Skip to contentSkip to conversation

wireshark: forcibly disable lua

PATCH New Gustavo Zacarias 5 participants 25 messages Dec 2, 2015 – Dec 16, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/9 wireshark: forcibly disable lua

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 <[email protected]>
---
 package/wireshark/wireshark.mk | 1 +
 1 file changed, 1 insertion(+)
package/wireshark/wireshark.mk +1 -0
index 366134d..867b945 100644
@@ -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))
Signature · 1 line
2.4.10
author
#1 lore raw

PATCH 2/9 wireshark: needs host-pkgconf

Needed for detection of various optional components.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/wireshark/wireshark.mk +1 -1
index 867b945..5d1d5f6 100644
@@ -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
Signature · 1 line
2.4.10
#2 lore raw

PATCH 2/9 wireshark: needs host-pkgconf

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line

Needed for detection of various optional components.

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

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/wireshark/wireshark.mk +1 -1
index 867b945..5d1d5f6 100644
@@ -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
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#3 lore raw

PATCH 3/9 wireshark: enable GUI options

In reply to 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 <[email protected]>
---
 package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +29 -1
index 5d1d5f6..9a8d370 100644
@@ -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))
Signature · 1 line
2.4.10
#4 lore raw

PATCH 3/9 wireshark: enable GUI options

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 23 lines

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

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +0 -1
index 5d1d5f6..9a8d370 100644
@@ -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

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 39

Quoted 10 lines
package/wireshark/wireshark.mk +9 -0
 
+# 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

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 52

Quoted 13 lines
package/wireshark/wireshark.mk +13 -0
+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.

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 56

Quoted 4 lines
package/wireshark/wireshark.mk +4 -0
+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.

Quoted 11 lines
package/wireshark/wireshark.mk +3 -0
+WIRESHARK_CONF_OPTS += --disable-wireshark
+endif
+
 $(eval $(autotools-package))
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#5 lore raw

PATCH 3/9 wireshark: enable GUI options

Quoted 3 lines · Yann E. MORIN

And add this variable, too:

WIRESHARK_HAS_GUI = NO

...

Quoted 21 lines

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 52

Quoted 11 lines
package/wireshark/wireshark.mk +11 -0
+# 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.

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 56

Quoted 4 lines
package/wireshark/wireshark.mk +4 -0
+endif
+
+# No GUI at all
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)

And then change that condition to:

Quoted 4 lines
     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.

author
#6 lore raw

PATCH 4/9 wireshark: add optional libnl suport

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index 9a8d370..d60f3b4 100644
@@ -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))
Signature · 1 line
2.4.10
#7 lore raw

PATCH 4/9 wireshark: add optional libnl suport

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 27 lines
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index 9a8d370..d60f3b4 100644
@@ -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))
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#8 lore raw

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

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index d60f3b4..2940d26 100644
@@ -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
Signature · 1 line
2.4.10
#9 lore raw

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

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index d60f3b4..2940d26 100644
@@ -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
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#10 lore raw

PATCH 6/9 wireshark: gcrypt support is optional

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/Config.in    |  1 -
 package/wireshark/wireshark.mk | 11 +++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
package/wireshark/Config.in +0 -1
index f559c22..52b0f52 100644
@@ -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
package/wireshark/wireshark.mk +9 -2
index 2940d26..cc9fb41 100644
@@ -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
Signature · 1 line
2.4.10
#11 lore raw

PATCH 6/9 wireshark: gcrypt support is optional

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 54 lines
---
 package/wireshark/Config.in    |  1 -
 package/wireshark/wireshark.mk | 11 +++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
package/wireshark/Config.in +0 -1
index f559c22..52b0f52 100644
@@ -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
package/wireshark/wireshark.mk +9 -2
index 2940d26..cc9fb41 100644
@@ -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
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#12 lore raw

PATCH 7/9 wireshark: add optional gnutls support

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +7 -1
index cc9fb41..0bc7801 100644
@@ -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
Signature · 1 line
2.4.10
#13 lore raw

