[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
index 586bf2f..3c231c7 100644
--- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86 \
diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
index d0da209..7bc1aa2 100644
--- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86 \
@@ -22,11 +22,11 @@
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86 \
diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
index 8e9c81d..9726491 100644
--- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index 94effa2..874a472 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86 \
@@ -22,11 +22,11 @@
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
##OEROOT##/meta-poky \
- ##OEROOT##/import-layers/meta-openembedded/meta-oe \
- ##OEROOT##/import-layers/meta-openembedded/meta-networking \
- ##OEROOT##/import-layers/meta-openembedded/meta-perl \
- ##OEROOT##/import-layers/meta-openembedded/meta-python \
- ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+ ##OEROOT##/meta-openembedded/meta-oe \
+ ##OEROOT##/meta-openembedded/meta-networking \
+ ##OEROOT##/meta-openembedded/meta-perl \
+ ##OEROOT##/meta-openembedded/meta-python \
+ ##OEROOT##/meta-openembedded/meta-webserver \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-machines/meta-x86 \