diff options
author | Armin Kuster <akuster808@gmail.com> | 2016-09-08 19:11:51 -0700 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-09-12 10:43:38 -0400 |
commit | 3a436ad18012f637e07f19c288526d0d563f8aa1 (patch) | |
tree | 790d3a92e980e3e2ec619ab2673fe87d2507c6ec /meta-networking/recipes-support/wireshark | |
parent | 554bbfb7352d61397e95cbad3c4a963ca0ad2aba (diff) | |
download | meta-openembedded-3a436ad18012f637e07f19c288526d0d563f8aa1.tar.gz |
wireshark: update to 2.2
remove unused config params.
Drop PE
Drop do_configure_prepend
update PACKAGECONFIG's for graphics
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/wireshark')
-rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_2.2.0.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_2.0.5.bb) | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.0.5.bb b/meta-networking/recipes-support/wireshark/wireshark_2.2.0.bb index 31ca4d24d..dca3be6dd 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.0.5.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.2.0.bb | |||
@@ -8,21 +8,16 @@ DEPENDS = "pcre expat glib-2.0 sbc" | |||
8 | 8 | ||
9 | SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" | 9 | SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "627b5fc6cf0aeca196c75debd5e69b14" | 11 | SRC_URI[md5sum] = "c7de0997f74934f25b456846cf75cb81" |
12 | SRC_URI[sha256sum] = "0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b" | 12 | SRC_URI[sha256sum] = "a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104" |
13 | |||
14 | PE = "1" | ||
15 | 13 | ||
16 | inherit autotools pkgconfig perlnative | 14 | inherit autotools pkgconfig perlnative |
17 | 15 | ||
18 | ARM_INSTRUCTION_SET = "arm" | 16 | ARM_INSTRUCTION_SET = "arm" |
19 | 17 | ||
20 | # Works with either gtk+ or gtk3. | ||
21 | WHICH_GTK = "gtk+" | ||
22 | 18 | ||
23 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap" | 19 | PACKAGECONFIG ?= "libpcap gnutls libnl libcap" |
24 | PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" | 20 | PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" |
25 | PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | ||
26 | #PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" | 21 | #PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" |
27 | 22 | ||
28 | PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" | 23 | PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" |
@@ -30,10 +25,9 @@ PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --wi | |||
30 | PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" | 25 | PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" |
31 | PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" | 26 | PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" |
32 | PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" | 27 | PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" |
33 | PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" | 28 | PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" |
34 | PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" | 29 | PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" |
35 | PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," | 30 | PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," |
36 | PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," | ||
37 | PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" | 31 | PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" |
38 | PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" | 32 | PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" |
39 | PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" | 33 | PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" |
@@ -44,15 +38,9 @@ PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" | |||
44 | PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" | 38 | PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" |
45 | 39 | ||
46 | # these next two options require addional layers | 40 | # these next two options require addional layers |
47 | PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" | ||
48 | PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" | 41 | PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" |
49 | 42 | ||
50 | EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark" | 43 | EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" |
51 | |||
52 | do_configure_prepend() { | ||
53 | # force to use fallback | ||
54 | sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags | ||
55 | } | ||
56 | 44 | ||
57 | ALLOW_EMPTY_${PN} = "1" | 45 | ALLOW_EMPTY_${PN} = "1" |
58 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 46 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |