Browse Source

meta-yocto: Rename to meta-poky to better match its purpose

"poky" is the reference distribution for the Yocto Project. This renames
the layer within the meta-yocto repository to meta-poky, better matching
what that layer contains.

A layer.conf file is left behind as this is the only way which allows
existing builds to migrate safely to the new name. It will be removed
at some future point.

This change requires the corresponding OE-Core change to handle the
migration and the changes to the infrastructure to support this.

(From meta-yocto rev: d0c88df2e14672fca4ebbde93c5efbcd0e4fa9b6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pyro-old
Richard Purdie 7 years ago
parent
commit
9d5483c375
  1. 2
      .templateconf
  2. 2
      README
  3. 12
      meta-poky/classes/poky-sanity.bbclass
  4. 8
      meta-poky/conf/bblayers.conf.sample
  5. 0
      meta-poky/conf/conf-notes.txt
  6. 0
      meta-poky/conf/distro/include/maintainers.inc
  7. 0
      meta-poky/conf/distro/include/poky-floating-revisions.inc
  8. 0
      meta-poky/conf/distro/include/poky-world-exclude.inc
  9. 0
      meta-poky/conf/distro/poky-bleeding.conf
  10. 0
      meta-poky/conf/distro/poky-lsb.conf
  11. 0
      meta-poky/conf/distro/poky-tiny.conf
  12. 0
      meta-poky/conf/distro/poky.conf
  13. 18
      meta-poky/conf/layer.conf
  14. 0
      meta-poky/conf/local.conf.sample
  15. 0
      meta-poky/conf/local.conf.sample.extended
  16. 0
      meta-poky/conf/site.conf.sample
  17. 10
      meta-poky/conf/toasterconf.json
  18. 0
      meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig
  19. 0
      meta-poky/recipes-core/busybox/busybox_%.bbappend
  20. 0
      meta-poky/recipes-core/psplash/files/psplash-poky-img.h
  21. 0
      meta-poky/recipes-core/psplash/psplash_git.bbappend
  22. 0
      meta-poky/recipes-core/tiny-init/files/init
  23. 0
      meta-poky/recipes-core/tiny-init/files/rc.local.sample
  24. 0
      meta-poky/recipes-core/tiny-init/tiny-init.bb
  25. 28
      meta-yocto/classes/poky-sanity.bbclass
  26. 18
      meta-yocto/conf/layer.conf
  27. 2
      scripts/lib/bsp/help.py
  28. 2
      scripts/lib/bsp/substrate/target/arch/layer/README

2
.templateconf

@ -1,2 +1,2 @@
# Template settings
TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf}

2
README

@ -42,7 +42,7 @@ documentation:
Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/
Mailing list: yocto@yoctoproject.org
meta-yocto(-bsp):
meta-poky, meta-yocto-bsp:
Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/meta-yocto(-bsp)
Mailing list: poky@yoctoproject.org

12
meta-poky/classes/poky-sanity.bbclass

@ -0,0 +1,12 @@
# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
python poky_update_bblayersconf() {
current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1)
latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1)
# No version transitions here yet
raise NotImplementedError("You need to update bblayers.conf manually for this version transision")
}
# Prepend to ensure our function runs before the OE-Core one
BBLAYERS_CONF_UPDATE_FUNCS =+ "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf"

8
meta-yocto/conf/bblayers.conf.sample → meta-poky/conf/bblayers.conf.sample

@ -1,16 +1,16 @@
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
LCONF_VERSION = "6"
POKY_BBLAYERS_CONF_VERSION = "1"
BBPATH = "${TOPDIR}"
BBFILES ?= ""
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/meta-yocto \
##OEROOT##/meta-poky \
##OEROOT##/meta-yocto-bsp \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
##OEROOT##/meta-yocto \
##OEROOT##/meta-poky \
"

0
meta-yocto/conf/conf-notes.txt → meta-poky/conf/conf-notes.txt

0
meta-yocto/conf/distro/include/maintainers.inc → meta-poky/conf/distro/include/maintainers.inc

0
meta-yocto/conf/distro/include/poky-floating-revisions.inc → meta-poky/conf/distro/include/poky-floating-revisions.inc

0
meta-yocto/conf/distro/include/poky-world-exclude.inc → meta-poky/conf/distro/include/poky-world-exclude.inc

0
meta-yocto/conf/distro/poky-bleeding.conf → meta-poky/conf/distro/poky-bleeding.conf

0
meta-yocto/conf/distro/poky-lsb.conf → meta-poky/conf/distro/poky-lsb.conf

0
meta-yocto/conf/distro/poky-tiny.conf → meta-poky/conf/distro/poky-tiny.conf

0
meta-yocto/conf/distro/poky.conf → meta-poky/conf/distro/poky.conf

18
meta-poky/conf/layer.conf

@ -0,0 +1,18 @@
# We have a conf and classes directory, add to BBPATH
BBPATH =. "${LAYERDIR}:"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "yocto"
BBFILE_PATTERN_yocto = "^${LAYERDIR}/"
BBFILE_PRIORITY_yocto = "5"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_yocto = "3"
LAYERDEPENDS_yocto = "core"
REQUIRED_POKY_BBLAYERS_CONF_VERSION = "1"

0
meta-yocto/conf/local.conf.sample → meta-poky/conf/local.conf.sample

0
meta-yocto/conf/local.conf.sample.extended → meta-poky/conf/local.conf.sample.extended

0
meta-yocto/conf/site.conf.sample → meta-poky/conf/site.conf.sample

10
meta-yocto/conf/toasterconf.json → meta-poky/conf/toasterconf.json

@ -20,10 +20,10 @@
"dirpath": "meta"
},
{
"name": "meta-yocto",
"local_path": "meta-yocto",
"name": "meta-poky",
"local_path": "meta-poky",
"vcs_url": "remote:origin",
"dirpath": "meta-yocto"
"dirpath": "meta-poky"
},
{
"name": "meta-yocto-bsp",
@ -83,7 +83,7 @@
"description": "Yocto Project master",
"bitbake": "master",
"branch": "master",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected."
},
@ -110,7 +110,7 @@
"description": "Local Yocto Project",
"bitbake": "HEAD",
"branch": "HEAD",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
}

0
meta-yocto/recipes-core/busybox/busybox/poky-tiny/defconfig → meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig

0
meta-yocto/recipes-core/busybox/busybox_%.bbappend → meta-poky/recipes-core/busybox/busybox_%.bbappend

0
meta-yocto/recipes-core/psplash/files/psplash-poky-img.h → meta-poky/recipes-core/psplash/files/psplash-poky-img.h

0
meta-yocto/recipes-core/psplash/psplash_git.bbappend → meta-poky/recipes-core/psplash/psplash_git.bbappend

0
meta-yocto/recipes-core/tiny-init/files/init → meta-poky/recipes-core/tiny-init/files/init

0
meta-yocto/recipes-core/tiny-init/files/rc.local.sample → meta-poky/recipes-core/tiny-init/files/rc.local.sample

0
meta-yocto/recipes-core/tiny-init/tiny-init.bb → meta-poky/recipes-core/tiny-init/tiny-init.bb

28
meta-yocto/classes/poky-sanity.bbclass

@ -1,28 +0,0 @@
# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
python poky_update_bblayersconf() {
current_version = int(d.getVar('LCONF_VERSION', True) or -1)
latest_version = int(d.getVar('LAYER_CONF_VERSION', True) or -1)
bblayers_fn = bblayers_conf_file(d)
lines = sanity_conf_read(bblayers_fn)
if current_version == 5 and latest_version > 5:
# Handle split out of meta-yocto-bsp from meta-yocto
if '/meta-yocto-bsp' not in d.getVar('BBLAYERS', True):
index, meta_yocto_line = sanity_conf_find_line('meta-yocto\s*\\\\\\n', lines)
if meta_yocto_line:
lines.insert(index + 1, meta_yocto_line.replace('meta-yocto',
'meta-yocto-bsp'))
else:
sys.exit()
current_version += 1
sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_version)
return
sys.exit()
}
# Prepend to ensure our function runs before the OE-Core one
BBLAYERS_CONF_UPDATE_FUNCS =+ "poky_update_bblayersconf"

18
meta-yocto/conf/layer.conf

@ -1,16 +1,2 @@
# We have a conf and classes directory, add to BBPATH
BBPATH =. "${LAYERDIR}:"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "yocto"
BBFILE_PATTERN_yocto = "^${LAYERDIR}/"
BBFILE_PRIORITY_yocto = "5"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_yocto = "2"
LAYERDEPENDS_yocto = "core"
# Dummy file to allow for meta-yocto -> meta-poky transition
BBPATH =. "${LAYERDIR}/../meta-poky:"

2
scripts/lib/bsp/help.py

@ -173,7 +173,7 @@ DESCRIPTION
BBLAYERS ?= " \\
/path/to/poky/meta \\
/path/to/poky/meta-yocto \\
/path/to/poky/meta-poky \\
/path/to/poky/meta-mybsp \\
"
"""

2
scripts/lib/bsp/substrate/target/arch/layer/README

@ -52,7 +52,7 @@ other layers needed. e.g.:
BBLAYERS ?= " \
/path/to/yocto/meta \
/path/to/yocto/meta-yocto \
/path/to/yocto/meta-poky \
/path/to/yocto/meta-yocto-bsp \
/path/to/yocto/meta-{{=layer_name}} \
"

Loading…
Cancel
Save