[meta-oe][PATCH] openssl: fix multilib file install conflicts

[meta-oe][PATCH] openssl: fix multilib file install conflicts

[Xulin Sun]

To avoid issue like below if run "bitbake lib32-wrlinux-image-glibc-std"
with series userspace packages(LAMP,krb5...) added:

Error: Transaction check error:
  file /usr/bin/c_rehash conflicts between attempted installs of
  lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64

Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c4e69cfb7..21359fa68a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
 RCONFLICTS_openssl-conf = "openssl10-conf"
 
 BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"
-- 
2.18.1

Re: [meta-oe][PATCH] openssl: fix multilib file install conflicts

[Randy MacLeod]

Xulin,

Thanks for sending this patch.

On 1/17/19 9:22 PM, Xulin Sun wrote:
> To avoid issue like below if run "bitbake lib32-wrlinux-image-glibc-std"

For future oe-core commits, please use a core-image-minimal
example that will be more familiar to people outside of Wind River.

> with series userspace packages(LAMP,krb5...) added:
> 
> Error: Transaction check error:
>    file /usr/bin/c_rehash conflicts between attempted installs of
>    lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64
>

Also, while your commit log explains what you fixed, it
doesn't describe the issue for those who don't know what c_rehash is so 
something like:

   Add multilib_script support for openssl's c_rehash which is
   a perl script.

Followed by the example failure log that you showed.


Since this hasn't been merged to master/master-next,
it would be nice if you sent a v2.

Thanks,
../Randy

> Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
> ---
>   meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> index 5c4e69cfb7..21359fa68a 100644
> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> @@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
>   RCONFLICTS_openssl-conf = "openssl10-conf"
>   
>   BBCLASSEXTEND = "native nativesdk"
> +
> +inherit multilib_script
> +
> +MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"
> 



-- 
# Randy MacLeod
# Wind River Linux

[meta-oe][PATCH v2] openssl: fix multilib file install conflicts

[Xulin Sun]

To avoid issue like below if run "bitbake lib32-core-image-minimal"
with series userspace packages(LAMP,krb5...) added.

Add multilib_script support for openssl's c_rehash which is a perl script.

Error: Transaction check error:
  file /usr/bin/c_rehash conflicts between attempted installs of
  lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64

Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c4e69c..21359fa 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
 RCONFLICTS_openssl-conf = "openssl10-conf"
 
 BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"
-- 
2.7.4

Re: [meta-oe][PATCH] openssl: fix multilib file install conflicts

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org <openembedded-
> core-bounces@lists.openembedded.org> On Behalf Of Randy MacLeod
> Sent: den 22 januari 2019 00:01
> To: Patches and discussions about the oe-core layer <openembedded-
> core@lists.openembedded.org>; Xulin Sun <xulin.sun@windriver.com>
> Subject: Re: [OE-core] [meta-oe][PATCH] openssl: fix multilib file
> install conflicts
> 
> Xulin,
> 
> Thanks for sending this patch.
> 
> On 1/17/19 9:22 PM, Xulin Sun wrote:
> > To avoid issue like below if run "bitbake lib32-wrlinux-image-glibc-
> std"
> 
> For future oe-core commits, please use a core-image-minimal
> example that will be more familiar to people outside of Wind River.
> 
> > with series userspace packages(LAMP,krb5...) added:
> >
> > Error: Transaction check error:
> >    file /usr/bin/c_rehash conflicts between attempted installs of
> >    lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-
> r0.aarch64
> >
> 
> Also, while your commit log explains what you fixed, it
> doesn't describe the issue for those who don't know what c_rehash is so
> something like:
> 
>    Add multilib_script support for openssl's c_rehash which is
>    a perl script.
> 
> Followed by the example failure log that you showed.
> 
> 
> Since this hasn't been merged to master/master-next,
> it would be nice if you sent a v2.
> 
> Thanks,
> ../Randy
> 
> > Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
> > ---
> >   meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
> >   1 file changed, 4 insertions(+)
> >
> > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> > index 5c4e69cfb7..21359fa68a 100644
> > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> > @@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
> >   RCONFLICTS_openssl-conf = "openssl10-conf"
> >
> >   BBCLASSEXTEND = "native nativesdk"
> > +
> > +inherit multilib_script
> > +
> > +MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"

Shouldn't that be:

MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"

given that openssl inherits lib_package and ${bindir}/c_rehash thus 
ends up in the ${PN}-bin package?

//Peter

Re: [meta-oe][PATCH] openssl: fix multilib file install conflicts

[Xulin Sun]

On 01/22/2019 10:25 PM, Peter Kjellerstedt wrote:
>> -----Original Message-----
>> From: openembedded-core-bounces@lists.openembedded.org <openembedded-
>> core-bounces@lists.openembedded.org> On Behalf Of Randy MacLeod
>> Sent: den 22 januari 2019 00:01
>> To: Patches and discussions about the oe-core layer <openembedded-
>> core@lists.openembedded.org>; Xulin Sun <xulin.sun@windriver.com>
>> Subject: Re: [OE-core] [meta-oe][PATCH] openssl: fix multilib file
>> install conflicts
>>
>> Xulin,
>>
>> Thanks for sending this patch.
>>
>> On 1/17/19 9:22 PM, Xulin Sun wrote:
>>> To avoid issue like below if run "bitbake lib32-wrlinux-image-glibc-
>> std"
>>
>> For future oe-core commits, please use a core-image-minimal
>> example that will be more familiar to people outside of Wind River.
>>
>>> with series userspace packages(LAMP,krb5...) added:
>>>
>>> Error: Transaction check error:
>>>     file /usr/bin/c_rehash conflicts between attempted installs of
>>>     lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-
>> r0.aarch64
>> Also, while your commit log explains what you fixed, it
>> doesn't describe the issue for those who don't know what c_rehash is so
>> something like:
>>
>>     Add multilib_script support for openssl's c_rehash which is
>>     a perl script.
>>
>> Followed by the example failure log that you showed.
>>
>>
>> Since this hasn't been merged to master/master-next,
>> it would be nice if you sent a v2.
>>
>> Thanks,
>> ../Randy
>>
>>> Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
>>> ---
>>>    meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
>>>    1 file changed, 4 insertions(+)
>>>
>>> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>> b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>>> index 5c4e69cfb7..21359fa68a 100644
>>> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>>> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>>> @@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
>>>    RCONFLICTS_openssl-conf = "openssl10-conf"
>>>
>>>    BBCLASSEXTEND = "native nativesdk"
>>> +
>>> +inherit multilib_script
>>> +
>>> +MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"
> Shouldn't that be:
>
> MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
>
> given that openssl inherits lib_package and ${bindir}/c_rehash thus
> ends up in the ${PN}-bin package?

It is verified that both these two modification method ( ${PN}  or 
${PN}-bin ) are all working and can fix the building error issue.
Seems that after update to openssl 1.1.1, the file /usr/bin/openssl is 
packaged into openssl-bin.

Thanks
Xulin
>
> //Peter
>
>

Re: [meta-oe][PATCH v2] openssl: fix multilib file install conflicts

[Richard Purdie]

On Tue, 2019-01-22 at 11:03 +0800, Xulin Sun wrote:
> To avoid issue like below if run "bitbake lib32-core-image-minimal"
> with series userspace packages(LAMP,krb5...) added.
> 
> Add multilib_script support for openssl's c_rehash which is a perl
> script.
> 
> Error: Transaction check error:
>   file /usr/bin/c_rehash conflicts between attempted installs of
>   lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-
> r0.aarch64
> 
> Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
> ---
>  meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> index 5c4e69c..21359fa 100644
> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
> @@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
>  RCONFLICTS_openssl-conf = "openssl10-conf"
>  
>  BBCLASSEXTEND = "native nativesdk"
> +
> +inherit multilib_script
> +
> +MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"

Peter's feedback still needs addressing on whether c_rehash is in ${PN}
or ${PN}-bin?

Cheers,

Richard

Re: [meta-oe][PATCH v2] openssl: fix multilib file install conflicts

[Xulin Sun]

On 01/27/2019 07:15 AM, Richard Purdie wrote:
> On Tue, 2019-01-22 at 11:03 +0800, Xulin Sun wrote:
>> To avoid issue like below if run "bitbake lib32-core-image-minimal"
>> with series userspace packages(LAMP,krb5...) added.
>>
>> Add multilib_script support for openssl's c_rehash which is a perl
>> script.
>>
>> Error: Transaction check error:
>>    file /usr/bin/c_rehash conflicts between attempted installs of
>>    lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-
>> r0.aarch64
>>
>> Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
>> ---
>>   meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>> b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>> index 5c4e69c..21359fa 100644
>> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
>> @@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
>>   RCONFLICTS_openssl-conf = "openssl10-conf"
>>   
>>   BBCLASSEXTEND = "native nativesdk"
>> +
>> +inherit multilib_script
>> +
>> +MULTILIB_SCRIPTS = "${PN}:${bindir}/c_rehash"
> Peter's feedback still needs addressing on whether c_rehash is in ${PN}
> or ${PN}-bin?

c_rehash is in ${PN}-bin.  if no other concerns, v3 will be sent.

Thanks
Xulin
>
> Cheers,
>
> Richard
>
>

[meta-oe][PATCH v3] openssl: fix multilib file install conflicts

[Xulin Sun]

To avoid issue like below if run "bitbake lib32-core-image-minimal"
with series userspace packages(LAMP,krb5...) added.

Add multilib_script support for openssl's c_rehash which is a perl script.

Error: Transaction check error:
  file /usr/bin/c_rehash conflicts between attempted installs of
  lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64

Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c4e69c..6676614 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
 RCONFLICTS_openssl-conf = "openssl10-conf"
 
 BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
-- 
2.7.4