summaryrefslogtreecommitdiffstats
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-24 16:41:42 +0000
commit9d8cb501f74ceb9b1571ebf5c3b5c4200bbfa134 (patch)
tree73e88d015514a9c635d1f48d9d8fb731fc8551a3
parent59bfcd7299cd5e45a5cae976864c530ced2de6bd (diff)
downloadpoky-9d8cb501f74ceb9b1571ebf5c3b5c4200bbfa134.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: 4ec04d14899cb7725ce908e3ef6302838275f0a8) 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> (cherry picked from commit de7bf6689a19dc614ce4b39c84ffd825bee1b962) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/license_image.bbclass2
-rw-r--r--meta/recipes-devtools/go/go_1.14.bb4
-rw-r--r--scripts/lib/devtool/menuconfig.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0d77d2f676..a241543ff2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -437,7 +437,7 @@ python () {
437 localdata.delVar('DATETIME') 437 localdata.delVar('DATETIME')
438 localdata.delVar('DATE') 438 localdata.delVar('DATE')
439 localdata.delVar('TMPDIR') 439 localdata.delVar('TMPDIR')
440 vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude', True) or '').split() 440 vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude') or '').split()
441 for dep in vardepsexclude: 441 for dep in vardepsexclude:
442 localdata.delVar(dep) 442 localdata.delVar(dep)
443 443
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass
index 9f3a0c3727..325b3cbba7 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -211,7 +211,7 @@ def get_deployed_dependencies(d):
211 deploy = {} 211 deploy = {}
212 # Get all the dependencies for the current task (rootfs). 212 # Get all the dependencies for the current task (rootfs).
213 taskdata = d.getVar("BB_TASKDEPDATA", False) 213 taskdata = d.getVar("BB_TASKDEPDATA", False)
214 pn = d.getVar("PN", True) 214 pn = d.getVar("PN")
215 depends = list(set([dep[0] for dep 215 depends = list(set([dep[0] for dep
216 in list(taskdata.values()) 216 in list(taskdata.values())
217 if not dep[0].endswith("-native") and not dep[0] == pn])) 217 if not dep[0].endswith("-native") and not dep[0] == pn]))
diff --git a/meta/recipes-devtools/go/go_1.14.bb b/meta/recipes-devtools/go/go_1.14.bb
index c17527998b..76ff788238 100644
--- a/meta/recipes-devtools/go/go_1.14.bb
+++ b/meta/recipes-devtools/go/go_1.14.bb
@@ -7,8 +7,8 @@ export CGO_ENABLED_riscv64 = ""
7# windows/mips/riscv doesn't support -buildmode=pie, so skip the QA checking 7# windows/mips/riscv doesn't support -buildmode=pie, so skip the QA checking
8# for windows/mips/riscv and their variants. 8# for windows/mips/riscv and their variants.
9python() { 9python() {
10 if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True) or 'windows' in d.getVar('TARGET_GOOS', True): 10 if 'mips' in d.getVar('TARGET_ARCH') or 'riscv' in d.getVar('TARGET_ARCH') or 'windows' in d.getVar('TARGET_GOOS'):
11 d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") 11 d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel")
12 else: 12 else:
13 d.setVar('GOBUILDMODE', 'pie') 13 d.setVar('GOBUILDMODE', 'pie')
14} 14}
diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py
index 95384c5333..ff9227035d 100644
--- a/scripts/lib/devtool/menuconfig.py
+++ b/scripts/lib/devtool/menuconfig.py
@@ -43,7 +43,7 @@ def menuconfig(args, config, basepath, workspace):
43 return 1 43 return 1
44 44
45 check_workspace_recipe(workspace, args.component) 45 check_workspace_recipe(workspace, args.component)
46 pn = rd.getVar('PN', True) 46 pn = rd.getVar('PN')
47 47
48 if not rd.getVarFlag('do_menuconfig','task'): 48 if not rd.getVarFlag('do_menuconfig','task'):
49 raise DevtoolError("This recipe does not support menuconfig option") 49 raise DevtoolError("This recipe does not support menuconfig option")