Remove default expansion parameter from getVarv5.12.0-rc

getVar defaults to expanding the variable, the second True
parameter is unnecessary.

Change-Id: Iafaf179c67ffedaba2946c078c1810a80198cf5e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

21 files changed, 27 insertions, 27 deletions

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
index 14d9c0b..c3b405e 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample
index 91e2add..e6b76a5 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
index bf32887..a544874 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
index 504577d..a34189a 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
index e6afe33..87aa512 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
index efe626a..0903d8f 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
index eccc371..241d330 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
index d042805..c94805c 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
index 0836f5a..c2abc8e 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
index c701d0e..99f144f 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample
index bf32887..a544874 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
index 5a09ec9..73f6da8 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
index f30ba79..9562c63 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
@@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
 
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index ad091e7..4e3e42f 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -33,7 +33,7 @@ DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
 SDK_VERSION := "${DISTRO_VERSION}"
 
-SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}"
+SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}"
 SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}"
 BUILDCFG_VARS += "SDKMACHINE"
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
index 4e4256b..2ad63f5 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -61,7 +61,7 @@ BBMASK += "\
     meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
     "
 
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}"
 EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
 
 MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index f61aad7..9a252d0 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -42,7 +42,7 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 
 WKS_FILE_DEPENDS += "u-boot-script-toradex"
 
-MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
+MACHINEDIR = "${@d.getVar('MACHINE').replace('-','_')}"
 IMAGE_BOOT_FILES += " \
     fwd_blk.img;flash_blk.img \
     fwd_eth.img;flash_eth.img \
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index c22a46c..ba3be58 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -36,7 +36,7 @@ inherit nativesdk packagegroup
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 
 python __anonymous() {
-    overrides = d.getVar("OVERRIDES", True).split(":")
+    overrides = d.getVar("OVERRIDES").split(":")
     if "mingw32" not in overrides:
         d.appendVar("OVERRIDES", ":linux")
 }
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
index 1afeb7e..8d63166 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb
@@ -55,11 +55,11 @@ python remove_qt_from_rootfs() {
     import subprocess
 
     # remove qtbase and all dependent packages
-    image_rootfs = d.getVar('IMAGE_ROOTFS', True)
-    opkg_conf = d.getVar("IPKGCONF_TARGET", True)
+    image_rootfs = d.getVar('IMAGE_ROOTFS')
+    opkg_conf = d.getVar("IPKGCONF_TARGET")
     opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg")
     opkg_args = "--volatile-cache -f %s -o %s " % (opkg_conf, image_rootfs)
-    opkg_args += d.getVar("OPKG_ARGS", True)
+    opkg_args += d.getVar("OPKG_ARGS")
 
     cmd = "%s %s --force-remove --force-removal-of-dependent-packages remove %s" % \
         (opkg_cmd, opkg_args, 'qtbase')
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index f115070..fe2ab16 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -38,11 +38,11 @@ S = "${WORKDIR}"
 
 inherit qbsp
 
-PV := "${@d.getVar('PV', True).split('+')[0]}"
+PV := "${@d.getVar('PV').split('+')[0]}"
 
-VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
+VERSION_SHORT = "${@d.getVar('PV').replace('.','')}"
 QBSP_NAME = "Automotive ${PV}"
-QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
+QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "automotive.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}"
 
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index a599e23..c85d3ba 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -38,11 +38,11 @@ S = "${WORKDIR}"
 
 inherit qbsp
 
-PV := "${@d.getVar('PV', True).split('+')[0]}"
+PV := "${@d.getVar('PV').split('+')[0]}"
 
-VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
+VERSION_SHORT = "${@d.getVar('PV').replace('.','')}"
 QBSP_NAME = "Boot2Qt ${PV}"
-QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
+QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}"
 
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index 2adad90..79749fc 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -34,7 +34,7 @@ PR = "r0"
 inherit nativesdk packagegroup
 
 python __anonymous() {
-    overrides = d.getVar("OVERRIDES", True).split(":")
+    overrides = d.getVar("OVERRIDES").split(":")
     if "mingw32" not in overrides:
         d.appendVar("OVERRIDES", ":linux")
 }