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>

4 files changed, 10 insertions, 10 deletions

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")
 }