PATCH 7/9 wireshark: add optional gnutls support

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 37 lines
---
 package/wireshark/wireshark.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +7 -1
index cc9fb41..0bc7801 100644
@@ -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
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#14 lore raw

PATCH 8/9 wireshark: add optional geoip support

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index 0bc7801..534131b 100644
@@ -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
Signature · 1 line
2.4.10
#15 lore raw

PATCH 8/9 wireshark: add optional geoip support

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 10 lines
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +0 -0
index 0bc7801..534131b 100644

package/wireshark/wireshark.mk else · line 66

Quoted 5 lines
package/wireshark/wireshark.mk +2 -0
@@ -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.

Quoted 15 lines
package/wireshark/wireshark.mk +5 -0
+WIRESHARK_DEPENDENCIES += geoip
+else
+WIRESHARK_CONF_OPTS += --without-geoip
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 WIRESHARK_CONF_OPTS += --with-gnutls=yes
 WIRESHARK_DEPENDENCIES += gnutls
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#16 lore raw

PATCH 8/9 wireshark: add optional geoip support

Quoted 7 lines · Yann E. MORIN

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.

author
#17 lore raw

PATCH 9/9 wireshark: add optional sbc support

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index 534131b..e44f26a 100644
@@ -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))
Signature · 1 line
2.4.10
#18 lore raw

PATCH 9/9 wireshark: add optional sbc support

Hi Gustavo,

package/wireshark/wireshark.mk else · line 99

Quoted 6 lines · Gustavo Zacarias
package/wireshark/wireshark.mk +6 -0
+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

Signature · 3 lines
     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 -
author
#19 lore raw

PATCH 9/9 wireshark: add optional sbc support

Quoted 11 lines · Baruch Siach

Hi Gustavo,

package/wireshark/wireshark.mk else · line 99

Quoted 6 lines · Gustavo Zacarias
package/wireshark/wireshark.mk +6 -0
+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.

#20 lore raw

PATCH 9/9 wireshark: add optional sbc support

Gustavo, All,

On 2015-12-02 17:59 -0300, Gustavo Zacarias spake thusly:

Quoted 14 lines · Baruch Siach
Quoted 4 lines

Hi Gustavo,

On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:

Quoted 8 lines

package/wireshark/wireshark.mk else · line 99

Quoted 6 lines
package/wireshark/wireshark.mk +6 -0
+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.

Quoted 3 lines

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.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#21 lore raw

PATCH 9/9 wireshark: add optional sbc support

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#22 lore raw

PATCH 1/9 wireshark: forcibly disable lua

In reply to Gustavo Zacarias

Gustavo, All,

On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:

Quoted 15 lines

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 <[email protected]>
---
 package/wireshark/wireshark.mk | 1 +
 1 file changed, 1 insertion(+)
package/wireshark/wireshark.mk +0 -0
index 366134d..867b945 100644

package/wireshark/wireshark.mk WIRESHARK_CONF_OPTS = \ · line 29

Quoted 4 lines
package/wireshark/wireshark.mk +1 -0
@@ -26,6 +26,7 @@ WIRESHARK_CONF_OPTS = \
 	--enable-static=no \
 	--with-gnutls=no \
 	--with-libsmi=no \
+	--with-lua=no \
Reviewed-by "Yann E. MORIN" <[email protected]>

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.

Quoted 10 lines
package/wireshark/wireshark.mk +0 -0
 	--includedir=$(STAGING_DIR)/usr/include
 
 $(eval $(autotools-package))
Signature · 6 lines
2.4.10

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#23 lore raw

PATCH 1/9 wireshark: forcibly disable lua

Quoted 10 lines · Yann E. MORIN

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.

#24 lore raw

PATCH 1/9 wireshark: forcibly disable lua

In reply to Gustavo Zacarias
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> 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 <[email protected]>

Committed patch 1-8, thanks.

Signature · 1 line
Bye, Peter Korsgaard