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-efl/recipes-efl/efl/edje-fpu.inc | 2 +- .../lightmediascanner/lightmediascanner_0.5.1.bb | 2 +- meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 2 +- meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 4 ++-- .../recipes-bsp/images/initramfs-kexecboot-klibc-image.bb | 2 +- meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb | 2 +- meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 4 ++-- meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb | 4 ++-- meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 4 ++-- meta-networking/recipes-kernel/netmap/netmap-modules_git.bb | 6 +++--- .../recipes-support/memcached/memcached_1.4.17.bb | 2 +- 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 +++++----- meta-python/classes/pypi.bbclass | 8 ++++---- 44 files changed, 78 insertions(+), 78 deletions(-) diff --git a/meta-efl/recipes-efl/efl/edje-fpu.inc b/meta-efl/recipes-efl/efl/edje-fpu.inc index 3f2aacffbf..32a6daf7d2 100644 --- a/meta-efl/recipes-efl/efl/edje-fpu.inc +++ b/meta-efl/recipes-efl/efl/edje-fpu.inc @@ -1,6 +1,6 @@ def get_edje_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + if d.getVar('TARGET_FPU') in [ 'soft' ]: return "--enable-fixed-point" return "" diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb index 9870fac3d6..d8c6dbb730 100644 --- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb +++ b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb @@ -57,6 +57,6 @@ python populate_packages_prepend () { pkgs = [] pkgs += do_split_packages(d, oe.path.join(lms_libdir, "plugins"), '^(.*)\.so$', d.expand('${PN}-plugin-%s'), 'LightMediaScanner plugin for %s', prepend=True, extra_depends=d.expand('${PN}')) - metapkg = d.getVar('PN', True) + '-meta' + metapkg = d.getVar('PN') + '-meta' d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) } diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index 5052b36fc3..ec17c75e37 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -111,7 +111,7 @@ python populate_packages_prepend () { d.setVar('FILES_' + metapkg, "") blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] 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 not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): print("Modifying %s" % pkg) diff --git a/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index c0ac911a64..90ed5a4641 100644 --- a/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -41,8 +41,8 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" UPSTREAM_CHECK_REGEX = "(?P2\.([0-8]*[02468])+(\.\d+)+)" python populate_packages_prepend() { - engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") - themes_root = os.path.join(d.getVar('datadir', True), "themes") + engines_root = os.path.join(d.getVar('libdir'), "gtk-2.0/2.10.0/engines") + themes_root = os.path.join(d.getVar('datadir'), "themes") do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') diff --git a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb index da3023fe17..b7a8a9356e 100644 --- a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +++ b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb @@ -7,7 +7,7 @@ SUMMARY = "Initramfs image for kexecboot kernel (klibc-static binaries)" IMAGE_INSTALL = "kexecboot-klibc kexec-klibc ubiattach-klibc" python () { - if d.getVar('TARGET_ARCH', True) == "nios2": + if d.getVar('TARGET_ARCH') == "nios2": raise bb.parse.SkipPackage("'nios2' not supported arch") } diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb index 69f38721b1..085955c139 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb @@ -57,4 +57,4 @@ CMDLINE_DEBUG ?= "quiet" INHIBIT_DEFAULT_DEPS = "1" # Note: for qvga the label is currently limited to about 24 chars -KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}" +KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO') or d.getVar('DISTRO_VERSION')}-${MACHINE}" diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb index 2f4afce063..3a4e7b52ad 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb @@ -36,5 +36,5 @@ deltask do_package_write_tar SSTATE_SCAN_FILES = "*" EXTRA_STAGING_FIXMES = "MANGLEDSTAGINGDIRTARGET MANGLEDSTAGINGDIR" -MANGLEDSTAGINGDIR = "${@d.getVar("STAGING_DIR", True).replace("/", "\\\\/").replace("-", "\\\\-")}" -MANGLEDSTAGINGDIRTARGET = "${@d.getVar("STAGING_DIR_TARGET", True).replace("/", "\\\\/").replace("-", "\\\\-")}" +MANGLEDSTAGINGDIR = "${@d.getVar("STAGING_DIR").replace("/", "\\\\/").replace("-", "\\\\-")}" +MANGLEDSTAGINGDIRTARGET = "${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-")}" diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb index 79ff6e2b00..38fac65d5e 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb @@ -48,12 +48,12 @@ PACKAGES_DYNAMIC = "${PN}-plugin-*" python populate_packages_prepend () { rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') - postinst = d.getVar('plugin_postinst', True) + postinst = d.getVar('plugin_postinst') pkgs = [] pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), 'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), '(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - metapkg = d.getVar('PN', True) + '-meta' + metapkg = d.getVar('PN') + '-meta' d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) } diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index e9b726c5fb..d24b81bc19 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -30,8 +30,8 @@ inherit update-rc.d systemd python __anonymous () { import re - karch = d.getVar('KARCH', True) - multilib = d.getVar('MLPREFIX', True) + karch = d.getVar('KARCH') + multilib = d.getVar('MLPREFIX') if multilib and karch == 'powerpc64': searchstr = "lib.?32" diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb index e9eea56cd8..82b9b059d4 100644 --- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb +++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb @@ -33,8 +33,8 @@ NETMAP_DRIVERS ??= "" NETMAP_ALL_DRIVERS = "ixgbe igb e1000e e1000 veth.c forcedeth.c virtio_net.c r8169.c" python __anonymous () { - drivers_list = d.getVar("NETMAP_DRIVERS", True).split() - all_drivers_list = d.getVar("NETMAP_ALL_DRIVERS", True).split() + drivers_list = d.getVar("NETMAP_DRIVERS").split() + all_drivers_list = d.getVar("NETMAP_ALL_DRIVERS").split() config_drivers = "--drivers=" + ",".join(drivers_list) extra_oeconf_drivers = bb.utils.contains_any('NETMAP_DRIVERS', all_drivers_list, config_drivers, '--no-drivers', d) @@ -70,7 +70,7 @@ do_configure_append () { #define NETMAP_LINUX_HAVE_E1000E_DOWN2 EOF -if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION', True) or "0", '3.17') < 0) else 'true' } ; then +if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION') or "0", '3.17') < 0) else 'true' } ; then echo OK cat >> ${S}/LINUX/netmap_linux_config.h <