[Buildroot] [PATCH 1/9] wireshark: forcibly disable lua

[Buildroot] [PATCH 1/9] wireshark: forcibly disable lua

[Gustavo Zacarias]

If host arch = target arch and liblua is in the host the buildsystem
will pick it up and try to use it since it passes basic build tests.
Forcibly disable it, since it causes no build failure, rather runtime
failures because said liblua is not present on the target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 366134d..867b945 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -26,6 +26,7 @@ WIRESHARK_CONF_OPTS = \
 	--enable-static=no \
 	--with-gnutls=no \
 	--with-libsmi=no \
+	--with-lua=no \
 	--includedir=$(STAGING_DIR)/usr/include
 
 $(eval $(autotools-package))
-- 
2.4.10

[Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf

[Gustavo Zacarias]

Needed for detection of various optional components.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 867b945..5d1d5f6 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -9,7 +9,7 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license
 WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
+WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
 WIRESHARK_CONF_ENV = \
 	LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
 	ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
-- 
2.4.10

[Buildroot] [PATCH 3/9] wireshark: enable GUI options

[Gustavo Zacarias]

Enable gtk2, gtk3 & qt5 automatic GUI options.
gtk2 & qt5 only build-time tested, gtk3 runtime-tested with wayland.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 5d1d5f6..9a8d370 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -20,7 +20,6 @@ WIRESHARK_AUTORECONF = YES
 # wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
 # Work around it by pointing includedir at staging
 WIRESHARK_CONF_OPTS = \
-	--disable-wireshark \
 	--without-krb5 \
 	--disable-usr-local \
 	--enable-static=no \
@@ -29,4 +28,33 @@ WIRESHARK_CONF_OPTS = \
 	--with-lua=no \
 	--includedir=$(STAGING_DIR)/usr/include
 
+# wireshark GUI options
+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
+WIRESHARK_CONF_OPTS += --with-gtk3=yes
+WIRESHARK_DEPENDENCIES += libgtk3
+else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
+WIRESHARK_CONF_OPTS += --with-gtk2=yes
+WIRESHARK_DEPENDECIES += libgtk2
+else
+WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no
+endif
+
+# Qt4 needs accessibility, we don't support it
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+WIRESHARK_CONF_OPTS += --with-qt=5
+WIRESHARK_DEPENDENCIES += qt5base
+# Seems it expects wrappers and passes a -qt=X parameter for version
+WIRESHARK_MAKE_OPTS += \
+	MOC="$(HOST_DIR)/usr/bin/moc" \
+	RCC="$(HOST_DIR)/usr/bin/rcc" \
+	UIC="$(HOST_DIR)/usr/bin/uic"
+else
+WIRESHARK_CONF_OPTS += --with-qt=no
+endif
+
+# No GUI at all
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)
+WIRESHARK_CONF_OPTS += --disable-wireshark
+endif
+
 $(eval $(autotools-package))
-- 
2.4.10

[Buildroot] [PATCH 4/9] wireshark: add optional libnl suport

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 9a8d370..d60f3b4 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -57,4 +57,11 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
 WIRESHARK_CONF_OPTS += --disable-wireshark
 endif
 
+ifeq ($(BR2_PACKAGE_LIBNL),y)
+WIRESHARK_CONF_OPTS += --with-libnl
+WIRESHARK_DEPENDENCIES += libnl
+else
+WIRESHARK_CONF_OPTS += --without-libnl
+endif
+
 $(eval $(autotools-package))
-- 
2.4.10

[Buildroot] [PATCH 5/9] wireshark: add optional c-ares support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index d60f3b4..2940d26 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -57,6 +57,13 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
 WIRESHARK_CONF_OPTS += --disable-wireshark
 endif
 
+ifeq ($(BR2_PACKAGE_C_ARES),y)
+WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += c-ares
+else
+WIREHARK_CONF_OPTS += --without-c-ares
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 WIRESHARK_CONF_OPTS += --with-libnl
 WIRESHARK_DEPENDENCIES += libnl
-- 
2.4.10

[Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/Config.in    |  1 -
 package/wireshark/wireshark.mk | 11 +++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index f559c22..52b0f52 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_WIRESHARK
 	bool "wireshark"
 	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_MMU # fork(), glib2
 	depends on BR2_USE_WCHAR # glib2
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 2940d26..cc9fb41 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license
 WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
+WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
 WIRESHARK_CONF_ENV = \
-	LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
 	ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
 
 # patch touching configure.ac
@@ -64,6 +63,14 @@ else
 WIREHARK_CONF_OPTS += --without-c-ares
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+WIRESHARK_CONF_OPTS += --with-gcrypt=yes
+WIRESHARK_DEPENDENCIES += libgcrypt
+else
+WIRESHARK_CONF_OPTS += --with-gcrypt=no
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 WIRESHARK_CONF_OPTS += --with-libnl
 WIRESHARK_DEPENDENCIES += libnl
-- 
2.4.10

[Buildroot] [PATCH 7/9] wireshark: add optional gnutls support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index cc9fb41..0bc7801 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \
 	--without-krb5 \
 	--disable-usr-local \
 	--enable-static=no \
-	--with-gnutls=no \
 	--with-libsmi=no \
 	--with-lua=no \
 	--includedir=$(STAGING_DIR)/usr/include
@@ -63,6 +62,13 @@ else
 WIREHARK_CONF_OPTS += --without-c-ares
 endif
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+WIRESHARK_CONF_OPTS += --with-gnutls=yes
+WIRESHARK_DEPENDENCIES += gnutls
+else
+WIRESHARK_CONF_OPTS += --with-gnutls=no
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 WIRESHARK_CONF_OPTS += --with-gcrypt=yes
-- 
2.4.10

[Buildroot] [PATCH 8/9] wireshark: add optional geoip support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 0bc7801..534131b 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -62,6 +62,13 @@ else
 WIREHARK_CONF_OPTS += --without-c-ares
 endif
 
+ifeq ($(BR2_PACKAGE_GEOIP),y)
+WIRESHARK_CONF_OPTS += --with-geoip=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += geoip
+else
+WIRESHARK_CONF_OPTS += --without-geoip
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 WIRESHARK_CONF_OPTS += --with-gnutls=yes
 WIRESHARK_DEPENDENCIES += gnutls
-- 
2.4.10

[Buildroot] [PATCH 9/9] wireshark: add optional sbc support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 534131b..e44f26a 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -91,4 +91,11 @@ else
 WIRESHARK_CONF_OPTS += --without-libnl
 endif
 
+ifeq ($(BR2_PACKAGE_SBC),y)
+WIRESHARK_CONF_OPTS += --with-sbc=yes
+WIRESHARK_DEPENDENCIES += sbc
+else
+WIRESHARK_CONF_OPTS += --with-sbc=no
+endif
+
 $(eval $(autotools-package))
-- 
2.4.10

[Buildroot] [PATCH 9/9] wireshark: add optional sbc support

[Baruch Siach]

Hi Gustavo,

On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
> +ifeq ($(BR2_PACKAGE_SBC),y)
> +WIRESHARK_CONF_OPTS += --with-sbc=yes
> +WIRESHARK_DEPENDENCIES += sbc
> +else
> +WIRESHARK_CONF_OPTS += --with-sbc=no
> +endif

Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 1/9] wireshark: forcibly disable lua

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> If host arch = target arch and liblua is in the host the buildsystem
> will pick it up and try to use it since it passes basic build tests.
> Forcibly disable it, since it causes no build failure, rather runtime
> failures because said liblua is not present on the target.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/wireshark/wireshark.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 366134d..867b945 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -26,6 +26,7 @@ WIRESHARK_CONF_OPTS = \
>  	--enable-static=no \
>  	--with-gnutls=no \
>  	--with-libsmi=no \
> +	--with-lua=no \

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

However, why not conditionally add it, like o:

ifeq ($(BR2_PACKAGE_LUA),y)
WIRESHARK_DEPENDENCIES += lua
else
WIRESHARK_CONF_OPTS += --with-lua=no
endif

Regards,
Yann E. MORIN.

>  	--includedir=$(STAGING_DIR)/usr/include
>  
>  $(eval $(autotools-package))
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf

[Yann E. MORIN]

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Needed for detection of various optional components.

The real reason is that configure does use PKG_CHECK_MODULES, whether
optional or not.

> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/wireshark/wireshark.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 867b945..5d1d5f6 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -9,7 +9,7 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
>  WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
>  WIRESHARK_LICENSE = wireshark license
>  WIRESHARK_LICENSE_FILES = COPYING
> -WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
> +WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
>  WIRESHARK_CONF_ENV = \
>  	LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
>  	ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 9/9] wireshark: add optional sbc support

[Gustavo Zacarias]

On 02/12/15 17:56, Baruch Siach wrote:

> Hi Gustavo,
>
> On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
>> +ifeq ($(BR2_PACKAGE_SBC),y)
>> +WIRESHARK_CONF_OPTS += --with-sbc=yes
>> +WIRESHARK_DEPENDENCIES += sbc
>> +else
>> +WIRESHARK_CONF_OPTS += --with-sbc=no
>> +endif
>
> Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.

Hi Baruch.
http://patchwork.ozlabs.org/patch/545815/
Already warned Peter about that prereq on IRC.
Regards.

[Buildroot] [PATCH 1/9] wireshark: forcibly disable lua

[Gustavo Zacarias]

On 02/12/15 17:57, Yann E. MORIN wrote:

> However, why not conditionally add it, like o:
>
> ifeq ($(BR2_PACKAGE_LUA),y)
> WIRESHARK_DEPENDENCIES += lua
> else
> WIRESHARK_CONF_OPTS += --with-lua=no
> endif
>
> Regards,
> Yann E. MORIN.

Hi Yann.
Because i didn't care in testing/enabling it and it may not work with 
all the lua versions we've got.
Regards.

[Buildroot] [PATCH 4/9] wireshark: add optional libnl suport

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/wireshark/wireshark.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 9a8d370..d60f3b4 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -57,4 +57,11 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
>  WIRESHARK_CONF_OPTS += --disable-wireshark
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBNL),y)
> +WIRESHARK_CONF_OPTS += --with-libnl
> +WIRESHARK_DEPENDENCIES += libnl
> +else
> +WIRESHARK_CONF_OPTS += --without-libnl
> +endif
> +
>  $(eval $(autotools-package))
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 5/9] wireshark: add optional c-ares support

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/wireshark/wireshark.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index d60f3b4..2940d26 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -57,6 +57,13 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
>  WIRESHARK_CONF_OPTS += --disable-wireshark
>  endif
>  
> +ifeq ($(BR2_PACKAGE_C_ARES),y)
> +WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
> +WIRESHARK_DEPENDENCIES += c-ares
> +else
> +WIREHARK_CONF_OPTS += --without-c-ares
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBNL),y)
>  WIRESHARK_CONF_OPTS += --with-libnl
>  WIRESHARK_DEPENDENCIES += libnl
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 9/9] wireshark: add optional sbc support

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:59 -0300, Gustavo Zacarias spake thusly:
> On 02/12/15 17:56, Baruch Siach wrote:
> 
> >Hi Gustavo,
> >
> >On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
> >>+ifeq ($(BR2_PACKAGE_SBC),y)
> >>+WIRESHARK_CONF_OPTS += --with-sbc=yes
> >>+WIRESHARK_DEPENDENCIES += sbc
> >>+else
> >>+WIRESHARK_CONF_OPTS += --with-sbc=no
> >>+endif
> >
> >Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.
> 
> Hi Baruch.
> http://patchwork.ozlabs.org/patch/545815/
> Already warned Peter about that prereq on IRC.

Then, you could have said so in a post-commit note, so we all know that
this package is pending in the patchwork.

Regards,
Yann E. MORIN.


