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 | |
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')
-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 31ca4d24d2..dca3be6dd1 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" SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" -SRC_URI[md5sum] = "627b5fc6cf0aeca196c75debd5e69b14" -SRC_URI[sha256sum] = "0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b" - -PE = "1" +SRC_URI[md5sum] = "c7de0997f74934f25b456846cf75cb81" +SRC_URI[sha256sum] = "a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104" inherit autotools pkgconfig perlnative ARM_INSTRUCTION_SET = "arm" -# Works with either gtk+ or gtk3. -WHICH_GTK = "gtk+" PACKAGECONFIG ?= "libpcap gnutls libnl libcap" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" #PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" 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 PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" -PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" -PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" -PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," -PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," +PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" +PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" +PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" @@ -44,15 +38,9 @@ PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" # these next two options require addional layers -PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark" - -do_configure_prepend() { - # force to use fallback - sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags -} +EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" ALLOW_EMPTY_${PN} = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |