diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openbmc-machines | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[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>
Diffstat (limited to 'meta-openbmc-machines')
15 files changed, 127 insertions, 127 deletions
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample index 811368ca45..50aab0732b 100644 --- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-arm \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-arm \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample index b428881e03..4b3e798c6c 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -8,10 +8,10 @@ BBFILES ?= "" 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 ?= " \ 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 \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample index 454e217d70..fefa4168e8 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample @@ -8,9 +8,9 @@ BBFILES ?= "" 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 ?= " \ 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 \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample index d70b2b1aab..5db0501fc6 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample @@ -8,20 +8,20 @@ BBFILES ?= "" 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 \ " diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index 9be37e679a..48f8174cd4 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-openpower \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample index 57513206ab..83eed8b779 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-openpower \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample index aa8a2b3659..ab22ee1f89 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-openpower \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample index bab8a2c60a..cb42c63415 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ ##OEROOT##/meta-poky \ - ##OEROOT##/import-layers/meta-openembedded/meta-oe/ \ - ##OEROOT##/import-layers/meta-openembedded/meta-filesystems/ \ - ##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-filesystems/ \ + ##OEROOT##/meta-openembedded/meta-networking/ \ + ##OEROOT##/meta-openembedded/meta-python/ \ + ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample index d5504265e1..e153a4b23a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-openpower \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample index baddd56d9c..5884868fdf 100644 --- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample @@ -8,10 +8,10 @@ BBFILES ?= "" 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##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -21,10 +21,10 @@ BBLAYERS ?= " \ 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##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample index e3c6dacfac..2a4140f627 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample @@ -8,11 +8,11 @@ BBFILES ?= "" 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-openpower \ @@ -22,11 +22,11 @@ BBLAYERS ?= " \ 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-openpower \ 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 586bf2fc3a..3c231c7f66 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 @@ BBFILES ?= "" 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 d0da209f37..7bc1aa2dd9 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 @@ BBFILES ?= "" 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 ?= " \ 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 8e9c81dfd7..9726491312 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 @@ BBFILES ?= "" 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 94effa2177..874a472de1 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 @@ BBFILES ?= "" 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 ?= " \ 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 \ |