mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

sanity: Do not mistake meta-yocto-bsp for meta-yocto

Browse Source 
The code in oecore_update_bblayers() handling the transition from
meta-yocto to meta-poky was not very resilient. It would, e.g.,
mistake meta-yocto-bsp for meta-yocto if the former occurred before
the latter in BBLAYERS.

The code also failed to update multiple existences of meta-yocto in
the bblayers.conf file, e.g., if it was present in
BBLAYERS_NON_REMOVABLE in addition to BBLAYERS (which it is by
default).

(From OE-Core rev: 8deb14898f351bd33950291ccde7c4458c6cf506)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2016-02-29 17:28:56 +01:00
committed by Richard Purdie
parent 86759deb5c
commit 4eaef67a38
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meta/classes/sanity.bbclass
View File

@@ -77,7 +77,7 @@ python oecore_update_bblayers() {
lconf_version = int(d.getVar('LAYER_CONF_VERSION', True))
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).
Please compare the your file against bblayers.conf.sample and merge any changes before continuing.
Please compare your file against bblayers.conf.sample and merge any changes before continuing.
"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample"
is a good way to visualise the changes.""" % (current_lconf, lconf_version)
@@ -132,12 +132,18 @@ is a good way to visualise the changes.""" % (current_lconf, lconf_version)
# Handle rename of meta-yocto -> meta-poky
# This marks the start of separate version numbers but code is needed in OE-Core
# for the migration, one last time.
layers = d.getVar('BBLAYERS', True)
layers = d.getVar('BBLAYERS', True).split()
layers = [ os.path.basename(path) for path in layers ]
if 'meta-yocto' in layers:
index, meta_yocto_line = sanity_conf_find_line('.*meta-yocto.*\n', lines)
if meta_yocto_line:
lines[index] = meta_yocto_line.replace('meta-yocto', 'meta-poky')
else:
found = False
while True:
index, meta_yocto_line = sanity_conf_find_line(r'.*meta-yocto[\'"\s\n]', lines)
if meta_yocto_line:
lines[index] = meta_yocto_line.replace('meta-yocto', 'meta-poky')
found = True
else:
break
if not found:
raise NotImplementedError(failmsg)
index, meta_yocto_line = sanity_conf_find_line('LCONF_VERSION.*\n', lines)
if meta_yocto_line: