mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

daq: Fix install conflict when enable multilib.

Browse Source 
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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2024-01-10 09:21:30 +08:00
committed by Khem Raj
parent 7c4f3f1e3e
commit 11056735e8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/daq/daq_2.0.7.bb
+2 -1
View File
@@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-nfq-module --disable-ipq-module --includedir=${included
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
inherit autotools inherit autotools multilib_script
MULTILIB_SCRIPTS += "${PN}:${bindir}/daq-modules-config "
DISABLE_STATIC = "" DISABLE_STATIC = ""