Skip to contentSkip to conversation

move from bb.data.getVar(x, d, 1) to d.getVar(x, True)

PATCH In review Cody P Schafer 4 participants 4 messages Nov 29, 2016 – Dec 5, 2016

lore
Share & tools
lore

Cody P Schafer

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 classes/java-library.bbclass              |  4 ++--
 recipes-core/icedtea/icedtea7-native.inc  |  2 +-
 recipes-core/openjdk/openjdk-7-common.inc |  2 +-
 recipes-core/openjdk/openjdk-8-common.inc | 10 +++++-----
 recipes-core/openjdk/openjdk-common.inc   |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
classes/java-library.bbclass +2 -2
index 144cd2f..58d5a40 100644
@@ -23,8 +23,8 @@ def java_package_name(d):
   pre=""
   post=""
 
-  bpn = bb.data.getVar('BPN', d, 1)
-  ml = bb.data.getVar('MLPREFIX', d, 1)
+  bpn = d.getVar('BPN', True)
+  ml = d.getVar('MLPREFIX', True)
   if not bpn.startswith("lib"):
     pre='lib'
recipes-core/icedtea/icedtea7-native.inc +1 -1
index 727998c..a8428dc 100644
@@ -211,7 +211,7 @@ do_compile() {
 def jdk_arch(d):
         import bb
 
-        target_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1)
+        target_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
 
         if target_arch in ['i386', 'i486', 'i586', 'i686']:
             return "x86"
recipes-core/openjdk/openjdk-7-common.inc +1 -1
index c491195..1ac3154 100644
@@ -55,7 +55,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
 export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
 export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
 export CACAO_CONFIGURE_ARGS = " \
-    ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}"
+    ${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}"
 
 JAVA_HOME[unexport] = "1"
recipes-core/openjdk/openjdk-8-common.inc +5 -5
index c339985..def779d 100644
@@ -171,7 +171,7 @@ do_configure_prepend() {
 def get_llvm_configure_arch(d):
     import bb;
 
-    arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1)
+    arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
     if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686":
         arch = "x86"
     elif arch == "arm":

@@ -181,7 +181,7 @@ def get_llvm_configure_arch(d):
     elif arch == "powerpc" or arch == "powerpc64":
         arch = "powerpc"
     else:
-        bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
+        bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) );
 
     return arch
 

@@ -193,7 +193,7 @@ export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}"
 def get_jdk_arch(d):
     import bb
 
-    jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1)
+    jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
     if jdk_arch == "x86-64":
         jdk_arch = "amd64"
     elif jdk_arch == "powerpc":

@@ -211,8 +211,8 @@ export DEBUG_BINARIES = "true"
 
 ALTERNATIVE_PRIORITY = "50"
 
-OPENJDK_UPDATE_VERSION = "${@bb.data.getVar('PV', d, 1).split('b')[0]}"
-OPENJDK_BUILD_NUMBER = "b${@bb.data.getVar('PV', d, 1).split('b')[1]}"
+OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}"
+OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}"
 EXTRA_OECONF_append = "\
         --with-build-number=${OPENJDK_BUILD_NUMBER} \
         --with-update-version=${OPENJDK_UPDATE_VERSION} \
recipes-core/openjdk/openjdk-common.inc +3 -3
index 6a72572..cdfdda8 100644
@@ -25,7 +25,7 @@ B = "${S}/build"
 def get_jdk_arch(d):
     import bb
 
-    jdk_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1)
+    jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
     if jdk_arch == "x86-64":
         jdk_arch = "amd64"
     elif jdk_arch == "powerpc":

@@ -45,7 +45,7 @@ JDK_FAKE = "${WORKDIR}/fake-jdk"
 def get_llvm_configure_arch(d):
     import bb;
 
-    arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1)
+    arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
     if arch == "x86-64" or arch == "i486" or arch == "i586" or arch == "i686":
         arch = "x86"
     elif arch == "arm":

@@ -55,7 +55,7 @@ def get_llvm_configure_arch(d):
     elif arch == "powerpc" or arch == "powerpc64":
         arch = "powerpc"
     else:
-        bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
+        bb.warn("%s does not support %s yet" % (d.getVar('PN', True), arch) );
 
     return arch
Signature · 1 line
2.10.2
#1 lore raw
Quoted 16 lines · Cody P Schafer

bb.data.getVar was removed, need to use the modern mechanism.

Signed-off-by Cody P Schafer <[email protected]>
---
 classes/java-library.bbclass              |  4 ++--
 recipes-core/icedtea/icedtea7-native.inc  |  2 +-
 recipes-core/openjdk/openjdk-7-common.inc |  2 +-
 recipes-core/openjdk/openjdk-8-common.inc | 10 +++++-----
 recipes-core/openjdk/openjdk-common.inc   |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
classes/java-library.bbclass +0 -0
index 144cd2f..58d5a40 100644

classes/java-library.bbclass def java_package_name(d): · line 28

Quoted 8 lines
classes/java-library.bbclass +2 -2
@@ -23,8 +23,8 @@ def java_package_name(d):
   pre=""
   post=""
 
-  bpn = bb.data.getVar('BPN', d, 1)
-  ml = bb.data.getVar('MLPREFIX', d, 1)
+  bpn = d.getVar('BPN', True)
+  ml = d.getVar('MLPREFIX', True)

If you’re working on master, even the ‘, True’ is no longer needed, FYI.

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
#2 lore raw
Quoted 21 lines · Christopher Larson
Quoted 19 lines · Cody P Schafer

bb.data.getVar was removed, need to use the modern mechanism.

Signed-off-by Cody P Schafer <[email protected]>
---
 classes/java-library.bbclass              |  4 ++--
 recipes-core/icedtea/icedtea7-native.inc  |  2 +-
 recipes-core/openjdk/openjdk-7-common.inc |  2 +-
 recipes-core/openjdk/openjdk-8-common.inc | 10 +++++-----
 recipes-core/openjdk/openjdk-common.inc   |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
classes/java-library.bbclass +0 -0
index 144cd2f..58d5a40 100644
@@ -23,8 +23,8 @@ def java_package_name(d):
   pre=""
   post=""
Quoted 7 lines

classes/java-library.bbclass def java_package_name(d): · line 30

Quoted 5 lines
classes/java-library.bbclass +2 -2
-  bpn = bb.data.getVar('BPN', d, 1)
-  ml = bb.data.getVar('MLPREFIX', d, 1)
+  bpn = d.getVar('BPN', True)
+  ml = d.getVar('MLPREFIX', True)

If you’re working on master, even the ‘, True’ is no longer needed, FYI.

I suspect that meta-java master is meant to work with more than just bitbake master, so keeping the parameter makes sense.

I think the change is okay and I'd love to see it merged as soon as possible. In Ostro OS, updating to bitbake and OE-core master is blocked by this meta-java incompatibility with bitbake master.

Can someone with commit rights to meta-java please merge it?

Bye, Patrick

#3 lore raw
Quoted 30 lines · Patrick Ohly
Quoted 21 lines · Christopher Larson
Quoted 19 lines · Cody P Schafer

bb.data.getVar was removed, need to use the modern mechanism.

Signed-off-by Cody P Schafer <[email protected]>
---
 classes/java-library.bbclass              |  4 ++--
 recipes-core/icedtea/icedtea7-native.inc  |  2 +-
 recipes-core/openjdk/openjdk-7-common.inc |  2 +-
 recipes-core/openjdk/openjdk-8-common.inc | 10 +++++-----
 recipes-core/openjdk/openjdk-common.inc   |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
classes/java-library.bbclass +0 -0
index 144cd2f..58d5a40 100644
@@ -23,8 +23,8 @@ def java_package_name(d):
   pre=""
   post=""
Quoted 7 lines

classes/java-library.bbclass def java_package_name(d): · line 30

Quoted 5 lines
classes/java-library.bbclass +2 -2
-  bpn = bb.data.getVar('BPN', d, 1)
-  ml = bb.data.getVar('MLPREFIX', d, 1)
+  bpn = d.getVar('BPN', True)
+  ml = d.getVar('MLPREFIX', True)

If you’re working on master, even the ‘, True’ is no longer needed, FYI.

Quoted 8 lines

I suspect that meta-java master is meant to work with more than just bitbake master, so keeping the parameter makes sense.

I think the change is okay and I'd love to see it merged as soon as possible. In Ostro OS, updating to bitbake and OE-core master is blocked by this meta-java incompatibility with bitbake master.

Can someone with commit rights to meta-java please merge it?

We are on it. Fabio is testing the meta-java patches for merging.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750