From 307f25c23efecd3861a9f8337806be9ca8b0b9f1 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 24 Sep 2017 06:03:49 +0200 Subject: meta: drop True option to getVar calls Search made with the following regex: getVar ?\((.*), True\). (From OE-Core rev: dbc0eaf478feb3f752ae22fd184984494fc85d0a) Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 2 +- meta/classes/rootfs-postcommands.bbclass | 2 +- meta/classes/staging.bbclass | 14 +++++++------- meta/conf/bitbake.conf | 2 +- meta/lib/oe/package_manager.py | 2 +- meta/recipes-devtools/go/go-cross.inc | 2 +- meta/recipes-devtools/go/go-crosssdk.inc | 2 +- meta/recipes-devtools/go/go-native.inc | 2 +- meta/recipes-devtools/go/go-target.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'meta') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index dbfcc05d10..7a5534edd8 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -192,7 +192,7 @@ python buildhistory_emit_pkghistory() { pe = d.getVar('PE') or "0" pv = d.getVar('PV') pr = d.getVar('PR') - layer = bb.utils.get_file_layer(d.getVar('FILE', True), d) + layer = bb.utils.get_file_layer(d.getVar('FILE'), d) pkgdata_dir = d.getVar('PKGDATA_DIR') packages = "" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 3755f94090..5391e7a8e3 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -318,5 +318,5 @@ python rootfs_log_check_recommends() { continue if 'unsatisfied recommendation for' in line: - bb.warn('[log_check] %s: %s' % (d.getVar('PN', True), line)) + bb.warn('[log_check] %s: %s' % (d.getVar('PN'), line)) } diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index ea831e0167..d21e198ae8 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -68,16 +68,16 @@ sysroot_stage_all() { } python sysroot_strip () { - inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP', True) + inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP') if inhibit_sysroot and oe.types.boolean(inhibit_sysroot): return 0 - dstdir = d.getVar('SYSROOT_DESTDIR', True) - pn = d.getVar('PN', True) - libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir", True)) - base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir", True)) - qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn, True) or "").split() - strip_cmd = d.getVar("STRIP", True) + dstdir = d.getVar('SYSROOT_DESTDIR') + pn = d.getVar('PN') + libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir")) + base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir")) + qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split() + strip_cmd = d.getVar("STRIP") oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=qa_already_stripped) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4ff1e9608e..f41680b27e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -337,7 +337,7 @@ FILESEXTRAPATHS ?= "__default:" # datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir, # mandir, docdir, bindir, sbindir, libexecdir, libdir, includedir and # oldincludedir -FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR', True)) else 'files/fs-perms-persistent-log.txt'}" +FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'files/fs-perms-persistent-log.txt'}" ################################################################## # General work and output directories for the build system. diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 994e462445..658c964277 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1151,7 +1151,7 @@ class OpkgPM(OpkgDpkgPM): # Create an temp dir as opkg root for dummy installation temp_rootfs = self.d.expand('${T}/opkg') - opkg_lib_dir = self.d.getVar('OPKGLIBDIR', True) + opkg_lib_dir = self.d.getVar('OPKGLIBDIR') if opkg_lib_dir[0] == "/": opkg_lib_dir = opkg_lib_dir[1:] temp_opkg_dir = os.path.join(temp_rootfs, opkg_lib_dir, 'opkg') diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 234528ab98..dac0dfd137 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc @@ -15,7 +15,7 @@ export GOROOT_FINAL = "${libdir}/go" export CGO_ENABLED = "1" export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" -CC = "${@d.getVar('BUILD_CC', True).strip()}" +CC = "${@d.getVar('BUILD_CC').strip()}" do_configure[noexec] = "1" diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc index 471c75b3d5..f67e4b92a0 100644 --- a/meta/recipes-devtools/go/go-crosssdk.inc +++ b/meta/recipes-devtools/go/go-crosssdk.inc @@ -14,7 +14,7 @@ export CGO_ENABLED = "1" export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" export GO_INSTALL = "cmd" -CC = "${@d.getVar('BUILD_CC', True).strip()}" +CC = "${@d.getVar('BUILD_CC').strip()}" do_configure[noexec] = "1" diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc index 66b845c633..95db1c2b7c 100644 --- a/meta/recipes-devtools/go/go-native.inc +++ b/meta/recipes-devtools/go/go-native.inc @@ -10,7 +10,7 @@ SRC_URI[bootstrap.sha256sum] = "9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e5 export GOOS = "${BUILD_GOOS}" export GOARCH = "${BUILD_GOARCH}" -CC = "${@d.getVar('BUILD_CC', True).strip()}" +CC = "${@d.getVar('BUILD_CC').strip()}" export CGO_ENABLED = "1" diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 6065c3c80d..b9689c03c4 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc @@ -25,7 +25,7 @@ do_configure[noexec] = "1" do_compile() { export GOBIN="${B}/bin" - export CC="${@d.getVar('BUILD_CC', True).strip()}" + export CC="${@d.getVar('BUILD_CC').strip()}" rm -rf ${GOBIN} ${B}/pkg mkdir ${GOBIN} diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 632178fd77..f06fa49ae5 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -32,7 +32,7 @@ S = "${WORKDIR}/git" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" def get_llvm_arch(bb, d, arch_var): import re - a = d.getVar(arch_var, True) + a = d.getVar(arch_var) if re.match('(i.86|athlon|x86.64)$', a): return 'X86' elif re.match('arm$', a): return 'ARM' elif re.match('armeb$', a): return 'ARM' @@ -174,7 +174,7 @@ python llvm_populate_packages() { split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) if split_packages: - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb index 14e63d9683..8c3590466d 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb @@ -74,7 +74,7 @@ python populate_packages_prepend () { # The test suite exercises all the loaders, so ensure they are all # dependencies of the ptest package. - d.appendVar("RDEPENDS_%s-ptest" % d.getVar('PN', True), " " + packages) + d.appendVar("RDEPENDS_%s-ptest" % d.getVar('PN'), " " + packages) } do_install_append() { -- cgit v1.2.3-54-g00ecf