commit ea4b0d76e02cb74654c9a6c8c1852b954979e4ba
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:22 2018 -0400
tree e25df3afc6bd5307e46e33dcf1d900683a4ba37b
parent d77b0dd6ff3e664c2ce8f4958327db55fa764a61

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

diff --git a/meta-neptune/conf/bblayers.conf.sample b/meta-neptune/conf/bblayers.conf.sample
index 90488aa..e60ce80 100644
--- a/meta-neptune/conf/bblayers.conf.sample
+++ b/meta-neptune/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,5 +15,5 @@
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
+  ##OEROOT##/meta-portwell/meta-neptune \
   "