update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,35 @@
|
||||
From 25d313275e87dc236e86c0e713cad08ea64253f8 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Date: Thu, 8 Sep 2016 10:58:34 +0100
|
||||
Subject: [PATCH] configure.ac: do not assume broken inet_pton in case of cross
|
||||
compiling
|
||||
|
||||
Patch configure.ac to not assume broken inet_pton in case of cross
|
||||
compiling.
|
||||
|
||||
[Vincent: adapt the patch for 2.2.0]
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c43e366..9672831 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2373,8 +2373,8 @@ int main()
|
||||
#endif
|
||||
}], [AC_MSG_RESULT(ok);
|
||||
have_inet_pton=yes], [AC_MSG_RESULT(broken);
|
||||
-have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken]);
|
||||
-have_inet_pton=no])],
|
||||
+have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken... not here]);
|
||||
+have_inet_pton=yes])],
|
||||
have_inet_pton=no)
|
||||
if test "$have_inet_pton" = no; then
|
||||
AC_LIBOBJ(inet_pton)
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 1ab938e762ee6ebd3211c22ef25a7575e37791c4 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 29 Dec 2016 20:16:53 +0200
|
||||
Subject: [PATCH] androiddump: add missing sys/time.h header
|
||||
|
||||
struct timeval requires sys/time.h. Fixes the following musl libc build error:
|
||||
|
||||
androiddump.c: In function 'useSndTimeout':
|
||||
androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type
|
||||
const struct timeval socket_timeout = {
|
||||
^
|
||||
|
||||
Change-Id: I52e204f32a012aabea2e54877e564576c072fe08
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://code.wireshark.org/review/19460
|
||||
---
|
||||
extcap/androiddump.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
|
||||
index 8287c4bb1a76..fab7c10e05cc 100644
|
||||
--- a/extcap/androiddump.c
|
||||
+++ b/extcap/androiddump.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
+#include <sys/time.h>
|
||||
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
# include <netinet/in.h>
|
||||
--
|
||||
2.11.0
|
||||
|
||||
32
bsp/buildroot-2017.02.11/package/wireshark/Config.in
Normal file
32
bsp/buildroot-2017.02.11/package/wireshark/Config.in
Normal file
@@ -0,0 +1,32 @@
|
||||
config BR2_PACKAGE_WIRESHARK
|
||||
bool "wireshark"
|
||||
select BR2_PACKAGE_LIBPCAP
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
depends on BR2_USE_MMU # fork(), glib2
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
help
|
||||
Network traffic sniffer and protocol decoder.
|
||||
|
||||
https://www.wireshark.org
|
||||
|
||||
if BR2_PACKAGE_WIRESHARK
|
||||
|
||||
config BR2_PACKAGE_WIRESHARK_QT
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
depends on BR2_PACKAGE_QT5TOOLS
|
||||
select 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
|
||||
|
||||
endif # BR2_PACKAGE_WIRESHARK
|
||||
|
||||
comment "wireshark needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -0,0 +1,4 @@
|
||||
# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.14.txt
|
||||
sha256 e7a3d4f9bbde20ea5ee09103f9f6dba38e3666dfe1d6a6a1c004602b5fac378b wireshark-2.2.14.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING
|
||||
109
bsp/buildroot-2017.02.11/package/wireshark/wireshark.mk
Normal file
109
bsp/buildroot-2017.02.11/package/wireshark/wireshark.mk
Normal file
@@ -0,0 +1,109 @@
|
||||
################################################################################
|
||||
#
|
||||
# wireshark
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WIRESHARK_VERSION = 2.2.14
|
||||
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
|
||||
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
|
||||
WIRESHARK_LICENSE = wireshark license
|
||||
WIRESHARK_LICENSE_FILES = COPYING
|
||||
WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
|
||||
WIRESHARK_CONF_ENV = \
|
||||
PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
|
||||
|
||||
# patch touching configure.ac
|
||||
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 = \
|
||||
--without-krb5 \
|
||||
--enable-static=no \
|
||||
--with-libsmi=no \
|
||||
--with-lua=no \
|
||||
--with-pcap=$(STAGING_DIR)/usr \
|
||||
--includedir=$(STAGING_DIR)/usr/include
|
||||
|
||||
# wireshark GUI options
|
||||
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
|
||||
WIRESHARK_CONF_OPTS += --with-gtk=3
|
||||
WIRESHARK_DEPENDENCIES += libgtk3
|
||||
else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
|
||||
WIRESHARK_CONF_OPTS += --with-gtk=2
|
||||
WIRESHARK_DEPENDENCIES += libgtk2
|
||||
else
|
||||
WIRESHARK_CONF_OPTS += --with-gtk=no
|
||||
endif
|
||||
|
||||
# Qt4 needs accessibility, we don't support it
|
||||
ifeq ($(BR2_PACKAGE_WIRESHARK_QT),y)
|
||||
WIRESHARK_CONF_OPTS += --with-qt=5
|
||||
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 += \
|
||||
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_WIRESHARK_GUI),)
|
||||
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
|
||||
WIRESHARK_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
|
||||
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
|
||||
WIRESHARK_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
WIRESHARK_CONF_OPTS += --with-gcrypt=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNL),y)
|
||||
WIRESHARK_CONF_OPTS += --with-libnl
|
||||
WIRESHARK_DEPENDENCIES += libnl
|
||||
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
|
||||
|
||||
define WIRESHARK_REMOVE_DOCS
|
||||
find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \
|
||||
-o -name '*.html' -print0 | xargs -0 rm -f
|
||||
endef
|
||||
|
||||
WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user