From efd3696e70a6603f1a45faa4a172433514f0a487 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 25 Nov 2016 15:28:52 +0000 Subject: remove True option to getVar calls getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) Signed-off-by: Joshua Lock --- meta-oe/classes/breakpad.bbclass | 6 +++--- meta-oe/classes/gitpkgv.bbclass | 4 ++-- meta-oe/classes/gitver.bbclass | 4 ++-- meta-oe/classes/machine_kernel_pr.bbclass | 2 +- meta-oe/classes/socorro-syms.bbclass | 8 ++++---- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 2 +- meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb | 2 +- meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb | 2 +- meta-oe/recipes-core/llvm/llvm.inc | 2 +- meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | 2 +- meta-oe/recipes-core/toybox/toybox_0.7.1.bb | 4 ++-- meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb | 2 +- meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb | 2 +- meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb | 2 +- meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb | 2 +- meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 12 ++++++------ meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb | 2 +- meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb | 4 ++-- meta-oe/recipes-navigation/navit/navit-fpu.inc | 2 +- meta-oe/recipes-support/atop/atop_2.2.3.bb | 2 +- meta-oe/recipes-support/fltk/fltk_1.3.3.bb | 2 +- meta-oe/recipes-support/libftdi/libftdi_1.3.bb | 2 +- meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 2 +- meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 4 ++-- meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++-- meta-oe/recipes-support/opencv/opencv_3.1.bb | 4 ++-- meta-oe/recipes-support/openldap/openldap_2.4.44.bb | 2 +- meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb | 2 +- meta-oe/recipes-support/poco/poco_1.7.5.bb | 4 ++-- meta-oe/recipes-support/poppler/poppler_0.48.0.bb | 2 +- meta-oe/recipes-support/postgresql/postgresql.inc | 8 ++++---- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 10 +++++----- 32 files changed, 57 insertions(+), 57 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/classes/breakpad.bbclass b/meta-oe/classes/breakpad.bbclass index b3abf278d6..36f11ff480 100644 --- a/meta-oe/classes/breakpad.bbclass +++ b/meta-oe/classes/breakpad.bbclass @@ -10,11 +10,11 @@ CXXFLAGS += "-I${STAGING_DIR_TARGET}${includedir}/breakpad " BREAKPAD_BIN ?= "" python () { - breakpad_bin = d.getVar("BREAKPAD_BIN", True) + breakpad_bin = d.getVar("BREAKPAD_BIN") if not breakpad_bin: - PN = d.getVar("PN", True) - FILE = os.path.basename(d.getVar("FILE", True)) + PN = d.getVar("PN") + FILE = os.path.basename(d.getVar("FILE")) bb.error("To build %s, see breakpad.bbclass for instructions on \ setting up your Breakpad configuration" % PN) raise ValueError('BREAKPAD_BIN not defined in %s' % PN) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 8cd4bfd1ed..3949b43c24 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -52,14 +52,14 @@ def get_git_pkgv(d, use_tags): import bb from pipes import quote - src_uri = d.getVar('SRC_URI', 1).split() + src_uri = d.getVar('SRC_URI').split() fetcher = bb.fetch2.Fetch(src_uri, d) ud = fetcher.ud # # If SRCREV_FORMAT is set respect it for tags # - format = d.getVar('SRCREV_FORMAT', True) + format = d.getVar('SRCREV_FORMAT') if not format: names = [] for url in ud.values(): diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass index e7b5155ee0..71bf42fbcd 100644 --- a/meta-oe/classes/gitver.bbclass +++ b/meta-oe/classes/gitver.bbclass @@ -24,7 +24,7 @@ def get_git_pv(path, d, tagadjust=None): import os import bb.process - gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git")) + gitdir = os.path.abspath(os.path.join(d.getVar("S"), ".git")) try: ver = gitrev_run("git describe --tags", gitdir) except Exception, exc: @@ -71,5 +71,5 @@ def mark_recipe_dependencies(path, d): mark_dependency(d, tagdir) python () { - mark_recipe_dependencies(d.getVar("S", True), d) + mark_recipe_dependencies(d.getVar("S"), d) } diff --git a/meta-oe/classes/machine_kernel_pr.bbclass b/meta-oe/classes/machine_kernel_pr.bbclass index 463b64d8e2..e48bd017f9 100644 --- a/meta-oe/classes/machine_kernel_pr.bbclass +++ b/meta-oe/classes/machine_kernel_pr.bbclass @@ -1,6 +1,6 @@ python __anonymous () { - machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True) + machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR') if machine_kernel_pr: d.setVar('PR', machine_kernel_pr) diff --git a/meta-oe/classes/socorro-syms.bbclass b/meta-oe/classes/socorro-syms.bbclass index 3f6ae6319b..cc435aba1e 100644 --- a/meta-oe/classes/socorro-syms.bbclass +++ b/meta-oe/classes/socorro-syms.bbclass @@ -21,10 +21,10 @@ FILES_${PN}-socorro-syms = "/usr/share/socorro-syms" python symbol_file_preprocess() { - package_dir = d.getVar("PKGD", True) - breakpad_bin = d.getVar("BREAKPAD_BIN", True) + package_dir = d.getVar("PKGD") + breakpad_bin = d.getVar("BREAKPAD_BIN") if not breakpad_bin: - package_name = d.getVar("PN", True) + package_name = d.getVar("PN") bb.error("Package %s depends on Breakpad via socorro-syms. See " "breakpad.bbclass for instructions on setting up the Breakpad " "configuration." % package_name) @@ -106,7 +106,7 @@ def repository_path(d, source_file_path): # child of the build directory TOPDIR. git_root_dir = run_command( "git rev-parse --show-toplevel", os.path.dirname(source_file_path)) - if not git_root_dir.startswith(d.getVar("TOPDIR", True)): + if not git_root_dir.startswith(d.getVar("TOPDIR")): return None return git_repository_path(source_file_path) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index e8ccf3799c..26c5c04826 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-gl] = ",,virtual/libgl wayland" PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland" python __anonymous() { - packageconfig = (d.getVar("PACKAGECONFIG", True) or "").split() + packageconfig = (d.getVar("PACKAGECONFIG") or "").split() flavors = [] if "x11-gles2" in packageconfig: flavors.append("x11-glesv2") diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index 52bf811e34..4365aa4bc6 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" FILES_${PN} += "${base_libdir}/udev/rules.d/" # fix usbmuxd installing files to /usr/lib64 on 64bit hosts: -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGECONFIG ??= "" PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist" diff --git a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb index a27a60b481..9d50ea44a1 100644 --- a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb +++ b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb @@ -8,7 +8,7 @@ EXTRA_OECONF = "--program-prefix=" # Compatability for the rare systems not using or having SYSV python () { - if d.getVar('HOST_NONSYSV', True) and d.getVar('HOST_NONSYSV', True) != '0': + if d.getVar('HOST_NONSYSV') and d.getVar('HOST_NONSYSV') != '0': d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ') } diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc index fa971f38c8..f27261fa93 100644 --- a/meta-oe/recipes-core/llvm/llvm.inc +++ b/meta-oe/recipes-core/llvm/llvm.inc @@ -153,7 +153,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-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index a46a91c8b9..f11ae7e4d2 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb @@ -18,7 +18,7 @@ PACKAGES = "${PN} ${PN}-dev" FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" INSANE_SKIP_${PN}-dev = "staticdev" ALLOW_EMPTY_${PN} = "1" -CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar('USE_NLS', 1) != 'no']}" +CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar('USE_NLS') != 'no']}" TARGET_CC_ARCH += "${LDFLAGS}" do_compile() { diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb b/meta-oe/recipes-core/toybox/toybox_0.7.1.bb index defca7016f..032b138552 100644 --- a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb +++ b/meta-oe/recipes-core/toybox/toybox_0.7.1.bb @@ -59,8 +59,8 @@ python do_package_prepend () { # Read links from /etc/toybox.links and create appropriate # update-alternatives variables - dvar = d.getVar('D', True) - pn = d.getVar('PN', True) + dvar = d.getVar('D') + pn = d.getVar('PN') target = "/bin/toybox" f = open('%s/etc/toybox.links' % (dvar), 'r') diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb index 781287a909..ff7944fcdf 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb @@ -5,7 +5,7 @@ LICENSE_DEFAULT = "GPLv2" LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3" python () { - for plugin in d.getVar('PLUGINS', True).split(): + for plugin in d.getVar('PLUGINS').split(): if 'LICENSE_%s' % plugin not in d: d.setVar('LICENSE_' + plugin, '${LICENSE_DEFAULT}') } diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb index 03e9812492..574d50a05b 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb @@ -44,7 +44,7 @@ do_configure () { GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings ./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH', True), d)}" \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ ${ARCHFLAGS} } diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb index 59075bc6b2..d3bf397b48 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb @@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d8 S = "${WORKDIR}/${BPN}${PV}/unix" # Short version format: "8.6" -VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" +VER = "${@os.path.splitext(d.getVar('PV'))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" inherit autotools distro_features_check diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb index 1bf538955e..d9a5821cbb 100644 --- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb +++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb @@ -15,4 +15,4 @@ S = "${WORKDIR}/git" inherit cmake lib_package -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index 724232339d..4e2c12279d 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb @@ -158,15 +158,15 @@ RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" # no syslog-init for systemd python () { if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN', True) - sysconfdir = d.getVar('sysconfdir', True) + pn = d.getVar('PN') + sysconfdir = d.getVar('sysconfdir') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir'), d.getVar('BPN'))) if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True))) + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir'))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir'))) } diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb index 28ea33e887..ac36a91a35 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb @@ -18,7 +18,7 @@ do_install() { python populate_packages_prepend () { tessdata_dir= d.expand('${datadir}/tessdata') pkgs = do_split_packages(d, tessdata_dir, '^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='') - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('RDEPENDS_' + pn, ' '+' '.join(pkgs)) } diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb index 9d9a6342e6..e5882e8b9c 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb @@ -27,11 +27,11 @@ EXTRA_OECONF = "--with-NE10-includes=${STAGING_DIR_TARGET}${includedir} \ " python () { - if d.getVar('TARGET_FPU', True) in [ 'soft' ]: + if d.getVar('TARGET_FPU') in [ 'soft' ]: d.appendVar('PACKAGECONFIG', ' fixed-point') # Ne10 is only available for armv7 and aarch64 - if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES', True).split()): + if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES').split()): d.appendVar('DEPENDS', ' ne10') } diff --git a/meta-oe/recipes-navigation/navit/navit-fpu.inc b/meta-oe/recipes-navigation/navit/navit-fpu.inc index d9637022ff..54b7a97793 100644 --- a/meta-oe/recipes-navigation/navit/navit-fpu.inc +++ b/meta-oe/recipes-navigation/navit/navit-fpu.inc @@ -1,6 +1,6 @@ def get_navit_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + if d.getVar('TARGET_FPU') in [ 'soft' ]: return "--enable-avoid-float" return "" diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.2.3.bb index 21311e3540..a36f08dd79 100644 --- a/meta-oe/recipes-support/atop/atop_2.2.3.bb +++ b/meta-oe/recipes-support/atop/atop_2.2.3.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" -ATOP_VER = "${@'-'.join(d.getVar('PV', True).rsplit('.', 1))}" +ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" SRC_URI = " \ http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ diff --git a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb index 117ecc366a..efba3a9d2d 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb @@ -41,7 +41,7 @@ do_install_append_class-target() { } python populate_packages_prepend () { - if (d.getVar('DEBIAN_NAMES', 1)): + if (d.getVar('DEBIAN_NAMES')): d.setVar('PKG_${BPN}', 'libfltk${PV}') } diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb index 5eee0dbf3f..199e5a8f65 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb @@ -24,7 +24,7 @@ PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=o inherit cmake binconfig pkgconfig -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" FILES_${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb index c0b8913e1f..6c22649710 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb @@ -16,7 +16,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " PACKAGECONFIG ??="" diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index 2fb9d64f59..951086f775 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -21,10 +21,10 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)" COMPATIBLE_MACHINE_armv7a = "(.*)" python () { - if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES', True).split()): + if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES').split()): d.setVar('NE10_TARGET_ARCH', 'armv7') bb.debug(2, 'Building Ne10 for armv7') - elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES', True).split()): + elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES').split()): d.setVar('NE10_TARGET_ARCH', 'aarch64') bb.debug(2, 'Building Ne10 for aarch64') else: diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index ced066f563..de2f0529ef 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -65,12 +65,12 @@ python populate_packages_prepend () { do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - pn = d.getVar('PN', 1) + pn = d.getVar('PN') metapkg = pn + '-dev' d.setVar('ALLOW_EMPTY_' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 74e30e4170..a0dd981317 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -89,12 +89,12 @@ python populate_packages_prepend () { do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - pn = d.getVar('PN', 1) + pn = d.getVar('PN') metapkg = pn + '-dev' d.setVar('ALLOW_EMPTY_' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb index 05ffc5ce3b..645a5179c7 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb @@ -242,7 +242,7 @@ python populate_packages_prepend () { d.setVar('ALLOW_EMPTY_' + metapkg, "1") d.setVar('FILES_' + metapkg, "") metapkg_rdepends = [] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index bd15bba715..8c948c5655 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/libwbxml-${PV}" inherit cmake pkgconfig -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGES += "${PN}-tools" diff --git a/meta-oe/recipes-support/poco/poco_1.7.5.bb b/meta-oe/recipes-support/poco/poco_1.7.5.bb index 0fc50e1549..2cab7960a5 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.5.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.5.bb @@ -62,12 +62,12 @@ PACKAGES = "${PN}-dbg ${POCO_PACKAGES}" python __anonymous () { packages = [] testrunners = [] - components = d.getVar("PACKAGECONFIG", True).split() + components = d.getVar("PACKAGECONFIG").split() components.append("Foundation") for lib in components: pkg = ("poco-%s" % lib.lower()).replace("_","") packages.append(pkg) - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) testrunners.append("%s" % lib) diff --git a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb index c586755644..ebe986b9f1 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb @@ -43,7 +43,7 @@ SRC_URI_append = "${QT4E_PATCHES}" # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + if d.getVar('TARGET_FPU') in [ 'soft' ]: return "--enable-fixedpoint" return "" diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 454624caaa..f720cbca27 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc @@ -91,7 +91,7 @@ python populate_packages_prepend() { fpack="${PN}-" + name + "-dbg" + " " + fpack d.setVar('PACKAGES', fpack) - conf=(d.getVar('PACKAGECONFIG', True) or "").split() + conf=(d.getVar('PACKAGECONFIG') or "").split() pack=d.getVar('PACKAGES', False) or "" bb.debug(1, "PACKAGECONFIG=%s" % conf) bb.debug(1, "PACKAGES1=%s" % pack ) @@ -105,7 +105,7 @@ python populate_packages_prepend() { if "python" in conf: fill_more("plpython") - pack=d.getVar('PACKAGES', True) or "" + pack=d.getVar('PACKAGES') or "" bb.debug(1, "PACKAGES2=%s" % pack) } @@ -191,7 +191,7 @@ do_install_append() { # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} - if [ "${@d.getVar('enable_pam', True)}" = "pam" ]; then + if [ "${@d.getVar('enable_pam')}" = "pam" ]; then install -d ${D}${sysconfdir}/pam.d install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql fi @@ -221,7 +221,7 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ ${libdir}/${BPN}/libpqwalreceiver.so \ ${libdir}/${BPN}/*_and_*.so \ ${@'${sysconfdir}/pam.d/postgresql' \ - if 'pam' == d.getVar('enable_pam', True) \ + if 'pam' == d.getVar('enable_pam') \ else ''} \ " diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 898e9c2a35..7b56dd4c1b 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -104,17 +104,17 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" # no syslog-init for systemd python () { if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN', True) - sysconfdir = d.getVar('sysconfdir', True) + pn = d.getVar('PN') + sysconfdir = d.getVar('sysconfdir') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir'))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir'))) } INITSCRIPT_NAME = "syslog" -- cgit 1.2.3-korg