Skip to contentSkip to conversation

wireshark: upgrade to 3.0.0

PATCH Superseded Oleksandr Kravchuk 3 participants 3 messages Mar 7, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 wireshark: upgrade to 3.0.0

---
 .../{wireshark_2.6.6.bb => wireshark_3.0.0.bb}       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_2.6.6.bb => wireshark_3.0.0.bb} (89%)
meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb +5 -7
similarity index 89%
rename from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb
index 4699f6798..d940a4567 100644
@@ -4,22 +4,20 @@ 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"
+DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native git"
 
 DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
 
-SRC_URI = "https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz \
-           file://0001-Add-libm-to-link-for-fmod-API.patch \
-          "
+SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz"
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "b30ba5b9b48ed2ff91c0ce357d33b46b"
-SRC_URI[sha256sum] = "487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863"
+SRC_URI[md5sum] = "258d62ac7434d126dc497303c8f7961b"
+SRC_URI[sha256sum] = "bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e"
 
 PE = "1"
 
-inherit cmake pkgconfig pythonnative perlnative upstream-version-is-even
+inherit cmake pkgconfig python3native perlnative upstream-version-is-even
 
 ARM_INSTRUCTION_SET = "arm"
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 36 lines · Oleksandr Kravchuk
Quoted 1 line
---
 .../{wireshark_2.6.6.bb => wireshark_3.0.0.bb}       | 12 +++++-----
--
 1 file changed, 5 insertions(+), 7 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_2.6.6.bb 

=> wireshark_3.0.0.bb} (89%)

(quoted diff) +0 -0

support/wireshark/wireshark_2.6.6.bb b/meta-networking/recipes- support/wireshark/wireshark_3.0.0.bb
similarity index 89%
rename from meta-networking/recipes- support/wireshark/wireshark_2.6.6.bb
rename to meta-networking/recipes- support/wireshark/wireshark_3.0.0.bb
index 4699f6798..d940a4567 100644

meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb +0 -0
@@ -4,22 +4,20 @@ 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"
+DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg- error libxml2 bison-native git"

DEPENDS_append_class-target = " wireshark-native chrpath-
replacement-native "

-SRC_URI = "
https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz \

meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb SECTION = "net" · line 11

Quoted 3 lines
meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb +1 -2
-           file://0001-Add-libm-to-link-for-fmod-API.patch \
-          "
+SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz"

You forgot to remove the actual patch file?

#2 lore raw
In reply to Oleksandr Kravchuk
Quoted 1 line · Oleksandr Kravchuk

Nack.  3.0 only supports QT5 as a gui, please remove GTK support. Why does this need git as a depends?

Quoted 40 lines
---
 .../{wireshark_2.6.6.bb => wireshark_3.0.0.bb}       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_2.6.6.bb => wireshark_3.0.0.bb} (89%)
meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb +5 -7
similarity index 89%
rename from meta-networking/recipes-support/wireshark/wireshark_2.6.6.bb
rename to meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb
index 4699f6798..d940a4567 100644
@@ -4,22 +4,20 @@ 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"
+DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native git"
 
 DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
 
-SRC_URI = "https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz \
-           file://0001-Add-libm-to-link-for-fmod-API.patch \
-          "
+SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz"
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[md5sum] = "b30ba5b9b48ed2ff91c0ce357d33b46b"
-SRC_URI[sha256sum] = "487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863"
+SRC_URI[md5sum] = "258d62ac7434d126dc497303c8f7961b"
+SRC_URI[sha256sum] = "bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e"
 
 PE = "1"
 
-inherit cmake pkgconfig pythonnative perlnative upstream-version-is-even
+inherit cmake pkgconfig python3native perlnative upstream-version-is-even
 
 ARM_INSTRUCTION_SET = "arm"