[PATCH 0/1] meta-yocto: Special case the openembedded-core layer in toasterconf.json to avoid duplicates

[PATCH 0/1] meta-yocto: Special case the openembedded-core layer in toasterconf.json to avoid duplicates

[brian avery]

I missed this part of the large toaster patch set because it lives outside of bitbake. 
This makes sure we have only 1 openembedded-core layer available in toaster.

The following changes since commit 4bc3f0994e68b3302a0523a3156dd0dca0cac7a0:

  bitbake: toaster: move clones into subdirectory (2015-09-29 14:11:39 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib toaster-next
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=toaster-next

Michael Wood (1):
  toaster: Special case the openembedded-core layer to avoid duplicates

 meta-yocto/conf/toasterconf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/1] toaster: Special case the openembedded-core layer to avoid duplicates

[brian avery]

From: Michael Wood <michael.g.wood@intel.com>

If the openembedded-core layer is specified in the toasterconf we need
to treat it differently because we may also get this layer either from
the layerindex source or I can also be provided locally.

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
---
 meta-yocto/conf/toasterconf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index c455276..9e45ff0 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/meta-yocto/conf/toasterconf.json
@@ -12,7 +12,7 @@
             "name": "Local Yocto Project",
             "sourcetype": "local",
             "apiurl": "../../",
-            "branches": ["HEAD", "master", "fido", "dizzy"],
+            "branches": ["HEAD" ],
             "layers": [
                 {
                     "name": "openembedded-core",
-- 
1.9.1