diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:16:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:31 +0000 |
commit | afadb9aa510f5ba4809fc43e3987ef30f94495aa (patch) | |
tree | a04dacc73d8f726a3c5de32bc4da968d5aa665a2 /meta/recipes-devtools | |
parent | 46d75fd3db307c9058d80bdc8efe38087dc556ed (diff) | |
download | poky-afadb9aa510f5ba4809fc43e3987ef30f94495aa.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)
(From OE-Core rev: 2da88ecbbf118bb7440f48184d4b39c273ab57e9)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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.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 de35104c60..9d0fe3b84f 100644 --- a/meta/recipes-devtools/python/python-native_2.7.15.bb +++ b/meta/recipes-devtools/python/python-native_2.7.15.bb | |||
@@ -67,7 +67,7 @@ python(){ | |||
67 | 67 | ||
68 | # Read JSON manifest | 68 | # Read JSON manifest |
69 | import json | 69 | import json |
70 | pythondir = d.getVar('THISDIR',True) | 70 | pythondir = d.getVar('THISDIR') |
71 | with open(pythondir+'/python/python2-manifest.json') as manifest_file: | 71 | with open(pythondir+'/python/python2-manifest.json') as manifest_file: |
72 | manifest_str = manifest_file.read() | 72 | manifest_str = manifest_file.read() |
73 | json_start = manifest_str.find('# EOC') + 6 | 73 | 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 56236da07f..c7bc4f3b0a 100644 --- a/meta/recipes-devtools/python/python3-native_3.5.6.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb | |||
@@ -81,7 +81,7 @@ python(){ | |||
81 | 81 | ||
82 | # Read JSON manifest | 82 | # Read JSON manifest |
83 | import json | 83 | import json |
84 | pythondir = d.getVar('THISDIR',True) | 84 | pythondir = d.getVar('THISDIR') |
85 | with open(pythondir+'/python3/python3-manifest.json') as manifest_file: | 85 | with open(pythondir+'/python3/python3-manifest.json') as manifest_file: |
86 | python_manifest=json.load(manifest_file) | 86 | python_manifest=json.load(manifest_file) |
87 | 87 | ||
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.bb index 200fe4da26..75ef3f4d03 100644 --- a/meta/recipes-devtools/rpm/rpm_4.14.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.bb | |||
@@ -104,9 +104,9 @@ do_install_append_class-native() { | |||
104 | do_install_append_class-nativesdk() { | 104 | do_install_append_class-nativesdk() { |
105 | for tool in ${WRAPPER_TOOLS}; do | 105 | for tool in ${WRAPPER_TOOLS}; do |
106 | create_wrapper ${D}$tool \ | 106 | create_wrapper ${D}$tool \ |
107 | RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ | 107 | RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ |
108 | RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \ | 108 | RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \ |
109 | MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \ | 109 | MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \ |
110 | RPM_NO_CHROOT_FOR_SCRIPTS=1 | 110 | RPM_NO_CHROOT_FOR_SCRIPTS=1 |
111 | done | 111 | done |
112 | 112 | ||