Skip to contentSkip to conversation

dhcpcd: Fix install conflict when enable multilib.

PATCH Superseded [email protected] 3 participants 15 messages Mar 8, 2023 – Mar 14, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 dhcpcd: Fix install conflict when enable multilib.

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon

The differences between the two files are as follows:
@@ -821,7 +821,7 @@
If you always use the same options, put them here.
.It Pa /usr/libexec/dhcpcd-run-hooks
Bourne shell script that is run to configure or de-configure an interface.
-.It Pa /usr/lib64/dhcpcd/dev
+.It Pa /usr/lib/dhcpcd/dev
Linux
.Pa /dev
management modules.

---
 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +3 -0
index 39e689d2f6..03dbf31b35 100644
@@ -62,3 +62,6 @@ do_install:append () {
 }
 
 FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8"
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 2/5 lua: Fix install conflict when enable multilib.

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/include/luaconf.h conflicts between attempted installs of lua-dev-5.4.4-r0.aarch64 and lib32-lua-dev-5.4.4-r0.armv7ahf_neon

The differences between the two files are as follows:
@@ -219,7 +219,7 @@

 #define LUA_ROOT       "/usr/"
 #define LUA_LDIR       LUA_ROOT "share/lua/" LUA_VDIR "/"
-#define LUA_CDIR       LUA_ROOT "lib64/lua/" LUA_VDIR "/"
+#define LUA_CDIR       LUA_ROOT "lib/lua/" LUA_VDIR "/"

#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \

---
 meta/recipes-devtools/lua/lua_5.4.4.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/lua/lua_5.4.4.bb +3 -0
index 0b2e754b31..a39d888ec2 100644
@@ -57,3 +57,6 @@ do_install_ptest () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-dev:${includedir}/luaconf.h"
Signature · 1 line
2.34.1
#2 lore raw

PATCH v4 3/5 vala: Fix install conflict when enable multilib.

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/bin/vala-gen-introspect-0.56 conflicts between attempted installs of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64 file /usr/bin/vapigen-wrapper conflicts between attempted installs
of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64

The differences of vala-gen-introspect-0.56 are as follows:
@@ -2,7 +2,7 @@

prefix=/usr
exec_prefix=/usr
-libdir=/usr/lib64
+libdir=/usr/lib
pkglibdir=${libdir}/vala-0.56

