commit ced66bd8f3e3f52d220a64e3e7d8f9aeba5a2039
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:05 2018 -0400
tree faf4ce6256d9b5990dc1d603443064aaf9e9cb29
parent 803c18b1ae36c33f37069b673a67da6121f63caa

[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-lanyang/conf/bblayers.conf.sample

diff --git a/meta-lanyang/conf/bblayers.conf.sample b/meta-lanyang/conf/bblayers.conf.sample
index 296acc3..fd230c7 100644
--- a/meta-lanyang/conf/bblayers.conf.sample
+++ b/meta-lanyang/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+LCONF_VERSION = "8"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -14,9 +14,9 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-inventec \
+  ##OEROOT##/meta-inventec/meta-lanyang \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -27,7 +27,7 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-inventec \
+  ##OEROOT##/meta-inventec/meta-lanyang \
   "