From 8f6374ef51eb0f4d2e85fbd6b546b9cee0bb954d Mon Sep 17 00:00:00 2001
From: André Draszik <andre.draszik@jci.com>
Date: Sun, 13 Jan 2019 11:13:08 +0000
Subject: remove True option to getVar calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
---
 classes/java-library.bbclass         |  4 ++--
 classes/openjdk-build-helper.bbclass | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'classes')

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index e0159ba..d801930 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -27,8 +27,8 @@ def java_package_name(d):
   pre=""
   post=""
 
-  bpn = d.getVar('BPN', True)
-  ml = d.getVar('MLPREFIX', True)
+  bpn = d.getVar('BPN')
+  ml = d.getVar('MLPREFIX')
   if not bpn.startswith("lib"):
     pre='lib'
 
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
index 01ed591..8d83e02 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -9,7 +9,7 @@ EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}"
 # In OE we have PARALLEL_MAKE which is the actual option passed to make,
 # e.g. "-j 4".
 def openjdk_build_helper_get_parallel_make(d):
-    pm = d.getVar('PARALLEL_MAKE', True);
+    pm = d.getVar('PARALLEL_MAKE');
     if not pm or '-j' not in pm:
         return 1
 
@@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d):
 def openjdk_build_helper_get_jdk_arch(d):
     import bb
 
-    jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+    jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH')
     if jdk_arch == "x86-64":
         jdk_arch = "amd64"
     elif jdk_arch == "powerpc":
@@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d):
 def openjdk_build_helper_get_llvm_configure_arch(d):
     import bb;
 
-    arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+    arch = d.getVar('TRANSLATED_TARGET_ARCH')
     if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']:
         arch = "x86"
     elif arch in ['mipsel', 'mips']:
@@ -84,7 +84,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
         arch = "arm"
     else:
         if 'shark' in d.getVar('PACKAGECONFIG').split():
-            bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) );
+            bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
 
     return arch
 
@@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
 def openjdk_build_helper_get_icedtea_arch(d):
     import bb;
 
-    arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+    arch = d.getVar('TRANSLATED_TARGET_ARCH')
     if arch == "x86-64":
         arch = "amd64"
     elif arch in ['i386', 'i486', 'i586', 'i686']:
-- 
cgit v1.2.3-54-g00ecf