diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2014-08-06 15:36:00 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2014-08-06 19:51:59 -0400 |
commit | a9636f77ac00bafd1429dc52bdf2f8f2446866f9 (patch) | |
tree | 7e22714a10cb332972109575d7361d467612cd87 /meta-networking | |
parent | 7a3f8a76cba9a248e5ea2bac6ed3d52dd82b6269 (diff) | |
download | meta-openembedded-a9636f77ac00bafd1429dc52bdf2f8f2446866f9.tar.gz |
wireshark: update configuration and epoch
Commit 6d781369 warranted a PE bump but didn't include it. Update it,
correct a typo in EXTRA_OECONF and explicitly disable c-ares resolver at
the same time.
Acked-by: Armin Kuster <akuster@mvista.com>
Acked-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_1.12.0.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb index 449ac47e5..13b1f3f52 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb | |||
@@ -23,13 +23,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," | |||
23 | PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" | 23 | PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" |
24 | PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" | 24 | PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" |
25 | 25 | ||
26 | EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark" | 26 | EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no" |
27 | 27 | ||
28 | LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" | 28 | LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" |
29 | SRC_URI = " \ | 29 | SRC_URI = " \ |
30 | http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \ | 30 | http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \ |
31 | " | 31 | " |
32 | 32 | ||
33 | PE = "1" | ||
34 | |||
33 | SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7" | 35 | SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7" |
34 | SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7" | 36 | SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7" |
35 | 37 | ||