summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-09-30 10:18:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 15:27:43 +0100
commitcf8ad8d4efdcc6a439ee33f70dec65fec674abfa (patch)
treeb12380dd0b67fdccfce6eea767e04408ab5f4758 /meta-yocto
parent20b888b9538a029425ec0faa7f1d137553c39c6b (diff)
downloadpoky-cf8ad8d4efdcc6a439ee33f70dec65fec674abfa.tar.gz
poky-cf8ad8d4efdcc6a439ee33f70dec65fec674abfa.tar.bz2
poky-cf8ad8d4efdcc6a439ee33f70dec65fec674abfa.zip
toaster: Special case the openembedded-core layer to avoid duplicates
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. (From meta-yocto rev: c05a715d0548eaf8c02c5fef43bab042efe171d4) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/toasterconf.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index c455276266..9e45ff09ce 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",