# Template settings
-TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf}
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
--- /dev/null
+# 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"
-# 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 \
"
--- /dev/null
+# 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"
"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",
"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."
},
"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."
}
+++ /dev/null
-# 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"
-# 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:"
BBLAYERS ?= " \\
/path/to/poky/meta \\
- /path/to/poky/meta-yocto \\
+ /path/to/poky/meta-poky \\
/path/to/poky/meta-mybsp \\
"
"""
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}} \
"
projects / thirdparty / openembedded / openembedded-core-contrib.git / commitdiff
