[meta-java][PATCH] openjdk-build-helper: fix arm64 build

[meta-java][PATCH] openjdk-build-helper: fix arm64 build

[Jerome Brunet]

When trying to build for an arm64 machine, such as qemuarm64, parsing of
the recipes fails with the following messages:

WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Exception during build_dependencies for LLVM_CONFIGURE_ARCH
WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Error during finalise of /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
ERROR: ExpansionError during parsing /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
Traceback (most recent call last):
  File "Var <LLVM_CONFIGURE_ARCH>", line 1, in <module>
  File "/meta-java/classes/openjdk-build-helper.bbclass", line 86, in openjdk_build_helper_get_llvm_configure_arch(d=<bb.data_smart.DataSmart object at 0x7f08fed017c0>):
         else:
    >        if 'shark' in d.getVar('PACKAGECONFIG').split():
                 bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
bb.data_smart.ExpansionError: Failure expanding variable LLVM_CONFIGURE_ARCH, expression was ${@openjdk_build_helper_get_llvm_configure_arch(d)} which triggered exception AttributeError: 'NoneType' object has no attribute 'split'

Using 'bb.utils.contains' solves the problem.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 classes/openjdk-build-helper.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
index 4e334c26c166..5f838b4f8a17 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -83,7 +83,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
     elif arch == "arm":
         arch = "arm"
     else:
-        if 'shark' in d.getVar('PACKAGECONFIG').split():
+        if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d):
             bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
 
     return arch
-- 
2.33.0

Re: [oe] [meta-java][PATCH] openjdk-build-helper: fix arm64 build

[Richard Leitner - SKIDATA]

Hi Jerome,

thanks for the patch! I've just applied it to master-next and if everything
goes well it will be merged to master after some testing.
If you want to see it backported to other branches please let me know!

lg;rl

On Fri, Oct 22, 2021 at 05:12:12PM +0200, Jerome Brunet via lists.openembedded.org wrote:
> When trying to build for an arm64 machine, such as qemuarm64, parsing of
> the recipes fails with the following messages:
> 
> WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Exception during build_dependencies for LLVM_CONFIGURE_ARCH
> WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Error during finalise of /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
> ERROR: ExpansionError during parsing /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
> Traceback (most recent call last):
>   File "Var <LLVM_CONFIGURE_ARCH>", line 1, in <module>
>   File "/meta-java/classes/openjdk-build-helper.bbclass", line 86, in openjdk_build_helper_get_llvm_configure_arch(d=<bb.data_smart.DataSmart object at 0x7f08fed017c0>):
>          else:
>     >        if 'shark' in d.getVar('PACKAGECONFIG').split():
>                  bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
> bb.data_smart.ExpansionError: Failure expanding variable LLVM_CONFIGURE_ARCH, expression was ${@openjdk_build_helper_get_llvm_configure_arch(d)} which triggered exception AttributeError: 'NoneType' object has no attribute 'split'
> 
> Using 'bb.utils.contains' solves the problem.
> 
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>  classes/openjdk-build-helper.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
> index 4e334c26c166..5f838b4f8a17 100644
> --- a/classes/openjdk-build-helper.bbclass
> +++ b/classes/openjdk-build-helper.bbclass
> @@ -83,7 +83,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
>      elif arch == "arm":
>          arch = "arm"
>      else:
> -        if 'shark' in d.getVar('PACKAGECONFIG').split():
> +        if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d):
>              bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
>  
>      return arch
> -- 
> 2.33.0
> 

Re: [oe] [meta-java][PATCH] openjdk-build-helper: fix arm64 build

[Jerome Brunet]

On Wed 17 Nov 2021 at 16:24, Richard Leitner - SKIDATA <Richard.Leitner@skidata.com> wrote:

> Hi Jerome,
>
> thanks for the patch! I've just applied it to master-next and if everything
> goes well it will be merged to master after some testing.
> If you want to see it backported to other branches please let me know!

It would be great to have an hardknott branch and have it on it.
Having an hardknott branch would help with override syntax change coming
with honister

>
> lg;rl
>
> On Fri, Oct 22, 2021 at 05:12:12PM +0200, Jerome Brunet via lists.openembedded.org wrote:
>> When trying to build for an arm64 machine, such as qemuarm64, parsing of
>> the recipes fails with the following messages:
>> 
>> WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Exception during build_dependencies for LLVM_CONFIGURE_ARCH
>> WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Error during finalise of /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
>> ERROR: ExpansionError during parsing /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
>> Traceback (most recent call last):
>>   File "Var <LLVM_CONFIGURE_ARCH>", line 1, in <module>
>>   File "/meta-java/classes/openjdk-build-helper.bbclass", line 86, in openjdk_build_helper_get_llvm_configure_arch(d=<bb.data_smart.DataSmart object at 0x7f08fed017c0>):
>>          else:
>>     >        if 'shark' in d.getVar('PACKAGECONFIG').split():
>>                  bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
>> bb.data_smart.ExpansionError: Failure expanding variable LLVM_CONFIGURE_ARCH, expression was ${@openjdk_build_helper_get_llvm_configure_arch(d)} which triggered exception AttributeError: 'NoneType' object has no attribute 'split'
>> 
>> Using 'bb.utils.contains' solves the problem.
>> 
>> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
>> ---
>>  classes/openjdk-build-helper.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
>> index 4e334c26c166..5f838b4f8a17 100644
>> --- a/classes/openjdk-build-helper.bbclass
>> +++ b/classes/openjdk-build-helper.bbclass
>> @@ -83,7 +83,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
>>      elif arch == "arm":
>>          arch = "arm"
>>      else:
>> -        if 'shark' in d.getVar('PACKAGECONFIG').split():
>> +        if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d):
>>              bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
>>  
>>      return arch
>> -- 
>> 2.33.0
>> 

Re: [oe] [meta-java][PATCH] openjdk-build-helper: fix arm64 build

[Richard Leitner - SKIDATA]

On Wed, Nov 17, 2021 at 06:10:02PM +0100, Jerome Brunet wrote:
> 
> On Wed 17 Nov 2021 at 16:24, Richard Leitner - SKIDATA <Richard.Leitner@skidata.com> wrote:
> 
> > Hi Jerome,
> >
> > thanks for the patch! I've just applied it to master-next and if everything
> > goes well it will be merged to master after some testing.
> > If you want to see it backported to other branches please let me know!
> 
> It would be great to have an hardknott branch and have it on it.
> Having an hardknott branch would help with override syntax change coming
> with honister

I've just created a hardknott branch with the same head as master. As
soon I've tested master-next I'll also add it to hardknott.

regards;rl

Re: [oe] [meta-java][PATCH] openjdk-build-helper: fix arm64 build

[Jerome Brunet]

On Wed 17 Nov 2021 at 17:14, Richard Leitner - SKIDATA <Richard.Leitner@skidata.com> wrote:

> On Wed, Nov 17, 2021 at 06:10:02PM +0100, Jerome Brunet wrote:
>> 
>> On Wed 17 Nov 2021 at 16:24, Richard Leitner - SKIDATA <Richard.Leitner@skidata.com> wrote:
>> 
>> > Hi Jerome,
>> >
>> > thanks for the patch! I've just applied it to master-next and if everything
>> > goes well it will be merged to master after some testing.
>> > If you want to see it backported to other branches please let me know!
>> 
>> It would be great to have an hardknott branch and have it on it.
>> Having an hardknott branch would help with override syntax change coming
>> with honister
>
> I've just created a hardknott branch with the same head as master. As
> soon I've tested master-next I'll also add it to hardknott.
>
> regards;rl

Awesome !

Thanks a lot