-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/wireshark/Config.in    |  1 -
>  package/wireshark/wireshark.mk | 11 +++++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
> index f559c22..52b0f52 100644
> --- a/package/wireshark/Config.in
> +++ b/package/wireshark/Config.in
> @@ -1,7 +1,6 @@
>  config BR2_PACKAGE_WIRESHARK
>  	bool "wireshark"
>  	select BR2_PACKAGE_LIBPCAP
> -	select BR2_PACKAGE_LIBGCRYPT
>  	select BR2_PACKAGE_LIBGLIB2
>  	depends on BR2_USE_MMU # fork(), glib2
>  	depends on BR2_USE_WCHAR # glib2
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 2940d26..cc9fb41 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
>  WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
>  WIRESHARK_LICENSE = wireshark license
>  WIRESHARK_LICENSE_FILES = COPYING
> -WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
> +WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
>  WIRESHARK_CONF_ENV = \
> -	LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
>  	ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
>  
>  # patch touching configure.ac
> @@ -64,6 +63,14 @@ else
>  WIREHARK_CONF_OPTS += --without-c-ares
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> +WIRESHARK_CONF_OPTS += --with-gcrypt=yes
> +WIRESHARK_DEPENDENCIES += libgcrypt
> +else
> +WIRESHARK_CONF_OPTS += --with-gcrypt=no
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBNL),y)
>  WIRESHARK_CONF_OPTS += --with-libnl
>  WIRESHARK_DEPENDENCIES += libnl
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 7/9] wireshark: add optional gnutls support

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/wireshark/wireshark.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index cc9fb41..0bc7801 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \
>  	--without-krb5 \
>  	--disable-usr-local \
>  	--enable-static=no \
> -	--with-gnutls=no \
>  	--with-libsmi=no \
>  	--with-lua=no \
>  	--includedir=$(STAGING_DIR)/usr/include
> @@ -63,6 +62,13 @@ else
>  WIREHARK_CONF_OPTS += --without-c-ares
>  endif
>  
> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> +WIRESHARK_CONF_OPTS += --with-gnutls=yes
> +WIRESHARK_DEPENDENCIES += gnutls
> +else
> +WIRESHARK_CONF_OPTS += --with-gnutls=no
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
>  WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
>  WIRESHARK_CONF_OPTS += --with-gcrypt=yes
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 8/9] wireshark: add optional geoip support

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/wireshark/wireshark.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 0bc7801..534131b 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -62,6 +62,13 @@ else
>  WIREHARK_CONF_OPTS += --without-c-ares
>  endif
>  
> +ifeq ($(BR2_PACKAGE_GEOIP),y)
> +WIRESHARK_CONF_OPTS += --with-geoip=$(STAGING_DIR)/usr

Is it needed to specify the path? Can't we just have;
    WIRESHARK_CONF_OPTS += --with-geoip

If the path is needed, then a little blrb in the commit log would be
nice.

And I forgot to add a similar comment for the --with-XXX=yes options.

Regards,
Yann E. MORIN.

> +WIRESHARK_DEPENDENCIES += geoip
> +else
> +WIRESHARK_CONF_OPTS += --without-geoip
> +endif
> +
>  ifeq ($(BR2_PACKAGE_GNUTLS),y)
>  WIRESHARK_CONF_OPTS += --with-gnutls=yes
>  WIRESHARK_DEPENDENCIES += gnutls
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/9] wireshark: enable GUI options

[Yann E. MORIN]

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Enable gtk2, gtk3 & qt5 automatic GUI options.
> gtk2 & qt5 only build-time tested, gtk3 runtime-tested with wayland.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
>  1 file changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 5d1d5f6..9a8d370 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -20,7 +20,6 @@ WIRESHARK_AUTORECONF = YES
>  # wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
>  # Work around it by pointing includedir at staging
>  WIRESHARK_CONF_OPTS = \
> -	--disable-wireshark \
>  	--without-krb5 \
>  	--disable-usr-local \
>  	--enable-static=no \
> @@ -29,4 +28,33 @@ WIRESHARK_CONF_OPTS = \
>  	--with-lua=no \
>  	--includedir=$(STAGING_DIR)/usr/include
>  
> +# wireshark GUI options
> +ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> +WIRESHARK_CONF_OPTS += --with-gtk3=yes
> +WIRESHARK_DEPENDENCIES += libgtk3
> +else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> +WIRESHARK_CONF_OPTS += --with-gtk2=yes
> +WIRESHARK_DEPENDECIES += libgtk2
> +else
> +WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no

