From 6ef233ba3dc6a0e804c1c6b280aef9ca401f9d61 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Wed, 21 Oct 2026 09:40:45 +0100 Subject: [PATCH] wireshark: let PACKAGECONFIG libnl turn netlink off When the migration from autotools to cmake happened, the libnl PACKAGECONFIG was kept, but -DENABLE_NETLINK=ON was in EXTRA_OECMAKE unconditionally. Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- meta-networking/recipes-support/wireshark/wireshark_4.6.9.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.6.9.bb b/meta-networking/recipes-support/wireshark/wireshark_4.6.9.bb index fec2345b06..a639d69894 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.6.9.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.6.9.bb @@ -44,7 +44,7 @@ PACKAGECONFIG:class-native = "libpcap gnutls ssl libssh" PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[libnl] = "-DENABLE_NETLINK=ON,-DENABLE_NETLINK=OFF,libnl" PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" PACKAGECONFIG[ssl] = ",,openssl" @@ -64,8 +64,7 @@ PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON -DUSE_qt6=OFF, -DENAB inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ +EXTRA_OECMAKE += "-DBUILD_mmdbresolve=OFF \ -DBUILD_randpktdump=OFF \ -DBUILD_androiddump=OFF \ -DBUILD_dcerpcidl2wrs=OFF \