mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
27ad9cac7b
* Update for new structure in sanity.bbclass - use a separate function to update bblayers.conf and add it to the list to be executed * Additionally, don't add meta-yocto-bsp if it's already in BBLAYERS (this can occur when switching between DISTRO = "" or other distros which use a LAYER_CONF_VERSION = "5" and DISTRO = "poky" which has LAYER_CONF_VERSION = "6") (From meta-yocto rev: 94b98b4868bfa6f9cb7d9a9f1d62c63665214c32) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
25 lines
901 B
Plaintext
25 lines
901 B
Plaintext
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 == 6:
|
|
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()
|
|
}
|
|
|
|
BBLAYERS_CONF_UPDATE_FUNCS += "poky_update_bblayersconf"
|