* [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
@ 2016-11-29 16:48 Cody P Schafer
2016-11-29 20:16 ` Christopher Larson
0 siblings, 1 reply; 4+ messages in thread
From: Cody P Schafer @ 2016-11-29 16:48 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador, Mario Domenech Goulart
bb.data.getVar was removed, need to use the modern mechanism.
Signed-off-by: Cody P Schafer <dev@codyps.com>
---
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(-)
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):
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'
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() {
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"
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}"
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"
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() {
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} \
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"
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
--
2.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
2016-11-29 16:48 [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True) Cody P Schafer
@ 2016-11-29 20:16 ` Christopher Larson
2016-12-05 12:13 ` Patrick Ohly
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Larson @ 2016-11-29 20:16 UTC (permalink / raw)
To: Openembedded Discussion; +Cc: Otavio Salvador, Mario Domenech Goulart
On Tue, Nov 29, 2016 at 9:48 AM, Cody P Schafer <dev@codyps.com> wrote:
> bb.data.getVar was removed, need to use the modern mechanism.
>
> Signed-off-by: Cody P Schafer <dev@codyps.com>
> ---
> 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(-)
>
> 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):
> 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.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
2016-11-29 20:16 ` Christopher Larson
@ 2016-12-05 12:13 ` Patrick Ohly
2016-12-05 12:39 ` Otavio Salvador
0 siblings, 1 reply; 4+ messages in thread
From: Patrick Ohly @ 2016-12-05 12:13 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador, Mario Domenech Goulart
On Tue, 2016-11-29 at 13:16 -0700, Christopher Larson wrote:
> On Tue, Nov 29, 2016 at 9:48 AM, Cody P Schafer <dev@codyps.com> wrote:
>
> > bb.data.getVar was removed, need to use the modern mechanism.
> >
> > Signed-off-by: Cody P Schafer <dev@codyps.com>
> > ---
> > 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(-)
> >
> > 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):
> > 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.
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True)
2016-12-05 12:13 ` Patrick Ohly
@ 2016-12-05 12:39 ` Otavio Salvador
0 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2016-12-05 12:39 UTC (permalink / raw)
To: Patrick Ohly
Cc: OpenEmbedded Devel List, Otavio Salvador, Mario Domenech Goulart
On Mon, Dec 5, 2016 at 10:13 AM, Patrick Ohly <patrick.ohly@gmx.de> wrote:
> On Tue, 2016-11-29 at 13:16 -0700, Christopher Larson wrote:
>> On Tue, Nov 29, 2016 at 9:48 AM, Cody P Schafer <dev@codyps.com> wrote:
>>
>> > bb.data.getVar was removed, need to use the modern mechanism.
>> >
>> > Signed-off-by: Cody P Schafer <dev@codyps.com>
>> > ---
>> > 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(-)
>> >
>> > 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):
>> > 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.
>
> 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.
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-05 12:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-29 16:48 [meta-java][PATCH] move from bb.data.getVar(x, d, 1) to d.getVar(x, True) Cody P Schafer
2016-11-29 20:16 ` Christopher Larson
2016-12-05 12:13 ` Patrick Ohly
2016-12-05 12:39 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.