if [ $# -ne 2 ]

---
 meta/recipes-devtools/vala/vala.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/vala/vala.inc +4 -1
index d3daee37dc..162e99bb03 100644
@@ -50,6 +50,9 @@ do_install:append:class-target() {
 # vapi files.
 SYSROOT_DIRS += "${bindir_crossscripts}"
 
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56"
+
 SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess"
 vapigen_sysroot_preprocess() {
         # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks
@@ -64,5 +67,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper"
 PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
 
 vala_package_preprocess () {
-	sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper
+	rm -rf ${PKGD}${bindir_crossscripts}
 }
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 4/5 xcb-proto: Fix install conflict when enable multilib.

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57

The differences between the two files are as follows:
@@ -2,7 +2,7 @@
exec_prefix=/usr
datarootdir=${prefix}/share
datadir=/usr/share
-libdir=/usr/lib64
+libdir=/usr/lib
xcbincludedir=${pc_sysrootdir}${datadir}/xcb PYTHON_PREFIX=${prefix} pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages

---
 meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +3 -0
index 4e4472a9c1..0fdca732e8 100644
@@ -28,3 +28,6 @@ DEV_PKG_DEPENDENCY = ""
 RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/xcb-proto.pc"
+
Signature · 1 line
2.34.1
#4 lore raw

Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Quoted 26 lines · wangmy

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57

The differences between the two files are as follows:

(quoted diff) +1 -1
@@ -2,7 +2,7 @@
 exec_prefix=/usr
 datarootdir=${prefix}/share
 datadir=/usr/share
-libdir=/usr/lib64
+libdir=/usr/lib
 xcbincludedir=${pc_sysrootdir}${datadir}/xcb
 PYTHON_PREFIX=${prefix}
 pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages
---
 meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +0 -0
index 4e4472a9c1..0fdca732e8 100644

meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb DEV_PKG_DEPENDENCY = "" · line 33

Quoted 6 lines
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +3 -0
@@ -28,3 +28,6 @@ DEV_PKG_DEPENDENCY = ""
 RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/xcb-proto.pc"
+

If the .pc file doesn't use libdir anywhere, we should just delete that line. It is being installed into a "noarch" location (datadir) so it shouldn't be library specific.

Also, we should *never* be putting pkgconfig files under update- alternatives control!

Cheers,

Richard

#5 lore raw

RE: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

When libxcb is compiled, it will read libdir from xcb-proto.pc to find the library. If delete this line, libxcb will report an error because it cannot find the directory of the library.

I haven't got any better way to solve this problem.

  --
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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 55 lines

-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Wednesday, March 8, 2023 5:21 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Quoted 29 lines · wangmy

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted
installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57

The differences between the two files are as follows:

(quoted diff) +1 -1
@@ -2,7 +2,7 @@
 exec_prefix=/usr
 datarootdir=${prefix}/share
 datadir=/usr/share
-libdir=/usr/lib64
+libdir=/usr/lib
 xcbincludedir=${pc_sysrootdir}${datadir}/xcb
 PYTHON_PREFIX=${prefix}
 pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages
---
 meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +0 -0
index 4e4472a9c1..0fdca732e8 100644

meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb DEV_PKG_DEPENDENCY = "" · line 33

Quoted 6 lines
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +3 -0
@@ -28,3 +28,6 @@ DEV_PKG_DEPENDENCY = ""
 RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/xcb-proto.pc"
+

If the .pc file doesn't use libdir anywhere, we should just delete that line. It is being installed into a "noarch" location (datadir) so it shouldn't be library specific.

Also, we should *never* be putting pkgconfig files under update- alternatives control!

Cheers,

Richard

#6 lore raw

Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Quoted 2 lines · wangmy

When libxcb is compiled, it will read libdir from xcb-proto.pc to find the library. If delete this line, libxcb will report an error because it cannot find the directory of the library.

Which library in particular? Can you show the error, and the point in libxcb's code where it happens?
xcb-proto does not install any libraries, and so there is no reason for xcb-proto.pc to tell where the libraries are.

Alex

#7 lore raw

RE: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

libxcb needs to find the python package in the path specified by pythondir recorded in xcb-proto.pc. If the libdir line is deleted, libxcb will report an error when compiling:

| Failed to load the xcbgen Python package!
| Make sure that xcb/proto installed it on your Python path.
| If not, you will need to create a .pth file or define $PYTHONPATH
| to extend the path.
| Refer to the README file in xcb/proto for more info.

The file contents after deleting libdir are compared as follows:
@@ -2,10 +2,8 @@
exec_prefix=/usr
datarootdir=${prefix}/share
datadir=/usr/share
-libdir=/usr/lib
xcbincludedir=${pc_sysrootdir}${datadir}/xcb PYTHON_PREFIX=${prefix}
-pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages

Name: XCB Proto
Description: X protocol descriptions for XCB

  --
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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 20 lines

-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Monday, March 13, 2023 3:50 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Richard Purdie <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Quoted 2 lines · wangmy

When libxcb is compiled, it will read libdir from xcb-proto.pc to find the library. If delete this line, libxcb will report an error because it cannot find the

directory of the library.

Which library in particular? Can you show the error, and the point in libxcb's code where it happens?
xcb-proto does not install any libraries, and so there is no reason for xcb-proto.pc to tell where the libraries are.

Alex

#8 lore raw

Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Thanks, in this case the correct fix would be to install xcb-proto.pc into $libdir, as it is indeed library specific. You need to patch Makefile.am in xcb-proto's source tree, and offer the patch to upstream.

Alex

Quoted 53 lines · On Tue, 14 Mar 2023 at 01:49, [email protected] <[email protected]> wrote:

libxcb needs to find the python package in the path specified by pythondir recorded in xcb-proto.pc. If the libdir line is deleted, libxcb will report an error when compiling:

| Failed to load the xcbgen Python package!
| Make sure that xcb/proto installed it on your Python path.
| If not, you will need to create a .pth file or define $PYTHONPATH
| to extend the path.
| Refer to the README file in xcb/proto for more info.

The file contents after deleting libdir are compared as follows:

(quoted diff) +0 -2
@@ -2,10 +2,8 @@
 exec_prefix=/usr
 datarootdir=${prefix}/share
 datadir=/usr/share
-libdir=/usr/lib
 xcbincludedir=${pc_sysrootdir}${datadir}/xcb
 PYTHON_PREFIX=${prefix}
-pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages
 
 Name: XCB Proto
 Description: X protocol descriptions for XCB

--
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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 20 lines

-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Monday, March 13, 2023 3:50 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Richard Purdie <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.

Quoted 2 lines · wangmy

When libxcb is compiled, it will read libdir from xcb-proto.pc to find the library. If delete this line, libxcb will report an error because it cannot find the

directory of the library.

Which library in particular? Can you show the error, and the point in libxcb's code where it happens?
xcb-proto does not install any libraries, and so there is no reason for xcb-proto.pc to tell where the libraries are.

Alex

#9 lore raw

PATCH v2 5/5 bash: Fix install conflict when enable multilib.

In reply to [email protected]

From: Wang Mingyu <[email protected]>

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

---
 meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/bash/bash_5.2.15.bb +3 -0
index f78f79fcc5..ce81496f52 100644
@@ -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"
Signature · 1 line
2.34.1
#10 lore raw

Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.

Quoted 36 lines · wangmy

From: Wang Mingyu <[email protected]>

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:

(quoted diff) +4 -4
@@ -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
---
 meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/bash/bash_5.2.15.bb +0 -0
index f78f79fcc5..ce81496f52 100644

meta/recipes-extended/bash/bash_5.2.15.bb DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb · line 25

Quoted 6 lines
meta/recipes-extended/bash/bash_5.2.15.bb +3 -0
@@ -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

#11 lore raw

RE: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.

Quoted 2 lines

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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 69 lines

-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Wednesday, March 8, 2023 5:25 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.

Quoted 15 lines · wangmy

From: Wang Mingyu <[email protected]>

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:

(quoted diff) +0 -3
@@ -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
(quoted diff) +0 -2
-fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security "
Quoted 3 lines
(quoted diff) +3 -0
+MACHINE="arm"
+OS="linux-gnueabi"
+CC="arm-pokymllib32-linux-gnueabi-gcc  -march=armv7-a -mfpu=neon
(quoted diff) +0 -2
-mfloat-abi=hard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2
-Wformat -Wformat-security -Werror=format-security "
Quoted 1 line
(quoted diff) +0 -0
 CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types
(quoted diff) +0 -2
-DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536
-DBRACKETED_PASTE_DEFAULT=0"
Quoted 20 lines
(quoted diff) +1 -1
 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
---
 meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/bash/bash_5.2.15.bb +0 -0
index f78f79fcc5..ce81496f52 100644
@@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = "
Quoted 2 lines

${@bb.utils.contains('TUNE_CCARGS', '-mthumb
DEBUG_OPTIMIZATION:append:armv5 = "

${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"

meta/recipes-extended/bash/bash_5.2.15.bb DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb · line 25

Quoted 5 lines

BBCLASSEXTEND = "nativesdk"

meta/recipes-extended/bash/bash_5.2.15.bb +3 -0
+
+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

#12 lore raw

Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.

Quoted 7 lines · On Thu, 2023-03-09 at 01:51 +0000, [email protected] wrote:
Quoted 3 lines

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

#13 lore raw
In reply to [email protected]

But what is the use case for installing two sets of documentation? Is it really something that needs to be fixed, or can you simply install just one of the two packages?

Alex

Quoted 46 lines · wangmy

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon

The differences between the two files are as follows:

(quoted diff) +1 -1
@@ -821,7 +821,7 @@
 If you always use the same options, put them here.
 .It Pa /usr/libexec/dhcpcd-run-hooks
 Bourne shell script that is run to configure or de-configure an interface.
-.It Pa /usr/lib64/dhcpcd/dev
+.It Pa /usr/lib/dhcpcd/dev
 Linux
 .Pa /dev
 management modules.
---
 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +3 -1
index 39e689d2f6..03dbf31b35 100644
@@ -62,3 +62,6 @@ do_install:append () {
 }
 
 FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8"
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178147): https://lists.openembedded.org/g/openembedded-core/message/178147
Mute This Topic: https://lists.openembedded.org/mt/97464365/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#14 lore raw
In reply to [email protected]
Quoted 27 lines · wangmy

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon

The differences between the two files are as follows:

(quoted diff) +1 -1
@@ -821,7 +821,7 @@
 If you always use the same options, put them here.
 .It Pa /usr/libexec/dhcpcd-run-hooks
 Bourne shell script that is run to configure or de-configure an interface.
-.It Pa /usr/lib64/dhcpcd/dev
+.It Pa /usr/lib/dhcpcd/dev
 Linux
 .Pa /dev
 management modules.
---
 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +0 -0
index 39e689d2f6..03dbf31b35 100644

meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb do_install:append () { · line 67

Quoted 6 lines
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +3 -0
@@ -62,3 +62,6 @@ do_install:append () {
 }
 
 FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8"

For something as simple as that we should just patch the docs to say /usr/<libdir>/dhcpcd/dev rather than trying to manage multiple versions.

Cheers,

Richard