diff mbox series

[V2,5/5] bash: Fix install conflict when enable multilib.

Message ID 1678239619-21210-5-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [V2,1/5] dhcpcd: Fix install conflict when enable multilib. | expand

Commit Message

Mingyu Wang (Fujitsu) March 8, 2023, 1:40 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

Error: Transaction test error:
  file /usr/bin/bashbug conflicts between attempted installs of lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and bash-bashbug-5.2.15-r0.aarch64

The differences between the two files are as follows:
@@ -26,14 +26,14 @@
 # configuration section:
 #      these variables are filled in by the make target in Makefile
 #
-MACHINE="aarch64"
-OS="linux-gnu"
-CC="aarch64-poky-linux-gcc  -mcpu=cortex-a57 -march=armv8-a+crc -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security "
+MACHINE="arm"
+OS="linux-gnueabi"
+CC="arm-pokymllib32-linux-gnueabi-gcc  -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security "
 CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types  -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536 -DBRACKETED_PASTE_DEFAULT=0"
 RELEASE="5.2"
 PATCHLEVEL="15"
 RELSTATUS="release"
-MACHTYPE="aarch64-poky-linux-gnu"
+MACHTYPE="arm-pokymllib32-linux-gnueabi"

 PATH=/bin:/usr/bin:/usr/local/bin:$PATH
 export PATH

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
 1 file changed, 3 insertions(+)

Comments

Richard Purdie March 8, 2023, 9:24 a.m. UTC | #1 
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> Error: Transaction test error:
>   file /usr/bin/bashbug conflicts between attempted installs of lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and bash-bashbug-5.2.15-r0.aarch64
> 
> The differences between the two files are as follows:
> @@ -26,14 +26,14 @@
>  # configuration section:
>  #      these variables are filled in by the make target in Makefile
>  #
> -MACHINE="aarch64"
> -OS="linux-gnu"
> -CC="aarch64-poky-linux-gcc  -mcpu=cortex-a57 -march=armv8-a+crc -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security "
> +MACHINE="arm"
> +OS="linux-gnueabi"
> +CC="arm-pokymllib32-linux-gnueabi-gcc  -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security "
>  CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types  -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536 -DBRACKETED_PASTE_DEFAULT=0"
>  RELEASE="5.2"
>  PATCHLEVEL="15"
>  RELSTATUS="release"
> -MACHTYPE="aarch64-poky-linux-gnu"
> +MACHTYPE="arm-pokymllib32-linux-gnueabi"
> 
>  PATH=/bin:/usr/bin:/usr/local/bin:$PATH
>  export PATH
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb b/meta/recipes-extended/bash/bash_5.2.15.bb
> index f78f79fcc5..ce81496f52 100644
> --- a/meta/recipes-extended/bash/bash_5.2.15.bb
> +++ b/meta/recipes-extended/bash/bash_5.2.15.bb
> @@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb
>  DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
>  
>  BBCLASSEXTEND = "nativesdk"
> +
> +inherit multilib_script
> +MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug"

I think we should just change the MACHINE, OS, CC and MACHTYPE lines to
something like "<redacted for multilib compatibility>".

Cheers,

Richard
Mingyu Wang (Fujitsu) March 9, 2023, 1:51 a.m. UTC | #2 
> I think we should just change the MACHINE, OS, CC and MACHTYPE lines to
> something like "<redacted for multilib compatibility>".
So for the correction of this problem, do we need to continue to vote for patch? 
Or accept this patch temporarily, and then roll it back after the bash update?

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com
http://www.fujitsu.com/cn/fnst/

> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: Wednesday, March 8, 2023 5:25 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable
> multilib.
> 
> On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> > From: Wang Mingyu <wangmy@fujitsu.com>
> >
> > Error: Transaction test error:
> >   file /usr/bin/bashbug conflicts between attempted installs of
> > lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and
> > bash-bashbug-5.2.15-r0.aarch64
> >
> > The differences between the two files are as follows:
> > @@ -26,14 +26,14 @@
> >  # configuration section:
> >  #      these variables are filled in by the make target in Makefile
> >  #
> > -MACHINE="aarch64"
> > -OS="linux-gnu"
> > -CC="aarch64-poky-linux-gcc  -mcpu=cortex-a57 -march=armv8-a+crc
> -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat
> -Wformat-security -Werror=format-security "
> > +MACHINE="arm"
> > +OS="linux-gnueabi"
> > +CC="arm-pokymllib32-linux-gnueabi-gcc  -march=armv7-a -mfpu=neon
> -mfloat-abi=hard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2
> -Wformat -Wformat-security -Werror=format-security "
> >  CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types
> -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536
> -DBRACKETED_PASTE_DEFAULT=0"
> >  RELEASE="5.2"
> >  PATCHLEVEL="15"
> >  RELSTATUS="release"
> > -MACHTYPE="aarch64-poky-linux-gnu"
> > +MACHTYPE="arm-pokymllib32-linux-gnueabi"
> >
> >  PATH=/bin:/usr/bin:/usr/local/bin:$PATH
> >  export PATH
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> >  meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb
> > b/meta/recipes-extended/bash/bash_5.2.15.bb
> > index f78f79fcc5..ce81496f52 100644
> > --- a/meta/recipes-extended/bash/bash_5.2.15.bb
> > +++ b/meta/recipes-extended/bash/bash_5.2.15.bb
> > @@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = "
> > ${@bb.utils.contains('TUNE_CCARGS', '-mthumb
> >  DEBUG_OPTIMIZATION:append:armv5 = "
> ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
> >
> >  BBCLASSEXTEND = "nativesdk"
> > +
> > +inherit multilib_script
> > +MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug"
> 
> I think we should just change the MACHINE, OS, CC and MACHTYPE lines to
> something like "<redacted for multilib compatibility>".
> 
> Cheers,
> 
> Richard
Richard Purdie March 9, 2023, 3:22 p.m. UTC | #3 
On Thu, 2023-03-09 at 01:51 +0000, wangmy@fujitsu.com wrote:
> > I think we should just change the MACHINE, OS, CC and MACHTYPE
> > lines to
> > something like "<redacted for multilib compatibility>".
> So for the correction of this problem, do we need to continue to vote
> for patch? 
> Or accept this patch temporarily, and then roll it back after the
> bash update?

I'd like to see a patch which fixes the issue properly. If I take this
one temporarily, it is unlikely anyone will then send the correct fix.

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb b/meta/recipes-extended/bash/bash_5.2.15.bb
index f78f79fcc5..ce81496f52 100644
--- a/meta/recipes-extended/bash/bash_5.2.15.bb
+++ b/meta/recipes-extended/bash/bash_5.2.15.bb
@@ -20,3 +20,6 @@  DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb
 DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
 
 BBCLASSEXTEND = "nativesdk"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug"