diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 22:25:37 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 19:43:25 +0300 |
commit | e18c61205e0234b03697129c20cc69c9b3940efc (patch) | |
tree | 067391dd07388ca91df4fdc7de128602b226866c | |
parent | 92f422187868bad645e3f1d005e9849aad7863ec (diff) | |
download | openbmc-e18c61205e0234b03697129c20cc69c9b3940efc.tar.xz |
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>
8 files changed, 14 insertions, 15 deletions
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 dee1fa1c8..1a51f1161 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 @@ BBFILES ?= "" 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 ?= " \ " 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 d231e886c..33c53f9db 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 @@ BBFILES ?= "" 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 ?= " \ " 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 11bfa80b9..484c8140f 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 @@ BBFILES ?= "" 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 ?= " \ " 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 7156d9bed..4af5ad3ab 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 @@ BBFILES ?= "" 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 ?= " \ " 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 59942f1ee..55c164a90 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 @@ BBFILES ?= "" 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 ?= " \ " 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 163ef19f7..f49a3b593 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 @@ BBFILES ?= "" 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 ?= " \ " 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 2f0321f1b..bc651fafa 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -7,10 +7,10 @@ BBFILES ?= "" 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 c3841b0aa..000000000 --- a/meta-yocto +++ /dev/null @@ -1 +0,0 @@ -yocto-poky/meta-yocto
\ No newline at end of file |