commit 20b1fa56a47308422b80026578fa5bd1d2a5ab0a
author Dave Cobbley <david.j.cobbley@linux.intel.com> Wed Aug 22 21:40:54 2018 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Aug 23 23:00:23 2018 -0400
tree 899b512a2140888915b91f66257261201d62c5f1
parent a9754f78e18182359889298f1ea66dc6cd202aa0

[Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-s2600wf/conf/bblayers.conf.sample

diff --git a/meta-s2600wf/conf/bblayers.conf.sample b/meta-s2600wf/conf/bblayers.conf.sample
index 5f4301b..9bb7743 100644
--- a/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-s2600wf/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "7"
+LCONF_VERSION = "8"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -15,7 +15,7 @@
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf \
+  ##OEROOT##/meta-x86 \
+  ##OEROOT##/meta-intel \
+  ##OEROOT##/meta-intel/meta-s2600wf \
 "