* [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib.
@ 2023-03-08 1:40 wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 2/5] lua: " wangmy
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: wangmy @ 2023-03-08 1:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
From: Wang Mingyu <wangmy@fujitsu.com>
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.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
index 39e689d2f6..03dbf31b35 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
@@ -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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [OE-core] [PATCH V2 2/5] lua: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
@ 2023-03-08 1:40 ` wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V4 3/5] vala: " wangmy
` (4 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: wangmy @ 2023-03-08 1:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
From: Wang Mingyu <wangmy@fujitsu.com>
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 \
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-devtools/lua/lua_5.4.4.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb
index 0b2e754b31..a39d888ec2 100644
--- a/meta/recipes-devtools/lua/lua_5.4.4.bb
+++ b/meta/recipes-devtools/lua/lua_5.4.4.bb
@@ -57,3 +57,6 @@ do_install_ptest () {
}
BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}-dev:${includedir}/luaconf.h"
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [OE-core] [PATCH V4 3/5] vala: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 2/5] lua: " wangmy
@ 2023-03-08 1:40 ` wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 4/5] xcb-proto: " wangmy
` (3 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: wangmy @ 2023-03-08 1:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
From: Wang Mingyu <wangmy@fujitsu.com>
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 ]
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-devtools/vala/vala.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index d3daee37dc..162e99bb03 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -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}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 2/5] lua: " wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V4 3/5] vala: " wangmy
@ 2023-03-08 1:40 ` wangmy
2023-03-08 9:21 ` Richard Purdie
2023-03-08 1:40 ` [OE-core] [PATCH V2 5/5] bash: " wangmy
` (2 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: wangmy @ 2023-03-08 1:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
From: Wang Mingyu <wangmy@fujitsu.com>
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
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
index 4e4472a9c1..0fdca732e8 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
@@ -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"
+
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
` (2 preceding siblings ...)
2023-03-08 1:40 ` [OE-core] [PATCH V2 4/5] xcb-proto: " wangmy
@ 2023-03-08 1:40 ` wangmy
2023-03-08 9:24 ` Richard Purdie
2023-03-08 8:43 ` [OE-core] [PATCH V2 1/5] dhcpcd: " Alexander Kanavin
2023-03-08 9:19 ` Richard Purdie
5 siblings, 1 reply; 15+ messages in thread
From: wangmy @ 2023-03-08 1:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
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"
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
` (3 preceding siblings ...)
2023-03-08 1:40 ` [OE-core] [PATCH V2 5/5] bash: " wangmy
@ 2023-03-08 8:43 ` Alexander Kanavin
2023-03-08 9:19 ` Richard Purdie
5 siblings, 0 replies; 15+ messages in thread
From: Alexander Kanavin @ 2023-03-08 8:43 UTC (permalink / raw)
To: wangmy; +Cc: openembedded-core
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
On Wed, 8 Mar 2023 at 02:40, wangmy <wangmy@fujitsu.com> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 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.
>
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> index 39e689d2f6..03dbf31b35 100644
> --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> @@ -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: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib.
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
` (4 preceding siblings ...)
2023-03-08 8:43 ` [OE-core] [PATCH V2 1/5] dhcpcd: " Alexander Kanavin
@ 2023-03-08 9:19 ` Richard Purdie
5 siblings, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2023-03-08 9:19 UTC (permalink / raw)
To: wangmy, openembedded-core
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 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.
>
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> index 39e689d2f6..03dbf31b35 100644
> --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> @@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-08 1:40 ` [OE-core] [PATCH V2 4/5] xcb-proto: " wangmy
@ 2023-03-08 9:21 ` Richard Purdie
2023-03-13 7:29 ` wangmy
0 siblings, 1 reply; 15+ messages in thread
From: Richard Purdie @ 2023-03-08 9:21 UTC (permalink / raw)
To: wangmy, openembedded-core
On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 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
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> index 4e4472a9c1..0fdca732e8 100644
> --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> @@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.
2023-03-08 1:40 ` [OE-core] [PATCH V2 5/5] bash: " wangmy
@ 2023-03-08 9:24 ` Richard Purdie
2023-03-09 1:51 ` wangmy
0 siblings, 1 reply; 15+ messages in thread
From: Richard Purdie @ 2023-03-08 9:24 UTC (permalink / raw)
To: wangmy, openembedded-core
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.
2023-03-08 9:24 ` Richard Purdie
@ 2023-03-09 1:51 ` wangmy
2023-03-09 15:22 ` Richard Purdie
0 siblings, 1 reply; 15+ messages in thread
From: wangmy @ 2023-03-09 1:51 UTC (permalink / raw)
To: Richard Purdie, openembedded-core
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib.
2023-03-09 1:51 ` wangmy
@ 2023-03-09 15:22 ` Richard Purdie
0 siblings, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2023-03-09 15:22 UTC (permalink / raw)
To: wangmy, openembedded-core
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-08 9:21 ` Richard Purdie
@ 2023-03-13 7:29 ` wangmy
2023-03-13 7:50 ` Alexander Kanavin
0 siblings, 1 reply; 15+ messages in thread
From: wangmy @ 2023-03-13 7:29 UTC (permalink / raw)
To: Richard Purdie, openembedded-core
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: wangmy@fujitsu.com
http://www.fujitsu.com/cn/fnst/
> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: Wednesday, March 8, 2023 5:21 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: 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/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
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> > meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> > b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> > index 4e4472a9c1..0fdca732e8 100644
> > --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> > +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
> > @@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-13 7:29 ` wangmy
@ 2023-03-13 7:50 ` Alexander Kanavin
2023-03-14 0:49 ` wangmy
0 siblings, 1 reply; 15+ messages in thread
From: Alexander Kanavin @ 2023-03-13 7:50 UTC (permalink / raw)
To: wangmy; +Cc: Richard Purdie, openembedded-core
On Mon, 13 Mar 2023 at 08:29, wangmy <wangmy@fujitsu.com> wrote:
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-13 7:50 ` Alexander Kanavin
@ 2023-03-14 0:49 ` wangmy
2023-03-14 8:29 ` Alexander Kanavin
0 siblings, 1 reply; 15+ messages in thread
From: wangmy @ 2023-03-14 0:49 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Richard Purdie, openembedded-core
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: wangmy@fujitsu.com
http://www.fujitsu.com/cn/fnst/
> -----Original Message-----
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Sent: Monday, March 13, 2023 3:50 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable
> multilib.
>
> On Mon, 13 Mar 2023 at 08:29, wangmy <wangmy@fujitsu.com> wrote:
> > 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib.
2023-03-14 0:49 ` wangmy
@ 2023-03-14 8:29 ` Alexander Kanavin
0 siblings, 0 replies; 15+ messages in thread
From: Alexander Kanavin @ 2023-03-14 8:29 UTC (permalink / raw)
To: wangmy; +Cc: Richard Purdie, openembedded-core
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
On Tue, 14 Mar 2023 at 01:49, wangmy@fujitsu.com <wangmy@fujitsu.com> 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:
> @@ -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: wangmy@fujitsu.com
> http://www.fujitsu.com/cn/fnst/
>
> > -----Original Message-----
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Sent: Monday, March 13, 2023 3:50 PM
> > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> > Cc: Richard Purdie <richard.purdie@linuxfoundation.org>;
> > openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable
> > multilib.
> >
> > On Mon, 13 Mar 2023 at 08:29, wangmy <wangmy@fujitsu.com> wrote:
> > > 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
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-03-14 8:29 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 1:40 [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 2/5] lua: " wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V4 3/5] vala: " wangmy
2023-03-08 1:40 ` [OE-core] [PATCH V2 4/5] xcb-proto: " wangmy
2023-03-08 9:21 ` Richard Purdie
2023-03-13 7:29 ` wangmy
2023-03-13 7:50 ` Alexander Kanavin
2023-03-14 0:49 ` wangmy
2023-03-14 8:29 ` Alexander Kanavin
2023-03-08 1:40 ` [OE-core] [PATCH V2 5/5] bash: " wangmy
2023-03-08 9:24 ` Richard Purdie
2023-03-09 1:51 ` wangmy
2023-03-09 15:22 ` Richard Purdie
2023-03-08 8:43 ` [OE-core] [PATCH V2 1/5] dhcpcd: " Alexander Kanavin
2023-03-08 9:19 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.