And add this variable, too:

    WIRESHARK_HAS_GUI = NO

> +endif
> +
> +# Qt4 needs accessibility, we don't support it
> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
> +WIRESHARK_CONF_OPTS += --with-qt=5
> +WIRESHARK_DEPENDENCIES += qt5base
> +# Seems it expects wrappers and passes a -qt=X parameter for version
> +WIRESHARK_MAKE_OPTS += \
> +	MOC="$(HOST_DIR)/usr/bin/moc" \
> +	RCC="$(HOST_DIR)/usr/bin/rcc" \
> +	UIC="$(HOST_DIR)/usr/bin/uic"
> +else
> +WIRESHARK_CONF_OPTS += --with-qt=no

Ditto.

> +endif
> +
> +# No GUI at all
> +ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)

And then change that condition to:

    ifeq ($(WIRESHARK_HAS_GUI),NO)

which is simpler to manage should there be other toolkit we can use in
the future.

Regards,
Yann E. MORIN.

> +WIRESHARK_CONF_OPTS += --disable-wireshark
> +endif
> +
>  $(eval $(autotools-package))
> -- 
> 2.4.10
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 8/9] wireshark: add optional geoip support

[Gustavo Zacarias]

On 02/12/15 18:52, Yann E. MORIN wrote:

> Is it needed to specify the path? Can't we just have;
>      WIRESHARK_CONF_OPTS += --with-geoip
>
> If the path is needed, then a little blrb in the commit log would be
> nice.
>
> And I forgot to add a similar comment for the --with-XXX=yes options.

Hi.
I don't have geoip in the distro, however it doesn't use pkgconfig so in 
this case and given other wireshark options having issues "better safe 
than sorry".
Regards.

[Buildroot] [PATCH 3/9] wireshark: enable GUI options

[Gustavo Zacarias]

On 02/12/15 18:55, Yann E. MORIN wrote:


> And add this variable, too:
>
>      WIRESHARK_HAS_GUI = NO
...
>> +# Qt4 needs accessibility, we don't support it
>> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
>> +WIRESHARK_CONF_OPTS += --with-qt=5
>> +WIRESHARK_DEPENDENCIES += qt5base
>> +# Seems it expects wrappers and passes a -qt=X parameter for version
>> +WIRESHARK_MAKE_OPTS += \
>> +	MOC="$(HOST_DIR)/usr/bin/moc" \
>> +	RCC="$(HOST_DIR)/usr/bin/rcc" \
>> +	UIC="$(HOST_DIR)/usr/bin/uic"
>> +else
>> +WIRESHARK_CONF_OPTS += --with-qt=no
>
> Ditto.
>
>> +endif
>> +
>> +# No GUI at all
>> +ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)
>
> And then change that condition to:
>
>      ifeq ($(WIRESHARK_HAS_GUI),NO)
>
> which is simpler to manage should there be other toolkit we can use in
> the future.

Hi.
Well, only one gtk and/or qt variant can be built at the same time, and 
i don't expect any other major toolkit to show up in the near future.
I think it can be adjusted in the future if that's the case, but right 
now that's only cosmetic.
If someone fails to specify --disable-wireshark the wireshark 
buildsystem will balk anyway since it's default on and won't detect any 
usable toolkit.
Regards.

[Buildroot] [PATCH 1/9] wireshark: forcibly disable lua

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > If host arch = target arch and liblua is in the host the buildsystem
 > will pick it up and try to use it since it passes basic build tests.
 > Forcibly disable it, since it causes no build failure, rather runtime
 > failures because said liblua is not present on the target.

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed patch 1-8, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 9/9] wireshark: add optional sbc support

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Wed,  2 Dec 2015 17:48:21 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/wireshark/wireshark.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com