On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> From: Wang Mingyu <wan...@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 <wan...@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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178159):
https://lists.openembedded.org/g/openembedded-core/message/178159
Mute This Topic: https://lists.openembedded.org/mt/97464376/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
