From 11056735e8c2ced778ec308f9a9f52964ceefa12 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 10 Jan 2024 09:21:30 +0800 Subject: [PATCH] daq: Fix install conflict when enable multilib. 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 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/daq/daq_2.0.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index c5499ffeeb..66ad83f711 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -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 = ""