MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

poky-sanity: remove True option to getVar calls

Browse Source 
Layer cleanup similar to
https://git.openembedded.org/openembedded-core/commit/?id=26c74fd10614582e177437608908eb43688ab510

(From meta-yocto rev: 672a6bea17fb6e202ccbc1b7ce9a2ebdd6245779)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Marko 2024-06-25 21:39:33 +02:00 committed by Richard Purdie
parent 6be592d2a7
commit c925c8d403
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-poky/classes/poky-sanity.bbclass
View File

@ -1,8 +1,8 @@
# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades # Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
python poky_update_bblayersconf() { python poky_update_bblayersconf() {
current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION') or -1)
latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION') or -1)
if current_version == -1 or latest_version == -1: if current_version == -1 or latest_version == -1:
# one or the other missing => malformed configuration # one or the other missing => malformed configuration
raise NotImplementedError("You need to update bblayers.conf manually for this version transition") raise NotImplementedError("You need to update bblayers.conf manually for this version transition")
@ -11,7 +11,7 @@ python poky_update_bblayersconf() {
# check for out of date templateconf.cfg file # check for out of date templateconf.cfg file
lines = [] lines = []
fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') fn = os.path.join(d.getVar('TOPDIR'), 'conf/templateconf.cfg')
lines = sanity_conf_read(fn) lines = sanity_conf_read(fn)
index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines)