From c5a5bce25764de55420664b6896fd76ba5d18f45 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 20 Nov 2018 13:43:51 +0200
Subject: Remove default expansion parameter from getVar

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

Change-Id: Iafaf179c67ffedaba2946c078c1810a80198cf5e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 meta-boot2qt/classes/abi-arch.bbclass     |  4 ++--
 meta-boot2qt/classes/qbsp.bbclass         |  4 ++--
 meta-boot2qt/classes/qt5-features.bbclass |  2 +-
 meta-boot2qt/classes/sdk-sources.bbclass  | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'meta-boot2qt')

diff --git a/meta-boot2qt/classes/abi-arch.bbclass b/meta-boot2qt/classes/abi-arch.bbclass
index 23b9b1c..63f9d1e 100644
--- a/meta-boot2qt/classes/abi-arch.bbclass
+++ b/meta-boot2qt/classes/abi-arch.bbclass
@@ -33,7 +33,7 @@ valid_archs = "arm x86 itanium mips ppc sh"
 def map_abi_arch(a, d):
     import re
 
-    valid_archs = d.getVar('valid_archs', True).split()
+    valid_archs = d.getVar('valid_archs').split()
 
     if   re.match('i.86$', a):                  return 'x86'
     elif re.match('x86.64$', a):                return 'x86'
@@ -46,4 +46,4 @@ def map_abi_arch(a, d):
     else:
         bb.error("cannot map '%s' to a abi architecture" % a)
 
-ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH', True), d)}"
+ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH'), d)}"
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index 7c6f7ef..fbfd266 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -50,7 +50,7 @@ do_qbsp[depends] += "\
     "
 
 QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
-QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}"
+QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE').replace('-','')}"
 QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}"
 
 QBSP_LICENSE_FILE ?= ""
@@ -69,7 +69,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${QBSP_SDK_TASK}-${MACHINE}.${SDK_POSTFIX}"
 SDK_POSTFIX = "sh"
 SDK_POSTFIX_sdkmingw32 = "7z"
 REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
-SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}"
+SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}"
 
 B = "${WORKDIR}/build"
 
diff --git a/meta-boot2qt/classes/qt5-features.bbclass b/meta-boot2qt/classes/qt5-features.bbclass
index 89b3ee6..8e90811 100644
--- a/meta-boot2qt/classes/qt5-features.bbclass
+++ b/meta-boot2qt/classes/qt5-features.bbclass
@@ -31,7 +31,7 @@ FEATURES := "${THISDIR}/features/${QT_MODULE}.opt"
 do_configure[file-checksums] += "${FEATURES}:True"
 
 def qt_features(d):
-    featurefile = d.getVar('FEATURES', True)
+    featurefile = d.getVar('FEATURES')
     with open(featurefile, 'r') as f:
         features = f.read().replace('\n', ' ')
     return features
diff --git a/meta-boot2qt/classes/sdk-sources.bbclass b/meta-boot2qt/classes/sdk-sources.bbclass
index b12f371..10454b4 100644
--- a/meta-boot2qt/classes/sdk-sources.bbclass
+++ b/meta-boot2qt/classes/sdk-sources.bbclass
@@ -28,11 +28,11 @@
 ############################################################################
 
 python do_fetch () {
-    src_uri = (d.getVar('SRC_URI', True) or "").split()
+    src_uri = (d.getVar('SRC_URI') or "").split()
     if len(src_uri) == 0:
         return
 
-    sdk_path = d.getVar('QT_SDK_PATH', True) or ""
+    sdk_path = d.getVar('QT_SDK_PATH') or ""
     if len(sdk_path) != 0:
         uris = list(src_uri);
         for url in uris:
@@ -53,13 +53,13 @@ python do_fetch () {
 
 python do_unpack () {
     sdk_uds = [];
-    src_uri = (d.getVar('SRC_URI', True) or "").split()
+    src_uri = (d.getVar('SRC_URI') or "").split()
     if len(src_uri) == 0:
         return
 
-    rootdir = d.getVar('WORKDIR', True)
+    rootdir = d.getVar('WORKDIR')
 
-    sdk_path = d.getVar('QT_SDK_PATH', True) or ""
+    sdk_path = d.getVar('QT_SDK_PATH') or ""
     if len(sdk_path) != 0:
         uris = list(src_uri);
         for url in uris:
@@ -81,8 +81,8 @@ python do_unpack () {
 
 def unpack_local_uri(ud, d):
     import subprocess
-    rootdir = d.getVar('WORKDIR', True)
-    sdk_path = d.getVar('QT_SDK_PATH', True)
+    rootdir = d.getVar('WORKDIR')
+    sdk_path = d.getVar('QT_SDK_PATH')
 
     destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git"))
     srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri"))
-- 
cgit v1.2.3-54-g00ecf