summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-13 11:16:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-14 11:35:56 +0000
commitdfd833725dab28015474359754883a67bbc80cc6 (patch)
tree8e662381b09eb469f0e37c6ebeb2e307e8c25e41 /meta
parent7f457682544e1ca80e7f3637d8ffddd9ede8ff57 (diff)
downloadpoky-dfd833725dab28015474359754883a67bbc80cc6.tar.gz
meta: remove True option to getVar calls (again)
A couple have still been missed in the past despite multiple attempts at doing so (or simply have re-appeared?). Search & replace made using the following command: sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) (From OE-Core rev: 9f551d588693328e4d99d33be94f26684eafcaba) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass4
-rw-r--r--meta/classes/systemd.bbclass2
-rw-r--r--meta/classes/update-alternatives.bbclass2
-rw-r--r--meta/classes/useradd-staticids.bbclass4
-rw-r--r--meta/recipes-core/systemd/systemd-boot_239.bb2
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.15.bb2
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.6.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.14.2.1.bb6
8 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index da0807d6e9..482ffa83f9 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -379,7 +379,7 @@ def sstate_installpkgdir(ss, d):
379 379
380 for plain in ss['plaindirs']: 380 for plain in ss['plaindirs']:
381 workdir = d.getVar('WORKDIR') 381 workdir = d.getVar('WORKDIR')
382 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 382 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
383 src = sstateinst + "/" + plain.replace(workdir, '') 383 src = sstateinst + "/" + plain.replace(workdir, '')
384 if sharedworkdir in plain: 384 if sharedworkdir in plain:
385 src = sstateinst + "/" + plain.replace(sharedworkdir, '') 385 src = sstateinst + "/" + plain.replace(sharedworkdir, '')
@@ -640,7 +640,7 @@ def sstate_package(ss, d):
640 os.rename(state[1], sstatebuild + state[0]) 640 os.rename(state[1], sstatebuild + state[0])
641 641
642 workdir = d.getVar('WORKDIR') 642 workdir = d.getVar('WORKDIR')
643 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 643 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
644 for plain in ss['plaindirs']: 644 for plain in ss['plaindirs']:
645 pdir = plain.replace(workdir, sstatebuild) 645 pdir = plain.replace(workdir, sstatebuild)
646 if sharedworkdir in plain: 646 if sharedworkdir in plain:
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index c7b784dea8..c8f4fdec88 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -86,7 +86,7 @@ python systemd_populate_packages() {
86 def systemd_generate_package_scripts(pkg): 86 def systemd_generate_package_scripts(pkg):
87 bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg) 87 bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
88 88
89 paths_escaped = ' '.join(shlex.quote(s) for s in d.getVar('SYSTEMD_SERVICE_' + pkg, True).split()) 89 paths_escaped = ' '.join(shlex.quote(s) for s in d.getVar('SYSTEMD_SERVICE_' + pkg).split())
90 d.setVar('SYSTEMD_SERVICE_ESCAPED_' + pkg, paths_escaped) 90 d.setVar('SYSTEMD_SERVICE_ESCAPED_' + pkg, paths_escaped)
91 91
92 # Add pkg to the overrides so that it finds the SYSTEMD_SERVICE_pkg 92 # Add pkg to the overrides so that it finds the SYSTEMD_SERVICE_pkg
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 1362274d4d..f1250f877b 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -154,7 +154,7 @@ def apply_update_alternative_renames(d):
154 if not alt_link: 154 if not alt_link:
155 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) 155 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name)
156 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) 156 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link)
157 if alt_link.startswith(os.path.join(d.getVar('sysconfdir', True), 'init.d')): 157 if alt_link.startswith(os.path.join(d.getVar('sysconfdir'), 'init.d')):
158 # Managing init scripts does not work (bug #10433), foremost 158 # Managing init scripts does not work (bug #10433), foremost
159 # because of a race with update-rc.d 159 # because of a race with update-rc.d
160 bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") 160 bb.fatal("Using update-alternatives for managing SysV init scripts is not supported")
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 64bf6dc823..70d59e5573 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -59,8 +59,8 @@ def update_useradd_static_config(d):
59 # Paths are resolved via BBPATH. 59 # Paths are resolved via BBPATH.
60 def get_table_list(d, var, default): 60 def get_table_list(d, var, default):
61 files = [] 61 files = []
62 bbpath = d.getVar('BBPATH', True) 62 bbpath = d.getVar('BBPATH')
63 tables = d.getVar(var, True) 63 tables = d.getVar(var)
64 if not tables: 64 if not tables:
65 tables = default 65 tables = default
66 for conf_file in tables.split(): 66 for conf_file in tables.split():
diff --git a/meta/recipes-core/systemd/systemd-boot_239.bb b/meta/recipes-core/systemd/systemd-boot_239.bb
index 312a0145d8..2450d52cb9 100644
--- a/meta/recipes-core/systemd/systemd-boot_239.bb
+++ b/meta/recipes-core/systemd/systemd-boot_239.bb
@@ -29,7 +29,7 @@ EXTRA_OEMESON += "-Defi=true \
29python __anonymous () { 29python __anonymous () {
30 import re 30 import re
31 target = d.getVar('TARGET_ARCH') 31 target = d.getVar('TARGET_ARCH')
32 prefix = "" if d.getVar('EFI_PROVIDER', True) == "systemd-boot" else "systemd-" 32 prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-"
33 if target == "x86_64": 33 if target == "x86_64":
34 systemdimage = prefix + "bootx64.efi" 34 systemdimage = prefix + "bootx64.efi"
35 else: 35 else:
diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.15.bb
index b0c2a59656..f00153f0ee 100644
--- a/meta/recipes-devtools/python/python-native_2.7.15.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.15.bb
@@ -68,7 +68,7 @@ python(){
68 68
69 # Read JSON manifest 69 # Read JSON manifest
70 import json 70 import json
71 pythondir = d.getVar('THISDIR',True) 71 pythondir = d.getVar('THISDIR')
72 with open(pythondir+'/python/python2-manifest.json') as manifest_file: 72 with open(pythondir+'/python/python2-manifest.json') as manifest_file:
73 manifest_str = manifest_file.read() 73 manifest_str = manifest_file.read()
74 json_start = manifest_str.find('# EOC') + 6 74 json_start = manifest_str.find('# EOC') + 6
diff --git a/meta/recipes-devtools/python/python3-native_3.5.6.bb b/meta/recipes-devtools/python/python3-native_3.5.6.bb
index 8476d681c3..c41ee8bbd9 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb
@@ -82,7 +82,7 @@ python(){
82 82
83 # Read JSON manifest 83 # Read JSON manifest
84 import json 84 import json
85 pythondir = d.getVar('THISDIR',True) 85 pythondir = d.getVar('THISDIR')
86 with open(pythondir+'/python3/python3-manifest.json') as manifest_file: 86 with open(pythondir+'/python3/python3-manifest.json') as manifest_file:
87 manifest_str = manifest_file.read() 87 manifest_str = manifest_file.read()
88 json_start = manifest_str.find('# EOC') + 6 88 json_start = manifest_str.find('# EOC') + 6
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 66eef557df..063f4269a5 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -105,9 +105,9 @@ do_install_append_class-native() {
105do_install_append_class-nativesdk() { 105do_install_append_class-nativesdk() {
106 for tool in ${WRAPPER_TOOLS}; do 106 for tool in ${WRAPPER_TOOLS}; do
107 create_wrapper ${D}$tool \ 107 create_wrapper ${D}$tool \
108 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ 108 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
109 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \ 109 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \
110 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \ 110 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \
111 RPM_NO_CHROOT_FOR_SCRIPTS=1 111 RPM_NO_CHROOT_FOR_SCRIPTS=1
112 done 112 done
113 113