From dfd833725dab28015474359754883a67bbc80cc6 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Sun, 13 Jan 2019 11:16:01 +0000 Subject: meta: remove True option to getVar calls (again) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-native_2.7.15.bb | 2 +- meta/recipes-devtools/python/python3-native_3.5.6.bb | 2 +- meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-devtools') 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(){ # Read JSON manifest import json - pythondir = d.getVar('THISDIR',True) + pythondir = d.getVar('THISDIR') with open(pythondir+'/python/python2-manifest.json') as manifest_file: manifest_str = manifest_file.read() 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(){ # Read JSON manifest import json - pythondir = d.getVar('THISDIR',True) + pythondir = d.getVar('THISDIR') with open(pythondir+'/python3/python3-manifest.json') as manifest_file: manifest_str = manifest_file.read() 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() { do_install_append_class-nativesdk() { for tool in ${WRAPPER_TOOLS}; do create_wrapper ${D}$tool \ - RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ - RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \ - MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \ + RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ + RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \ + MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \ RPM_NO_CHROOT_FOR_SCRIPTS=1 done -- cgit v1.2.3-54-g00ecf