* [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link
@ 2016-10-18 11:26 Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 2/3] wireshark: avoid host qtchooser Baruch Siach
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Baruch Siach @ 2016-10-18 11:26 UTC (permalink / raw)
To: buildroot
Saves a redirect.
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/wireshark/Config.in | 2 +-
package/wireshark/wireshark.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index defeb4b3e479..4982c1f8d53d 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_WIRESHARK
help
Network traffic sniffer and protocol decoder.
- http://www.wireshark.org
+ https://www.wireshark.org
comment "wireshark needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 8dc72da940d7..e71b419d8773 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -6,7 +6,7 @@
WIRESHARK_VERSION = 2.2.1
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
-WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
+WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/3] wireshark: avoid host qtchooser
2016-10-18 11:26 [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Baruch Siach
@ 2016-10-18 11:26 ` Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility Baruch Siach
2016-10-19 21:03 ` [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Baruch Siach @ 2016-10-18 11:26 UTC (permalink / raw)
To: buildroot
Some distros provide a 'qtchooser' utility to select Qt library
version. Make sure not to use that host provided utility.
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/wireshark/wireshark.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index e71b419d8773..01886c803ea8 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -41,6 +41,7 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
WIRESHARK_CONF_OPTS += --with-qt=5
WIRESHARK_DEPENDENCIES += qt5base
+WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER=""
# Seems it expects wrappers and passes a -qt=X parameter for version
WIRESHARK_MAKE_OPTS += \
MOC="$(HOST_DIR)/usr/bin/moc" \
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility
2016-10-18 11:26 [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 2/3] wireshark: avoid host qtchooser Baruch Siach
@ 2016-10-18 11:26 ` Baruch Siach
2016-10-18 12:52 ` Thomas Petazzoni
2016-10-19 21:20 ` Thomas Petazzoni
2016-10-19 21:03 ` [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Thomas Petazzoni
2 siblings, 2 replies; 8+ messages in thread
From: Baruch Siach @ 2016-10-18 11:26 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.net/results/0a4/0a4ccf752ed1e81e2416d33a78984b47087f68bd/
http://autobuild.buildroot.net/results/196/196b96e28a2cd5983a58948df4a2c3eb3bccdfa4/
http://autobuild.buildroot.net/results/056/056b3299ce45552fe3e7cbf5aa68b223f8fa458e/
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/wireshark/Config.in | 2 ++
package/wireshark/wireshark.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index 4982c1f8d53d..959fb5b4f79d 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_WIRESHARK
bool "wireshark"
select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_QT5TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS
+ select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS
depends on BR2_USE_MMU # fork(), glib2
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 01886c803ea8..a2aa205e29e8 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -40,7 +40,7 @@ endif
# Qt4 needs accessibility, we don't support it
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
WIRESHARK_CONF_OPTS += --with-qt=5
-WIRESHARK_DEPENDENCIES += qt5base
+WIRESHARK_DEPENDENCIES += qt5base qt5tools
WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER=""
# Seems it expects wrappers and passes a -qt=X parameter for version
WIRESHARK_MAKE_OPTS += \
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility
2016-10-18 11:26 ` [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility Baruch Siach
@ 2016-10-18 12:52 ` Thomas Petazzoni
2016-10-19 21:20 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2016-10-18 12:52 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 18 Oct 2016 14:26:32 +0300, Baruch Siach wrote:
> # Qt4 needs accessibility, we don't support it
Unrelated to your patch, but this comment is now wrong: my colleague
Romain Perier has added support for Qt4 accessibility.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link
2016-10-18 11:26 [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 2/3] wireshark: avoid host qtchooser Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility Baruch Siach
@ 2016-10-19 21:03 ` Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2016-10-19 21:03 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 18 Oct 2016 14:26:30 +0300, Baruch Siach wrote:
> Saves a redirect.
>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> package/wireshark/Config.in | 2 +-
> package/wireshark/wireshark.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
All three patches applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility
2016-10-18 11:26 ` [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility Baruch Siach
2016-10-18 12:52 ` Thomas Petazzoni
@ 2016-10-19 21:20 ` Thomas Petazzoni
2016-10-19 22:06 ` Baruch Siach
1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2016-10-19 21:20 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 18 Oct 2016 14:26:32 +0300, Baruch Siach wrote:
> Fixes:
> http://autobuild.buildroot.net/results/0a4/0a4ccf752ed1e81e2416d33a78984b47087f68bd/
> http://autobuild.buildroot.net/results/196/196b96e28a2cd5983a58948df4a2c3eb3bccdfa4/
> http://autobuild.buildroot.net/results/056/056b3299ce45552fe3e7cbf5aa68b223f8fa458e/
>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
This patch causes a recursive Kconfig dependency:
package/qt5/qt5base/Config.in:118:error: recursive dependency detected!
package/qt5/qt5base/Config.in:118: symbol BR2_PACKAGE_QT5BASE_GUI is selected by BR2_PACKAGE_QT5TOOLS_PIXELTOOL
package/qt5/qt5tools/Config.in:19: symbol BR2_PACKAGE_QT5TOOLS_PIXELTOOL depends on BR2_PACKAGE_QT5TOOLS
package/qt5/qt5tools/Config.in:1: symbol BR2_PACKAGE_QT5TOOLS is selected by BR2_PACKAGE_QT5BASE_WIDGETS
package/qt5/qt5base/Config.in:131: symbol BR2_PACKAGE_QT5BASE_WIDGETS is selected by BR2_PACKAGE_QT5X11EXTRAS
package/qt5/qt5x11extras/Config.in:1: symbol BR2_PACKAGE_QT5X11EXTRAS depends on BR2_PACKAGE_QT5BASE_XCB
package/qt5/qt5base/Config.in:186: symbol BR2_PACKAGE_QT5BASE_XCB depends on BR2_PACKAGE_QT5BASE_GUI
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility
2016-10-19 21:20 ` Thomas Petazzoni
@ 2016-10-19 22:06 ` Baruch Siach
2016-10-20 16:15 ` Yann E. MORIN
0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2016-10-19 22:06 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Wed, Oct 19, 2016 at 11:20:03PM +0200, Thomas Petazzoni wrote:
> On Tue, 18 Oct 2016 14:26:32 +0300, Baruch Siach wrote:
> > Fixes:
> > http://autobuild.buildroot.net/results/0a4/0a4ccf752ed1e81e2416d33a78984b47087f68bd/
> > http://autobuild.buildroot.net/results/196/196b96e28a2cd5983a58948df4a2c3eb3bccdfa4/
> > http://autobuild.buildroot.net/results/056/056b3299ce45552fe3e7cbf5aa68b223f8fa458e/
> >
> > Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>
> This patch causes a recursive Kconfig dependency:
>
> package/qt5/qt5base/Config.in:118:error: recursive dependency detected!
> package/qt5/qt5base/Config.in:118: symbol BR2_PACKAGE_QT5BASE_GUI is selected by BR2_PACKAGE_QT5TOOLS_PIXELTOOL
> package/qt5/qt5tools/Config.in:19: symbol BR2_PACKAGE_QT5TOOLS_PIXELTOOL depends on BR2_PACKAGE_QT5TOOLS
> package/qt5/qt5tools/Config.in:1: symbol BR2_PACKAGE_QT5TOOLS is selected by BR2_PACKAGE_QT5BASE_WIDGETS
> package/qt5/qt5base/Config.in:131: symbol BR2_PACKAGE_QT5BASE_WIDGETS is selected by BR2_PACKAGE_QT5X11EXTRAS
> package/qt5/qt5x11extras/Config.in:1: symbol BR2_PACKAGE_QT5X11EXTRAS depends on BR2_PACKAGE_QT5BASE_XCB
> package/qt5/qt5base/Config.in:186: symbol BR2_PACKAGE_QT5BASE_XCB depends on BR2_PACKAGE_QT5BASE_GUI
I actually saw this during testing, but it was not apparent to me that the
wireshark Config.in change is the trigger. Not sure what is the correct
solution here. Maybe remove the Config.in change, and do instead:
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5TOOLS),yy)
WIRESHARK_CONF_OPTS += --with-qt=5
...
else
WIRESHARK_CONF_OPTS += --with-qt=no
endif
That will make the detection of no GUI below harder.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility
2016-10-19 22:06 ` Baruch Siach
@ 2016-10-20 16:15 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2016-10-20 16:15 UTC (permalink / raw)
To: buildroot
Baruch, All,
On 2016-10-20 01:06 +0300, Baruch Siach spake thusly:
> On Wed, Oct 19, 2016 at 11:20:03PM +0200, Thomas Petazzoni wrote:
> > On Tue, 18 Oct 2016 14:26:32 +0300, Baruch Siach wrote:
> > > Fixes:
> > > http://autobuild.buildroot.net/results/0a4/0a4ccf752ed1e81e2416d33a78984b47087f68bd/
> > > http://autobuild.buildroot.net/results/196/196b96e28a2cd5983a58948df4a2c3eb3bccdfa4/
> > > http://autobuild.buildroot.net/results/056/056b3299ce45552fe3e7cbf5aa68b223f8fa458e/
> > >
> > > Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> > > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> >
> > This patch causes a recursive Kconfig dependency:
> >
> > package/qt5/qt5base/Config.in:118:error: recursive dependency detected!
> > package/qt5/qt5base/Config.in:118: symbol BR2_PACKAGE_QT5BASE_GUI is selected by BR2_PACKAGE_QT5TOOLS_PIXELTOOL
> > package/qt5/qt5tools/Config.in:19: symbol BR2_PACKAGE_QT5TOOLS_PIXELTOOL depends on BR2_PACKAGE_QT5TOOLS
> > package/qt5/qt5tools/Config.in:1: symbol BR2_PACKAGE_QT5TOOLS is selected by BR2_PACKAGE_QT5BASE_WIDGETS
> > package/qt5/qt5base/Config.in:131: symbol BR2_PACKAGE_QT5BASE_WIDGETS is selected by BR2_PACKAGE_QT5X11EXTRAS
> > package/qt5/qt5x11extras/Config.in:1: symbol BR2_PACKAGE_QT5X11EXTRAS depends on BR2_PACKAGE_QT5BASE_XCB
> > package/qt5/qt5base/Config.in:186: symbol BR2_PACKAGE_QT5BASE_XCB depends on BR2_PACKAGE_QT5BASE_GUI
>
> I actually saw this during testing, but it was not apparent to me that the
> wireshark Config.in change is the trigger. Not sure what is the correct
> solution here. Maybe remove the Config.in change, and do instead:
>
> ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5TOOLS),yy)
> WIRESHARK_CONF_OPTS += --with-qt=5
> ...
> else
> WIRESHARK_CONF_OPTS += --with-qt=no
> endif
That's what we discussed with Thomas yesterday on IRC. That is an easy
and simple solution, while fixing the kconfig-level dependencies is not
trivial.
> That will make the detection of no GUI below harder.
Then you can do:
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5TOOLS),yy)
WIRESHARK_QT_GUI = y
WIRESHARK_CONF_OPTS += --with-qt=5
...
else
WIRESHARK_CONF_OPTS += --with-qt=no
fi
ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(WIRESHARK_QT_GUI),)
...
endif
But then, we could do all that in Kconfig still:
config BR2_PACKAGE_WIRESHARK_QT
bool
default y
depends on BR2_PACKAGE_QT5BASE_WIDGETS
depends on BR2_PACKAGE_QT5TOOLS
depends on BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
config BR2_PACKAGE_WIRESHARK_GUI
bool
default y if BR2_PACKAGE_LIBGTK2
default y if BR2_PACKAGE_LIBGTK3
default y if BR2_PACKAGE_WIRESHARK_QT
And then re-use that in the .mk file:
ifeq ($(BR2_PACKAGE_WIRESHARK_QT),y)
WIRESHARK_CONF_OPTS += --with-qt=5
...
else
WIRESHARK_CONF_OPTS += --with-qt=no
endif
ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),)
WIRESHARK_CONF_OPTS += --disable-wireshark
endif
I would prefer that last solution, if at all possible. I'll send a patch
to that effect shortly.
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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-20 16:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-18 11:26 [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 2/3] wireshark: avoid host qtchooser Baruch Siach
2016-10-18 11:26 ` [Buildroot] [PATCH 3/3] wireshark: needs the qt5tools lrelease utility Baruch Siach
2016-10-18 12:52 ` Thomas Petazzoni
2016-10-19 21:20 ` Thomas Petazzoni
2016-10-19 22:06 ` Baruch Siach
2016-10-20 16:15 ` Yann E. MORIN
2016-10-19 21:03 ` [Buildroot] [PATCH 1/3] wireshark: use https for download and homepage link Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.