[meta-networking][PATCH] wireshark: update to version 2.0.0

[meta-networking][PATCH] wireshark: update to version 2.0.0

[Armin Kuster]

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

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../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%)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
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
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
@@ -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}*"
-- 
2.3.5

Re: [meta-networking][PATCH] wireshark: update to version 2.0.0

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2132 bytes --]

On Tue, Nov 24, 2015 at 07:14:05AM -0800, Armin Kuster wrote:
> 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.

> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  .../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%)
> 
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
> 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
> --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
> @@ -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.

> -
> -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}*"

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

> -- 
> 2.3.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-networking][PATCH] wireshark: update to version 2.0.0

[akuster808]

On 11/24/2015 07:28 AM, Martin Jansa wrote:
> On Tue, Nov 24, 2015 at 07:14:05AM -0800, Armin Kuster wrote:
>> 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
> 
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>  .../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%)
>>
>> diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
>> 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
>> --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.8.bb
>> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.0.0.bb
>> @@ -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.
> 
>> -
>> -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}*"
> 
> You don't need the trailing * unless it installs some files in something
> like /usr/sharefoo
> 
>> -- 
>> 2.3.5
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> 
>