Skip to contentSkip to conversation

dhcpcd: Fix install conflict when enable multilib.

PATCH Superseded [email protected] 1 participant 2 messages Feb 24, 2023

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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

---
 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 2/2 xcb-proto: Fix install conflict when enable multilib.

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

---
 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