Skip to contentSkip to conversation

wireshark: update to version 2.0.0

PATCH Superseded Armin Kuster 2 participants 3 messages Nov 24, 2015 – Nov 25, 2015

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wireshark: update to version 2.0.0

the default gui is now QT so wireshark built with gtk is wireshark-gtk.

---
 .../wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb}         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb} (93%)
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +4 -4
similarity index 93%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
rename to meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
index eee9f30..011c6e1 100644
@@ -8,10 +8,8 @@ DEPENDS = "perl-native pcre expat glib-2.0 sbc"
 
 SRC_URI = "https://2.na.dl.wireshark.org/src/${BP}.tar.bz2"
 
-PE = "1"
-
-SRC_URI[md5sum] = "988a4595a4a87dafb3c4870ea40e89b5"
-SRC_URI[sha256sum] = "357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7"
+SRC_URI[md5sum] = "5909af2a09a9a3023ba61bc62e787ad2"
+SRC_URI[sha256sum] = "90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd"
 
 inherit autotools pkgconfig
 
@@ -55,3 +53,5 @@ do_configure_prepend() {
 
 ALLOW_EMPTY_${PN} = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+FILES_${PN} += "${datadir}*"
Signature · 1 line
2.3.5
#1 lore raw
Quoted 2 lines · Armin Kuster

the default gui is now QT so wireshark built with gtk is wireshark-gtk.

But QT is explicitly disabled, right? Maybe worth mentioning in commit message.

Quoted 14 lines
---
 .../wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb}         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb} (93%)
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +0 -0
similarity index 93%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
rename to meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
index eee9f30..011c6e1 100644

meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb DEPENDS = "perl-native pcre expat glib-2.0 sbc" · line 11

Quoted 4 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +0 -1
@@ -8,10 +8,8 @@ DEPENDS = "perl-native pcre expat glib-2.0 sbc"
 
 SRC_URI = "https://2.na.dl.wireshark.org/src/${BP}.tar.bz2"
 
-PE = "1"

You cannot drop PE without the overall version going backwards.

Quoted 9 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +2 -3
-
-SRC_URI[md5sum] = "988a4595a4a87dafb3c4870ea40e89b5"
-SRC_URI[sha256sum] = "357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7"
+SRC_URI[md5sum] = "5909af2a09a9a3023ba61bc62e787ad2"
+SRC_URI[sha256sum] = "90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd"
 
 inherit autotools pkgconfig
 

meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb do_configure_prepend() { · line 57

Quoted 5 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +2 -0
@@ -55,3 +53,5 @@ do_configure_prepend() {
 
 ALLOW_EMPTY_${PN} = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+FILES_${PN} += "${datadir}*"

You don't need the trailing * unless it installs some files in something like /usr/sharefoo

Quoted 8 lines
Signature · 7 lines
2.3.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 6 lines · Martin Jansa
Quoted 2 lines · Armin Kuster

the default gui is now QT so wireshark built with gtk is wireshark-gtk.

But QT is explicitly disabled, right? Maybe worth mentioning in commit message.

Correct. QT is disabled explicitly. In 2.0, QT is the preferred GUI so they now append 'gtk' to the file name 'wireshark' when building with gtk.

Its time to play with QT to get wireshark on that stack.

I will amend the commit message.

thanks,

- armin

Quoted 51 lines
Quoted 15 lines
---
 .../wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb}         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.8.bb => wireshark_2.0.0.bb} (93%)
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +0 -0
similarity index 93%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
rename to meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
index eee9f30..011c6e1 100644

meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb DEPENDS = "perl-native pcre expat glib-2.0 sbc" · line 11

Quoted 4 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +0 -1
@@ -8,10 +8,8 @@ DEPENDS = "perl-native pcre expat glib-2.0 sbc"
 
 SRC_URI = "https://2.na.dl.wireshark.org/src/${BP}.tar.bz2"
 
-PE = "1"

You cannot drop PE without the overall version going backwards.

Quoted 9 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +2 -3
-
-SRC_URI[md5sum] = "988a4595a4a87dafb3c4870ea40e89b5"
-SRC_URI[sha256sum] = "357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7"
+SRC_URI[md5sum] = "5909af2a09a9a3023ba61bc62e787ad2"
+SRC_URI[sha256sum] = "90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd"
 
 inherit autotools pkgconfig
 

meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb do_configure_prepend() { · line 57

Quoted 5 lines
meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb +2 -0
@@ -55,3 +53,5 @@ do_configure_prepend() {
 
 ALLOW_EMPTY_${PN} = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+FILES_${PN} += "${datadir}*"

You don't need the trailing * unless it installs some files in something like /usr/sharefoo

Quoted 8 lines
Signature · 7 lines
2.3.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel