diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:16:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 11:35:56 +0000 |
commit | dfd833725dab28015474359754883a67bbc80cc6 (patch) | |
tree | 8e662381b09eb469f0e37c6ebeb2e307e8c25e41 /meta/recipes-devtools | |
parent | 7f457682544e1ca80e7f3637d8ffddd9ede8ff57 (diff) | |
download | poky-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/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python-native_2.7.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.5.6.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 6 |
3 files changed, 5 insertions, 5 deletions
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() { | |||
105 | do_install_append_class-nativesdk() { | 105 | do_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 | ||