summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-02-01 16:50:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 21:46:56 +0000
commit54d0147307e0fb581db20603cfec58d74343a0de (patch)
tree0924d0197faf85851987995fe249615d0ee28e16 /meta/classes
parentf8183e4c6f63ac34ab17262f60ea4b64d6712e6f (diff)
downloadpoky-54d0147307e0fb581db20603cfec58d74343a0de.tar.gz
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) (From OE-Core rev: de7bf6689a19dc614ce4b39c84ffd825bee1b962) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/license_image.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c424c4c41d..aa14ea2316 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -440,7 +440,7 @@ python () {
440 localdata.delVar('DATE') 440 localdata.delVar('DATE')
441 localdata.delVar('TMPDIR') 441 localdata.delVar('TMPDIR')
442 localdata.delVar('IMAGE_VERSION_SUFFIX') 442 localdata.delVar('IMAGE_VERSION_SUFFIX')
443 vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() 443 vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split()
444 for dep in vardepsexclude: 444 for dep in vardepsexclude:
445 localdata.delVar(dep) 445 localdata.delVar(dep)
446 446
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass
index 3213ea758e..1c06a02951 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -229,7 +229,7 @@ def get_deployed_dependencies(d):
229 deploy = {} 229 deploy = {}
230 # Get all the dependencies for the current task (rootfs). 230 # Get all the dependencies for the current task (rootfs).
231 taskdata = d.getVar("BB_TASKDEPDATA", False) 231 taskdata = d.getVar("BB_TASKDEPDATA", False)
232 pn = d.getVar("PN", True) 232 pn = d.getVar("PN")
233 depends = list(set([dep[0] for dep 233 depends = list(set([dep[0] for dep
234 in list(taskdata.values()) 234 in list(taskdata.values())
235 if not dep[0].endswith("-native") and not dep[0] == pn])) 235 if not dep[0].endswith("-native") and not dep[0] == pn]))