[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>
diff --git a/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
index fad77af..a137219 100644
--- a/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-evb-aspeed/meta-evb-ast2500/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 ?= ""
@@ -14,9 +14,9 @@
##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-aspeed \
- ##OEROOT##/meta-openbmc-machines/meta-evb \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
+ ##OEROOT##/meta-evb \
+ ##OEROOT##/meta-evb/meta-evb-aspeed \
+ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
@@ -27,7 +27,7 @@
##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-aspeed \
- ##OEROOT##/meta-openbmc-machines/meta-evb \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
+ ##OEROOT##/meta-evb \
+ ##OEROOT##/meta-evb/meta-evb-aspeed \
+ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \
"
diff --git a/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
index 99dd4d7..74cbfac 100644
--- a/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-evb-nuvoton/meta-evb-npcm750/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 ?= ""
@@ -13,9 +13,9 @@
##OEROOT##/meta-openembedded/meta-python \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-nuvoton \
- ##OEROOT##/meta-openbmc-machines/meta-evb \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
+ ##OEROOT##/meta-evb \
+ ##OEROOT##/meta-evb/meta-evb-nuvoton \
+ ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
@@ -25,7 +25,7 @@
##OEROOT##/meta-openembedded/meta-python \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-nuvoton \
- ##OEROOT##/meta-openbmc-machines/meta-evb \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton \
- ##OEROOT##/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
+ ##OEROOT##/meta-evb \
+ ##OEROOT##/meta-evb/meta-evb-nuvoton \
+ ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \
"
diff --git a/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb-raspberrypi/conf/bblayers.conf.sample
index 5db0501..d34db13 100644
--- a/meta-evb-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-evb-raspberrypi/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 ?= ""