rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bsp/buildroot/package/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch
View File

@@ -1,35 +0,0 @@
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

35
bsp/buildroot/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
View File

@@ -1,35 +0,0 @@
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

3
bsp/buildroot/package/wireshark/Config.in
View File

@@ -1,9 +1,11 @@
config BR2_PACKAGE_WIRESHARK
bool "wireshark"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -> libgpg-error
depends on BR2_USE_MMU # fork(), glib2
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGLIB2
help
Network traffic sniffer and protocol decoder.
@@ -28,5 +30,6 @@ config BR2_PACKAGE_WIRESHARK_GUI
endif # BR2_PACKAGE_WIRESHARK
comment "wireshark needs a toolchain w/ wchar, threads"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

4
bsp/buildroot/package/wireshark/wireshark.hash
View File

@@ -1,4 +1,4 @@
# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.17.txt
sha256 923d39ff9c6df83b9594868542061da33bf330e12526778a8cb3adcf912eebb0 wireshark-2.2.17.tar.bz2
# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.6.txt
sha256 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863 wireshark-2.6.6.tar.xz
# Locally calculated
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING

94
bsp/buildroot/package/wireshark/wireshark.mk
View File

@@ -4,27 +4,21 @@
#
################################################################################
WIRESHARK_VERSION = 2.2.17
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
WIRESHARK_VERSION = 2.6.6
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
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_DEPENDENCIES = host-pkgconf libgcrypt libpcap libglib2
WIRESHARK_CONF_ENV = \
LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
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 \
--disable-guides \
--enable-static=no \
--with-libsmi=no \
--with-lua=no \
--with-pcap=$(STAGING_DIR)/usr \
--includedir=$(STAGING_DIR)/usr/include
--with-pcap=yes
# wireshark GUI options
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
@@ -56,6 +50,13 @@ ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),)
WIRESHARK_CONF_OPTS += --disable-wireshark
endif
ifeq ($(BR2_PACKAGE_BCG729),y)
WIRESHARK_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += bcg729
else
WIRESHARK_CONF_OPTS += --without-bcg729
endif
ifeq ($(BR2_PACKAGE_C_ARES),y)
WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += c-ares
@@ -63,13 +64,6 @@ 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
@@ -77,12 +71,18 @@ 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
ifeq ($(BR2_PACKAGE_LIBKRB5),y)
WIRESHARK_CONF_OPTS += --with-krb5=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += libkrb5
else
WIRESHARK_CONF_OPTS += --with-gcrypt=no
WIRESHARK_CONF_OPTS += --without-krb5
endif
ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
WIRESHARK_CONF_OPTS += --with-maxminddb=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += libmaxminddb
else
WIRESHARK_CONF_OPTS += --without-maxminddb
endif
ifeq ($(BR2_PACKAGE_LIBNL),y)
@@ -92,6 +92,42 @@ else
WIRESHARK_CONF_OPTS += --without-libnl
endif
ifeq ($(BR2_PACKAGE_LIBSSH),y)
WIRESHARK_CONF_OPTS += --with-libssh=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += libssh
else
WIRESHARK_CONF_OPTS += --without-libssh
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
WIRESHARK_CONF_OPTS += --with-libxml2
WIRESHARK_DEPENDENCIES += libxml2
else
WIRESHARK_CONF_OPTS += --without-libxml2
endif
# no support for lua53 yet
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
WIRESHARK_CONF_OPTS += --with-lua
WIRESHARK_DEPENDENCIES += lua
else
WIRESHARK_CONF_OPTS += --without-lua
endif
ifeq ($(BR2_PACKAGE_LZ4),y)
WIRESHARK_CONF_OPTS += --with-lz4=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += lz4
else
WIRESHARK_CONF_OPTS += --without-lz4
endif
ifeq ($(BR2_PACKAGE_NGHTTP2),y)
WIRESHARK_CONF_OPTS += --with-nghttp2=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += nghttp2
else
WIRESHARK_CONF_OPTS += --without-nghttp2
endif
ifeq ($(BR2_PACKAGE_SBC),y)
WIRESHARK_CONF_OPTS += --with-sbc=yes
WIRESHARK_DEPENDENCIES += sbc
@@ -99,6 +135,16 @@ else
WIRESHARK_CONF_OPTS += --with-sbc=no
endif
ifeq ($(BR2_PACKAGE_SNAPPY),y)
WIRESHARK_CONF_OPTS += --with-snappy=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += snappy
ifeq ($(BR2_STATIC_LIBS),y)
WIRESHARK_CONF_ENV += LIBS=-lstdc++
endif
else
WIRESHARK_CONF_OPTS += --without-snappy
endif
define WIRESHARK_REMOVE_DOCS
find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \
-o -name '*.html' -print0 | xargs -0 rm -f