yocto-2.1: meta-yocto to meta-poky transition
With yocto-2.1, per meta-yocto/conf/layer.conf, meta-yocto is
deprecated and should be transitioned to meta-poky.
Change-Id: Ie1819c13d1741d68f130570c676b3fe274cbb6f4
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
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 dee1fa1..1a51f11 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
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
index d231e88..33c53f9 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/bblayers.conf.sample
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
index 11bfa80..484c814 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/bblayers.conf.sample
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
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 7156d9b..4af5ad3 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
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
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 59942f1..55c164a 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
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
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 163ef19..f49a3b5 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
@@ -7,7 +7,7 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
@@ -17,7 +17,7 @@
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-openbmc-bsp/meta-aspeed \
##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample
index 2f0321f..bc651fa 100644
--- a/meta-phosphor/conf/bblayers.conf.sample
+++ b/meta-phosphor/conf/bblayers.conf.sample
@@ -7,10 +7,10 @@
BBLAYERS ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
##OEROOT##/meta-phosphor \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
- ##OEROOT##/meta-yocto \
+ ##OEROOT##/meta-poky \
"
diff --git a/meta-yocto b/meta-yocto
deleted file mode 120000
index c3841b0..0000000
--- a/meta-yocto
+++ /dev/null
@@ -1 +0,0 @@
-yocto-poky/meta-yocto
\ No newline at end of file