commit 8798c9ccf453a6b4b5baab37ffaf14630f7be00e
author Dave Cobbley <david.j.cobbley@linux.intel.com> Tue Aug 14 10:05:37 2018 -0700
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Wed Aug 22 21:26:31 2018 -0400
tree ac5ca92194c2cf6ba3db7060b1dc001708ba98b4
parent 414eab4ded361f937299586b9966d3f488bae95b

[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>

meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample

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 b428881..4b3e798 100644
--- a/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
@@ -8,10 +8,10 @@
 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-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
@@ -21,10 +21,10 @@
 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-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \

meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample

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 454e217..fefa416 100644
--- a/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
@@ -8,9 +8,9 @@
 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-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
@@ -20,9 +20,9 @@
 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-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \

meta-evb-raspberrypi/conf/bblayers.conf.sample

diff --git a/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb-raspberrypi/conf/bblayers.conf.sample
index d70b2b1..5db0501 100644
--- a/meta-evb-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-evb-raspberrypi/conf/bblayers.conf.sample
@@ -8,20 +8,20 @@
 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-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/import-layers/meta-raspberrypi \
+  ##OEROOT##/meta-raspberrypi \
   "
 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-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/import-layers/meta-raspberrypi \
+  ##OEROOT##/meta-raspberrypi \
   "