Skip to contentSkip to conversation

daq: Fix install conflict when enable multilib.

PATCH New [email protected] 1 participant 1 message Jan 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 daq: Fix install conflict when enable multilib.

From: Wang Mingyu <[email protected]>

Error: Transaction test error:
file /usr/bin/daq-modules-config conflicts between attempted installs of lib32-daq-2.0.7-r0.armv7ahf_neon and daq-2.0.7-r0.cortexa57

The differences of daq-modules-config are as follows:
@@ -7,7 +7,7 @@

prefix=/usr
exec_prefix=/usr
-LIBDIR=/usr/lib64
+LIBDIR=/usr/lib
STATIC_LIBS=" -lsfbpf -lpcap -lsfbpf -lnfnetlink -lnetfilter_queue -lsfbpf -lpcap -ldnet"

static=0

---
 meta-networking/recipes-connectivity/daq/daq_2.0.7.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +2 -1
index c5499ffee..66ad83f71 100644
@@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-nfq-module --disable-ipq-module --includedir=${included
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
-inherit autotools
+inherit autotools multilib_script
+MULTILIB_SCRIPTS += "${PN}:${bindir}/daq-modules-config "
 
 DISABLE_STATIC = ""
 
Signature · 1 line
2.34.1