Patchwork [meta-networking] wireshark: update configuration and epoch

login
register
mail settings
Submitter Joe MacDonald
Date Aug. 6, 2014, 7:40 p.m.
Message ID <1407354015-12183-1-git-send-email-joe_macdonald@mentor.com>
Download mbox | patch
Permalink /patch/77413/
State Accepted, archived
Headers show

Comments

Joe MacDonald - Aug. 6, 2014, 7:40 p.m.
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.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Armin Kuster - Aug. 6, 2014, 7:58 p.m.
if needed.

Acked-by: Armin Kuster <akuster@mvista.com>




On 08/06/2014 12:40 PM, Joe MacDonald wrote:
> 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.
>
> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> ---
>   meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 449ac47..13b1f3f 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,"
>   PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
>   PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
>
> -EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark"
> +EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
>
>   LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
>   SRC_URI = " \
>       http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \
>   "
>
> +PE = "1"
> +
>   SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
>   SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"
>
>
Martin Jansa - Aug. 6, 2014, 9:39 p.m.
On Wed, Aug 06, 2014 at 03:40:15PM -0400, Joe MacDonald wrote:
> 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.
> 
> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> ---
>  meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> 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 449ac47..13b1f3f 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,"
>  PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
>  PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
>  
> -EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark"
> +EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
>  
>  LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
>  SRC_URI = " \
>      http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \
>  "
>  
> +PE = "1"
> +
>  SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
>  SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"

Thanks!

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>  
> -- 
> 2.0.0.257.g75cc6c6
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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 449ac47..13b1f3f 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,"
 PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
 PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
 
-EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark"
+EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
 
 LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
 SRC_URI = " \
     http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \
 "
 
+PE = "1"
+
 SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
 SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"