summaryrefslogtreecommitdiffstats
path: root/meta-poky/classes
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2024-06-25 21:39:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-01 13:53:45 +0100
commitc925c8d403881275023e258151312583f6b090cd (patch)
tree58f11cf0ebb1f8ed0d01431ca3aba076361a7e5d /meta-poky/classes
parent6be592d2a7268ca394445539f6568d1c64fb0bc7 (diff)
downloadpoky-c925c8d403881275023e258151312583f6b090cd.tar.gz
poky-sanity: remove True option to getVar calls
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>
Diffstat (limited to 'meta-poky/classes')
-rw-r--r--meta-poky/classes/poky-sanity.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-poky/classes/poky-sanity.bbclass b/meta-poky/classes/poky-sanity.bbclass
index 81cd2eb6a6..a068c7368c 100644
--- a/meta-poky/classes/poky-sanity.bbclass
+++ b/meta-poky/classes/poky-sanity.bbclass
@@ -1,8 +1,8 @@
1# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades 1# Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades
2 2
3python poky_update_bblayersconf() { 3python poky_update_bblayersconf() {
4 current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) 4 current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION') or -1)
5 latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) 5 latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION') or -1)
6 if current_version == -1 or latest_version == -1: 6 if current_version == -1 or latest_version == -1:
7 # one or the other missing => malformed configuration 7 # one or the other missing => malformed configuration
8 raise NotImplementedError("You need to update bblayers.conf manually for this version transition") 8 raise NotImplementedError("You need to update bblayers.conf manually for this version transition")
@@ -11,7 +11,7 @@ python poky_update_bblayersconf() {
11 11
12 # check for out of date templateconf.cfg file 12 # check for out of date templateconf.cfg file
13 lines = [] 13 lines = []
14 fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') 14 fn = os.path.join(d.getVar('TOPDIR'), 'conf/templateconf.cfg')
15 15
16 lines = sanity_conf_read(fn) 16 lines = sanity_conf_read(fn)
17 index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) 17 index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines)