diff options
author | Cody P Schafer <dev@codyps.com> | 2016-11-29 11:48:17 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-12-06 16:25:08 -0200 |
commit | 2a3cd732ce7efea9f372862be7ef70ff5ecb50d9 (patch) | |
tree | 6fd21a770c2aab45a08a38c3167636e465cd401d | |
parent | a70bf4a9e3e1c03ff1cc2d0db228a383943c54db (diff) | |
download | meta-java-2a3cd732ce7efea9f372862be7ef70ff5ecb50d9.tar.gz |
move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
bb.data.getVar was removed, need to use the modern mechanism.
Signed-off-by: Cody P Schafer <dev@codyps.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | classes/java-library.bbclass | 4 | ||||
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 10 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-common.inc | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 144cd2f..58d5a40 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass | |||
@@ -23,8 +23,8 @@ def java_package_name(d): | |||
23 | pre="" | 23 | pre="" |
24 | post="" | 24 | post="" |
25 | 25 | ||
26 | bpn = bb.data.getVar('BPN', d, 1) | 26 | bpn = d.getVar('BPN', True) |
27 | ml = bb.data.getVar('MLPREFIX', d, 1) | 27 | ml = d.getVar('MLPREFIX', True) |
28 | if not bpn.startswith("lib"): | 28 | if not bpn.startswith("lib"): |
29 | pre='lib' | 29 | pre='lib' |
30 | 30 | ||
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 727998c..a8428dc 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -211,7 +211,7 @@ do_compile() { | |||
211 | def jdk_arch(d): | 211 | def jdk_arch(d): |
212 | import bb | 212 | import bb |
213 | 213 | ||
214 | target_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) | 214 | target_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) |
215 | 215 | ||
216 | if target_arch in ['i386', 'i486', 'i586', 'i686']: | 216 | if target_arch in ['i386', 'i486', 'i586', 'i686']: |
217 | return "x86" | 217 | return "x86" |
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index c491195..1ac3154 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -55,7 +55,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | |||
55 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | 55 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" |
56 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | 56 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" |
57 | export CACAO_CONFIGURE_ARGS = " \ | 57 | export CACAO_CONFIGURE_ARGS = " \ |
58 | ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}" | 58 | ${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}" |
59 | 59 | ||
60 | JAVA_HOME[unexport] = "1" | 60 | JAVA_HOME[unexport] = "1" |
61 | 61 | ||
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index c339985..def779d 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -171,7 +171,7 @@ do_configure_prepend() { | |||
171 | def get_llvm_configure_arch(d): | 171 | def get_llvm_configure_arch(d): |
172 | import bb; | 172 | import bb; |
173 | 173 | ||
174 | arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) | 174 | arch = d.getVar('TRANSLATED_TARGET_ARCH', True) |
175 | if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": | 175 | if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": |
176 | arch = "x86" | 176 | arch = "x86" |
177 | elif arch == "arm": | 177 | elif arch == "arm": |
@@ -181,7 +181,7 @@ def get_llvm_configure_arch(d): | |||
181 | elif arch == "powerpc" or arch == "powerpc64": | 181 | elif arch == "powerpc" or arch == "powerpc64": |
182 | arch = "powerpc" | 182 | arch = "powerpc" |
183 | else: | 183 | else: |
184 | bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); | 184 | bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) ); |
185 | 185 | ||
186 | return arch | 186 | return arch |
187 | 187 | ||
@@ -193,7 +193,7 @@ export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" | |||
193 | def get_jdk_arch(d): | 193 | def get_jdk_arch(d): |
194 | import bb | 194 | import bb |
195 | 195 | ||
196 | jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) | 196 | jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) |
197 | if jdk_arch == "x86-64": | 197 | if jdk_arch == "x86-64": |
198 | jdk_arch = "amd64" | 198 | jdk_arch = "amd64" |
199 | elif jdk_arch == "powerpc": | 199 | elif jdk_arch == "powerpc": |
@@ -211,8 +211,8 @@ export DEBUG_BINARIES = "true" | |||
211 | 211 | ||
212 | ALTERNATIVE_PRIORITY = "50" | 212 | ALTERNATIVE_PRIORITY = "50" |
213 | 213 | ||
214 | OPENJDK_UPDATE_VERSION = "${@bb.data.getVar('PV', d, 1).split('b')[0]}" | 214 | OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}" |
215 | OPENJDK_BUILD_NUMBER = "b${@bb.data.getVar('PV', d, 1).split('b')[1]}" | 215 | OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}" |
216 | EXTRA_OECONF_append = "\ | 216 | EXTRA_OECONF_append = "\ |
217 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 217 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
218 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 218 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 6a72572..cdfdda8 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc | |||
@@ -25,7 +25,7 @@ B = "${S}/build" | |||
25 | def get_jdk_arch(d): | 25 | def get_jdk_arch(d): |
26 | import bb | 26 | import bb |
27 | 27 | ||
28 | jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) | 28 | jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) |
29 | if jdk_arch == "x86-64": | 29 | if jdk_arch == "x86-64": |
30 | jdk_arch = "amd64" | 30 | jdk_arch = "amd64" |
31 | elif jdk_arch == "powerpc": | 31 | elif jdk_arch == "powerpc": |
@@ -45,7 +45,7 @@ JDK_FAKE = "${WORKDIR}/fake-jdk" | |||
45 | def get_llvm_configure_arch(d): | 45 | def get_llvm_configure_arch(d): |
46 | import bb; | 46 | import bb; |
47 | 47 | ||
48 | arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) | 48 | arch = d.getVar('TRANSLATED_TARGET_ARCH', True) |
49 | if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": | 49 | if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686": |
50 | arch = "x86" | 50 | arch = "x86" |
51 | elif arch == "arm": | 51 | elif arch == "arm": |
@@ -55,7 +55,7 @@ def get_llvm_configure_arch(d): | |||
55 | elif arch == "powerpc" or arch == "powerpc64": | 55 | elif arch == "powerpc" or arch == "powerpc64": |
56 | arch = "powerpc" | 56 | arch = "powerpc" |
57 | else: | 57 | else: |
58 | bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); | 58 | bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) ); |
59 | 59 | ||
60 | return arch | 60 | return arch |
61 | 61 | ||