remove True option to getVar calls

getVar() has been defaulting to expanding by default for
a long time (2016), thus remove the True option from
getVar() calls with a regex search and replace.

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)

Signed-off-by: André Draszik <andre.draszik@jci.com>

diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index a7cc53fc8c43e2e79fda6467ff3ab44b3880dde6..9fcf37be30363ce06cce3c81a680f2645f99b007 100644 (file)
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -26,22 +26,22 @@
 # Copyright 2013-2016 (C) O.S. Systems Software LTDA.
 
 python __anonymous () {
-    machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split())
-    machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split())
+    machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER") or "").split())
+    machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER") or "").split())
     if machine_socarch_filter or machine_arch_filter:
-        provides = set((d.getVar("PROVIDES", True) or "").split())
-        depends = set((d.getVar("DEPENDS", True) or "").split())
-        PN = d.getVar("PN", True)
+        provides = set((d.getVar("PROVIDES") or "").split())
+        depends = set((d.getVar("DEPENDS") or "").split())
+        PN = d.getVar("PN")
 
         package_arch = None
         if list(machine_arch_filter & (provides | depends)):
-            package_arch = d.getVar("MACHINE_ARCH", True)
+            package_arch = d.getVar("MACHINE_ARCH")
         elif list(machine_socarch_filter & (provides | depends)):
-            package_arch = d.getVar("MACHINE_SOCARCH", True)
+            package_arch = d.getVar("MACHINE_SOCARCH")
             if not package_arch:
                 raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.")
 
-            machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX", True)
+            machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX")
             if not machine_socarch_suffix:
                 raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH_SUFFIX as MACHINE_SOCARCH_FILTER is set for this SoC.")
 
@@ -49,18 +49,18 @@ python __anonymous () {
             bb.debug(1, "Use '%s' as package architecture for '%s'" % (package_arch, PN))
             d.setVar("PACKAGE_ARCH", package_arch)
 
-    cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split()
-    machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "")
+    cur_package_archs = (d.getVar("PACKAGE_ARCHS") or "").split()
+    machine_socarch = (d.getVar("MACHINE_SOCARCH") or "")
     if not machine_socarch in cur_package_archs:
         d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch)
 
-    if d.getVar("TUNE_ARCH", True) == "arm":
+    if d.getVar("TUNE_ARCH") == "arm":
         # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set
         # add the other value to extra archs also, so that a image recipe searches both for packages.
-        if  d.getVar("ARM_INSTRUCTION_SET", True) == "thumb":
-            d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH", True))
+        if  d.getVar("ARM_INSTRUCTION_SET") == "thumb":
+            d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH"))
         else:
-            d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH", True))
+            d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH"))
 }
 
 MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}"

diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 198a19446d191b8cdff0e9250a4c1092e375593d..03f576e5722eb8ba4021eba185d35d45f5592078 100644 (file)
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f70040
 LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE"
 
 python fsl_bin_do_unpack() {
-    src_uri = (d.getVar('SRC_URI', True) or "").split()
+    src_uri = (d.getVar('SRC_URI') or "").split()
     if len(src_uri) == 0:
         return
 
@@ -44,9 +44,9 @@ python fsl_bin_do_unpack() {
 }
 
 python do_unpack() {
-    eula = d.getVar('ACCEPT_FSL_EULA', True)
-    eula_file = d.getVar('FSL_EULA_FILE', True)
-    pkg = d.getVar('PN', True)
+    eula = d.getVar('ACCEPT_FSL_EULA')
+    eula_file = d.getVar('FSL_EULA_FILE')
+    pkg = d.getVar('PN')
     if eula == None:
         bb.fatal("To use '%s' you need to accept the Freescale EULA at '%s'. "
                  "Please read it and in case you accept it, write: "

diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass
index 959fdc16cca419aa425a9c3fd00c15393a125ca0..4b7d66d51225580a59da24ec9ae3b9798034dd3d 100644 (file)
--- a/classes/machine-overrides-extender.bbclass
+++ b/classes/machine-overrides-extender.bbclass
@@ -15,18 +15,18 @@
 # Copyright 2016-2018 (C) O.S. Systems Software LTDA.
 
 def machine_overrides_extender(d):
-    machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES', True) or '').split(':')
+    machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':')
 
     # Gather the list of overrides to filter out
     machine_overrides_filter_out = []
     for override in machine_overrides:
-        machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override, True) or '').split()
+        machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override) or '').split()
 
     # Drop any overrides of filter_out prior extending
     machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out]
 
     for override in machine_overrides:
-        extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override, True)
+        extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override)
 
         if extender:
             extender = extender.split(':')

diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 2209e339dfcddf9e9c738f239bb0b0b9880cd62d..ffa67c8c70978e3e5bfdc6cc8cde3913505e7c87 100644 (file)
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -12,7 +12,7 @@ python () {
         d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
         d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
 
-    error_qa = d.getVar('ERROR_QA', True)
+    error_qa = d.getVar('ERROR_QA')
     if 'arch' in error_qa:
         d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
 }

diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index b7171ebc583f6703112629e752ceea579da85160..187681a8b1234a918fb2342d3942d3846da9eb1b 100644 (file)
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
 
 python __anonymous () {
     families = ['mx6']
-    cur_families = (d.getVar('MACHINEOVERRIDES', True) or '').split(':')
+    cur_families = (d.getVar('MACHINEOVERRIDES') or '').split(':')
     if any(map(lambda x: x in cur_families,
                families)):
         d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir')

diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 1af630a67296a9b8b08fc07aee5b7d8dba67a6bf..9bac32d9795b7bdea6f6132360f99b6ab1d10cb5 100644 (file)
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -11,9 +11,9 @@ SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46"
 S = "${WORKDIR}/git"
 
 python () {
-    if not d.getVar("QE_UCODE", True):
-        PN = d.getVar("PN", True)
-        FILE = os.path.basename(d.getVar("FILE", True))
+    if not d.getVar("QE_UCODE"):
+        PN = d.getVar("PN")
+        FILE = os.path.basename(d.getVar("FILE"))
         bb.debug(1, "To build %s, see %s for instructions on \
                      setting up your qe-ucode" % (PN, FILE))
         raise bb.parse.SkipRecipe("because QE_UCODE is not set")

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index c6bdad23ab0375b07824a31c3fca9a1fddf9876f..007e7d2567e988805b391f69eff964dfcde6a9e8 100644 (file)
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 
 export PYTHON = "${USRBINPATH}/python2"
 
-M="${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
+M="${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
 
 do_install () {
     if [ ${M} = ls2088ardb ]; then

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
index 8438134d0079db1094f75f00fd048b985231b464..f48dc81fbee5f4a5cb2d1dde5c0d0cec10fe41ab 100644 (file)
--- a/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2018.09.bb
@@ -11,11 +11,11 @@ DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
 DEPENDS_append_qoriq-ppc = " boot-format-native"
 
 python () {
-    if d.getVar("TCMODE", True) == "external-fsl":
+    if d.getVar("TCMODE") == "external-fsl":
         return
 
-    ml = d.getVar("MULTILIB_VARIANTS", True)
-    arch = d.getVar("OVERRIDES", True)
+    ml = d.getVar("MULTILIB_VARIANTS")
+    arch = d.getVar("OVERRIDES")
 
     if "e5500-64b:" in arch or "e6500-64b:" in arch:
         if not "lib32" in ml:

diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.1.0g.bb b/recipes-connectivity/openssl/openssl-qoriq_1.1.0g.bb
index 7a4897fdd3f3bcc3bd28a79d3d83ec7e3b52b83f..3df7c1a34a98eae4684029c0eeea590410d9a957 100644 (file)
--- a/recipes-connectivity/openssl/openssl-qoriq_1.1.0g.bb
+++ b/recipes-connectivity/openssl/openssl-qoriq_1.1.0g.bb
@@ -26,7 +26,7 @@ SRCREV = "c2300d1fdb30a439f555b07f228d3bce498238d5"
 PROVIDES = "openssl"
 
 python() {
-    pkgs = d.getVar('PACKAGES', True).split()
+    pkgs = d.getVar('PACKAGES').split()
     for p in pkgs:
         if 'openssl-qoriq' in p:
             d.appendVar("RPROVIDES_%s" % p, p.replace('openssl-qoriq', 'openssl'))

diff --git a/recipes-daemons/ptpd/ptpd-qoriq.bb b/recipes-daemons/ptpd/ptpd-qoriq.bb
index cb047fd24aac0bdddf7c924313e5cb3e6962735d..569deed5f0be76ebc0784a0f32319154710d2696 100644 (file)
--- a/recipes-daemons/ptpd/ptpd-qoriq.bb
+++ b/recipes-daemons/ptpd/ptpd-qoriq.bb
@@ -17,7 +17,7 @@ PROVIDES = "ptpd"
 inherit autotools pkgconfig systemd
 
 python() {
-    pkgs = d.getVar('PACKAGES', True).split()
+    pkgs = d.getVar('PACKAGES').split()
     for p in pkgs:
         if 'ptpd-qoriq' in p:
             d.appendVar("RPROVIDES_%s" % p, p.replace('ptpd-qoriq', 'ptpd'))

diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index 7423b5426ae8e5ac8e69442b8599e7e2f9fedcec..889603c90df6642c9b5c80022d43fbf8e52c3f5f 100644 (file)
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -25,7 +25,7 @@ COMPATIBLE_HOST_mipsarchn64 = "null"
 PROVIDES = "qemu"
 
 python() {
-    pkgs = d.getVar('PACKAGES', True).split()
+    pkgs = d.getVar('PACKAGES').split()
     for p in pkgs:
         if 'qemu-qoriq' in p:
             d.appendVar("RPROVIDES_%s" % p, p.replace('qemu-qoriq', 'qemu'))

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 8348c1b48974616db37ac703e4ad5e91e8df863e..b33780d2bf5b02cd1cc2ba3fbf992c7fb6a2219a 100644 (file)
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -82,7 +82,7 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \
        libopenvx-imx libopenvx-imx-dev \
 "
 python __anonymous () {
-        has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT', True) or '0')
+        has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
         if has_vivante_kernel_driver_support != '1':
                 raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.')
 }
@@ -102,7 +102,7 @@ SOLIBS = "${SOLIBSDEV}"
 python __anonymous() {
     # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
     # the source we cannot fix it. Disable the insane check for now.
-    packages = d.getVar('PACKAGES', True).split()
+    packages = d.getVar('PACKAGES').split()
     for p in packages:
         d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
 

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 5ead6251f02377c097ac9e1fcce6d56b2db2bfcf..8541ed7ca4a3a056af984d2eda964581464b9826 100644 (file)
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -6,7 +6,7 @@ PACKAGECONFIG_remove_imxgpu3d = "gles"
 
 # FIXME: mesa should support 'x11-no-tls' option
 python () {
-    overrides = d.getVar("OVERRIDES", True).split(":")
+    overrides = d.getVar("OVERRIDES").split(":")
     if "imxgpu2d" not in overrides:
         return
 

diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc
index 0d7249fdc2b3569e6c20335e905fc4a424ec796a..ad54fc9e965e362ce70401113a322577efad1447 100644 (file)
--- a/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc
+++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 python() {
-    pkgs = d.getVar('PACKAGES', True).split()
+    pkgs = d.getVar('PACKAGES').split()
     for p in pkgs:
         if 'cryptodev-qoriq' in p:
             d.appendVar("RPROVIDES_%s" % p, p.replace('cryptodev-qoriq', 'cryptodev'))

diff --git a/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
index 60a3717ecd1ad3fe2a9533f95d1938658429f81f..39860c862278fe1df1f66ba7886a73eff936a1cd 100644 (file)
--- a/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.4.2.bb
@@ -43,7 +43,7 @@ python __set_insane_skip() {
     # Ensure we have PACKAGES expanded
     bb.build.exec_func("read_subpackage_metadata", d)
 
-    for p in d.getVar('PACKAGES', True).split():
+    for p in d.getVar('PACKAGES').split():
         # Even though we are packaging libraries those are plugins so we
         # shouldn't rename the packages to follow its sonames.
         d.setVar("DEBIAN_NOAUTONAME_%s" % p, "1")
@@ -66,7 +66,7 @@ python __split_libfslcodec_plugins() {
                       output_pattern='imx-codec-%s',
                       description='Freescale i.MX Codec (%s)',
                       extra_depends='')
-    pkgs = d.getVar('PACKAGES', True).split()
+    pkgs = d.getVar('PACKAGES').split()
     for pkg in pkgs:
         meta = pkg[10:]
         if meta != '':

diff --git a/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb b/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
index 492ab89345ce2a91d0c75010b67cd32f0d781eec..ed1a13daafff7d9d1b31a3166e8f364287214248 100644 (file)
--- a/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.4.2.bb
@@ -30,7 +30,7 @@ python __set_insane_skip() {
     # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
     # the source we cannot fix it. Disable the insane check for now.
     # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
-    for p in d.getVar('PACKAGES', True).split():
+    for p in d.getVar('PACKAGES').split():
         d.setVar("INSANE_SKIP_%s" % p, "ldflags dev-so textrel")
 }