commit 7dbc9783d232c37cfa42d51474b8c309517def6d
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 22:59:47 2018 -0400
tree 8ae92cc324b7df02ecb0bd1a64414006097b6d36
parent e83cef914331834ec22e09ba4f45057d76ed162c

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

diff --git a/meta-msn/conf/bblayers.conf.sample b/meta-msn/conf/bblayers.conf.sample
index 95b3b58..1f34a69 100644
--- a/meta-msn/conf/bblayers.conf.sample
+++ b/meta-msn/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,9 +15,9 @@
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
+  ##OEROOT##/meta-x86 \
+  ##OEROOT##/meta-mellanox \
+  ##OEROOT##/meta-mellanox/meta-msn \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -29,7 +29,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-mellanox \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
+  ##OEROOT##/meta-x86 \
+  ##OEROOT##/meta-mellanox \
+  ##OEROOT##/meta-mellanox/meta-msn \
   "