summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-13 11:13:08 +0000
committerRichard Leitner <richard.leitner@skidata.com>2019-12-27 12:05:54 +0100
commit7a3a8322a747c8803dbfbf3aa4912cf9f8158695 (patch)
tree0b30eb3e80156f051006977d7782b4c61a4bac9f /classes
parent7bb0903d1a96d0bee47236f59128db62072a7043 (diff)
downloadmeta-java-7a3a8322a747c8803dbfbf3aa4912cf9f8158695.tar.gz
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> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/java-library.bbclass4
-rw-r--r--classes/openjdk-build-helper.bbclass10
2 files changed, 7 insertions, 7 deletions
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):
27 pre="" 27 pre=""
28 post="" 28 post=""
29 29
30 bpn = d.getVar('BPN', True) 30 bpn = d.getVar('BPN')
31 ml = d.getVar('MLPREFIX', True) 31 ml = d.getVar('MLPREFIX')
32 if not bpn.startswith("lib"): 32 if not bpn.startswith("lib"):
33 pre='lib' 33 pre='lib'
34 34
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}"
9# In OE we have PARALLEL_MAKE which is the actual option passed to make, 9# In OE we have PARALLEL_MAKE which is the actual option passed to make,
10# e.g. "-j 4". 10# e.g. "-j 4".
11def openjdk_build_helper_get_parallel_make(d): 11def openjdk_build_helper_get_parallel_make(d):
12 pm = d.getVar('PARALLEL_MAKE', True); 12 pm = d.getVar('PARALLEL_MAKE');
13 if not pm or '-j' not in pm: 13 if not pm or '-j' not in pm:
14 return 1 14 return 1
15 15
@@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d):
55def openjdk_build_helper_get_jdk_arch(d): 55def openjdk_build_helper_get_jdk_arch(d):
56 import bb 56 import bb
57 57
58 jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) 58 jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH')
59 if jdk_arch == "x86-64": 59 if jdk_arch == "x86-64":
60 jdk_arch = "amd64" 60 jdk_arch = "amd64"
61 elif jdk_arch == "powerpc": 61 elif jdk_arch == "powerpc":
@@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d):
73def openjdk_build_helper_get_llvm_configure_arch(d): 73def openjdk_build_helper_get_llvm_configure_arch(d):
74 import bb; 74 import bb;
75 75
76 arch = d.getVar('TRANSLATED_TARGET_ARCH', True) 76 arch = d.getVar('TRANSLATED_TARGET_ARCH')
77 if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']: 77 if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']:
78 arch = "x86" 78 arch = "x86"
79 elif arch in ['mipsel', 'mips']: 79 elif arch in ['mipsel', 'mips']:
@@ -84,7 +84,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
84 arch = "arm" 84 arch = "arm"
85 else: 85 else:
86 if 'shark' in d.getVar('PACKAGECONFIG').split(): 86 if 'shark' in d.getVar('PACKAGECONFIG').split():
87 bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN', True), arch) ); 87 bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
88 88
89 return arch 89 return arch
90 90
@@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
93def openjdk_build_helper_get_icedtea_arch(d): 93def openjdk_build_helper_get_icedtea_arch(d):
94 import bb; 94 import bb;
95 95
96 arch = d.getVar('TRANSLATED_TARGET_ARCH', True) 96 arch = d.getVar('TRANSLATED_TARGET_ARCH')
97 if arch == "x86-64": 97 if arch == "x86-64":
98 arch = "amd64" 98 arch = "amd64"
99 elif arch in ['i386', 'i486', 'i586', 'i686']: 99 elif arch in ['i386', 'i486', 'i586', 'i686']: