From 0248b3ee2b847cfb25aa94018532d1cb1799b2cc Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Mon, 11 Mar 2019 00:47:22 +0100 Subject: wireshark: upgrade to 3.0.0 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../0001-Add-libm-to-link-for-fmod-API.patch | 29 ---------------------- .../recipes-support/wireshark/wireshark_3.0.0.bb | 13 +--------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch deleted file mode 100644 index e65ef9b10..000000000 --- a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Jun 2018 23:23:44 -0700 -Subject: [PATCH] Add libm to link for fmod() API - -fixes -ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5' -| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/wireshark/1_2.6.1-r0/recipe-sysroot/lib/libm.so.6: error adding symbols: DSO missing from command line - -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7950e85..acee140 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2494,6 +2494,7 @@ if(BUILD_tshark) - ${LIBEPAN_LIBS} - ${APPLE_CORE_FOUNDATION_LIBRARY} - ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} -+ m - ) - set(tshark_FILES - capture_opts.c --- -2.17.1 - diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb index d940a4567..dc55e3de0 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb @@ -4,7 +4,7 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native git" +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " @@ -21,11 +21,7 @@ inherit cmake pkgconfig python3native perlnative upstream-version-is-even ARM_INSTRUCTION_SET = "arm" -# Options: gtk+, gtk+3 and qt5 -GTK = "gtk+3" - PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" -PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " ${GTK}", "", d)}" PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" @@ -34,8 +30,6 @@ PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DE PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" PACKAGECONFIG[libnl] = ",,libnl" PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gtk+] = "-DENABLE_GTK=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK=OFF, gtk+" -PACKAGECONFIG[gtk+3] = "-DENABLE_GTK3=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK3=OFF, gtk+3" PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" PACKAGECONFIG[ssl] = ",,openssl" PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" @@ -77,16 +71,11 @@ do_install_append_class-target() { } PACKAGE_BEFORE_PN += "tshark" -PACKAGE_BEFORE_PN += "${PN}-gtk" FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" -FILES_${PN}-gtk = "${bindir}/wireshark-gtk ${datadir}/icons ${datadir}/appdata \ - ${datadir}/applications ${datadir}/wireshark ${datadir}/mime \ - ${mandir}/man1/wireshark.* " FILES_${PN} += "${datadir}*" RDEPENDS_tshark = "wireshark" -RDEPENDS_${PN}-gtk = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "${GTK}", "", d)} wireshark" BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf