diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-03-11 00:47:22 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-03-10 21:18:43 -0700 |
commit | 0248b3ee2b847cfb25aa94018532d1cb1799b2cc (patch) | |
tree | 227bd34e88d4e856bedf1f504c3487de4146651b | |
parent | ec3307cebe5b6c2a020b535aa222f3220f97ce33 (diff) | |
download | meta-openembedded-0248b3ee2b847cfb25aa94018532d1cb1799b2cc.tar.gz |
wireshark: upgrade to 3.0.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch | 29 | ||||
-rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb | 13 |
2 files changed, 1 insertions, 41 deletions
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 @@ | |||
1 | From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 12 Jun 2018 23:23:44 -0700 | ||
4 | Subject: [PATCH] Add libm to link for fmod() API | ||
5 | |||
6 | fixes | ||
7 | ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5' | ||
8 | | /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 | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 7950e85..acee140 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -2494,6 +2494,7 @@ if(BUILD_tshark) | ||
20 | ${LIBEPAN_LIBS} | ||
21 | ${APPLE_CORE_FOUNDATION_LIBRARY} | ||
22 | ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} | ||
23 | + m | ||
24 | ) | ||
25 | set(tshark_FILES | ||
26 | capture_opts.c | ||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||
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" | |||
4 | LICENSE = "GPL-2.0" | 4 | LICENSE = "GPL-2.0" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" |
6 | 6 | ||
7 | DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native git" | 7 | DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" |
8 | 8 | ||
9 | DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " | 9 | DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " |
10 | 10 | ||
@@ -21,11 +21,7 @@ inherit cmake pkgconfig python3native perlnative upstream-version-is-even | |||
21 | 21 | ||
22 | ARM_INSTRUCTION_SET = "arm" | 22 | ARM_INSTRUCTION_SET = "arm" |
23 | 23 | ||
24 | # Options: gtk+, gtk+3 and qt5 | ||
25 | GTK = "gtk+3" | ||
26 | |||
27 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" | 24 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" |
28 | PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " ${GTK}", "", d)}" | ||
29 | 25 | ||
30 | PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" | 26 | PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" |
31 | 27 | ||
@@ -34,8 +30,6 @@ PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DE | |||
34 | PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" | 30 | PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" |
35 | PACKAGECONFIG[libnl] = ",,libnl" | 31 | PACKAGECONFIG[libnl] = ",,libnl" |
36 | PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" | 32 | PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" |
37 | PACKAGECONFIG[gtk+] = "-DENABLE_GTK=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK=OFF, gtk+" | ||
38 | PACKAGECONFIG[gtk+3] = "-DENABLE_GTK3=ON -DBUILD_wireshark_gtk=ON, -DENABLE_GTK3=OFF, gtk+3" | ||
39 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" | 33 | PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" |
40 | PACKAGECONFIG[ssl] = ",,openssl" | 34 | PACKAGECONFIG[ssl] = ",,openssl" |
41 | PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" | 35 | PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" |
@@ -77,16 +71,11 @@ do_install_append_class-target() { | |||
77 | } | 71 | } |
78 | 72 | ||
79 | PACKAGE_BEFORE_PN += "tshark" | 73 | PACKAGE_BEFORE_PN += "tshark" |
80 | PACKAGE_BEFORE_PN += "${PN}-gtk" | ||
81 | 74 | ||
82 | FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" | 75 | FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" |
83 | FILES_${PN}-gtk = "${bindir}/wireshark-gtk ${datadir}/icons ${datadir}/appdata \ | ||
84 | ${datadir}/applications ${datadir}/wireshark ${datadir}/mime \ | ||
85 | ${mandir}/man1/wireshark.* " | ||
86 | 76 | ||
87 | FILES_${PN} += "${datadir}*" | 77 | FILES_${PN} += "${datadir}*" |
88 | 78 | ||
89 | RDEPENDS_tshark = "wireshark" | 79 | RDEPENDS_tshark = "wireshark" |
90 | RDEPENDS_${PN}-gtk = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "${GTK}", "", d)} wireshark" | ||
91 | 80 | ||
92 | BBCLASSEXTEND = "native" | 81 | BBCLASSEXTEND = "native" |