From 49fabb152a4330401de568ec4656a3eefbb46385 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 17:49:16 +0100 Subject: [PATCH 0001/2640] Kick-off 2018.05 cycle Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 90019bd764..45c6077cf6 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.02-rc1 +export BR2_VERSION := 2018.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1517840000 From f83d92b60f25df3178ce7775716403c76d63d9b1 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 5 Feb 2018 20:08:41 +0800 Subject: [PATCH 0002/2640] package/sqlite: bump version to 3220000 (3.22.0) Signed-off-by: Scott Fan Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index be5820e1f8..2aac7dc1d3 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,6 +1,6 @@ # From http://www.sqlite.org/download.html -sha1 f56fe3407d8297fc0a68a058f4c9e6b77e83575c sqlite-autoconf-3210000.tar.gz +sha1 2fb24ec12001926d5209d2da90d252b9825366ac sqlite-autoconf-3220000.tar.gz # Calculated based on the hash above -sha256 d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3 sqlite-autoconf-3210000.tar.gz +sha256 2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612 sqlite-autoconf-3220000.tar.gz # Locally calculated sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 5239592f18..e8ce92df56 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQLITE_VERSION = 3210000 +SQLITE_VERSION = 3220000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = http://www.sqlite.org/2017 +SQLITE_SITE = http://www.sqlite.org/2018 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_INSTALL_STAGING = YES From 99c6f9fba171a73d899e93c8ce944be5a154ceb4 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Mon, 5 Feb 2018 09:31:41 +0100 Subject: [PATCH 0003/2640] x11vnc: update to 0.9.15 This updates x11vnc from 0.9.14 to 0.9.15. The cherry-picked patch is now part of the release. Signed-off-by: Martin Kepplinger Signed-off-by: Thomas Petazzoni --- ...ection-when-using-without-crypt-cryp.patch | 27 ------------------- package/x11vnc/x11vnc.hash | 2 +- package/x11vnc/x11vnc.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch diff --git a/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch b/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch deleted file mode 100644 index 31b5cfed7d..0000000000 --- a/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d6919c0be7f531b20cbfcb9929d697ac3c132c40 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= -Date: Wed, 12 Oct 2016 15:17:51 +0200 -Subject: [PATCH] Fix compiler detection when using - --without-{crypt,crypto,ssl} - -(cherry picked from commit d6919c0be7f531b20cbfcb9929d697ac3c132c40) -Signed-off-by: Romain Naour ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 55724bc..bdfff94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,6 +5,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AM_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) - -+AC_PROG_CC - AC_PROG_SED - - # some OS's need both -lssl and -lcrypto on link line: --- -2.9.3 - diff --git a/package/x11vnc/x11vnc.hash b/package/x11vnc/x11vnc.hash index 3cdbfa1b0f..86f41044db 100644 --- a/package/x11vnc/x11vnc.hash +++ b/package/x11vnc/x11vnc.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 45f87c5e4382988c73e8c7891ac2bfb45d8f9ce1196ae06651c84636684ea143 x11vnc-0.9.14.tar.gz +sha256 3e43bd875edc3c7f52a0d3676c4ec7de910fcd210240ee20b4522deb2bf84cff x11vnc-0.9.15.tar.gz diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index f1f4da21bc..0fa87d2d82 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -4,7 +4,7 @@ # ################################################################################ -X11VNC_VERSION = 0.9.14 +X11VNC_VERSION = 0.9.15 X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION)) # sdl support is not used in x11vnc, but host include / library search paths # leak in if host has sdl-config From 6030986311434d554635761925925bfd351b836b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 22:45:17 +0100 Subject: [PATCH 0004/2640] support/config-fragments: add internal defconfigs for glibc and musl While we have several defconfigs building internal toolchains with uClibc, we don't have any building internal toolchain with glibc and musl. However, having such defconfigs is nice when we bump the C library version, in order to immediately get feedback on build failures. Note that while the ARC internal defconfig uses glibc, it uses the special ARC glibc version, so it doesn't test version bumps of the upstream glibc C library. Signed-off-by: Thomas Petazzoni --- .../config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++++ .../config-fragments/autobuild/br-arm-internal-musl.config | 4 ++++ support/config-fragments/autobuild/toolchain-configs.csv | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 support/config-fragments/autobuild/br-arm-internal-glibc.config create mode 100644 support/config-fragments/autobuild/br-arm-internal-musl.config diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config new file mode 100644 index 0000000000..6b2566eedc --- /dev/null +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -0,0 +1,4 @@ +BR2_arm=y +BR2_cortex_a8=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/config-fragments/autobuild/br-arm-internal-musl.config b/support/config-fragments/autobuild/br-arm-internal-musl.config new file mode 100644 index 0000000000..92788626d6 --- /dev/null +++ b/support/config-fragments/autobuild/br-arm-internal-musl.config @@ -0,0 +1,4 @@ +BR2_arm=y +BR2_cortex_a8=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index efb78eec4f..2010113f44 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -12,6 +12,8 @@ support/config-fragments/autobuild/br-arm-full.config,x86_64 support/config-fragments/autobuild/br-arm-full-nothread.config,x86_64 support/config-fragments/autobuild/br-arm-full-static.config,x86_64 support/config-fragments/autobuild/br-arm-internal-full.config,any +support/config-fragments/autobuild/br-arm-internal-glibc.config,any +support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-bfin-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 From 14fdb63804f1548b5d1ab9598100c7f103d4512d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 22:46:59 +0100 Subject: [PATCH 0005/2640] support/config-fragments: remove bogus BR2_JLEVEL option There is no reason to have a BR2_JLEVEL option in such toolchain defconfigs. Signed-off-by: Thomas Petazzoni --- .../config-fragments/autobuild/br-xtensa-full-internal.config | 1 - 1 file changed, 1 deletion(-) diff --git a/support/config-fragments/autobuild/br-xtensa-full-internal.config b/support/config-fragments/autobuild/br-xtensa-full-internal.config index f642a4d76b..89e81d4c45 100644 --- a/support/config-fragments/autobuild/br-xtensa-full-internal.config +++ b/support/config-fragments/autobuild/br-xtensa-full-internal.config @@ -1,4 +1,3 @@ BR2_xtensa=y -BR2_JLEVEL=8 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From ab9b556f981c6b0d22325455bb47927f109b7584 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Feb 2018 21:57:12 +0100 Subject: [PATCH 0006/2640] package/x11r7/xlib_libxshmfence: fix build with glibc 2.27 With glibc 2.27 memfd_create() is inside a _GNU_SOURCE guard, so call AC_USE_SYSTEM_EXTENSIONS to get this defined. Signed-off-by: Romain Naour [Thomas: add reference to upstream commit, as suggested by Yann E. Morin.] Signed-off-by: Thomas Petazzoni --- ...ure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch | 31 +++++++++++++++++++ .../xlib_libxshmfence/xlib_libxshmfence.mk | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch diff --git a/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch b/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch new file mode 100644 index 0000000000..1ca1303267 --- /dev/null +++ b/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch @@ -0,0 +1,31 @@ +From 0b550a4e7acf02d3478602848f6afbfcbfb0d4b2 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 29 Jan 2018 16:24:36 +0000 +Subject: [PATCH] configure.ac: call AC_USE_SYSTEM_EXTENSIONS + +With glibc 2.27 memfd_create() is inside a _GNU_SOURCE guard, so call +AC_USE_SYSTEM_EXTENSIONS to get this defined. + +Signed-off-by: Ross Burton +Upstream: https://cgit.freedesktop.org/xorg/lib/libxshmfence/commit/?id=0b550a4e7acf02d3478602848f6afbfcbfb0d4b2 +Signed-off-by: Romain Naour +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 55772d0..ed77e6d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,6 +28,8 @@ AC_INIT([libxshmfence], [1.2], + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) + ++AC_USE_SYSTEM_EXTENSIONS ++ + # Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +-- +2.14.3 + diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 3a2f32623a..9686c408c1 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -12,4 +12,7 @@ XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto +# 0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch +XLIB_LIBXSHMFENCE_AUTORECONF = YES + $(eval $(autotools-package)) From e14eea82acb4cf95f0064afa2c98c27a0fc97269 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Feb 2018 21:57:13 +0100 Subject: [PATCH 0007/2640] package/pulseaudio: only define memfd_create() if not already defined Before glibc version 2.27 there was no wrapper for memfd_create(2). Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...nly-define-memfd_create-if-not-alrea.patch | 64 +++++++++++++++++++ package/pulseaudio/pulseaudio.mk | 3 + 2 files changed, 67 insertions(+) create mode 100644 package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch diff --git a/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch new file mode 100644 index 0000000000..8f103bf201 --- /dev/null +++ b/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch @@ -0,0 +1,64 @@ +From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Wed, 24 Jan 2018 03:51:49 +0200 +Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already + defined + +glibc 2.27 is to be released soon, and it will provide memfd_create(). +If glibc provides the function, we must not define it ourselves, +otherwise building fails due to conflict between the two implementations +of the same function. + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 +Signed-off-by: Romain Naour +--- + configure.ac | 3 +++ + src/pulsecore/memfd-wrappers.h | 7 ++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0084c86e..0eb44b08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -610,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], + [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. + *** Use linux v3.17 or higher for such a feature.])]) + ++AS_IF([test "x$HAVE_MEMFD" = "x1"], ++ AC_CHECK_FUNCS([memfd_create])) ++ + AC_SUBST(HAVE_MEMFD) + AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) + AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) +diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h +index 3bed9b2b..c7aadfd3 100644 +--- a/src/pulsecore/memfd-wrappers.h ++++ b/src/pulsecore/memfd-wrappers.h +@@ -20,13 +20,14 @@ + License along with PulseAudio; if not, see . + ***/ + +-#ifdef HAVE_MEMFD ++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) + + #include + #include + + /* +- * No glibc wrappers exist for memfd_create(2), so provide our own. ++ * Before glibc version 2.27 there was no wrapper for memfd_create(2), ++ * so we have to provide our own. + * + * Also define memfd fcntl sealing macros. While they are already + * defined in the kernel header file , that file as +@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { + #define F_SEAL_WRITE 0x0008 /* prevent writes */ + #endif + +-#endif /* HAVE_MEMFD */ ++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ + + #endif +-- +2.14.3 + diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 13fcec52a3..f59828d43d 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -15,6 +15,9 @@ PULSEAUDIO_CONF_OPTS = \ --disable-legacy-database-entry-format \ --disable-manpages +# 0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch +PULSEAUDIO_AUTORECONF = YES + PULSEAUDIO_DEPENDENCIES = \ host-pkgconf libtool libsndfile speex host-intltool \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ From f1d4756d46fb71fbe6791c33261ed05939117ff2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Feb 2018 21:57:14 +0100 Subject: [PATCH 0008/2640] package/libraw: rename internal powf64 Starting with Glibc 2.27, powf64() is provided by the C library and colide with the one defined dy libraw. Rename internal powf64 to libraw_powf64. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...-dcraw_common-rename-internal-powf64.patch | 348 ++++++++++++++++++ 1 file changed, 348 insertions(+) create mode 100644 package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch diff --git a/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch b/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch new file mode 100644 index 0000000000..ef3b81aa24 --- /dev/null +++ b/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch @@ -0,0 +1,348 @@ +From 045c57d9d030075575409cf50cd7f6ee635df5c0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 5 Feb 2018 16:22:39 +0100 +Subject: [PATCH] internal/dcraw_common: rename internal powf64() + +Starting with Glibc 2.27, powf64() is provided by the C library +and colide with the one defined dy libraw. + +Rename internal powf64 to libraw_powf64. + +Signed-off-by: Romain Naour +--- + internal/dcraw_common.cpp | 98 +++++++++++++++++++++++------------------------ + 1 file changed, 49 insertions(+), 49 deletions(-) + +diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp +index 0c7c07a..cf26865 100644 +--- a/internal/dcraw_common.cpp ++++ b/internal/dcraw_common.cpp +@@ -5537,7 +5537,7 @@ static float powf_lim(float a, float b, float limup) + { + return (b>limup || b < -limup)?0.f:powf(a,b); + } +-static float powf64(float a, float b) ++static float libraw_powf64(float a, float b) + { + return powf_lim(a,b,64.f); + } +@@ -5561,7 +5561,7 @@ static float my_roundf(float x) { + static float _CanonConvertAperture(ushort in) + { + if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f; +- return powf64(2.0, in/64.0); ++ return libraw_powf64(2.0, in/64.0); + } + + void CLASS setCanonBodyFeatures (unsigned id) +@@ -5902,21 +5902,21 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len) + if (fabsf(imgdata.lens.makernotes.MinFocal) < 1.1f) + { + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 2]) +- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); ++ imgdata.lens.makernotes.MinFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 2] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 3]) +- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); ++ imgdata.lens.makernotes.MaxFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 3] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 4]) +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(2.0f, (float)LensData[i + 4] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 5]) +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(2.0f, (float)LensData[i + 5] / 24.0f); + } + imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; + if (i != 2) + { + if ((LensData[i - 1]) && + (fabsf(imgdata.lens.makernotes.CurFocal) < 1.1f)) +- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); +- if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); ++ imgdata.lens.makernotes.CurFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i - 1] / 24.0f); ++ if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = libraw_powf64(2.0f, (float)LensData[i + 7] / 24.0f); + } + imgdata.lens.makernotes.LensID = + (unsigned long long) LensData[i] << 56 | +@@ -6088,13 +6088,13 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 + if (table_buf[iLensData+9] && + (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) + imgdata.lens.makernotes.CurFocal = +- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); ++ 10*(table_buf[iLensData+9]>>2) * libraw_powf64(4, (table_buf[iLensData+9] & 0x03)-2); + if (table_buf[iLensData+10] & 0xf0) + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); + if (table_buf[iLensData+10] & 0x0f) + imgdata.lens.makernotes.MinAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); + + if (iLensData != 12) + { +@@ -6111,14 +6111,14 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 + if ((table_buf[iLensData+14] > 1) && + (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); + } + else if ((id != 0x12e76) && // K-5 + (table_buf[iLensData+15] > 1) && + (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) + { + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); + } + } + free(table_buf); +@@ -6525,11 +6525,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) + { + if (buf[0]) + imgdata.lens.makernotes.MaxAp4CurFocal = +- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; ++ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; + + if (buf[1]) + imgdata.lens.makernotes.MinAp4CurFocal = +- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; ++ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; + } + + if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) +@@ -6539,7 +6539,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) + lid = SonySubstitution[buf[0x3d]] << 8 | + SonySubstitution[buf[0x3c]]; + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); ++ libraw_powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); + } + if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF)) + imgdata.lens.makernotes.LensMount = +@@ -6924,7 +6924,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) + { + unsigned char cc; + fread(&cc, 1, 1, ifp); +- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); ++ iso_speed = (int)(100.0 * libraw_powf64(2.0, (double)(cc) / 12.0 - 5.0)); + break; + } + } +@@ -6957,7 +6957,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) + } + break; + case 0x1002: +- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); ++ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); + break; + case 0x20100201: + imgdata.lens.makernotes.LensID = +@@ -6977,10 +6977,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) + fread(imgdata.lens.makernotes.Lens, MIN(len,127), 1, ifp); + break; + case 0x20100205: +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100206: +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100207: + imgdata.lens.makernotes.MinFocal = (float)get2(); +@@ -6991,7 +6991,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) + imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; + break; + case 0x2010020a: +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100301: + imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; +@@ -7195,7 +7195,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) + lid = (((ushort)table_buf[2])<<8) | + ((ushort)table_buf[3]); + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); ++ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); + } + break; + case 1536: +@@ -7669,7 +7669,7 @@ void CLASS parse_makernote (int base, int uptag) + } + break; + case 0x1002: +- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); ++ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); + break; + case 0x20100201: + { +@@ -7694,10 +7694,10 @@ void CLASS parse_makernote (int base, int uptag) + fread(imgdata.lens.makernotes.Lens, MIN(len,127), 1, ifp); + break; + case 0x20100205: +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100206: +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100207: + imgdata.lens.makernotes.MinFocal = (float)get2(); +@@ -7708,7 +7708,7 @@ void CLASS parse_makernote (int base, int uptag) + imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; + break; + case 0x2010020a: +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100301: + imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; +@@ -7977,7 +7977,7 @@ void CLASS parse_makernote (int base, int uptag) + lid = (((ushort)table_buf[2])<<8) | + ((ushort)table_buf[3]); + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); ++ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); + } + break; + case 1536: +@@ -8064,19 +8064,19 @@ void CLASS parse_makernote (int base, int uptag) + { + unsigned char cc; + fread(&cc,1,1,ifp); +- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); ++ iso_speed = int(100.0 * libraw_powf64(2.0f,float(cc)/12.0-5.0)); + } + if (tag == 4 && len > 26 && len < 35) { + if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) +- iso_speed = 50 * powf64(2.0, i/32.0 - 4); ++ iso_speed = 50 * libraw_powf64(2.0, i/32.0 - 4); + #ifdef LIBRAW_LIBRARY_BUILD + get4(); + #else + if ((i=(get2(),get2())) != 0x7fff && !aperture) +- aperture = powf64(2.0, i/64.0); ++ aperture = libraw_powf64(2.0, i/64.0); + #endif + if ((i=get2()) != 0xffff && !shutter) +- shutter = powf64(2.0, (short) i/-32.0); ++ shutter = libraw_powf64(2.0, (short) i/-32.0); + wbi = (get2(),get2()); + shot_order = (get2(),get2()); + } +@@ -8579,7 +8579,7 @@ void CLASS parse_exif (int base) + imgdata.lens.Lens[0] = 0; + break; + case 0x9205: +- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + break; + #endif + case 33434: shutter = getreal(type); break; +@@ -8592,10 +8592,10 @@ void CLASS parse_exif (int base) + case 36867: + case 36868: get_timestamp(0); break; + case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) +- shutter = powf64(2.0, expo); break; ++ shutter = libraw_powf64(2.0, expo); break; + case 37378: // 0x9202 ApertureValue + if ((fabs(ape = getreal(type))<256.0) && (!aperture)) +- aperture = powf64(2.0, ape/2); ++ aperture = libraw_powf64(2.0, ape/2); + break; + case 37385: flash_used = getreal(type); break; + case 37386: focal_len = getreal(type); break; +@@ -9196,7 +9196,7 @@ int CLASS parse_tiff_ifd (int base) + imgdata.lens.Lens[0] = 0; + break; + case 0x9205: +- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + break; + // IB end + #endif +@@ -9970,22 +9970,22 @@ void CLASS parse_ciff (int offset, int length, int depth) + thumb_length = len; + } + if (type == 0x1818) { +- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); +- aperture = powf64(2.0f, int_to_float(get4())/2); ++ shutter = libraw_powf64(2.0f, -int_to_float((get4(),get4()))); ++ aperture = libraw_powf64(2.0f, int_to_float(get4())/2); + #ifdef LIBRAW_LIBRARY_BUILD + imgdata.lens.makernotes.CurAp = aperture; + #endif + } + if (type == 0x102a) { + // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; +- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; ++ iso_speed = libraw_powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; + #ifdef LIBRAW_LIBRARY_BUILD + aperture = _CanonConvertAperture((get2(),get2())); + imgdata.lens.makernotes.CurAp = aperture; + #else +- aperture = powf64(2.0, (get2(),(short)get2())/64.0); ++ aperture = libraw_powf64(2.0, (get2(),(short)get2())/64.0); + #endif +- shutter = powf64(2.0,-((short)get2())/32.0); ++ shutter = libraw_powf64(2.0,-((short)get2())/32.0); + wbi = (get2(),get2()); + if (wbi > 17) wbi = 0; + fseek (ifp, 32, SEEK_CUR); +@@ -10189,8 +10189,8 @@ void CLASS parse_phase_one (int base) + setPhaseOneFeatures(unique_id); + break; + case 0x0401: +- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); +- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); ++ if (type == 4) imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); ++ else imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (getreal(type)/2.0f)); + break; + case 0x0403: + if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); +@@ -10204,16 +10204,16 @@ void CLASS parse_phase_one (int base) + break; + case 0x0414: + if (type == 4) { +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); + } else { +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + } + break; + case 0x0415: + if (type == 4) { +- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); ++ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); + } else { +- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + } + break; + case 0x0416: +@@ -12119,15 +12119,15 @@ void CLASS identify() + case 18: iso_speed = 320; break; + case 19: iso_speed = 400; break; + } +- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; ++ shutter = libraw_powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; + FORC4 cam_mul[c ^ (c >> 1)] = get4(); + fseek (ifp, 88, SEEK_SET); +- aperture = powf64(2.0f, ((float)get4())/16.0f); ++ aperture = libraw_powf64(2.0f, ((float)get4())/16.0f); + fseek (ifp, 112, SEEK_SET); + focal_len = get4(); + #ifdef LIBRAW_LIBRARY_BUILD + fseek (ifp, 104, SEEK_SET); +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, ((float)get4())/16.0f); + fseek (ifp, 124, SEEK_SET); + fread(imgdata.lens.makernotes.Lens, 32, 1, ifp); + imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; +-- +2.14.3 + From 30daaed1935004661cf54d90dc361a3f1d9d509c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Feb 2018 21:57:15 +0100 Subject: [PATCH 0009/2640] package/glibc: remove GLIBC_SRC_SUBDIR GLIBC_SRC_SUBDIR was needed when Buildroot supported eglibc which stored all sources in a sub-directory. It was not removed by the commit removing eglibc support [1]. [1] 500de2598a4902a0e9ec53f7b475046ff17c6681 Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index fd79d84f15..cf4bdec065 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -20,10 +20,8 @@ GLIBC_VERSION = glibc-2.26-107-g73a92363619e52c458146e903dfb9b1ba823aa40 GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) endif -GLIBC_SRC_SUBDIR = . - GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) -GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES) +GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO @@ -86,7 +84,7 @@ define GLIBC_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ - $(SHELL) $(@D)/$(GLIBC_SRC_SUBDIR)/configure \ + $(SHELL) $(@D)/configure \ ac_cv_path_BASH_SHELL=/bin/bash \ libc_cv_forced_unwind=yes \ libc_cv_ssp=no \ From cdbb96e0b189ce7a270979993422b9780a3a6224 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Tue, 30 Jan 2018 13:03:53 +0100 Subject: [PATCH 0010/2640] board: Add Vyasa RK3288 board support Add Vyasa board, from rk3288 family SOC. Signed-off-by: Jagan Teki Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/amarula/vyasa/extlinux.conf | 4 +++ board/amarula/vyasa/genimage.cfg | 21 +++++++++++ board/amarula/vyasa/linux_gmac.fragment | 3 ++ board/amarula/vyasa/post-build.sh | 9 +++++ board/amarula/vyasa/readme.txt | 31 +++++++++++++++++ configs/amarula_vyasa_rk3288_defconfig | 46 +++++++++++++++++++++++++ 8 files changed, 117 insertions(+) create mode 100644 board/amarula/vyasa/extlinux.conf create mode 100644 board/amarula/vyasa/genimage.cfg create mode 100644 board/amarula/vyasa/linux_gmac.fragment create mode 100755 board/amarula/vyasa/post-build.sh create mode 100644 board/amarula/vyasa/readme.txt create mode 100644 configs/amarula_vyasa_rk3288_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf975fcd47..18b05a7fc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,6 +67,7 @@ acmesystems_aria_g25_128mb_defconfig: *defconfig acmesystems_aria_g25_256mb_defconfig: *defconfig acmesystems_arietta_g25_128mb_defconfig: *defconfig acmesystems_arietta_g25_256mb_defconfig: *defconfig +amarula_vyasa_rk3288_defconfig: *defconfig arcturus_ucp1020_defconfig: *defconfig arm_foundationv8_defconfig: *defconfig arm_juno_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c524cb6ac5..9508172322 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -782,8 +782,10 @@ N: Ismael Luceno F: package/axel/ N: Jagan Teki +F: board/amarula/ F: board/bananapi/ F: board/engicam/ +F: configs/amarula_vyasa_rk3288_defconfig F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a64-olinuxino/ diff --git a/board/amarula/vyasa/extlinux.conf b/board/amarula/vyasa/extlinux.conf new file mode 100644 index 0000000000..a8fcc35f5a --- /dev/null +++ b/board/amarula/vyasa/extlinux.conf @@ -0,0 +1,4 @@ +label Vyasa linux-next + kernel /boot/uImage + devicetree /boot/rk3288-vyasa.dtb + append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/amarula/vyasa/genimage.cfg b/board/amarula/vyasa/genimage.cfg new file mode 100644 index 0000000000..fa41de3672 --- /dev/null +++ b/board/amarula/vyasa/genimage.cfg @@ -0,0 +1,21 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-tpl-spl-dtb.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/amarula/vyasa/linux_gmac.fragment b/board/amarula/vyasa/linux_gmac.fragment new file mode 100644 index 0000000000..8ebf383597 --- /dev/null +++ b/board/amarula/vyasa/linux_gmac.fragment @@ -0,0 +1,3 @@ +# Currently mainline kernel exhibits issues when running rockchip gmac +# on the board, so enable it as loadable module and insert it later +CONFIG_DWMAC_ROCKCHIP=m diff --git a/board/amarula/vyasa/post-build.sh b/board/amarula/vyasa/post-build.sh new file mode 100755 index 0000000000..ffbbcdeb58 --- /dev/null +++ b/board/amarula/vyasa/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/bin/mkimage +BOARD_DIR="$(dirname $0)" + +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/amarula/vyasa/readme.txt b/board/amarula/vyasa/readme.txt new file mode 100644 index 0000000000..b95889e814 --- /dev/null +++ b/board/amarula/vyasa/readme.txt @@ -0,0 +1,31 @@ +Vyasa RK3288 +============ + +Vyasa is RK3288 based Single board computer with fully supported opensource software. + +https://openedev.amarulasolutions.com/display/ODWIKI/Vyasa+RK3288 + +How to build it +=============== + + $ make amarula_vyasa_rk3288_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build rootfs image: + + $ make + +Prepare your SDCard +=================== + +Buildroot generates a ready-to-use SD card image that you can flash directly to +the card. The image will be in output/images/sdcard.img. +You can write this image directly to an SD card device (i.e. /dev/xxx): + + $ sudo dd if=output/images/sdcard.img of=/dev/xxx + $ sudo sync + +Finally, you can insert the SD card to the Vyasa RK3288 board, close J4 and boot it. diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig new file mode 100644 index 0000000000..a020b353b9 --- /dev/null +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -0,0 +1,46 @@ +# Architecture +BR2_arm=y +BR2_cortex_a17=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 4.14 series +BR2_KERNEL_HEADERS_4_14=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/openedev/linux-openedev" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d127129e85a020879f334154300ddd3f7ec21c1e" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-vyasa" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/amarula/vyasa/linux_gmac.fragment" + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="vyasa-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to VYASA RK3288!" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" From 98b68d08fae47e4946a3883b13f923238ac6dcd4 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Tue, 30 Jan 2018 13:03:55 +0100 Subject: [PATCH 0011/2640] board: Add Tinker RK3288 board support Add Tinker board, from rk3288 family SOC. Signed-off-by: Jagan Teki Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/asus/tinker/extlinux.conf | 4 +++ board/asus/tinker/genimage.cfg | 15 ++++++++++ board/asus/tinker/post-build.sh | 9 ++++++ board/asus/tinker/readme.txt | 37 +++++++++++++++++++++++ configs/asus_tinker_rk3288_defconfig | 45 ++++++++++++++++++++++++++++ 7 files changed, 113 insertions(+) create mode 100644 board/asus/tinker/extlinux.conf create mode 100644 board/asus/tinker/genimage.cfg create mode 100755 board/asus/tinker/post-build.sh create mode 100644 board/asus/tinker/readme.txt create mode 100644 configs/asus_tinker_rk3288_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18b05a7fc5..b7dfef0935 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,7 @@ arm_juno_defconfig: *defconfig armadeus_apf27_defconfig: *defconfig armadeus_apf28_defconfig: *defconfig armadeus_apf51_defconfig: *defconfig +asus_tinker_rk3288_defconfig: *defconfig at91sam9260eknf_defconfig: *defconfig at91sam9g20dfc_defconfig: *defconfig at91sam9g45m10ek_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 9508172322..665fb653c7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -783,9 +783,11 @@ F: package/axel/ N: Jagan Teki F: board/amarula/ +F: board/asus/ F: board/bananapi/ F: board/engicam/ F: configs/amarula_vyasa_rk3288_defconfig +F: configs/asus_tinker_rk3288_defconfig F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a64-olinuxino/ diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf new file mode 100644 index 0000000000..136af0debd --- /dev/null +++ b/board/asus/tinker/extlinux.conf @@ -0,0 +1,4 @@ +label Tinker linux-next + kernel /boot/uImage + devicetree /boot/rk3288-tinker.dtb + append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg new file mode 100644 index 0000000000..a4b1e8d608 --- /dev/null +++ b/board/asus/tinker/genimage.cfg @@ -0,0 +1,15 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-spl-dtb { + in-partition-table = "no" + image = "u-boot-spl-dtb.img" + offset = 32K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh new file mode 100755 index 0000000000..8108ed83ff --- /dev/null +++ b/board/asus/tinker/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/bin/mkimage +BOARD_DIR="$(dirname $0)" + +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img +cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt new file mode 100644 index 0000000000..7372d29520 --- /dev/null +++ b/board/asus/tinker/readme.txt @@ -0,0 +1,37 @@ +Tinker RK3288 +============= + +Tinker Board is a Single Board Computer (SBC) in an ultra-small form +factor that offers class-leading performance while leveraging outstanding +mechanical compatibility. + +Tinker link: +https://www.asus.com/in/Single-Board-Computer/Tinker-Board/ + +Wiki link: +https://openedev.amarulasolutions.com/display/ODWIKI/Tinker+RK3288 + +How to build it +=============== + + $ make asus_tinker_rk3288_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build rootfs image: + + $ make + +Prepare your SDCard +=================== + +Buildroot generates a ready-to-use SD card image that you can flash directly to +the card. The image will be in output/images/sdcard.img. +You can write this image directly to an SD card device (i.e. /dev/xxx): + + $ sudo dd if=output/images/sdcard.img of=/dev/xxx + $ sudo sync + +Finally, you can insert the SD card to the Tinker RK3288 board and boot it. diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig new file mode 100644 index 0000000000..22e9bcd817 --- /dev/null +++ b/configs/asus_tinker_rk3288_defconfig @@ -0,0 +1,45 @@ +# Architecture +BR2_arm=y +BR2_cortex_a17=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 4.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" From c032e6825ad96e6d4b69cecde2402c02a2a356b5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Feb 2018 21:57:16 +0100 Subject: [PATCH 0012/2640] package/glibc: security bump to 2.27 See: https://sourceware.org/ml/libc-announce/2018/msg00000.html https://sourceware.org/glibc/wiki/Release/2.27 Fixes the following CVEs: CVE-2017-1000408 CVE-2017-1000409 CVE-2017-16997 CVE-2018-1000001 CVE-2018-6485 While at it, add license file hashes. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.hash | 6 +++++- package/glibc/glibc.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index f3a6577d2a..86d3bb56dd 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,4 +1,8 @@ # Locally calculated (fetched from Github) -sha256 0766875391224153502c5542a71b6e46db53b44691078b3130e1a0df41586430 glibc-glibc-2.26-107-g73a92363619e52c458146e903dfb9b1ba823aa40.tar.gz +sha256 a74489d14f4017bee6a6c6fe76f1de0dbf7d66c8695116de5aadd141c4757892 glibc-glibc-2.27.tar.gz # Locally calculated (fetched from Github) sha256 5aa9adeac09727db0b8a52794186563771e74d70410e9fd86431e339953fd4bb glibc-arc-2017.09-release.tar.gz + +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431 LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index cf4bdec065..b674191b22 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master -GLIBC_VERSION = glibc-2.26-107-g73a92363619e52c458146e903dfb9b1ba823aa40 +GLIBC_VERSION = glibc-2.27 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. From 873040371b1436d480fb9153427504ce9e3d78cf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 1 Feb 2018 21:09:04 +0100 Subject: [PATCH 0013/2640] autofs: allow to use libtirpc uClibc-ng removed internal RPC implementation as it is ipv4 only and can not be used for most important RPC software rpcbind and nfs-utils. musl does not implement RPC and GNU C library deprecated the internal implementation a while ago. It is still possible to use the C library implementation. Signed-off-by: Waldemar Brodkorb [Thomas: change to use libtirpc when available, not just when the toolchain does not have RPC support.] Signed-off-by: Thomas Petazzoni --- package/autofs/Config.in | 7 +++---- package/autofs/autofs.mk | 9 ++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/autofs/Config.in b/package/autofs/Config.in index 8e08357a4e..efb0ec28ee 100644 --- a/package/autofs/Config.in +++ b/package/autofs/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_AUTOFS bool "autofs" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on !BR2_STATIC_LIBS # dlfcn + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help Autofs controls the operation of the automount daemons. The automount daemons automatically mount filesystems when they @@ -15,7 +15,6 @@ config BR2_PACKAGE_AUTOFS http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html -comment "autofs needs a toolchain w/ NPTL, RPC, dynamic library" +comment "autofs needs a toolchain w/ NPTL and dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index 90cc38de55..87a218441e 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -9,7 +9,7 @@ AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ AUTOFS_LICENSE_FILES = COPYING COPYRIGHT -AUTOFS_DEPENDENCIES = host-flex host-bison +AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf # autofs looks on the build machine for the path of modprobe, so tell # it explicitly where it will be located on the target. @@ -31,4 +31,11 @@ AUTOFS_CONF_OPTS = \ AUTOFS_MAKE_ENV = DONTSTRIP=1 +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +AUTOFS_CONF_OPTS += --with-libtirpc +AUTOFS_DEPENDENCIES += libtirpc +else +AUTOFS_CONF_OPTS += --without-libtirpc +endif + $(eval $(autotools-package)) From ecfde09985c3f8c116f58176b871dedfac96fe4e Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 7 Sep 2017 15:25:42 +0200 Subject: [PATCH 0014/2640] support/testing: add python-cryptography tests Signed-off-by: Yegor Yefremov Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 2 ++ .../tests/package/test_python_cryptography.py | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 support/testing/tests/package/test_python_cryptography.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7dfef0935..b4be44843c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -284,6 +284,8 @@ tests.package.test_ipython.TestIPythonPy2: *runtime_test tests.package.test_ipython.TestIPythonPy3: *runtime_test tests.package.test_python.TestPython2: *runtime_test tests.package.test_python.TestPython3: *runtime_test +tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test +tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py new file mode 100644 index 0000000000..b60152de1c --- /dev/null +++ b/support/testing/tests/package/test_python_cryptography.py @@ -0,0 +1,31 @@ +import os + +from tests.package.test_python import TestPythonBase + +class TestPythonCryptography(TestPythonBase): + def fernet_test(self, timeout=-1): + cmd = self.interpreter + " -c 'from cryptography.fernet import Fernet;" + cmd += "key = Fernet.generate_key();" + cmd += "f = Fernet(key)'" + _, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual(exit_code, 0) + +class TestPythonPy2Cryptography(TestPythonCryptography): + config = TestPythonBase.config + \ +""" +BR2_PACKAGE_PYTHON=y +BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y +""" + def test_run(self): + self.login() + self.fernet_test(40) + +class TestPythonPy3Cryptography(TestPythonCryptography): + config = TestPythonBase.config + \ +""" +BR2_PACKAGE_PYTHON3=y +BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y +""" + def test_run(self): + self.login() + self.fernet_test(40) From 4b3b757307a23f2d3a2eeea75c1411025c6cacac Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 08:39:44 -0500 Subject: [PATCH 0015/2640] json-for-modern-cpp: bump to v3.1.0 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 7f394aaee7..b2abe49700 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 402464cd6d50c81bb6a683d07c537e5a8c4684fd1186826d3aa1385ce6adac13 json-v3.0.1.tar.gz +sha256 b20be343922f73504baf8a01543c2a42d16e01f18bb231b324a8959416ccf4f8 json-v3.1.0.tar.gz sha256 6a6115fc4a7239a135f2dce8d33f94cb8a936b8f608ac0f6699fbac278b0dd5b LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 6413d6255f..406f8ad1f4 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = v3.0.1 +JSON_FOR_MODERN_CPP_VERSION = v3.1.0 JSON_FOR_MODERN_CPP_SOURCE = json-${JSON_FOR_MODERN_CPP_VERSION}.tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From 41a3bc75e165ef5f029bf0fb87ff55f1506e362d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 08:46:03 -0500 Subject: [PATCH 0016/2640] ncurses: bump to 6.1 Remove 0002-recognise-uclinux.patch as it has been applies upstream. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/ncurses/0001-gcc-5.x-MKlib_gen.patch | 5 ++-- package/ncurses/0002-recognise-uclinux.patch | 29 -------------------- package/ncurses/ncurses.hash | 2 +- package/ncurses/ncurses.mk | 2 +- 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 package/ncurses/0002-recognise-uclinux.patch diff --git a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch index df7c15fee9..0106e8077f 100644 --- a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch +++ b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch @@ -11,10 +11,11 @@ http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39b Original author: Thomas E. Dickey Signed-off-by: Mikhail Peselnik - +[Adam Duskett: Refresh for 6.1] +Signed-off-by: Adam Duskett --- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 +++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 -@@ -491,11 +491,22 @@ +@@ -505,11 +505,22 @@ -e 's/gen_$//' \ -e 's/ / /g' >>$TMP diff --git a/package/ncurses/0002-recognise-uclinux.patch b/package/ncurses/0002-recognise-uclinux.patch deleted file mode 100644 index 57dd4cf37f..0000000000 --- a/package/ncurses/0002-recognise-uclinux.patch +++ /dev/null @@ -1,29 +0,0 @@ -aclocal: fix detection for uclinux hosts -uclinux is just a linux like the others... - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: "Adam Duskett" - ---- a/aclocal.m4 2015-08-05 20:46:34.000000000 -0400 -+++ b/aclocal.m4 2017-02-07 09:58:17.770056849 -0500 -@@ -7656,7 +7656,7 @@ - cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= - ;; --(linux*|gnu*|mint*|k*bsd*-gnu) -+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) - CF_GNU_SOURCE - ;; - (minix*) -diff -durN a/configure b/configure ---- a/configure 2015-08-05 05:20:32.000000000 -0400 -+++ b/configure 2017-02-07 09:58:52.883886426 -0500 -@@ -7869,7 +7869,7 @@ - cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= - ;; --(linux*|gnu*|mint*|k*bsd*-gnu) -+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) - - echo "$as_me:7874: checking if we must define _GNU_SOURCE" >&5 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 6bca143836..045625ae3b 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 ncurses-6.0.tar.gz +sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index e63b6e4aed..32ee085314 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCURSES_VERSION = 6.0 +NCURSES_VERSION = 6.1 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses From 2d020aeb60470c2ebf77cf10688e3d02cf0d3d4a Mon Sep 17 00:00:00 2001 From: Cam Hutchison Date: Mon, 16 Oct 2017 12:13:51 +1100 Subject: [PATCH 0017/2640] package/ncurses: add option to install extra terminfo files Add an option to ncurses to install extra user-configured terminfo files. By default, only a small number of vital terminfo files are installed on the target. This allows a build to specify the terminfo files it needs. Signed-off-by: Cam Hutchison [Thomas: qstrip the variable before using it.] Signed-off-by: Thomas Petazzoni --- package/ncurses/Config.in | 10 ++++++++++ package/ncurses/ncurses.mk | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index bb45bd8dc0..297b2ee415 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -23,4 +23,14 @@ config BR2_PACKAGE_NCURSES_TARGET_PROGS help Include ncurses programs in target (clear, reset, tput, ...) +config BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO + string "additional terminfo files to install" + help + Whitespace separated list of terminfo files to install on the + target. A small number of vital terminfo files are always + installed. This list is in addition to the vital ones. + + The terminfo filenames should have the single letter path + prefix. e.g. t/tmux. + endif diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 32ee085314..eccfbecb8b 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -63,7 +63,8 @@ NCURSES_TERMINFO_FILES = \ x/xterm+256color \ x/xterm-256color \ x/xterm-color \ - x/xterm-xfree86 + x/xterm-xfree86 \ + $(call qstrip,$(BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO)) ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec From aa33514beee68b919682f447bd07e89815083868 Mon Sep 17 00:00:00 2001 From: Steve Kenton Date: Mon, 22 Jan 2018 15:31:38 -0600 Subject: [PATCH 0018/2640] udftools: new package Signed-off-by: Steve Kenton [Thomas: add hash for the license file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/udftools/Config.in | 12 ++++++++++++ package/udftools/udftools.hash | 3 +++ package/udftools/udftools.mk | 12 ++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/udftools/Config.in create mode 100644 package/udftools/udftools.hash create mode 100644 package/udftools/udftools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 665fb653c7..d0605af387 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1693,6 +1693,7 @@ F: package/dvdrw-tools/ F: package/memtest86/ F: package/mjpegtools/ F: package/tovid/ +F: package/udftools/ F: package/xorriso/ N: Steve Thomas diff --git a/package/Config.in b/package/Config.in index 9cd5d9c087..5929cfea2d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -196,6 +196,7 @@ menu "Filesystem and flash utilities" source "package/squashfs/Config.in" source "package/sshfs/Config.in" source "package/sunxi-tools/Config.in" + source "package/udftools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" endmenu diff --git a/package/udftools/Config.in b/package/udftools/Config.in new file mode 100644 index 0000000000..bbccd60186 --- /dev/null +++ b/package/udftools/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_UDFTOOLS + bool "udftools" + depends on BR2_USE_WCHAR + select BR2_PACKAGE_READLINE + help + Tools for creating UDF filesystems + Maintained fork of the 2004 Sourcforge package + + https://github.com/pali/udftools + +comment "udftools needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/package/udftools/udftools.hash b/package/udftools/udftools.hash new file mode 100644 index 0000000000..837a515726 --- /dev/null +++ b/package/udftools/udftools.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 67fe428d452901215cfad8049d250540c97114b1a20dd63277b91c2c4fae8292 udftools-2.0.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/udftools/udftools.mk b/package/udftools/udftools.mk new file mode 100644 index 0000000000..708fef9ab7 --- /dev/null +++ b/package/udftools/udftools.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# udftools +# +################################################################################ + +UDFTOOLS_VERSION = 2.0 +UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION) +UDFTOOLS_LICENSE = GPL-2.0+ +UDFTOOLS_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) From 56057835f6b92f9a547892478ea2bf0165006602 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 8 Feb 2018 21:36:17 +0200 Subject: [PATCH 0019/2640] wget: bump to version 1.19.4 Update license hash; s/http/https/ of in-text URLs. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wget/wget.hash | 5 +++-- package/wget/wget.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 0048557946..ab0d1d1dfd 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,4 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d59a745ad2c522970660bb30d38601f9457b151b322e01fa20a5a0da0f55df07 wget-1.19.2.tar.lz +# https://ftp.gnu.org/gnu/wget/wget-1.19.4.tar.lz.sig +sha256 2fc0ffb965a8dc8f1e4a89cbe834c0ae7b9c22f559ebafc84c7874ad1866559a wget-1.19.4.tar.lz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 3fee8e1b0c..23e4c8acca 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.19.2 +WGET_VERSION = 1.19.4 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf From ab863898812a926f0ee687269c2e2ed61bc7adc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Thu, 8 Feb 2018 10:27:47 +0100 Subject: [PATCH 0020/2640] package/rauc: Version bump to 0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's a bug in 0.2 which prevents proper operation when activated via D-Bus, which is why I'm bumping this. Signed-off-by: Jan Kundrát Link: https://github.com/rauc/rauc/issues/125 Signed-off-by: Thomas Petazzoni --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 649d19571e..91d7c1d62e 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v0.2/rauc-0.2.tar.xz.asc -sha256 83aa3ac3716e1c29315162e3cbf5d4db79f26dd95efe1bc634bbce364b95491a rauc-0.2.tar.xz +# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc +sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4909062cf5..63fbc53022 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 0.2 +RAUC_VERSION = 0.3 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 62099784d40333079a811503bc4f5cd138d9f6ed Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 7 Feb 2018 16:23:53 -0500 Subject: [PATCH 0021/2640] qemu: add BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS Match the style used with other packages such as valgrind. Signed-off-by: Adam Duskett Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 71f38ef41f..b001dd9514 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -1,11 +1,15 @@ -config BR2_PACKAGE_HOST_QEMU - bool "host qemu" - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ +config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_armeb || BR2_aarch64 || \ BR2_i386 || BR2_m68k || BR2_microblazeel || \ BR2_microblazebe || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ BR2_sparc || BR2_x86_64 + +config BR2_PACKAGE_HOST_QEMU + bool "host qemu" + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \ if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE help From 2ab611c40ff08bd4a7922456fed22af6953af3b1 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 12:40:35 -0500 Subject: [PATCH 0022/2640] ncurses: fix build failure with ncurses 6.1 Ncurses 6.1 introduced the config option --disable-stripping which is set to no by default. Set this option to ensure that ncurses doesn't try to strip the executables. Fixes: http://autobuild.buildroot.net/results/3a5ddfcf7cd3a5c2bc068e3e33c823d6bcd3e79b Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/ncurses/ncurses.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index eccfbecb8b..90cf4a4dc5 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -25,6 +25,7 @@ NCURSES_CONF_OPTS = \ --enable-const \ --enable-overwrite \ --enable-pc-files \ + --disable-stripping \ --with-pkg-config-libdir="/usr/lib/pkgconfig" \ $(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \ --without-manpages From 24340922e66dcb96c5e574ab1a0e826a9661a64d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 6 Feb 2018 14:34:27 -0200 Subject: [PATCH 0023/2640] configs/wandboard: Bump U-Boot and kernel versions Bump U-Boot to 2018.01 version and kernel to 4.15.1. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index e6ba1d4e14..8f28b60ecf 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1" From c44cf5e98c9b02a2889e63b556ce78221d0e4110 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 6 Feb 2018 14:34:28 -0200 Subject: [PATCH 0024/2640] configs/wandboard: Add support for the rev D1 variants Since kernel 4.15 the wandboard rev D1 variants are supported. Add support for them. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 8f28b60ecf..b43c0c0e13 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -22,7 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" BR2_LINUX_KERNEL_INSTALL_TARGET=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From bea61a2fe1cb2e573d0f635b23cf0ceffa852fb8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 13:03:46 -0500 Subject: [PATCH 0025/2640] sngrep: bump to 1.4.5 Also add 0001-Fix-building-against-LibreSSL.patch to fix compiling against LibreSSL. This patch has been submitted and accepted upstream. https://github.com/irontec/sngrep/commit/0ee014d497986c40de264f6392b01fdf4e337fd5 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .../0001-Fix-building-against-LibreSSL.patch | 78 +++++++++++++++++++ package/sngrep/sngrep.hash | 6 +- package/sngrep/sngrep.mk | 2 +- 3 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 package/sngrep/0001-Fix-building-against-LibreSSL.patch diff --git a/package/sngrep/0001-Fix-building-against-LibreSSL.patch b/package/sngrep/0001-Fix-building-against-LibreSSL.patch new file mode 100644 index 0000000000..311f0b3d52 --- /dev/null +++ b/package/sngrep/0001-Fix-building-against-LibreSSL.patch @@ -0,0 +1,78 @@ +From 05d110ef57e9647b84c9656e746f72a76ea8c758 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 6 Feb 2018 12:47:43 -0500 +Subject: [PATCH] Fix building against LibreSSL + +LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most +changes from OpenSSL >= 1.1. + +To work around this: + +- Check to see if LIBRESSL_VERSION_NUMBER is defined. +- If so, define MODSSL_USE_OPENSSL_PRE_1_1_API. +- Change all checks for OPENSSL_VERSION_NUMBER < 0x10100000L to + '#if MODSSL_USE_OPENSSL_PRE_1_1_API' + +Upstream-Status: Committed +https://github.com/irontec/sngrep/commit/0ee014d497986c40de264f6392b01fdf4e337fd5 + +Signed-off-by: Adam Duskett +--- + src/capture_openssl.c | 6 +++--- + src/capture_openssl.h | 9 +++++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/capture_openssl.c b/src/capture_openssl.c +index 0a052c3..a4e1de0 100644 +--- a/src/capture_openssl.c ++++ b/src/capture_openssl.c +@@ -94,7 +94,7 @@ P_hash(const char *digest, unsigned char *dest, int dlen, unsigned char *secret, + + // Calculate enough data to fill destination + while (pending > 0) { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if MODSSL_USE_OPENSSL_PRE_1_1_API + HMAC_CTX hm; + HMAC_Init(&hm, secret, sslen, md); + HMAC_Update(&hm, tmpseed, tmpslen); +@@ -495,7 +495,7 @@ tls_process_record(struct SSLConnection *conn, const uint8_t *payload, + break; + case change_cipher_spec: + // From now on, this connection will be encrypted using MasterSecret +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if MODSSL_USE_OPENSSL_PRE_1_1_API + if (conn->client_cipher_ctx->cipher && conn->server_cipher_ctx->cipher) + conn->encrypted = 1; + #else +@@ -588,7 +588,7 @@ tls_process_record_handshake(struct SSLConnection *conn, const opaque *fragment, + // Decrypt PreMasterKey + clientkeyex = (struct ClientKeyExchange *) body; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if MODSSL_USE_OPENSSL_PRE_1_1_API + RSA_private_decrypt(UINT16_INT(clientkeyex->length), + (const unsigned char *) &clientkeyex->exchange_keys, + (unsigned char *) &conn->pre_master_secret, +diff --git a/src/capture_openssl.h b/src/capture_openssl.h +index 31f48ce..b3e88fe 100644 +--- a/src/capture_openssl.h ++++ b/src/capture_openssl.h +@@ -65,6 +65,15 @@ + #define OLD_OPENSSL_VERSION 1 + #endif + ++/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most ++ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...) ++ */ ++#if defined(LIBRESSL_VERSION_NUMBER) ++#define MODSSL_USE_OPENSSL_PRE_1_1_API (1) ++#else ++#define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#endif ++ + //! Three bytes unsigned integer + typedef struct uint16 { + unsigned char x[2]; +-- +2.14.3 + diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index cd2dff5536..16552cf5cd 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.4.4/sngrep-1.4.4.tar.gz.md5sum -md5 8e2286c2e23f4b29667025e5809dc303 sngrep-1.4.4.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.4.5/sngrep-1.4.5.tar.gz.md5sum +md5 11f1cdb8e8f3a3c9ef02ecd12268322e sngrep-1.4.5.tar.gz # Locally computed -sha256 2379b8b3e9498d426a0bc03b90d74170a80f98f167f89c126d53dcc66bc5f60b sngrep-v1.4.4.tar.gz +sha256 16f1566f4507ba560c7461cc7ff1c1653beb14b8baf7846269bbb4880564e57f sngrep-v1.4.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 7442cef529..4c9958d497 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = v1.4.4 +SNGREP_VERSION = v1.4.5 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION)) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE From 0cdf2fb747b1520f05776501455fc6a84ac20545 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 6 Feb 2018 20:35:05 +0100 Subject: [PATCH 0026/2640] tinycbor: bump to version 0.5.0 This version added support for shared or static library building through BUILD_STATIC and BUILD_SHARED variables so set them depending on BR2_xxx_LIBS variables Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinycbor/tinycbor.hash | 2 +- package/tinycbor/tinycbor.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index affc7a6e41..73ab82f528 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 37a06c618ccddd7edc3747277425fcd38fa71eab37c7aaf0b03818a49950da81 tinycbor-v0.4.2.tar.gz +sha256 5826a284e7f120a8d2c49cb581702be3e851acb4083a4f5af6112975a8b22209 tinycbor-v0.5.0.tar.gz sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index b1848b56aa..a9afbb6e46 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCBOR_VERSION = v0.4.2 +TINYCBOR_VERSION = v0.5.0 TINYCBOR_SITE = $(call github,intel,tinycbor,$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE @@ -18,6 +18,14 @@ endif TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +ifeq ($(BR2_STATIC_LIBS),y) +TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=1 +else ifeq ($(BR2_SHARED_LIBS),y) +TINYCBOR_MAKE_OPTS += BUILD_STATIC=0 BUILD_SHARED=1 +endif + # disabled parallel build because of build failures while # producing the .config file define TINYCBOR_BUILD_CMDS From e0e460df83865bb45567d5283e0f3528629a7050 Mon Sep 17 00:00:00 2001 From: Alex Baldwin Date: Thu, 8 Feb 2018 20:37:48 +0100 Subject: [PATCH 0027/2640] liblo : bump version to 0.29 Starting from version 0.28, C++ wrappers are provided as well. The configure script appropriately detects the availability of a C++ compiler so no Buildroot changes are needed for this. Building fails with --enable-ipv6 so --disable-ipv6 is needed in CONF_OPTS. This is known by liblo developers and building without ipv6 support is recomennded. Included hash for license files. Signed-off-by: Alex Baldwin [Thomas: use single sha256 hash for license file.] Signed-off-by: Thomas Petazzoni --- package/liblo/liblo.hash | 9 ++++++--- package/liblo/liblo.mk | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/liblo/liblo.hash b/package/liblo/liblo.hash index a4e01a6d73..fe61f82e67 100644 --- a/package/liblo/liblo.hash +++ b/package/liblo/liblo.hash @@ -1,3 +1,6 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.26/ -sha1 21942c8f19e9829b5842cb85352f98c49dfbc823 liblo-0.26.tar.gz -md5 5351de14262560e15e7f23865293b16f liblo-0.26.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.29/ +sha1 6aa69456787d3d6ef915281b4a0f8f2c79548ce3 liblo-0.29.tar.gz +md5 b0e70bc0fb2254addf94adddf85cffd3 liblo-0.29.tar.gz + +# Locally computed +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 3c852be7e3..14b0527966 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -4,11 +4,14 @@ # ################################################################################ -LIBLO_VERSION = 0.26 +LIBLO_VERSION = 0.29 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ LIBLO_LICENSE_FILES = COPYING LIBLO_INSTALL_STAGING = YES +# IPv6 support broken, issue known upstream +LIBLO_CONF_OPTS = --disable-ipv6 + $(eval $(autotools-package)) From 0a726eab68b4f8c8a760da049fd538fb35f4d201 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Feb 2018 17:14:47 -0200 Subject: [PATCH 0028/2640] libmbim: bump to version 1.16.0 Drop the patch already applied upstream. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...er-realpath-to-canonicalize_file_nam.patch | 37 ------------------- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch diff --git a/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch b/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch deleted file mode 100644 index 1a72b618af..0000000000 --- a/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b043b9b676e88a80e3d4013863c5e970fdde1df Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Mon, 11 Sep 2017 09:31:03 +0200 -Subject: [PATCH] mbim-device: prefer realpath() to canonicalize_file_name() - -Usually the canonicalize_file_name() GNU extension is preferred to the -POSIX realpath(), as it covers some of the limitations the latter has. -But this extension isn't available in lots of platforms or in other -c library implementations (e.g. musl), so just default to the POSIX -method to improve portability. - -Note that the check for canonicalize_file_name() availability during -configure isn't as trivial as adding a new AC_CHECK_FUNCS(), and -importing a gnulib module seems overkill just for this one liner. - -(cherry picked from commit 417b0b80023dc30d61c111ec0a54da2884d3a541) -Signed-off-by: Aleksander Morgado ---- - src/libmbim-glib/mbim-device.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c -index e1f32a6..20e64af 100644 ---- a/src/libmbim-glib/mbim-device.c -+++ b/src/libmbim-glib/mbim-device.c -@@ -867,7 +867,7 @@ get_descriptors_filepath (MbimDevice *self) - * /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.5/2-1.5:2.0 - */ - tmp = g_strdup_printf ("/sys/class/%s/%s/device", subsystems[i], device_basename); -- path = canonicalize_file_name (tmp); -+ path = realpath (tmp, NULL); - g_free (tmp); - - if (g_file_test (path, G_FILE_TEST_EXISTS)) { --- -2.13.1 - diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 664513e5c0..9734181a34 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 22cafe6b8432433aa58bedcf7db71111522ce6531bfe24e8e9b6058412cd31cf libmbim-1.14.2.tar.xz +sha256 c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2 libmbim-1.16.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index b67905a7fa..169cdc1dcd 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.14.2 +LIBMBIM_VERSION = 1.16.0 LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) From ebc1cfd248bfdd3d3a2f0a48ff3bc80b3acae95f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Feb 2018 17:15:04 -0200 Subject: [PATCH 0029/2640] libqmi: bump to version 1.20.0 Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1c54231a99..297e1f0fa2 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec libqmi-1.18.0.tar.xz +sha256 21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4 libqmi-1.20.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 08875649a6..a7140dc38c 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.18.0 +LIBQMI_VERSION = 1.20.0 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) From 2348e35cb3b72f95154e3a8801c358cc8311cd0f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Feb 2018 17:15:06 -0200 Subject: [PATCH 0030/2640] modem-manager: bump to version 1.6.12 Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index bc0804485f..8531330d22 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68 ModemManager-1.6.10.tar.xz +sha256 eefb7615c2c7ebc994abfc2782bfa9e798643a633362b40db96f7f61706a6283 ModemManager-1.6.12.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index b741acf066..100c4a2941 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.6.10 +MODEM_MANAGER_VERSION = 1.6.12 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From 441008a984be06d903618447ab273c706b64ec20 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Feb 2018 17:15:07 -0200 Subject: [PATCH 0031/2640] usb_modeswitch: bump to version 2.5.2 Also add license hash for "make legal-info". Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/usb_modeswitch/usb_modeswitch.hash | 3 ++- package/usb_modeswitch/usb_modeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index b202e6353a..3cbd370e2c 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633 usb-modeswitch-2.5.0.tar.bz2 +sha256 abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6 usb-modeswitch-2.5.2.tar.bz2 +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index c67d4cd583..8e6b433913 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.5.0 +USB_MODESWITCH_VERSION = 2.5.2 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb From f8cdb979c2bb8f71d9c24c3747fda3bfb0cb4ab1 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Feb 2018 17:15:09 -0200 Subject: [PATCH 0032/2640] usb_modeswitch_data: bump to version 20170806 Also add license hash for "make legal-info". Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/usb_modeswitch_data/usb_modeswitch_data.hash | 3 ++- package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.hash b/package/usb_modeswitch_data/usb_modeswitch_data.hash index e19fcac628..f35fd69a8b 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.hash +++ b/package/usb_modeswitch_data/usb_modeswitch_data.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1 usb-modeswitch-data-20170205.tar.bz2 +sha256 ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c usb-modeswitch-data-20170806.tar.bz2 +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk index 4f634cdaf4..80ecd33d85 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.mk +++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_DATA_VERSION = 20170205 +USB_MODESWITCH_DATA_VERSION = 20170806 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch From 73569ed6f8b66699b5d65dfb057dad3c99b56cae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Feb 2018 21:36:58 +0100 Subject: [PATCH 0033/2640] cjson: bump to version 1.7.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index ea2ecbb7e9..c72565d2bf 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 28ef8c069db19010b9af247b86b05f0f879ac914a4620997c3e5181465170b40 cjson-v1.7.1.tar.gz +sha256 e5101b6c0416d26b8ce2dd3fcdd779eacd93d765a1872789ba099a5f31a338e7 cjson-v1.7.2.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 88a33a2ce4..31d57e1f2b 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.7.1 +CJSON_VERSION = v1.7.2 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From 421ac4fafb3dd86e3e620f5bd8361478c73e8fe4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Feb 2018 21:37:17 +0100 Subject: [PATCH 0034/2640] rygel: bump to version 0.36.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rygel/rygel.hash | 4 ++-- package/rygel/rygel.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash index 028af21bb4..879cbd714b 100644 --- a/package/rygel/rygel.hash +++ b/package/rygel/rygel.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.36/rygel-0.36.0.sha256sum: -sha256 31e8ade78b4ea59978d1b59056fa5cd8aef6b9c1457d3dd06de4d2e75a01813f rygel-0.36.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.36/rygel-0.36.1.sha256sum: +sha256 a67fdd801f6e4121ae44cfffabc0f35fff487cab173b6c6f052449ad7b5fb820 rygel-0.36.1.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index cd8897ceb5..d1bc30589c 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -5,7 +5,7 @@ ################################################################################ RYGEL_VERSION_MAJOR = 0.36 -RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).0 +RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).1 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR) RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) From f91a2b3772a9fe978538adfe4db6fd2af687e922 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 7 Feb 2018 16:54:54 +0100 Subject: [PATCH 0035/2640] libgpiod: bump version to v1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a major update for libgpiod. The API is not compatible with the v0.x.y series but since nothing in current buildroot git depends on this project, I believe we can simply bump the version. The included tools are compatible with their 0.x.y counterparts. Signed-off-by: Bartosz Golaszewski Reviewed-by: Jan Kundrát Tested-by: Jan Kundrát Signed-off-by: Thomas Petazzoni --- package/libgpiod/libgpiod.hash | 2 +- package/libgpiod/libgpiod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index 73150dc9b9..a98e138fa4 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37 libgpiod-0.3.2.tar.xz +sha256 34c76b3730b9d4a1159bcb14000f78b1e890251b8a3823b794fa930654eabdd0 libgpiod-1.0.tar.xz diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index bc2e51d280..598adcc599 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPIOD_VERSION = 0.3.2 +LIBGPIOD_VERSION = 1.0 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ From 0552b7fc3878d7e446ee082f492845bc33594bba Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Wed, 7 Feb 2018 19:35:59 +0100 Subject: [PATCH 0036/2640] package/openssh: also install ssh-copy-id script This script is useful to copy SSH keys between client and server [1] and installed on most distributions (for example on debian: [2]). [1] https://www.ssh.com/ssh/copy-id [2] https://packages.debian.org/fr/jessie/armhf/openssh-client/filelist Signed-off-by: Julien BOIBESSOT Reviewed-by: "Yann E. MORIN" [Thomas: use full destination path.] Signed-off-by: Thomas Petazzoni --- package/openssh/openssh.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 6b7ac22c19..986bab413d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -73,4 +73,10 @@ define OPENSSH_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50sshd endef +define OPENSSH_INSTALL_SSH_COPY_ID + $(INSTALL) -D -m 755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +endef + +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SSH_COPY_ID + $(eval $(autotools-package)) From 58105f2df6696296ee70f1ae666d24d3163ce65a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 7 Feb 2018 09:52:15 -0500 Subject: [PATCH 0037/2640] busybox: bump to 1.28.0 Other changes: - Update 0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch for 1.28.0 - Remove upstream patches 3, 4, and 5. - Update buxybox.config and busybox-minimal.config Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...trip-non-l-arguments-returned-by-pkg.patch | 2 +- ...-per-arch-Makefile-before-Makefile.f.patch | 46 --------- ...rc-sparc64-Makefile-define-ARCH_FPIC.patch | 79 ---------------- ...httpd-fix-handling-of-range-requests.patch | 27 ------ package/busybox/busybox-minimal.config | 93 ++++++++++++------- package/busybox/busybox.config | 87 ++++++++++------- package/busybox/busybox.hash | 6 +- package/busybox/busybox.mk | 2 +- 8 files changed, 114 insertions(+), 228 deletions(-) delete mode 100644 package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch delete mode 100644 package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch delete mode 100644 package/busybox/0005-httpd-fix-handling-of-range-requests.patch diff --git a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index 105626cbe2..a5da3a251e 100644 --- a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -12,7 +12,7 @@ diff --git a/Makefile.flags b/Makefile.flags index 307afa7..885e323 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -141,7 +141,9 @@ ifeq ($(CONFIG_SELINUX),y) +@@ -153,7 +153,9 @@ ifeq ($(CONFIG_SELINUX),y) SELINUX_PC_MODULES = libselinux libsepol $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) CPPFLAGS += $(SELINUX_CFLAGS) diff --git a/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch b/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch deleted file mode 100644 index 610ca3992d..0000000000 --- a/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2c240f131ae5cc981702b45397be3b311c67a9ee Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 14 Jul 2017 22:23:46 +0200 -Subject: [PATCH] Makefile: include per-arch Makefile before Makefile.flags - -Makefile.flags contains: - -ARCH_FPIC ?= -fpic -ARCH_FPIE ?= -fpie - -However, arch/$(ARCH)/Makefile gets included *after* Makefile.flags, -and therefore doesn't get the chance to provide its own value. - -Fix this by including arch/$(ARCH)/Makefile *before* Makefile.flags. - -[Submitted upstream: http://lists.busybox.net/pipermail/busybox/2017-July/085632.html] -Signed-off-by: Thomas Petazzoni ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 971e68e..fe85070 100644 ---- a/Makefile -+++ b/Makefile -@@ -508,6 +508,8 @@ ifeq ($(dot-config),1) - # To avoid any implicit rule to kick in, define an empty command - .config .kconfig.d: ; - -+-include $(srctree)/arch/$(ARCH)/Makefile -+ - # Now we can define CFLAGS etc according to .config - include $(srctree)/Makefile.flags - -@@ -531,8 +533,6 @@ endif - # Defaults busybox but it is usually overridden in the arch makefile - all: busybox doc - ---include $(srctree)/arch/$(ARCH)/Makefile -- - # arch Makefile may override CC so keep this after arch Makefile is included - #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) - CHECKFLAGS += $(NOSTDINC_FLAGS) --- -2.9.4 - diff --git a/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch b/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch deleted file mode 100644 index b487035358..0000000000 --- a/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 43593d65827f4e7f848fc410321b0b2deed986fc Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 14 Jul 2017 21:54:37 +0200 -Subject: [PATCH] arch/{sparc,sparc64}/Makefile: define ARCH_FPIC - -Building Busybox on SPARC or SPARC64 with CONFIG_BUILD_LIBBUSYBOX=y -currently fails with: - -miscutils/lib.a(i2c_tools.o): In function `i2c_dev_open': -i2c_tools.c:(.text.i2c_dev_open+0x14): relocation truncated to fit: R_SPARC_GOT13 against `.LC0' -i2c_tools.c:(.text.i2c_dev_open+0x38): relocation truncated to fit: R_SPARC_GOT13 against symbol `bb_errno' defined in COMMON section in libbb/lib.a(ptr_to_globals.o) -i2c_tools.c:(.text.i2c_dev_open+0x6c): relocation truncated to fit: R_SPARC_GOT13 against `.LC1' -miscutils/lib.a(i2c_tools.o): In function `check_funcs_test_end': -i2c_tools.c:(.text.check_funcs_test_end+0x24): relocation truncated to fit: R_SPARC_GOT13 against `.LC2' -i2c_tools.c:(.text.check_funcs_test_end+0x2c): relocation truncated to fit: R_SPARC_GOT13 against `.LC3' -miscutils/lib.a(i2c_tools.o): In function `check_read_funcs': -i2c_tools.c:(.text.check_read_funcs+0x30): relocation truncated to fit: R_SPARC_GOT13 against `.LC10' -i2c_tools.c:(.text.check_read_funcs+0x80): relocation truncated to fit: R_SPARC_GOT13 against `.LC4' -i2c_tools.c:(.text.check_read_funcs+0x98): relocation truncated to fit: R_SPARC_GOT13 against `.LC5' -i2c_tools.c:(.text.check_read_funcs+0xc0): relocation truncated to fit: R_SPARC_GOT13 against `.LC6' -i2c_tools.c:(.text.check_read_funcs+0xe0): relocation truncated to fit: R_SPARC_GOT13 against `.LC7' -i2c_tools.c:(.text.check_read_funcs+0xf8): additional relocation overflows omitted from the output - -As stated by the gcc documentation, the SPARC architecture has a -limited GOT size, which prevents moderately large binaries to be built -with -fpic, and -fPIC is necessary. From gcc's documentation: - -'-fpic' - Generate position-independent code (PIC) suitable for use in a - shared library, if supported for the target machine. Such code - accesses all constant addresses through a global offset table - (GOT). The dynamic loader resolves the GOT entries when the - program starts (the dynamic loader is not part of GCC; it is part - of the operating system). If the GOT size for the linked - executable exceeds a machine-specific maximum size, you get an - error message from the linker indicating that '-fpic' does not - work; in that case, recompile with '-fPIC' instead. (These - maximums are 8k on the SPARC, 28k on AArch64 and 32k on the m68k - and RS/6000. The x86 has no such limit.) - -'-fPIC' - If supported for the target machine, emit position-independent - code, suitable for dynamic linking and avoiding any limit on the - size of the global offset table. This option makes a difference on - AArch64, m68k, PowerPC and SPARC. - -With a limit of 8KB on SPARC, we quickly reach this limit, and we hit -it when building Busybox on SPARC/SPARC64 with the -CONFIG_BUILD_LIBBUSYBOX=y option enabled. - -Therefore, this commit redefines ARCH_FPIC as -fPIC on sparc and -sparc64 to solve this issue. - -[Submitted upstream: http://lists.busybox.net/pipermail/busybox/2017-July/085633.html] -Signed-off-by: Thomas Petazzoni ---- - arch/sparc/Makefile | 1 + - arch/sparc64/Makefile | 1 + - 2 files changed, 2 insertions(+) - create mode 100644 arch/sparc/Makefile - create mode 100644 arch/sparc64/Makefile - -diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile -new file mode 100644 -index 0000000..4d6c5fb ---- /dev/null -+++ b/arch/sparc/Makefile -@@ -0,0 +1 @@ -+ARCH_FPIC = -fPIC -diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile -new file mode 100644 -index 0000000..4d6c5fb ---- /dev/null -+++ b/arch/sparc64/Makefile -@@ -0,0 +1 @@ -+ARCH_FPIC = -fPIC --- -2.9.4 - diff --git a/package/busybox/0005-httpd-fix-handling-of-range-requests.patch b/package/busybox/0005-httpd-fix-handling-of-range-requests.patch deleted file mode 100644 index b3ca32d75c..0000000000 --- a/package/busybox/0005-httpd-fix-handling-of-range-requests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2b400d9b2b7309d6e479102fc3ce646e893058a5 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Mon, 18 Sep 2017 13:09:11 +0200 -Subject: [PATCH] httpd: fix handling of range requests - -Signed-off-by: Denys Vlasenko -Signed-off-by: Peter Korsgaard ---- - networking/httpd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/networking/httpd.c b/networking/httpd.c -index e072f23c7..5e32fc936 100644 ---- a/networking/httpd.c -+++ b/networking/httpd.c -@@ -2337,7 +2337,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) - if (STRNCASECMP(iobuf, "Range:") == 0) { - /* We know only bytes=NNN-[MMM] */ - char *s = skip_whitespace(iobuf + sizeof("Range:")-1); -- if (is_prefixed_with(s, "bytes=") == 0) { -+ if (is_prefixed_with(s, "bytes=")) { - s += sizeof("bytes=")-1; - range_start = BB_STRTOOFF(s, &s, 10); - if (s[0] != '-' || range_start < 0) { --- -2.11.0 - diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 4130e6a8b6..a7aa19ea8a 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1,39 +1,39 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.1 -# Sun Jul 30 15:42:11 2017 +# Busybox version: 1.28.0 +# Wed Feb 7 09:47:09 2018 # CONFIG_HAVE_DOT_CONFIG=y # -# Busybox Settings +# Settings # # CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_LONG_OPTS=y # CONFIG_SHOW_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set +CONFIG_LFS=y # CONFIG_PAM is not set -CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" +CONFIG_BUSYBOX=y +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set CONFIG_PLATFORM_LINUX=y # @@ -43,14 +43,15 @@ CONFIG_STATIC=y # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +# CONFIG_USE_PORTABLE_CODE is not set # # Installation Options ("make install" behavior) @@ -77,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Busybox Library Tuning +# Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y @@ -144,7 +145,6 @@ CONFIG_BZCAT=y # CONFIG_UNLZMA is not set CONFIG_LZCAT=y # CONFIG_LZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set # CONFIG_UNXZ is not set CONFIG_XZCAT=y # CONFIG_XZ is not set @@ -164,8 +164,8 @@ CONFIG_FEATURE_GZIP_DECOMPRESS=y CONFIG_UNLZOP=y CONFIG_LZOPCAT=y # CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set # CONFIG_TAR is not set # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_FEATURE_TAR_CREATE is not set @@ -183,12 +183,14 @@ CONFIG_LZOPCAT=y # CONFIG_FEATURE_UNZIP_BZIP2 is not set # CONFIG_FEATURE_UNZIP_LZMA is not set # CONFIG_FEATURE_UNZIP_XZ is not set +# CONFIG_FEATURE_LZMA_FAST is not set # # Coreutils # CONFIG_BASENAME=y CONFIG_CAT=y +CONFIG_FEATURE_CATN=y CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -219,11 +221,8 @@ CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set # CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set # CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y @@ -261,12 +260,10 @@ CONFIG_SHA3SUM=y # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y # CONFIG_MKTEMP is not set CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y CONFIG_NICE=y CONFIG_NL=y CONFIG_NOHUP=y @@ -281,7 +278,6 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set CONFIG_SEQ=y CONFIG_SHRED=y # CONFIG_SHUF is not set @@ -320,6 +316,7 @@ CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" +CONFIG_BB_ARCH=y CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y @@ -387,6 +384,14 @@ CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_WHICH=y +# +# klibc-utils +# +# CONFIG_MINIPS is not set +CONFIG_NUKE=y +CONFIG_RESUME=y +CONFIG_RUN_INIT=y + # # Editors # @@ -456,6 +461,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # # Init Utilities @@ -489,12 +496,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set # CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 @@ -604,7 +609,6 @@ CONFIG_FEATURE_GETOPT_LONG=y # CONFIG_HD is not set CONFIG_XXD=y # CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IONICE is not set # CONFIG_IPCRM is not set @@ -644,7 +648,6 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set # CONFIG_NSENTER is not set -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -658,11 +661,15 @@ CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_LINUX32=y CONFIG_LINUX64=y CONFIG_SETPRIV=y +CONFIG_FEATURE_SETPRIV_DUMP=y +CONFIG_FEATURE_SETPRIV_CAPABILITIES=y +CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y # CONFIG_SETSID is not set CONFIG_SWAPON=y # CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWAPOFF=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set @@ -678,7 +685,11 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set @@ -692,6 +703,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set +CONFIG_FEATURE_VOLUMEID_MINIX=y # CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set @@ -724,6 +736,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_CROND is not set # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set # CONFIG_DC is not set @@ -746,6 +759,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +CONFIG_HEXEDIT=y # CONFIG_I2CGET is not set # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set @@ -777,6 +791,7 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +CONFIG_SETFATTR=y CONFIG_SETSERIAL=y # CONFIG_STRINGS is not set # CONFIG_TIME is not set @@ -872,6 +887,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" # CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y +# CONFIG_NETCAT is not set CONFIG_NC_SERVER=y # CONFIG_NC_EXTRA is not set # CONFIG_NC_110_COMPAT is not set @@ -899,11 +915,11 @@ CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set # CONFIG_TLS is not set # CONFIG_TRACEROUTE is not set @@ -922,13 +938,9 @@ CONFIG_WGET=y # CONFIG_FEATURE_WGET_OPENSSL is not set # CONFIG_WHOIS is not set # CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set @@ -936,11 +948,19 @@ CONFIG_UDHCPC=y # CONFIG_FEATURE_UDHCPC_ARPING is not set CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +# CONFIG_UDHCPC6 is not set +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set + +# +# Common options for DHCP applets +# # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # @@ -1020,13 +1040,11 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set # CONFIG_GETENFORCE is not set # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set # CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set # CONFIG_SESTATUS is not set # CONFIG_SETENFORCE is not set @@ -1081,17 +1099,19 @@ CONFIG_HUSH_TEST=y CONFIG_HUSH_HELP=y CONFIG_HUSH_EXPORT=y CONFIG_HUSH_EXPORT_N=y +CONFIG_HUSH_READONLY=y CONFIG_HUSH_KILL=y CONFIG_HUSH_WAIT=y CONFIG_HUSH_TRAP=y CONFIG_HUSH_TYPE=y +CONFIG_HUSH_TIMES=y CONFIG_HUSH_READ=y CONFIG_HUSH_SET=y CONFIG_HUSH_UNSET=y CONFIG_HUSH_ULIMIT=y CONFIG_HUSH_UMASK=y +CONFIG_HUSH_GETOPTS=y # CONFIG_HUSH_MEMLEAK is not set -# CONFIG_MSH is not set # # Options common to all shells @@ -1101,6 +1121,7 @@ CONFIG_FEATURE_SH_MATH_64=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set # diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 7753a861fd..38de13d4d9 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,39 +1,39 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.1 -# Sun Jul 30 15:27:03 2017 +# Busybox version: 1.28.0 +# Wed Feb 7 09:44:57 2018 # CONFIG_HAVE_DOT_CONFIG=y # -# Busybox Settings +# Settings # CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_LONG_OPTS=y CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y # CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set +CONFIG_LFS=y # CONFIG_PAM is not set -CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" +CONFIG_BUSYBOX=y +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set CONFIG_PLATFORM_LINUX=y # @@ -43,14 +43,15 @@ CONFIG_PLATFORM_LINUX=y # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +# CONFIG_USE_PORTABLE_CODE is not set # # Installation Options ("make install" behavior) @@ -77,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Busybox Library Tuning +# Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y @@ -144,7 +145,6 @@ CONFIG_BZCAT=y CONFIG_UNLZMA=y CONFIG_LZCAT=y CONFIG_LZMA=y -# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNXZ=y CONFIG_XZCAT=y CONFIG_XZ=y @@ -164,8 +164,8 @@ CONFIG_FEATURE_GZIP_DECOMPRESS=y CONFIG_UNLZOP=y CONFIG_LZOPCAT=y # CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_CREATE=y @@ -183,12 +183,14 @@ CONFIG_FEATURE_UNZIP_CDF=y CONFIG_FEATURE_UNZIP_BZIP2=y CONFIG_FEATURE_UNZIP_LZMA=y CONFIG_FEATURE_UNZIP_XZ=y +# CONFIG_FEATURE_LZMA_FAST is not set # # Coreutils # CONFIG_BASENAME=y CONFIG_CAT=y +CONFIG_FEATURE_CATN=y CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -219,11 +221,8 @@ CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set # CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set # CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y @@ -261,12 +260,10 @@ CONFIG_SHA3SUM=y # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MKTEMP=y CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y CONFIG_NICE=y CONFIG_NL=y CONFIG_NOHUP=y @@ -281,7 +278,6 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set CONFIG_SEQ=y CONFIG_SHRED=y # CONFIG_SHUF is not set @@ -320,6 +316,7 @@ CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" +CONFIG_BB_ARCH=y CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y @@ -391,6 +388,14 @@ CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_WHICH=y +# +# klibc-utils +# +# CONFIG_MINIPS is not set +CONFIG_NUKE=y +CONFIG_RESUME=y +CONFIG_RUN_INIT=y + # # Editors # @@ -460,6 +465,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # # Init Utilities @@ -493,12 +500,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set CONFIG_ADDGROUP=y -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 @@ -608,7 +613,6 @@ CONFIG_HEXDUMP=y # CONFIG_HD is not set CONFIG_XXD=y CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y # CONFIG_IONICE is not set CONFIG_IPCRM=y @@ -648,7 +652,6 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_MOUNTPOINT=y # CONFIG_NSENTER is not set -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y # CONFIG_RDEV is not set @@ -662,11 +665,15 @@ CONFIG_SETARCH=y CONFIG_LINUX32=y CONFIG_LINUX64=y CONFIG_SETPRIV=y +CONFIG_FEATURE_SETPRIV_DUMP=y +CONFIG_FEATURE_SETPRIV_CAPABILITIES=y +CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y CONFIG_SETSID=y CONFIG_SWAPON=y # CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWAPOFF=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set @@ -700,6 +707,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set +CONFIG_FEATURE_VOLUMEID_MINIX=y # CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set @@ -732,6 +740,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y CONFIG_DC=y @@ -754,6 +763,7 @@ CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +CONFIG_HEXEDIT=y CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y @@ -785,6 +795,7 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y @@ -880,6 +891,7 @@ CONFIG_NAMEIF=y # CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set # CONFIG_NC is not set +# CONFIG_NETCAT is not set # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set # CONFIG_NC_110_COMPAT is not set @@ -907,6 +919,7 @@ CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTPD is not set # @@ -915,7 +928,6 @@ CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set # CONFIG_TLS is not set CONFIG_TRACEROUTE=y @@ -934,13 +946,9 @@ CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_FEATURE_WGET_OPENSSL is not set # CONFIG_WHOIS is not set # CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set @@ -948,11 +956,19 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +# CONFIG_UDHCPC6 is not set +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set + +# +# Common options for DHCP applets +# # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # @@ -1032,13 +1048,11 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set # CONFIG_GETENFORCE is not set # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set # CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set # CONFIG_SESTATUS is not set # CONFIG_SETENFORCE is not set @@ -1093,17 +1107,19 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_EXPORT is not set # CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set +# CONFIG_HUSH_TIMES is not set # CONFIG_HUSH_READ is not set # CONFIG_HUSH_SET is not set # CONFIG_HUSH_UNSET is not set # CONFIG_HUSH_ULIMIT is not set # CONFIG_HUSH_UMASK is not set +# CONFIG_HUSH_GETOPTS is not set # CONFIG_HUSH_MEMLEAK is not set -# CONFIG_MSH is not set # # Options common to all shells @@ -1113,6 +1129,7 @@ CONFIG_FEATURE_SH_MATH_64=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set # diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 3e1956d0a0..4ca3936ada 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.27.2.tar.bz2.sign -md5 476186f4bab81781dab2369bfd42734e busybox-1.27.2.tar.bz2 -sha1 11669e223cc38de646ce26080e91ca29b8d42ad9 busybox-1.27.2.tar.bz2 +# From https://busybox.net/downloads/busybox-1.28.0.tar.bz2.sign +md5 b119b8decda796ab5cee5478dc9c642c busybox-1.28.0.tar.bz2 +sha1 a25e9a33e830e307c2a446ca234531049dd427f2 busybox-1.28.0.tar.bz2 # License files, locally calculated sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d0bbd3fd6e..73353baeda 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.27.2 +BUSYBOX_VERSION = 1.28.0 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 61addf9107e5369b6dbc77724ab0b0ecede74897 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 6 Feb 2018 16:48:49 -0800 Subject: [PATCH 0038/2640] glibc: needs host-bison Since upstream commit 1faaf7035cabda101e1d6653bff7a539f201db91 ("plural.c: improve reproducibility"), glibc now requires bison to be available on the host for its build process. This is needed starting with glibc 2.27. Fixes: http://autobuild.buildroot.net/results/ca4d883793c1674d3a052edd5e56897f79683448/ Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index b674191b22..00e114566c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,7 +28,7 @@ GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO # Before glibc is configured, we must have the first stage # cross-compiler and the kernel headers -GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk +GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk GLIBC_SUBDIR = build From fe563efcb1877d11753bf3acc19694bfdd0f63ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sat, 10 Feb 2018 10:59:11 +0100 Subject: [PATCH 0039/2640] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.15.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vincent Stehlé Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../aarch64-virt/{linux-4.13.config => linux-4.15.config} | 2 -- board/qemu/aarch64-virt/readme.txt | 2 +- configs/qemu_aarch64_virt_defconfig | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) rename board/qemu/aarch64-virt/{linux-4.13.config => linux-4.15.config} (97%) diff --git a/board/qemu/aarch64-virt/linux-4.13.config b/board/qemu/aarch64-virt/linux-4.15.config similarity index 97% rename from board/qemu/aarch64-virt/linux-4.13.config rename to board/qemu/aarch64-virt/linux-4.15.config index 93cb42f2ea..c9f2708ad5 100644 --- a/board/qemu/aarch64-virt/linux-4.13.config +++ b/board/qemu/aarch64-virt/linux-4.15.config @@ -1,6 +1,5 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y CONFIG_TASKSTATS=y @@ -10,7 +9,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_ARCH_VEXPRESS=y -CONFIG_SMP=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_BINFMT_MISC=y CONFIG_COMPAT=y diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt index 9e09d953f9..ce0b621366 100644 --- a/board/qemu/aarch64-virt/readme.txt +++ b/board/qemu/aarch64-virt/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.11.0 diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index c94c4ac773..3bafd90e5a 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.13.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.15.config" From 133a0a3b9e0ec743ac3e673e97a551e6be403c55 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 08:25:03 -0500 Subject: [PATCH 0040/2640] python-sqlalchemy: new package SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. It provides a full suite of well known enterprise-level persistence patterns, designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language. Signed-off-by: Adam Duskett Reviewed-by: Yegor Yefremov [Thomas: fix check-package warnings.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-sqlalchemy/Config.in | 13 +++++++++++++ package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++++ package/python-sqlalchemy/python-sqlalchemy.mk | 14 ++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/python-sqlalchemy/Config.in create mode 100644 package/python-sqlalchemy/python-sqlalchemy.hash create mode 100644 package/python-sqlalchemy/python-sqlalchemy.mk diff --git a/DEVELOPERS b/DEVELOPERS index d0605af387..f859ebe984 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -52,6 +52,7 @@ F: package/libsepol/ F: package/nginx-naxsi/ F: package/policycoreutils/ F: package/python-mutagen/ +F: package/python-sqlalchemy/ F: package/restorecond/ F: package/refpolicy/ F: package/selinux-python/ diff --git a/package/Config.in b/package/Config.in index 5929cfea2d..6bd95e3bf0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -919,6 +919,7 @@ menu "External python modules" source "package/python-socketio/Config.in" source "package/python-sortedcontainers//Config.in" source "package/python-spidev/Config.in" + source "package/python-sqlalchemy/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-sqlalchemy/Config.in b/package/python-sqlalchemy/Config.in new file mode 100644 index 0000000000..f7ec3a6ad4 --- /dev/null +++ b/package/python-sqlalchemy/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SQLALCHEMY + bool "python-sqlalchemy" + help + SQLAlchemy is the Python SQL toolkit and Object Relational + Mapper that gives application developers the full power and + flexibility of SQL. + + It provides a full suite of well known enterprise-level + persistence patterns, designed for efficient and + high-performing database access, adapted into a simple and + Pythonic domain language. + + http://www.sqlalchemy.org diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash new file mode 100644 index 0000000000..9e13a2f20f --- /dev/null +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/SQLAlchemy/json, sha256 locally computed +md5 968e07dc0aa92f9205bb3877f33f498f SQLAlchemy-1.2.2.tar.gz +sha256 64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d SQLAlchemy-1.2.2.tar.gz +sha256 73bda3d7d6c568f494c1d12520a97d41a38b7ce91d88c21f1b469b747b17f7fd LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk new file mode 100644 index 0000000000..c0023712a2 --- /dev/null +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sqlalchemy +# +################################################################################ + +PYTHON_SQLALCHEMY_VERSION = 1.2.2 +PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz +PYTHON_SQLALCHEMY_SITE = https://pypi.python.org/packages/b9/fb/a56d2fc0ce3571328fa872734ad124cae25a4cea422088987f865fb71787 +PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_SQLALCHEMY_LICENSE = MIT +PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 0bfaedca37e8f4c68cbfa72d227b2c4074bbe57d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 6 Feb 2018 08:25:04 -0500 Subject: [PATCH 0041/2640] python-flask-sqlalchemy: new package Flask-SQLAlchemy is a Flask microframework extension which adds support for the SQLAlchemy SQL toolkit/ORM. Signed-off-by: Adam Duskett Reviewed-by: Yegor Yefremov [Thomas: fix check-package warnings.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-flask-sqlalchemy/Config.in | 9 +++++++++ .../python-flask-sqlalchemy.hash | 4 ++++ .../python-flask-sqlalchemy.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-flask-sqlalchemy/Config.in create mode 100644 package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash create mode 100644 package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk diff --git a/DEVELOPERS b/DEVELOPERS index f859ebe984..293bd73797 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -51,6 +51,7 @@ F: package/libsemanage/ F: package/libsepol/ F: package/nginx-naxsi/ F: package/policycoreutils/ +F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ F: package/python-sqlalchemy/ F: package/restorecond/ diff --git a/package/Config.in b/package/Config.in index 6bd95e3bf0..19dda8aad9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -775,6 +775,7 @@ menu "External python modules" source "package/python-flask-babel/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" + source "package/python-flask-sqlalchemy/Config.in" source "package/python-flup/Config.in" source "package/python-futures/Config.in" source "package/python-gobject/Config.in" diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in new file mode 100644 index 0000000000..fa4a035110 --- /dev/null +++ b/package/python-flask-sqlalchemy/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY + bool "python-flask-sqlalchemy" + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + help + Flask-SQLAlchemy is a Flask microframework extension which + adds support for the SQLAlchemy SQL toolkit/ORM. + + http://github.com/mitsuhiko/flask-sqlalchemy diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash new file mode 100644 index 0000000000..9e15b5d8f0 --- /dev/null +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/Flask-SQLAlchemy/json, sha256 locally computed +md5 373ce61dfd03b593ad2eaba68c9fee35 Flask-SQLAlchemy-2.3.2.tar.gz +sha256 5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53 Flask-SQLAlchemy-2.3.2.tar.gz +sha256 de2011f25501c45f2b78bfa4f851ce021cfbab0f1e7ab763233688e0b969821f PKG-INFO diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk new file mode 100644 index 0000000000..37fe603f1e --- /dev/null +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-sqlalchemy +# +################################################################################ + +PYTHON_FLASK_SQLALCHEMY_VERSION = 2.3.2 +PYTHON_FLASK_SQLALCHEMY_SOURCE = Flask-SQLAlchemy-$(PYTHON_FLASK_SQLALCHEMY_VERSION).tar.gz +PYTHON_FLASK_SQLALCHEMY_SITE = https://pypi.python.org/packages/3a/66/f5ace276517c075f102457dd2f7d8645b033758f9c6effb4e0970a90fec1 +PYTHON_FLASK_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3c +PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) From 3c19c81d60f758a1011aa49135181e8621a02508 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 12 Feb 2018 12:27:48 -0500 Subject: [PATCH 0042/2640] json-for-modern-cpp: fix license hash Fixes: http://autobuild.buildroot.net/results/942485b94f21567c2f35a1a3cc62450f3461a4f9 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index b2abe49700..04a520d7d7 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 b20be343922f73504baf8a01543c2a42d16e01f18bb231b324a8959416ccf4f8 json-v3.1.0.tar.gz -sha256 6a6115fc4a7239a135f2dce8d33f94cb8a936b8f608ac0f6699fbac278b0dd5b LICENSE.MIT +sha256 7b875bb7a4e28abb7956ea821b4b7d88ff6a2a4fabf261c3993730a365ec56dd LICENSE.MIT From 27562c2bf3871e7d5f3b64717b07f2a7230b542b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sat, 10 Feb 2018 23:04:27 +0100 Subject: [PATCH 0043/2640] configs/amarula_vyasa_rk3288: uboot needs pylibfdt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For this platform, u-boot uses dtoc during the build, which needs Python libfdt. Set the corresponding option TARGET_UBOOT_NEEDS_PYLIBFDT in the defconfig. Signed-off-by: Vincent Stehlé Cc: Jagan Teki Signed-off-by: Thomas Petazzoni --- configs/amarula_vyasa_rk3288_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index a020b353b9..4cd46e79de 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -13,6 +13,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y From 879fa7f82a86ffdc6d1cf7c9bfbb5cf830583d69 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Feb 2018 22:06:33 +0100 Subject: [PATCH 0044/2640] systemd: allow to build with uClibc toolchains We need to disable any systemd parts using either IDN, NSS or gshadow. IDN is only disabled in C library function call to getnameinfo(), it does not effect libidn/libidn2 usage in systemd. Tested with qemu-system-arm. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 3 +++ package/systemd/systemd.mk | 11 +++++++++++ system/Config.in | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 661f40dee4..81eee96c57 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -190,6 +190,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y help nss-myhostname is a plug-in module for the GNU Name Service @@ -245,6 +246,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED config BR2_PACKAGE_SYSTEMD_RESOLVED bool "enable resolve daemon" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y help systemd-resolved is a system service that provides network @@ -278,6 +280,7 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs gshadow.h help systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1c31ebb34c..a6c4b338e9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -48,6 +48,17 @@ SYSTEMD_CONF_OPTS += \ -Dmount-path=/usr/bin/mount \ -Dumount-path=/usr/bin/umount +# disable unsupported features for non-glibc toolchains +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +SYSTEMD_CONF_OPTS += \ + -Didn=true \ + -Dnss-systemd=true +else +SYSTEMD_CONF_OPTS += \ + -Didn=false \ + -Dnss-systemd=false +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true diff --git a/system/Config.in b/system/Config.in index d48cf8d8c4..7b36516cc7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -127,7 +127,7 @@ config BR2_INIT_SYSV config BR2_INIT_SYSTEMD bool "systemd" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SSP @@ -137,8 +137,8 @@ config BR2_INIT_SYSTEMD select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD -comment "systemd needs a glibc toolchain, headers >= 3.10" - depends on !(BR2_TOOLCHAIN_USES_GLIBC \ +comment "systemd needs a glibc or uClibc toolchain, headers >= 3.10" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC \ && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10) config BR2_INIT_NONE From 1063e9ef80e2c4ac6c71518fc661381b42bcdd24 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Feb 2018 23:11:26 +0100 Subject: [PATCH 0045/2640] cjson: bump to version 1.7.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index c72565d2bf..c75854d2ac 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e5101b6c0416d26b8ce2dd3fcdd779eacd93d765a1872789ba099a5f31a338e7 cjson-v1.7.2.tar.gz +sha256 726a60137ab1aa6784dc575bf7d4c92f5367e937739c8bffcddce79071cf5f50 cjson-v1.7.3.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 31d57e1f2b..08020c48f6 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.7.2 +CJSON_VERSION = v1.7.3 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From 26e0186b5f41821dd7aec04d2d583e1c4b5afaad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Feb 2018 17:51:06 +0100 Subject: [PATCH 0046/2640] package/ffmpeg: bump version to 3.4.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index cdf740834b..a8092616a9 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0 ffmpeg-3.4.1.tar.xz +sha256 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 ffmpeg-3.4.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 76c31f5f52..5d2f89fb43 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.4.1 +FFMPEG_VERSION = 3.4.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 9f869e7358e64a6076fb9387bf219d602cee7159 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 12 Feb 2018 20:25:13 +0100 Subject: [PATCH 0047/2640] package/htop: bump to 2.1.0 No upstream hash provided with this release [1]. Add licence file hash. [1] http://www.freelists.org/post/htop/ANN-htop-210 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/htop/htop.hash | 6 +++--- package/htop/htop.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/htop/htop.hash b/package/htop/htop.hash index cfea23f99b..5419d767a3 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,3 +1,3 @@ -# Hashes from: http://www.freelists.org/post/htop/ANN-htop-202 -md5 7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz -sha1 201f793f13dce2448e36047079875b9bd5bba75a htop-2.0.2.tar.gz +# Locally calculated +sha256 3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748 htop-2.1.0.tar.gz +sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index d06e4a56d0..71889557ca 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 2.0.2 +HTOP_VERSION = 2.1.0 HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses # Prevent htop build system from searching the host paths From 9b22578afec87d64a289d0bc014aa41583858407 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Feb 2018 17:52:36 +0100 Subject: [PATCH 0048/2640] package/lib{va, va-intel-driver, va-utils}: bump version to 2.1.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-intel-driver/libva-intel-driver.hash | 4 ++-- package/libva-intel-driver/libva-intel-driver.mk | 2 +- package/libva-utils/libva-utils.hash | 4 ++-- package/libva-utils/libva-utils.mk | 2 +- package/libva/libva.hash | 4 ++-- package/libva/libva.mk | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 4ffc60cab5..dbe5d67fb4 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,5 +1,5 @@ # From https://github.com/01org/intel-vaapi-driver/releases -sha1 19e83c084a404817263c04371c42345b617900ff intel-vaapi-driver-2.0.0.tar.bz2 +sha1 a40c6bd89b71b547986bf9f9fa2533bb50cf269e intel-vaapi-driver-2.1.0.tar.bz2 # Locally computed -sha256 10f6b0a91f34715d8d4d9a9e0fb3cc0afe5fcf85355db1272bd5fff31522f469 intel-vaapi-driver-2.0.0.tar.bz2 +sha256 ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf intel-vaapi-driver-2.1.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index 0255038b0a..dd1903024f 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 2.0.0 +LIBVA_INTEL_DRIVER_VERSION = 2.1.0 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/01org/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 3429fb53a6..46674a3675 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,5 @@ # From https://github.com/01org/libva-utils/releases -sha1 b4dc39459f8539c1ea16e7ca957a853fb7735ec4 libva-utils-2.0.0.tar.bz2 +sha1 9902eb944c3ace00be4fe95627708f156fc5ace7 libva-utils-2.1.0.tar.bz2 # Locally computed -sha256 a921df31311d8f49d2e392a5fc2a068d79f89aeb588309fbff24365310dbc5f6 libva-utils-2.0.0.tar.bz2 +sha256 f6a7790c3dcc56537372c90a83036a3136194a8b397e84e97bf9cc9254fa2c51 libva-utils-2.1.0.tar.bz2 sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 275d599606..85ee3083fd 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.0.0 +LIBVA_UTILS_VERSION = 2.1.0 LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 LIBVA_UTILS_SITE = https://github.com/01org/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) LIBVA_UTILS_LICENSE = MIT diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 1736575447..ed707095f0 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ # From https://github.com/01org/libva/releases -sha1 762a49f8925ca1d0531c5071afbd629ffea93b90 libva-2.0.0.tar.bz2 +sha1 9ecde2b6c9deda16e895a0b00b8aef3a765acb4c libva-2.1.0.tar.bz2 # Locally computed -sha256 bb0601f9a209e60d8d0b867067323661a7816ff429021441b775452b8589e533 libva-2.0.0.tar.bz2 +sha256 f3fa953a11d3210c3a4ee79031abdbe0863d5ce13d9b3f93f315f1eec60a4b0f libva-2.1.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 8d1e27f270..79956a9d8e 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.0.0 +LIBVA_VERSION = 2.1.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/01org/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT From b99ca5ce3243cf06c45917bd07872aaf00d25e0a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Feb 2018 14:27:49 +0200 Subject: [PATCH 0049/2640] musl: add more kernel headers guards Kernel version 4.15 (not 4.16 as the musl commit log claims) allows disabling of more parts of the kernel headers definitions. Add upstream musl patch that defines the relevant macros. This solves issues of networking related symbols redefinition in kernel headers that cause headers conflicts. With that in place a subsequent commit will limit the musl/kernel headers conflict avoidance workaround in Buildroot to kernel headers older than 4.15. This workaround has been introduced in commit 196932cd91 (toolchain: workaround musl/kernel headers conflict). Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...api-guards-for-Linux-kernel-header-f.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch diff --git a/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch b/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch new file mode 100644 index 0000000000..cbfc9b668f --- /dev/null +++ b/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch @@ -0,0 +1,69 @@ +From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 6 Jan 2018 23:32:52 +0100 +Subject: [PATCH] add additional uapi guards for Linux kernel header files + +With Linux kernel 4.16 it will be possible to guard more parts of the +Linux header files from a libc. Make use of this in musl to guard all +the structures and other definitions from the Linux header files which +are also defined by the header files provided by musl. This will make +it possible to compile source files which include both the libc +headers and the kernel userspace headers. + +This extends the definitions done in commit 04983f227238 ("make +netinet/in.h suppress clashing definitions from kernel headers") + +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit b583c5d3b4cc + + include/net/if.h | 7 +++++++ + include/netinet/if_ether.h | 1 + + include/sys/xattr.h | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/include/net/if.h b/include/net/if.h +index 2f2fcc10e484..774cbff0b506 100644 +--- a/include/net/if.h ++++ b/include/net/if.h +@@ -125,6 +125,13 @@ struct ifconf { + #define ifc_req ifc_ifcu.ifcu_req + #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) + ++#define __UAPI_DEF_IF_IFCONF 0 ++#define __UAPI_DEF_IF_IFMAP 0 ++#define __UAPI_DEF_IF_IFNAMSIZ 0 ++#define __UAPI_DEF_IF_IFREQ 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #endif + + #ifdef __cplusplus +diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h +index d9a131aa2d1d..97134d75b480 100644 +--- a/include/netinet/if_ether.h ++++ b/include/netinet/if_ether.h +@@ -133,5 +133,6 @@ do { \ + (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ + } while(0) + ++#define __UAPI_DEF_ETHHDR 0 + + #endif +diff --git a/include/sys/xattr.h b/include/sys/xattr.h +index 6479fcc62e5f..eeeaafc44f09 100644 +--- a/include/sys/xattr.h ++++ b/include/sys/xattr.h +@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); + int lremovexattr(const char *, const char *); + int fremovexattr(int, const char *); + ++#define __UAPI_DEF_XATTR 0 ++ + #ifdef __cplusplus + } + #endif +-- +2.15.1 + From 6afee03e3cc3b9afa4861cc0a9bbc6be03a16be8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Feb 2018 14:27:50 +0200 Subject: [PATCH 0050/2640] toolchain: limit musl/kernel headers conflict workaround The musl/kernel headers workaround was added in commit 196932cd91 (toolchain: workaround musl/kernel headers conflict) to fix definition collisions in networking related headers between musl headers and kernel headers. Kernel headers from version 4.15 and newer do not need this workaround anymore since kernel commit c0bace798436bc (uapi libc compat: add fallback for unsupported libcs). The C library does not have to define the __GLIBC__ macro to make the __UAPI_DEF_* macros effective. Updated the comment to accordingly. Tested with the xl2tp package. This package fails to build with older kernel headers without the workaround (struct in_pktinfo redefinition, among others). With 4.15 headers, xl2tp builds fine with this patch applied. That is, no workaround needed. Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- toolchain/toolchain/toolchain.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index b55b0c712c..179c09edf1 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -13,18 +13,18 @@ endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc -# headers and kernel headers. This is a temporary measure until musl finds a -# better solution. +# headers and kernel headers. This is needed for kernel headers older than +# 4.15. Kernel headers 4.15 and newer don't require __GLIBC__ to be defined. # # Augment the original suggestion with __USE_MISC since recent kernels -# require this glibc internal macro. Also, as musl defines IFF_LOWER_UP, -# IFF_DORMANT and IFF_ECHO, add another macro to suppress them in the -# kernel header, and avoid macro/enum conflict. +# (older than 4.15) require this glibc internal macro. Also, as musl defines +# IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO, add another macro to suppress +# them in the kernel header, and avoid macro/enum conflict. # # Kernel version 3.12 introduced the libc-compat.h header. # # [1] http://www.openwall.com/lists/musl/2015/10/08/2 -ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12),yy) +ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15),yy:) define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK $(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \ $(STAGING_DIR)/usr/include/linux/libc-compat.h From 65a7e82c891e967c4dd96678be72b8acf16a0127 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Feb 2018 15:46:47 +0200 Subject: [PATCH 0051/2640] iproute2: bump to version 4.15.0 Keep the musl workaround patch for now, even though libc-compat.h has been updated from kernel v4.15. To take advantage of the new libc-compat.h we need a newer or patched version of musl. The workaround patch will be removed once musl is updated, and external autobuilders toolchains are rebuilt. Cc: Petr Vorel Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index e9b8a0ef26..630447cc71 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 iproute2-4.14.1.tar.xz +sha256 48d4616a99d7b609b7b795c0ae8ec57099fb0271ed89253e8772c02327798355 iproute2-4.15.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 15bb132c50..11db7d2c6e 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.14.1 +IPROUTE2_VERSION = 4.15.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 5c5f274601902c9faa585233b774a5926b6105ce Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sun, 11 Feb 2018 18:56:48 +0300 Subject: [PATCH 0052/2640] configs/orange-pi-zero-plus2: bump kernel and u-boot versions Bump versions: - use U-Boot 2008.01 - use Linux kernel v4.15.2 Drop patch with dts sdcard fix since it has been merged to Linux v4.15. Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...ange-pi-zero-plus2-fix-sdcard-detect.patch | 30 ------------------- configs/orangepi_zero_plus2_defconfig | 11 +++---- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch deleted file mode 100644 index 203402932b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f88e9301948173dd35afad4a6939092c7f269aed Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Fri, 3 Nov 2017 22:58:54 +0300 -Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: fix sdcard detect - -The sdcard detect pin on orange-pi-zero-plus2 is pulled up. -Fix cd-gpio description to enable sdcard detect. - -Signed-off-by: Sergey Matyukevich -Signed-off-by: Maxime Ripard ---- - arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -index b6b7a56..a42fd79 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -@@ -71,7 +71,7 @@ - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; - status = "okay"; - }; - --- -1.9.1 - diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 5b1ff3500c..7906dba5c7 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,11 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# Patch dir -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches" +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -20,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -34,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" From 53ae154c77228b36d1d9ae0cad057de8879ad2bc Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sun, 11 Feb 2018 18:56:49 +0300 Subject: [PATCH 0053/2640] configs/orange-pi-zero-plus2: enable WiFi support Orange-Pi Zero Plus2 board has AP6212 WiFi/BT combo, but does not have ethernet port. So it makes sense to enable wireless networking by default: - add DTS patch enabling AP6212 WiFi/BT combo support -- this patch is on its way to mainline Linux v4.16 - enable WiFi support in kernel config - enable Broadcom brcmfmac kernel driver in kernel config - add Broadcom wireless firmware package to image - add basic wireless tools to image - add mdev to image to enable module autoloading - add rootfs overlay with proper NVRAM file for on-board AP6212 chip Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- .../orangepi-zero-plus2/linux-extras.config | 10 +++ ...s-orange-pi-zero-plus2-enable-ap6212.patch | 73 +++++++++++++++++++ .../lib/firmware/brcm/brcmfmac43430-sdio.txt | 54 ++++++++++++++ configs/orangepi_zero_plus2_defconfig | 17 ++++- 4 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 board/orangepi/orangepi-zero-plus2/linux-extras.config create mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch create mode 100644 board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt diff --git a/board/orangepi/orangepi-zero-plus2/linux-extras.config b/board/orangepi/orangepi-zero-plus2/linux-extras.config new file mode 100644 index 0000000000..52b4b4b29e --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/linux-extras.config @@ -0,0 +1,10 @@ +# wireless core +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_CFG80211_WEXT=y + +# wireless drivers +CONFIG_WLAN=y +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_BRCMFMAC=m diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch new file mode 100644 index 0000000000..282e2171f2 --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch @@ -0,0 +1,73 @@ +From: Sergey Matyukevich +Date: Sun, 11 Feb 2018 16:21:43 +0300 +Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT combo + +Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board: +- WiFi SDIO interface is connected to MMC1 +- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq +- WiFi HOST_WAKE pin connected to gpio PL7 +- BT is connected to UART1 + +Signed-off-by: Sergey Matyukevich +Signed-off-by: Maxime Ripard +--- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 32 ++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +index a42fd79a62a3..d415b7b67cce 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +@@ -64,6 +64,13 @@ + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ pinctrl-names = "default"; ++ reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ ++ post-power-on-delay-ms = <200>; ++ }; + }; + + &mmc0 { +@@ -75,6 +82,25 @@ + status = "okay"; + }; + ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins_a>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ interrupt-parent = <&r_pio>; ++ interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>; /* PL7 */ ++ interrupt-names = "host-wake"; ++ }; ++}; ++ + &mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; +@@ -90,3 +116,9 @@ + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; + }; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ status = "okay"; ++}; +-- +2.16.1 + diff --git a/board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt b/board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt new file mode 100644 index 0000000000..8f0bf69063 --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt @@ -0,0 +1,54 @@ +#AP6212_NVRAM_V1.0_20140603 +# 2.4 GHz, 20 MHz BW mode + +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0726 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0726 +boardrev=0x1101 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +xtalfreq=26000 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz, measured at CHIP OUTPUT +pa2ga0=-168,7161,-820 +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=90 +txpwrbckof=6 +cckbw202gpo=0x5555 +legofdmbw202gpo=0x77777777 +mcsbw202gpo=0xaaaaaaaa + +# OFDM IIR : +ofdmdigfilttype=7 +# PAPD mode: +papdmode=2 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +#OOB parameters +hostwake=0x40 +hostrdy=0x41 +usbrdy=0x03 +usbrdydelay=100 +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x10 for Host awake +muxenab=0x10 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 + diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 7906dba5c7..5ca6cf0fe2 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,8 +2,10 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches" +BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -35,6 +37,19 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" + +# wireless firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y + +# wireless tools +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" From 6320325eba253935f53e75e8ed365ad704d2b443 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 9 Feb 2018 12:28:47 +0200 Subject: [PATCH 0054/2640] keepalived: bump to version 1.4.1 Add license file hash. Cc: Ilias Apalodimas Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/keepalived/keepalived.hash | 3 ++- package/keepalived/keepalived.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 5d33c5be00..4590c33ef9 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048 keepalived-1.3.5.tar.gz +sha256 220407517ccad822d1ffa80f7bc37582abaf97da6f7bda2326fa6904b1855bd0 keepalived-1.4.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 59d3cb5cfb..6d3d8e7cc6 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 1.3.5 +KEEPALIVED_VERSION = 1.4.1 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt KEEPALIVED_LICENSE = GPL-2.0+ From 18f33eee21d3ca947cf8a6b5c150bb29e8f711dc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 10 Feb 2018 20:27:46 +0100 Subject: [PATCH 0055/2640] libupnp: bump to version 1.6.25 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 929e5c42e7..e52b7ea9d7 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7d83d79af3bb4062e5c3a58bf2e90d2da5b8b99e2b2d57c23b5b6f766288cf96 libupnp-1.6.24.tar.bz2 +sha256 c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43 libupnp-1.6.25.tar.bz2 sha256 0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd LICENSE diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index c7085c2148..8831885ba4 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.24 +LIBUPNP_VERSION = 1.6.25 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no From ca0e6272008dfc5e90f3f5a0de5eaa4d345b122e Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 7 Feb 2018 22:38:09 -0200 Subject: [PATCH 0056/2640] liburiparser: bump to version 0.8.5 and move to GitHub uriparser 0.8.5 with bugfixes has been released. It has also moved from SourceForge to GitHub: https://uriparser.github.io/ Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/liburiparser/Config.in | 2 +- package/liburiparser/liburiparser.hash | 6 ++---- package/liburiparser/liburiparser.mk | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/liburiparser/Config.in b/package/liburiparser/Config.in index e85a2626d2..b39e3907dd 100644 --- a/package/liburiparser/Config.in +++ b/package/liburiparser/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBURIPARSER uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. - http://uriparser.sourceforge.net + https://uriparser.github.io diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 9e9517c17f..c03e832f9f 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,5 +1,3 @@ -# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.4/ -md5 9aabdc3611546f553f4af372167de6d6 uriparser-0.8.4.tar.bz2 -sha1 7a1948c20bed54b04dad0e1d7d2fa8f80fc7b2b3 uriparser-0.8.4.tar.bz2 # Locally calculated -sha256 c6ef125800c2ef13a41a22126bfc77e8b8c08993a6b96196117695988ea76249 COPYING +sha256 58eacd5c03d9e341c04eb0b30831faec89f3b415949ff8d72254e63432352cdd uriparser-0.8.5.tar.bz2 +sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 856a6aafd4..4b32b7f7f2 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.8.4 +LIBURIPARSER_VERSION = 0.8.5 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 -LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION) +LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING LIBURIPARSER_INSTALL_STAGING = YES From 4081ee424a8a6d4d965d683437a28c72ceb9b90c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Feb 2018 07:58:34 +0200 Subject: [PATCH 0057/2640] iproute2: fix build with uclibc-ng ublibc-ng does not provide PF_VSOCK/AF_VSOCK definitions. Add them locally until ucblibc-ng updates its headers. Fixes: http://autobuild.buildroot.net/results/3d5/3d5a29e3c61ff071628c2937844ea4156059b3dd/ Cc: Petr Vorel Cc: Waldemar Brodkorb Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...-local-PF_VSOCK-AF_VSOCK-definitions.patch | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch diff --git a/package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch b/package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch new file mode 100644 index 0000000000..bbd1f45de9 --- /dev/null +++ b/package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch @@ -0,0 +1,58 @@ +From ca5562864f3c45557ee96a6fd6036150066c6b58 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 15 Feb 2018 07:39:52 +0200 +Subject: [PATCH] ss: add local PF_VSOCK/AF_VSOCK definitions + +uclibc-ng does not provide these definitions yet. Add them locally to +fix the build. + +Increase AF_MAX to cover AF_VSOCK. + +Signed-off-by: Baruch Siach +--- +Upstream status: not upstreamable. uclibc-ng needs to update its Linux +socket.h. +--- + misc/ss.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/misc/ss.c b/misc/ss.c +index 29a250704c2d..b3f289ae358e 100644 +--- a/misc/ss.c ++++ b/misc/ss.c +@@ -50,6 +50,14 @@ + #define BUF_CHUNK (1024 * 1024) + #define LEN_ALIGN(x) (((x) + 1) & ~1) + ++#ifndef PF_VSOCK ++#define PF_VSOCK 40 ++#endif ++ ++#ifndef AF_VSOCK ++#define AF_VSOCK PF_VSOCK ++#endif ++ + #define DIAG_REQUEST(_req, _r) \ + struct { \ + struct nlmsghdr nlh; \ +@@ -298,7 +306,7 @@ static const struct filter default_dbs[MAX_DB] = { + }, + }; + +-static const struct filter default_afs[AF_MAX] = { ++static const struct filter default_afs[AF_MAX+1] = { + [AF_INET] = { + .dbs = INET_DBM, + .states = SS_CONN, +@@ -383,7 +391,7 @@ static void filter_merge_defaults(struct filter *f) + if (!(default_dbs[db].families & f->families)) + f->families |= default_dbs[db].families; + } +- for (af = 0; af < AF_MAX; af++) { ++ for (af = 0; af < AF_MAX+1; af++) { + if (!(f->families & FAMILY_MASK(af))) + continue; + +-- +2.15.1 + From 7e469bb64641e510f7ebae4b31e537e3997fa6ef Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Feb 2018 14:57:17 +0100 Subject: [PATCH 0058/2640] sunxi-mali-mainline: new package Add Allwinner Mali openGL userspace driver r6p2. Used combined with kernelspace Mali driver, it gives possibility to use 3D openGL SoC acceleration. It provides fbdev libraries and headers. It is compatible with Linux >= 4.4 as sunxi-mali-driver-mainline. [Peter: Move version logic to Config.in, ensure directories exists] Signed-off-by: Giulio Benetti Reviewed-by: Maxime Ripard Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/sunxi-mali-mainline/Config.in | 40 +++++++++++++++++++ package/sunxi-mali-mainline/egl.pc | 12 ++++++ package/sunxi-mali-mainline/glesv2.pc | 12 ++++++ .../sunxi-mali-mainline.mk | 34 ++++++++++++++++ 6 files changed, 102 insertions(+) create mode 100644 package/sunxi-mali-mainline/Config.in create mode 100644 package/sunxi-mali-mainline/egl.pc create mode 100644 package/sunxi-mali-mainline/glesv2.pc create mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk diff --git a/DEVELOPERS b/DEVELOPERS index 293bd73797..1b14927228 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -730,6 +730,9 @@ F: package/ocrad/ F: package/tesseract-ocr/ F: package/webp/ +N: Giulio Benetti +F: package/sunxi-mali-mainline/ + N: Gregory Dymarek F: package/ding-libs/ F: package/gengetopt/ diff --git a/package/Config.in b/package/Config.in index 19dda8aad9..87c55e227b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -504,6 +504,7 @@ endmenu source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" source "package/sunxi-mali/Config.in" + source "package/sunxi-mali-mainline/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in new file mode 100644 index 0000000000..759bed86ba --- /dev/null +++ b/package/sunxi-mali-mainline/Config.in @@ -0,0 +1,40 @@ +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline" + depends on BR2_arm + depends on BR2_ARM_EABIHF + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries. + + https://github.com/free-electrons/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_MAINLINE + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-mainline" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-mainline" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "r6p2" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + +endif + +comment "sunxi-mali needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-mainline/egl.pc new file mode 100644 index 0000000000..3854e5ff58 --- /dev/null +++ b/package/sunxi-mali-mainline/egl.pc @@ -0,0 +1,12 @@ +prefix=/usr/ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: egl +Description: ARM Mali implementation of EGL +Version: 1.4 +Requires: +Libs: -L${libdir} -lEGL -lGLESv2 +Cflags: -I${includedir} + diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-mainline/glesv2.pc new file mode 100644 index 0000000000..6910b46a70 --- /dev/null +++ b/package/sunxi-mali-mainline/glesv2.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: glesv2 +Description: ARM Mali implementation of OpenGL ESv2 +Version: 2.0 +Requires: +Libs: -L${libdir} -lGLESv2 -lGLESv1_CM +Cflags: -I${includedir} + diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk new file mode 100644 index 0000000000..933e2beb0d --- /dev/null +++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# sunxi-mali-mainline +# +################################################################################ + +SUNXI_MALI_MAINLINE_VERSION = cb3e8ece9b2c3a70cbeb3204cd6f30eceaa32023 +SUNXI_MALI_MAINLINE_SITE = $(call github,free-electrons,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) +SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES +SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles + +SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) + +define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/include/* \ + $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/fbdev/lib/lib_fb_dev/* \ + $(TARGET_DIR)/usr/lib/ +endef + +$(eval $(generic-package)) From 4fdf2d642b8d1a7fcabf1a995887c33581fa7aad Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Feb 2018 14:57:52 +0100 Subject: [PATCH 0059/2640] sunxi-mali-mainline-driver: new package Add allwinner mali kernel driver package. Used in combination with userspace Allwinner openGL libraries, it gives possibility to use 3D openGL SoC acceleration. [Peter: Rename to sunxi-mali-mainline-driver. Use revision selection from sunxi-mali-mainline package. Depend on that package and default to y if dependencies are met. Tweak Linux config] Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + linux/linux.mk | 3 +++ package/Config.in | 1 + package/sunxi-mali-mainline-driver/Config.in | 25 ++++++++++++++++++ .../sunxi-mali-mainline-driver.mk | 26 +++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 package/sunxi-mali-mainline-driver/Config.in create mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1b14927228..e2b3901425 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -732,6 +732,7 @@ F: package/webp/ N: Giulio Benetti F: package/sunxi-mali-mainline/ +F: package/sunxi-mali-mainline-driver/ N: Gregory Dymarek F: package/ding-libs/ diff --git a/linux/linux.mk b/linux/linux.mk index 5300b9cfc5..776304e730 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -291,6 +291,9 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK,$(@D)/.config)) + $(if $(BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER), + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA,$(@D)/.config)) $(if $(BR2_PACKAGE_IPTABLES), $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER,$(@D)/.config) diff --git a/package/Config.in b/package/Config.in index 87c55e227b..97317fdb5f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -505,6 +505,7 @@ endmenu source "package/sunxi-cedarx/Config.in" source "package/sunxi-mali/Config.in" source "package/sunxi-mali-mainline/Config.in" + source "package/sunxi-mali-mainline-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in new file mode 100644 index 0000000000..c939d2a957 --- /dev/null +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -0,0 +1,25 @@ +comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" + depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver" + default y + depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_LINUX_KERNEL + select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra + help + This package builds and installs the Linux kernel driver for + the Mali GPU on Allwinner platforms, compatible with recent + Linux kernels (>= 4.4). Note that it should be installed + together with the corresponding userspace OpenGL libraries, + which are provided as binaries only at: + https://github.com/free-electrons/mali-blobs + + sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + with the following options enabled: + + - CONFIG_CMA + - CONFIG_DMA_CMA + + https://github.com/mripard/sunxi-mali/blob/master/README.md diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk new file mode 100644 index 0000000000..e4871c0bf0 --- /dev/null +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# sunxi-mali-mainline-driver +# +################################################################################ + +SUNXI_MALI_MAINLINE_DRIVER_VERSION = 42c7c139c14103a83bb2ad7e7a1f0ed491f96500 +SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) +SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux + +SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ + KDIR=$(LINUX_DIR) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + INSTALL_MOD_PATH=$(TARGET_DIR) + +define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -b +endef + +define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -i +endef + +$(eval $(generic-package)) From 1d339809d61aeed2911291830581f643596a2e5c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Feb 2018 17:33:48 +0100 Subject: [PATCH 0060/2640] sunxi-mali-mainline-driver: bump version For 4.15 support and various fixes. This version now uses quilt to apply patches, which is not a required dependency of Buildroot - So add a POST_PATCH hook to change it to use apply-patches.sh instead. git shortlog --invert-grep --grep travis --no-merges 42c7c139c14103a83bb2ad7e7a1f0ed491f96500.. Giulio Benetti (7): Fix bulding driver twice. Fix 0014-mali-Make-devfreq-optional.patch Add unapply_patches function in build.sh Fix 0013-mali-support-building-against-4.15.patch Add clean option to build.sh Add parallel building by default and -j option to override jobs number. Add 0015 parallel build patch to quilt series Jonathan Liu (2): Add note about FRONTBUFFER_LOCKING environment variable Fix Qt capitalization and add link to website Maxime Ripard (12): mali: Fix build in 4.15 mali: Make reserved memory optional as it should be mali: sunxi: Set platform bus type right after device allocation mali: Make devfreq optional mali: Actually fix the build build: Treat patch and make failures as errors build: Make patch return immediately on error build: Make sure that we're building a supported release README: fix the casing of sunXi README: Talk about triple buffering build: Switch to quilt patches: Move version-specific patches to their directory Signed-off-by: Peter Korsgaard --- .../sunxi-mali-mainline-driver.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index e4871c0bf0..9123c42947 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = 42c7c139c14103a83bb2ad7e7a1f0ed491f96500 +SUNXI_MALI_MAINLINE_DRIVER_VERSION = e752ddc8c4b9f2b9b9c6d193e2ba354caf8707f5 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux @@ -13,6 +13,14 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ CROSS_COMPILE=$(TARGET_CROSS) \ INSTALL_MOD_PATH=$(TARGET_DIR) +define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES + define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -b From eaa81347ad383ed7da5dcd2f9abf4299281cf863 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 15 Feb 2018 21:44:13 +0100 Subject: [PATCH 0061/2640] libostree: bump to version 2018.2 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 54bc263f06..6ae4824007 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8b5e3b80425b91c93aeb916bb047ee194aa138a9cf00ce173dcc0ebc0dd11f4b libostree-2018.1.tar.xz +sha256 37661de4a0ac73af5d921f494f17dd052ae2844111ba7c5aaeb1cbc4aae94bea libostree-2018.2.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 336d11a978..236657e9fa 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.1 +LIBOSTREE_VERSION = 2018.2 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From fd5762538680e9d0c15b80b5da4109a24630e6a8 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 19 Feb 2018 06:30:31 -0800 Subject: [PATCH 0062/2640] libite: bump version to 2.0.1 Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/libite/libite.hash | 2 +- package/libite/libite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index ec894c5e00..437127d15c 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 18c087123f02cc3cfb612bf53b12dc8a94d4d3ebf015ed5937b1f9203eef72f8 libite-v1.9.2.tar.gz +sha256 39a4c12af30a38a813fac7c8d7512efb3692f910eba9c697a50ce0203e039dad libite-v2.0.1.tar.gz sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 chomp.c sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d pidfile.c diff --git a/package/libite/libite.mk b/package/libite/libite.mk index e88060d1dc..02ea948ef2 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = v1.9.2 +LIBITE_VERSION = v2.0.1 LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION)) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c From c8e60ff15eacc496eae053a93e15e5c0d8f284e7 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 19 Feb 2018 06:30:32 -0800 Subject: [PATCH 0063/2640] inadyn: bump version to 2.3 Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/inadyn/inadyn.hash | 6 +++--- package/inadyn/inadyn.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index c6c062ce15..742b6f226f 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,5 +1,5 @@ -# From https://github.com/troglobit/inadyn/releases/download/v2.2.1/inadyn-2.2.1.tar.xz.md5 -md5 8f7796ee45b2a2e282a54a2d31d03953 inadyn-2.2.1.tar.xz +# From https://github.com/troglobit/inadyn/releases/download/v2.3/inadyn-2.3.tar.xz.md5 +md5 63efb284b7f3f389c01bad19ee28407e inadyn-2.3.tar.xz # Locally computed -sha256 e7a74fcf8b7c069990940c0dc4d4d18071005be225667fdfcfa4156c44384579 inadyn-2.2.1.tar.xz +sha256 4a98b80d8565b9e4cb32b19b7a8b06a22a7d9a6f4f03a5298a8d441b6187c760 inadyn-2.3.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 5eac3b5c3a..0b1f82dae8 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.2.1 +INADYN_VERSION = 2.3 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz INADYN_LICENSE = GPL-2.0+ From 576437cdb197afdd3e6c2200a16da73943c8c050 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 19 Feb 2018 02:27:18 -0500 Subject: [PATCH 0064/2640] go: bump to 1.10 This commit bumps the Go programming language to the 1.10 release. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 445a0b7c20..73c1578d0b 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,2 +1,2 @@ # From https://golang.org/dl/ -sha256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 go1.9.src.tar.gz +sha256 f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24 go1.10.src.tar.gz diff --git a/package/go/go.mk b/package/go/go.mk index 23facbdd81..4d55e16cc3 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.9 +GO_VERSION = 1.10 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From e10f1eb5b1309366a8309f2c0d63dd5a755f7fd8 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Wed, 21 Feb 2018 06:17:36 -0800 Subject: [PATCH 0065/2640] libite: update path for license files Two of the license files have moved in the source package. Update the package to reflect these changes. Fixes: http://autobuild.buildroot.net/results/8fd71513f021652a9a4ff2354dd5fe4fedf3d557 http://autobuild.buildroot.net/results/6a1ab663f1093351662ca7b86c9224a630798f35 http://autobuild.buildroot.net/results/066373da2da2cc8c0c22cc4a3048d1b187c9c389 http://autobuild.buildroot.net/results/edad6ac5d3f61257e99b90c6f54d4d6786aa7ad7 http://autobuild.buildroot.net/results/c2b72c2a32de949a5b1ab46d6d7c540353cfaf5e http://autobuild.buildroot.net/results/8635ca4bbec464d196846a4018d1228d6651b211 Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/libite/libite.hash | 4 ++-- package/libite/libite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 437127d15c..7ef9dca57a 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Locally calculated sha256 39a4c12af30a38a813fac7c8d7512efb3692f910eba9c697a50ce0203e039dad libite-v2.0.1.tar.gz sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE -sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 chomp.c -sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d pidfile.c +sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 src/chomp.c +sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 02ea948ef2..a128953c7a 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -7,7 +7,7 @@ LIBITE_VERSION = v2.0.1 LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION)) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause -LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c +LIBITE_LICENSE_FILES = LICENSE src/chomp.c src/pidfile.c LIBITE_INSTALL_STAGING = YES LIBITE_AUTORECONF = YES From 4de24dc4a9a8f9e2aec09764d608f37635e220a9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 20 Feb 2018 13:22:08 +0100 Subject: [PATCH 0066/2640] sunxi-mali-mainline-driver: set parallel build according to buildroot sunxi-mali-mainline-driver builds using parallel compilation by default, using -j $(nproc), but this could be not wanted. Pass -j $(PARALLEL_JOBS) to build using jobs configured in buildroot. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- .../sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index 9123c42947..cde76e2655 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -23,12 +23,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i endef $(eval $(generic-package)) From 8b8f664a94dc4b34543591da1bb6fcd0de21fcbe Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 22 Feb 2018 14:12:03 +0100 Subject: [PATCH 0067/2640] linux-firmware: add firmware for ath10k QCA6174 module Signed-off-by: Erik Larsson Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index f93561ee14..4e77a3f9a3 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -83,6 +83,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X help Firmware files for the Atheros QCA988X module +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 + bool "Atheros 10k (QCA6174)" + help + Firmware files for the Atheros QCA6174 module + config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 82680937aa..a6fd8ebba4 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -143,6 +143,14 @@ LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif +# ath10k-qca6174 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174),y) +LINUX_FIRMWARE_FILES += ath10k/QCA6174/hw3.0/board.bin \ + ath10k/QCA6174/hw3.0/firmware-4.bin \ + ath10k/QCA6174/hw3.0/firmware-6.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +endif + # sd8686 v8 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8),y) LINUX_FIRMWARE_FILES += libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin From e1a8cdca5d5990ded69ebf521a4a4aa325fe1f6c Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Fri, 23 Feb 2018 10:52:00 +0100 Subject: [PATCH 0068/2640] iptables: bump to version 1.6.2 Also removed a patch fixing the build with musl as it made its way into the 1.6.2 version. Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- ...-nfsynproxy-fix-build-with-musl-libc.patch | 44 ------------------- package/iptables/iptables.hash | 6 +-- package/iptables/iptables.mk | 2 +- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch diff --git a/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch b/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch deleted file mode 100644 index 1f86ad1354..0000000000 --- a/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 06e0312d0bfd1f0b9e7c23ab654f18524d49e86b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 2 Mar 2017 09:20:48 +0200 -Subject: [PATCH] utils: nfsynproxy: fix build with musl libc - -The musl libc exposes some struct tcphdr field only when _GNU_SOURCE is -defined. Fix the following build failure: - -nfsynproxy.c: In function ‘parse_packet’: -nfsynproxy.c:34:9: error: ‘const struct tcphdr’ has no member named ‘syn’ - if (!th->syn || !th->ack) - ^ -nfsynproxy.c:34:21: error: ‘const struct tcphdr’ has no member named ‘ack’ - if (!th->syn || !th->ack) - ^ -nfsynproxy.c:42:8: error: ‘const struct tcphdr’ has no member named ‘res2’ - if (th->res2 == 0x1) - ^ -nfsynproxy.c:45:13: error: ‘const struct tcphdr’ has no member named ‘doff’ - length = th->doff * 4 - sizeof(*th); - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: pending (http://patchwork.ozlabs.org/patch/734503/) - - utils/nfsynproxy.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/nfsynproxy.c b/utils/nfsynproxy.c -index baedc92c5d9f..bf5c416340f1 100644 ---- a/utils/nfsynproxy.c -+++ b/utils/nfsynproxy.c -@@ -6,6 +6,7 @@ - * published by the Free Software Foundation. - */ - -+#define _GNU_SOURCE - #include - #include - #include --- -2.11.0 - diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index b673c8abdb..8b191797fb 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.1.tar.bz2.{md5sum,sha1sum} -md5 ab38a33806b6182c6f53d6afb4619add iptables-1.6.1.tar.bz2 -sha1 b2592490ca7a6c2cd0f069e167a4337c86acdf91 iptables-1.6.1.tar.bz2 +# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.2.tar.bz2.{md5sum,sha1sum} +md5 7d2b7847e4aa8832a18437b8a4c1873d iptables-1.6.2.tar.bz2 +sha1 6279effbf8f2c7ff53d19ae13308f8a6e6a60dd9 iptables-1.6.2.tar.bz2 diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 44cfde2b9a..49a537f608 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.6.1 +IPTABLES_VERSION = 1.6.2 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_INSTALL_STAGING = YES From 382fe9f9261812682eab2d35e47aa94dc554380e Mon Sep 17 00:00:00 2001 From: Simon van der Veldt Date: Wed, 21 Feb 2018 20:53:16 +0100 Subject: [PATCH 0069/2640] linux: allow both in-tree and custom dts files For some boards, for example the Raspberry Pi, it's necessary to build in-tree dts files as well as custom/out of tree dts-files (dt-blob.bin). The existing logic made these two options exclusive, this commit changes that to allow both in-tree as well as custom sources for dts files. Signed-off-by: Simon van der Veldt [Arnout: re-wrap help, add extra empty line, change = into +=] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 19 +++++++------------ linux/linux.mk | 8 +++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 1bc8171291..80e85b9e8b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -363,10 +363,6 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT config BR2_LINUX_KERNEL_APPENDED_DTB bool -choice - prompt "Device tree source" - default BR2_LINUX_KERNEL_USE_INTREE_DTS - config BR2_LINUX_KERNEL_USE_INTREE_DTS bool "Use a device tree present in the kernel" help @@ -374,14 +370,6 @@ config BR2_LINUX_KERNEL_USE_INTREE_DTS the kernel sources. The dts files are located in the arch//boot/dts folder. -config BR2_LINUX_KERNEL_USE_CUSTOM_DTS - bool "Use a custom device tree file" - help - Use a custom device tree file, i.e, a device - tree file that does not belong to the kernel - source tree. -endchoice - config BR2_LINUX_KERNEL_INTREE_DTS_NAME string "Device Tree Source file names" depends on BR2_LINUX_KERNEL_USE_INTREE_DTS @@ -390,6 +378,13 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME the trailing .dts. You can provide a list of dts files to build, separated by spaces. +config BR2_LINUX_KERNEL_USE_CUSTOM_DTS + bool "Use a custom device tree file" + help + Use a custom device tree file, i.e, a device + tree file that does not belong to the kernel + source tree. + config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Device Tree Source file paths" depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS diff --git a/linux/linux.mk b/linux/linux.mk index 776304e730..ab940e7305 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -119,13 +119,15 @@ endif LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y) -KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) -else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y) +KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) +endif + +ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y) # We keep only the .dts files, so that the user can specify both .dts # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -KERNEL_DTS_NAME = $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) endif KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME)) From 2759ba039790cd15892bafbd140b34c1b63e299e Mon Sep 17 00:00:00 2001 From: Alex Baldwin Date: Sun, 25 Feb 2018 15:40:33 +0100 Subject: [PATCH 0070/2640] liblo: disable werror to fix build issues Pass the --disable-werror option to remove -Werror, and therefore avoid a number of build failures. Fixes: http://autobuild.buildroot.net/results/61ab7e23d2ef62f055efc74a998e3c108a3cdb43 Signed-off-by: Alex Baldwin Signed-off-by: Thomas Petazzoni --- package/liblo/liblo.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 14b0527966..c7d163dae2 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -12,6 +12,9 @@ LIBLO_LICENSE_FILES = COPYING LIBLO_INSTALL_STAGING = YES # IPv6 support broken, issue known upstream -LIBLO_CONF_OPTS = --disable-ipv6 +# werror - not needed for release. +LIBLO_CONF_OPTS += \ + --disable-ipv6 \ + --disable-werror $(eval $(autotools-package)) From e44ae2afe7f39240ce5c17a104f73f3b4e492b64 Mon Sep 17 00:00:00 2001 From: Alex Baldwin Date: Sun, 25 Feb 2018 15:40:34 +0100 Subject: [PATCH 0071/2640] liblo: link with libatomic when available liblo uses atomic builtins that are only available inside libatomic on some architectures, so link with it when available. Fixes: http://autobuild.buildroot.net/results/c8bed3a3fa7d2b2258f573cbfcb01af07419e0bf/ Signed-off-by: Alex Baldwin Signed-off-by: Thomas Petazzoni --- package/liblo/liblo.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index c7d163dae2..7845c68ff2 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -17,4 +17,10 @@ LIBLO_CONF_OPTS += \ --disable-ipv6 \ --disable-werror +# Liblo uses atomic builtins, so we need to link with libatomic for +# the architectures who explicitly need libatomic. +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBLO_CONF_ENV += LIBS="-latomic" +endif + $(eval $(autotools-package)) From cc526b428bb6f1e35ce9165f94e6f2fd306a37c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 22 Feb 2018 17:49:04 -0500 Subject: [PATCH 0072/2640] pkgconf: pkg-config.in: double quote $@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The shell expands "$@" as "$1" "$2" "$3"... while it expands $@ as $1 $2 $3. With the second form, we loses spaces in positional parameters. As example, the following call pkg-config --cflags "one two" three is wrapped as pkgconf --cflags one two three while we are expecting pkgconf --cflags "one two" three "$@" is really useful when writing wrappers. It passes the positional arguments *as* they are given. Double quote $@ to prevent from splitting elements. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/pkgconf/pkg-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in index b9ce0935cc..9387931ff2 100644 --- a/package/pkgconf/pkg-config.in +++ b/package/pkgconf/pkg-config.in @@ -2,4 +2,4 @@ PKGCONFDIR=$(dirname $0) DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@ -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ $@ +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ "$@" From cc2f3a2a5924934b14a078d914ad3c4d731f3e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 22 Feb 2018 17:49:05 -0500 Subject: [PATCH 0073/2640] pkgconf: pkg-config.in: exec pkgconf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the shell script with pkgconf without creating a new process. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/pkgconf/pkg-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in index 9387931ff2..99c0add8fb 100644 --- a/package/pkgconf/pkg-config.in +++ b/package/pkgconf/pkg-config.in @@ -2,4 +2,4 @@ PKGCONFDIR=$(dirname $0) DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@ -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ "$@" +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@" From ee5efb464418fb31c6c96434f4ede4f83f8afb0c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 24 Feb 2018 12:12:14 +0100 Subject: [PATCH 0074/2640] package/mesa3d-demos: bump to 8.4.0 Use the new upstream url. Added all hashes provided by upstream. Rebase patch on top of 8.4.0 and convert it to git formated patch. Add a comment above "MESA3D_DEMOS_AUTORECONF = YES" See https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...-makes-opengl-an-optional-component.patch} | 56 ++++++++++++------- package/mesa3d-demos/mesa3d-demos.hash | 7 ++- package/mesa3d-demos/mesa3d-demos.mk | 5 +- 3 files changed, 43 insertions(+), 25 deletions(-) rename package/mesa3d-demos/{0001-demos-optional-gl.patch => 0001-demos-makes-opengl-an-optional-component.patch} (52%) diff --git a/package/mesa3d-demos/0001-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch similarity index 52% rename from package/mesa3d-demos/0001-demos-optional-gl.patch rename to package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index 6470e9d8d9..b328fca810 100644 --- a/package/mesa3d-demos/0001-demos-optional-gl.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,12 +1,22 @@ -This patches makes opengl an optional component. +From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 +From: Spenser Gilliland +Date: Sat, 24 Feb 2018 11:36:17 +0100 +Subject: [PATCH] demos: makes opengl an optional component Signed-off-by: Spenser Gilliland +[Romain: convert to git patch, rebase on 8.4.0] +Signed-off-by: Romain Naour --- -Index: mesa3d-demos-8.1.0/configure.ac -=================================================================== ---- mesa3d-demos-8.1.0.orig/configure.ac -+++ mesa3d-demos-8.1.0/configure.ac -@@ -51,6 +51,14 @@ + configure.ac | 12 +++++++++++- + src/egl/opengl/Makefile.am | 2 ++ + src/util/Makefile.am | 2 ++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0b5e9a76..24298c44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) PKG_PROG_PKG_CONFIG() @@ -21,7 +31,7 @@ Index: mesa3d-demos-8.1.0/configure.ac dnl Get the pkg-config definitions for libGL. We include a fallback dnl path for GL implementation that don't provide a .pc file PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -113,6 +121,8 @@ +@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" @@ -30,7 +40,7 @@ Index: mesa3d-demos-8.1.0/configure.ac AC_ARG_ENABLE([egl], [AS_HELP_STRING([--enable-egl], [enable EGL library @<:@default=auto@:>@])], -@@ -303,7 +313,7 @@ +@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) AC_SUBST([WAYLAND_CFLAGS]) AC_SUBST([WAYLAND_LIBS]) @@ -39,29 +49,30 @@ Index: mesa3d-demos-8.1.0/configure.ac AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am -+++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -@@ -50,12 +50,14 @@ +diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am +index 6d184ff6..219ab850 100644 +--- a/src/egl/opengl/Makefile.am ++++ b/src/egl/opengl/Makefile.am +@@ -56,6 +56,7 @@ endif endif if HAVE_EGL +if HAVE_GL + bin_PROGRAMS = \ + eglinfo noinst_PROGRAMS = \ - eglinfo \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) +@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ + $(EGL_X11_DEMOS) \ + $(EGL_WL_DEMOS) endif +endif egltri_x11_SOURCES = egltri.c eglgears_x11_SOURCES = eglgears.c -Index: mesa3d-demos-8.1.0/src/util/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/util/Makefile.am -+++ mesa3d-demos-8.1.0/src/util/Makefile.am +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index 759a293a..012b9c75 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am @@ -27,7 +27,9 @@ AM_CFLAGS = \ AM_LDFLAGS = \ $(DEMO_LIBS) @@ -72,3 +83,6 @@ Index: mesa3d-demos-8.1.0/src/util/Makefile.am if HAVE_GLUT AM_CFLAGS += \ +-- +2.14.3 + diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index a50a3a1e0c..8a771df2f8 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,2 +1,5 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000191.html -sha256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef mesa-demos-8.3.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html +md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 +sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 +sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 +sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index cbc15c3b69..52a1e2420a 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,9 +4,10 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.3.0 +MESA3D_DEMOS_VERSION = 8.4.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA3D_DEMOS_VERSION) +MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos +# 0001-demos-makes-opengl-an-optional-component.patch MESA3D_DEMOS_AUTORECONF = YES MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT From 14b7b8ac50eaef8b09920c75d5dcfc196764b6db Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 24 Feb 2018 13:25:57 +0100 Subject: [PATCH 0075/2640] sunxi-mali-mainline-driver: bump version For 4.16 support. git shortlog --invert-grep --grep travis --no-merges e752ddc8c4b9f2b9b9c6d193e2ba354caf8707f5.. Giulio Benetti (1): mali: Fix build in 4.16 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- .../sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index cde76e2655..24e759aaa7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e752ddc8c4b9f2b9b9c6d193e2ba354caf8707f5 +SUNXI_MALI_MAINLINE_DRIVER_VERSION = 94ccbc8924c12a818d61d36a4b389b74a89fde3c SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux From 3a0c20c5309b36c379af97038e69c8ebd4119f83 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 21 Feb 2018 14:26:43 +0100 Subject: [PATCH 0076/2640] scanpypi: add support for Python3 The script was changed via modernize utility. The only manual made part was the handling of StringIO. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 55bfb2fedb..12bfc24e10 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -7,13 +7,13 @@ Any package built by scanpypi should be manually checked for errors. """ from __future__ import print_function +from __future__ import absolute_import import argparse import json -import urllib2 +import six.moves.urllib.request, six.moves.urllib.error, six.moves.urllib.parse import sys import os import shutil -import StringIO import tarfile import zipfile import errno @@ -23,6 +23,13 @@ import textwrap import tempfile import imp from functools import wraps +from six.moves import map +from six.moves import zip +from six.moves import input +if six.PY2: + import StringIO +else: + import io BUF_SIZE = 65536 @@ -147,15 +154,15 @@ class BuildrootPackage(): self.metadata_url = 'https://pypi.python.org/pypi/{pkg}/json'.format( pkg=self.real_name) try: - pkg_json = urllib2.urlopen(self.metadata_url).read().decode() - except urllib2.HTTPError as error: + pkg_json = six.moves.urllib.request.urlopen(self.metadata_url).read().decode() + except six.moves.urllib.error.HTTPError as error: print('ERROR:', error.getcode(), error.msg, file=sys.stderr) print('ERROR: Could not find package {pkg}.\n' 'Check syntax inside the python package index:\n' 'https://pypi.python.org/pypi/ ' .format(pkg=self.real_name)) raise - except urllib2.URLError: + except six.moves.urllib.error.URLError: print('ERROR: Could not find package {pkg}.\n' 'Check syntax inside the python package index:\n' 'https://pypi.python.org/pypi/ ' @@ -193,8 +200,8 @@ class BuildrootPackage(): try: print('Downloading package {pkg} from {url}...'.format( pkg=self.real_name, url=download_url['url'])) - download = urllib2.urlopen(download_url['url']) - except urllib2.HTTPError as http_error: + download = six.moves.urllib.request.urlopen(download_url['url']) + except six.moves.urllib.error.HTTPError as http_error: download = http_error else: self.used_url = download_url @@ -205,7 +212,7 @@ class BuildrootPackage(): if self.md5_sum == download_url['md5_digest']: break else: - if download.__class__ == urllib2.HTTPError: + if download.__class__ == six.moves.urllib.error.HTTPError: raise download raise DownloadFailed('Failed to downloas package {pkg}' .format(pkg=self.real_name)) @@ -219,7 +226,10 @@ class BuildrootPackage(): Keyword arguments: tmp_path -- directory where you want the package to be extracted """ - as_file = StringIO.StringIO(self.as_string) + if six.PY2: + as_file = StringIO.StringIO(self.as_string) + else: + as_file = io.BytesIO(self.as_string) if self.filename[-3:] == 'zip': with zipfile.ZipFile(as_file) as as_zipfile: tmp_pkg = os.path.join(tmp_path, self.buildroot_name) @@ -303,8 +313,8 @@ class BuildrootPackage(): if len(item) > 0 and item[0] != '#'] req_not_found = self.pkg_req - self.pkg_req = map(pkg_buildroot_name, self.pkg_req) - pkg_tuples = zip(req_not_found, self.pkg_req) + self.pkg_req = list(map(pkg_buildroot_name, self.pkg_req)) + pkg_tuples = list(zip(req_not_found, self.pkg_req)) # pkg_tuples is a list of tuples that looks like # ('werkzeug','python-werkzeug') because I need both when checking if # dependencies already exist or are already in the download list @@ -412,8 +422,7 @@ class BuildrootPackage(): classifiers_licenses = [regexp.sub(r"\1", lic) for lic in self.metadata['info']['classifiers'] if regexp.match(lic)] - licenses = map(lambda x: license_dict[x] if x in license_dict else x, - classifiers_licenses) + licenses = [license_dict[x] if x in license_dict else x for x in classifiers_licenses] if not len(licenses): print('WARNING: License has been set to "{license}". It is most' ' likely wrong, please change it if need be'.format( @@ -583,7 +592,7 @@ class BuildrootPackage(): # \t + two spaces is 3 char long help_lines.append('') help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = map(lambda x: x + '\n', help_lines) + help_lines = [x + '\n' for x in help_lines] lines += help_lines with open(path_to_config, 'w') as config_file: @@ -624,7 +633,7 @@ def main(): print('Fetching package', package.real_name) try: package.fetch_package_info() - except (urllib2.URLError, urllib2.HTTPError): + except (six.moves.urllib.error.URLError, six.moves.urllib.error.HTTPError): continue if package.metadata_name.lower() == 'setuptools': # setuptools imports itself, that does not work very well @@ -634,7 +643,7 @@ def main(): try: package.download_package() - except urllib2.HTTPError as error: + except six.moves.urllib.error.HTTPError as error: print('Error: {code} {reason}'.format(code=error.code, reason=error.reason)) print('Error downloading package :', package.buildroot_name) @@ -682,7 +691,7 @@ def main(): continue print('Error: Package {name} already exists' .format(name=package.pkg_dir)) - del_pkg = raw_input( + del_pkg = input( 'Do you want to delete existing package ? [y/N]') if del_pkg.lower() == 'y': shutil.rmtree(package.pkg_dir) From fc73a401be45de4cabb49a55822d3730dc6add37 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Feb 2018 19:21:52 +0100 Subject: [PATCH 0077/2640] gcc: add the real gcc bugfix for m68k from upstream Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../4.9.4/0002-m68k-coldfire-pr68467.patch | 48 +++++++++++++++++++ package/gcc/4.9.4/891-fix-m68k-uclinux.patch | 18 ------- .../5.5.0/0001-m68k-coldfire-pr68467.patch | 48 +++++++++++++++++++ package/gcc/5.5.0/891-fix-m68k-uclinux.patch | 18 ------- .../6.4.0/0001-m68k-coldfire-pr68467.patch | 48 +++++++++++++++++++ package/gcc/6.4.0/891-fix-m68k-uclinux.patch | 18 ------- .../7.3.0/0001-m68k-coldfire-pr68467.patch | 48 +++++++++++++++++++ package/gcc/7.3.0/0891-fix-m68k-uclinux.patch | 30 ------------ 8 files changed, 192 insertions(+), 84 deletions(-) create mode 100644 package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch delete mode 100644 package/gcc/4.9.4/891-fix-m68k-uclinux.patch create mode 100644 package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch delete mode 100644 package/gcc/5.5.0/891-fix-m68k-uclinux.patch create mode 100644 package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch delete mode 100644 package/gcc/6.4.0/891-fix-m68k-uclinux.patch create mode 100644 package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch delete mode 100644 package/gcc/7.3.0/0891-fix-m68k-uclinux.patch diff --git a/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch b/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch new file mode 100644 index 0000000000..d701ab6878 --- /dev/null +++ b/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch @@ -0,0 +1,48 @@ +Backport from upstream, see +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-4.9.4.orig/gcc/config/m68k/m68k.c gcc-4.9.4/gcc/config/m68k/m68k.c +--- gcc-4.9.4.orig/gcc/config/m68k/m68k.c 2014-02-27 12:10:55.000000000 +0100 ++++ gcc-4.9.4/gcc/config/m68k/m68k.c 2018-02-17 21:28:53.430538916 +0100 +@@ -166,6 +166,8 @@ + const_tree, bool); + static bool m68k_cannot_force_const_mem (enum machine_mode mode, rtx x); + static bool m68k_output_addr_const_extra (FILE *, rtx); ++static machine_mode m68k_promote_function_mode (const_tree, machine_mode, ++ int *, const_tree, int); + static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; + + /* Initialize the GCC target structure. */ +@@ -308,6 +310,9 @@ + #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL + #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 + ++#undef TARGET_PROMOTE_FUNCTION_MODE ++#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode ++ + static const struct attribute_spec m68k_attribute_table[] = + { + /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, +@@ -6527,4 +6532,20 @@ + == m68k_fk_interrupt_handler)); + } + ++/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ ++ ++static machine_mode ++m68k_promote_function_mode (const_tree type, machine_mode mode, ++ int *punsignedp ATTRIBUTE_UNUSED, ++ const_tree fntype ATTRIBUTE_UNUSED, ++ int for_return) ++{ ++ /* Promote libcall arguments narrower than int to match the normal C ++ ABI (for which promotions are handled via ++ TARGET_PROMOTE_PROTOTYPES). */ ++ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) ++ return SImode; ++ return mode; ++} ++ + #include "gt-m68k.h" diff --git a/package/gcc/4.9.4/891-fix-m68k-uclinux.patch b/package/gcc/4.9.4/891-fix-m68k-uclinux.patch deleted file mode 100644 index 4347642d67..0000000000 --- a/package/gcc/4.9.4/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host ---- gcc-4.9.3.orig/libgcc/config.host 2014-03-27 16:40:31.000000000 +0100 -+++ gcc-4.9.3/libgcc/config.host 2016-04-05 16:20:53.422809885 +0200 -@@ -750,7 +750,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch b/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch new file mode 100644 index 0000000000..75ad536054 --- /dev/null +++ b/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch @@ -0,0 +1,48 @@ +Backport from upstream, see +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-5.5.0.orig/gcc/config/m68k/m68k.c gcc-5.5.0/gcc/config/m68k/m68k.c +--- gcc-5.5.0.orig/gcc/config/m68k/m68k.c 2015-01-15 14:28:42.000000000 +0100 ++++ gcc-5.5.0/gcc/config/m68k/m68k.c 2018-02-17 19:34:33.146309632 +0100 +@@ -196,6 +196,8 @@ + const_tree, bool); + static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); + static bool m68k_output_addr_const_extra (FILE *, rtx); ++static machine_mode m68k_promote_function_mode (const_tree, machine_mode, ++ int *, const_tree, int); + static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; + + /* Initialize the GCC target structure. */ +@@ -338,6 +340,9 @@ + #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL + #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 + ++#undef TARGET_PROMOTE_FUNCTION_MODE ++#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode ++ + static const struct attribute_spec m68k_attribute_table[] = + { + /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, +@@ -6548,4 +6553,20 @@ + == m68k_fk_interrupt_handler)); + } + ++/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ ++ ++static machine_mode ++m68k_promote_function_mode (const_tree type, machine_mode mode, ++ int *punsignedp ATTRIBUTE_UNUSED, ++ const_tree fntype ATTRIBUTE_UNUSED, ++ int for_return) ++{ ++ /* Promote libcall arguments narrower than int to match the normal C ++ ABI (for which promotions are handled via ++ TARGET_PROMOTE_PROTOTYPES). */ ++ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) ++ return SImode; ++ return mode; ++} ++ + #include "gt-m68k.h" diff --git a/package/gcc/5.5.0/891-fix-m68k-uclinux.patch b/package/gcc/5.5.0/891-fix-m68k-uclinux.patch deleted file mode 100644 index 4e186bd3d3..0000000000 --- a/package/gcc/5.5.0/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host ---- gcc-5.3.0.orig/libgcc/config.host 2015-10-01 14:01:18.000000000 +0200 -+++ gcc-5.3.0/libgcc/config.host 2016-04-26 21:30:25.353691745 +0200 -@@ -794,7 +794,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch b/package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch new file mode 100644 index 0000000000..afc18a508e --- /dev/null +++ b/package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch @@ -0,0 +1,48 @@ +Backport from upstream, see +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-6.4.0.orig/gcc/config/m68k/m68k.c gcc-6.4.0/gcc/config/m68k/m68k.c +--- gcc-6.4.0.orig/gcc/config/m68k/m68k.c 2016-01-04 15:30:50.652828000 +0100 ++++ gcc-6.4.0/gcc/config/m68k/m68k.c 2018-02-17 19:08:16.313168186 +0100 +@@ -180,6 +180,8 @@ + const_tree, bool); + static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); + static bool m68k_output_addr_const_extra (FILE *, rtx); ++static machine_mode m68k_promote_function_mode (const_tree, machine_mode, ++ int *, const_tree, int); + static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; + + /* Initialize the GCC target structure. */ +@@ -322,6 +324,9 @@ + #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL + #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 + ++#undef TARGET_PROMOTE_FUNCTION_MODE ++#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode ++ + static const struct attribute_spec m68k_attribute_table[] = + { + /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, +@@ -6524,4 +6529,20 @@ + == m68k_fk_interrupt_handler)); + } + ++/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ ++ ++static machine_mode ++m68k_promote_function_mode (const_tree type, machine_mode mode, ++ int *punsignedp ATTRIBUTE_UNUSED, ++ const_tree fntype ATTRIBUTE_UNUSED, ++ int for_return) ++{ ++ /* Promote libcall arguments narrower than int to match the normal C ++ ABI (for which promotions are handled via ++ TARGET_PROMOTE_PROTOTYPES). */ ++ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) ++ return SImode; ++ return mode; ++} ++ + #include "gt-m68k.h" diff --git a/package/gcc/6.4.0/891-fix-m68k-uclinux.patch b/package/gcc/6.4.0/891-fix-m68k-uclinux.patch deleted file mode 100644 index 754aa74e88..0000000000 --- a/package/gcc/6.4.0/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.1.0.orig/libgcc/config.host gcc-6.1.0/libgcc/config.host ---- gcc-6.1.0.orig/libgcc/config.host 2016-02-26 21:02:28.000000000 +0100 -+++ gcc-6.1.0/libgcc/config.host 2016-04-29 09:18:40.377989160 +0200 -@@ -812,7 +812,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch b/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch new file mode 100644 index 0000000000..629c6496e5 --- /dev/null +++ b/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch @@ -0,0 +1,48 @@ +Backport from upstream, see +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-7.2.0.orig/gcc/config/m68k/m68k.c gcc-7.2.0/gcc/config/m68k/m68k.c +--- gcc-7.2.0.orig/gcc/config/m68k/m68k.c 2017-04-03 22:30:56.274463000 +0000 ++++ gcc-7.2.0/gcc/config/m68k/m68k.c 2018-01-27 02:16:53.779367849 +0000 +@@ -182,6 +182,8 @@ + const_tree, bool); + static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); + static bool m68k_output_addr_const_extra (FILE *, rtx); ++static machine_mode m68k_promote_function_mode (const_tree, machine_mode, ++ int *, const_tree, int); + static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; + static enum flt_eval_method + m68k_excess_precision (enum excess_precision_type); +@@ -332,6 +334,9 @@ + #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL + #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 + ++#undef TARGET_PROMOTE_FUNCTION_MODE ++#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode ++ + static const struct attribute_spec m68k_attribute_table[] = + { + /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, +@@ -6571,4 +6576,20 @@ + return FLT_EVAL_METHOD_UNPREDICTABLE; + } + ++/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ ++ ++static machine_mode ++m68k_promote_function_mode (const_tree type, machine_mode mode, ++ int *punsignedp ATTRIBUTE_UNUSED, ++ const_tree fntype ATTRIBUTE_UNUSED, ++ int for_return) ++{ ++ /* Promote libcall arguments narrower than int to match the normal C ++ ABI (for which promotions are handled via ++ TARGET_PROMOTE_PROTOTYPES). */ ++ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) ++ return SImode; ++ return mode; ++} ++ + #include "gt-m68k.h" diff --git a/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch b/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch deleted file mode 100644 index e84fd92453..0000000000 --- a/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c2773170a1b0e2728f71f2275a99fd177ba2cef4 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 23:25:17 +0200 -Subject: [PATCH] fix m68k uclinux avoids internal compiler error while - compiling linux-atomic.c See here: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - libgcc/config.host | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config.host b/libgcc/config.host -index b279a64..04fe183 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -820,7 +820,7 @@ m68k*-*-netbsdelf*) - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux --- -2.9.3 - From 64ca9a51306d10862e3c04d7e9b1ee99557a9e4d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 20 Feb 2018 23:20:25 +0100 Subject: [PATCH 0078/2640] package/htop: remove 0xe2 from MetersPanel.c This non ascii character trigger an issue with MakeHeader.py. ./scripts/MakeHeader.py MetersPanel.c Traceback (most recent call last): File "./scripts/MakeHeader.py", line 32, in for line in file.readlines(): File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128) Fixes: http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...Panel-remove-0xe2-from-MetersPanel.c.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch diff --git a/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch b/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch new file mode 100644 index 0000000000..81f9d1bd97 --- /dev/null +++ b/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch @@ -0,0 +1,52 @@ +From ae32d292ca641c08b6db8d2f7cfcce2a54d00835 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 20 Feb 2018 23:09:24 +0100 +Subject: [PATCH] MetersPanel: remove 0xe2 from MetersPanel.c + +This non ascii character trigger an issue with MakeHeader.py. + +./scripts/MakeHeader.py MetersPanel.c +Traceback (most recent call last): + File "./scripts/MakeHeader.py", line 32, in + for line in file.readlines(): + File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode + return codecs.ascii_decode(input, self.errors)[0] +UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128) + +http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6/build-end.log + +Signed-off-by: Romain Naour +--- + MetersPanel.c | 2 +- + MetersPanel.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/MetersPanel.c b/MetersPanel.c +index 3cf3e07..47296a4 100644 +--- a/MetersPanel.c ++++ b/MetersPanel.c +@@ -37,7 +37,7 @@ static const char* const MetersFunctions[] = {"Style ", "Move ", " + static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"}; + static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)}; + +-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese ++// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese + // terminals, breaking our aligning. + // In , arrows (U+2019..U+2199) are + // considered "Ambiguous characters". +diff --git a/MetersPanel.h b/MetersPanel.h +index e00169c..e80754a 100644 +--- a/MetersPanel.h ++++ b/MetersPanel.h +@@ -29,7 +29,7 @@ struct MetersPanel_ { + + // Note: In code the meters are known to have bar/text/graph "Modes", but in UI + // we call them "Styles". +-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese ++// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese + // terminals, breaking our aligning. + // In , arrows (U+2019..U+2199) are + // considered "Ambiguous characters". +-- +2.14.3 + From cfafcfa9af4ee04c563d3c682d2001a8516a866c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 26 Feb 2018 14:01:17 +0100 Subject: [PATCH 0079/2640] scanpypi: fix Py2/3 conversion leftover Use urlparse from six package. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 12bfc24e10..1720c0c051 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -188,7 +188,7 @@ class BuildrootPackage(): 'md5_digest': None}] # In this case, we can't get the name of the downloaded file # from the pypi api, so we need to find it, this should work - urlpath = urllib2.urlparse.urlparse( + urlpath = six.moves.urllib.parse.urlparse( self.metadata['info']['download_url']).path # urlparse().path give something like # /path/to/file-version.tar.gz From c46f72b61e4dc989f520271bc98f7b15015fcdcf Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 26 Feb 2018 14:01:18 +0100 Subject: [PATCH 0080/2640] scanpypi: fix licence detection handling for unknown licences Check for match object not being None. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1720c0c051..14ee87784a 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -436,7 +436,7 @@ class BuildrootPackage(): for license_file in license_files: with open(license_file) as lic_file: match = liclookup.match(lic_file.read()) - if match.confidence >= 90.0: + if match is not None and match.confidence >= 90.0: license_names.append(match.license.id) if len(license_names) > 0: From 716cfa6744b542a25a969088c73ad66dffbf6fcf Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Tue, 27 Feb 2018 04:39:22 -0800 Subject: [PATCH 0081/2640] bind: use BIND_PKGDIR vairable Use the BIND_PKGDIR variable instead of package/bind. Signed-off-by: Christopher McCrory Signed-off-by: Thomas Petazzoni --- package/bind/bind.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index bec902079c..392ef321c2 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -93,11 +93,11 @@ endef ifeq ($(BR2_PACKAGE_BIND_SERVER),y) define BIND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/bind/S81named \ + $(INSTALL) -m 0755 -D $(BIND_PKGDIR)/S81named \ $(TARGET_DIR)/etc/init.d/S81named endef define BIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/bind/named.service \ + $(INSTALL) -D -m 644 $(BIND_PKGDIR)/named.service \ $(TARGET_DIR)/usr/lib/systemd/system/named.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants From 17a6404faf50f2886f0cace4cd91f921f118430e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Feb 2018 21:51:25 +0100 Subject: [PATCH 0082/2640] azmq: bump to version 1.0.2 Add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/azmq/azmq.hash | 5 +++-- package/azmq/azmq.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/azmq/azmq.hash b/package/azmq/azmq.hash index d3993f4988..35139cfaeb 100644 --- a/package/azmq/azmq.hash +++ b/package/azmq/azmq.hash @@ -1,3 +1,4 @@ # Locally calculated -# https://github.com/zeromq/azmq/archive/v1.0.tar.gz -sha256 c204c731bcb7810ca3a2c5515e88974ef2ff8d0589e60a897dc238b369180e7b azmq-v1.0.tar.gz +# https://github.com/zeromq/azmq/archive/v1.0.2.tar.gz +sha256 25fa8b07756cffae95e25a55c7ea42efe02e8cd797552201aa771dd69cfc8fbf azmq-v1.0.2.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-BOOST_1_0 diff --git a/package/azmq/azmq.mk b/package/azmq/azmq.mk index 427ad0f5b4..9ccb407a65 100644 --- a/package/azmq/azmq.mk +++ b/package/azmq/azmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZMQ_VERSION = v1.0 +AZMQ_VERSION = v1.0.2 AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION)) AZMQ_DEPENDENCIES = boost zeromq AZMQ_LICENSE = BSL-1.0 From 379c34739082f3906ccf4877b85a2e714606bffe Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 28 Feb 2018 21:00:28 +0200 Subject: [PATCH 0083/2640] gnupg2: bump to version 2.2.5 Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index a003da668b..9cc8e4c913 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,6 +1,6 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q4/000419.html -sha1 732266e8888c6f41c084d043c7a0058332ff3580 gnupg-2.2.4.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q1/000420.html +sha1 9dec110397e460b3950943e18f5873a4f277f216 gnupg-2.2.5.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2.sig -sha256 401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec gnupg-2.2.4.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.5.tar.bz2.sig +sha256 3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57 gnupg-2.2.5.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 980fae342b..ba5370902f 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.4 +GNUPG2_VERSION = 2.2.5 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From b690d534679ddf188d67289141af6167044af459 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 28 Feb 2018 21:01:12 +0200 Subject: [PATCH 0084/2640] iw: bump to version 4.14 Drop IW_MAKE_OPTS, passing the CC, LD, and LDFLAGS in the environment via TARGET_CONFIGURE_OPTS is enough. Add license file hash. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/iw/iw.hash | 4 +++- package/iw/iw.mk | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 414f34225f..6423df7732 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 324cc805fad52cba2c16b9ab569906889fb645cc962aac4cfda1db85d2de97ce iw-4.9.tar.xz +sha256 f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89 iw-4.14.tar.xz +# Locally calculated +sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index aa85cbb5b9..8264e8b5dc 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,20 +4,19 @@ # ################################################################################ -IW_VERSION = 4.9 +IW_VERSION = 4.14 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC IW_LICENSE_FILES = COPYING IW_DEPENDENCIES = host-pkgconf libnl -IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)" IW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" \ GIT_DIR=$(IW_DIR) define IW_BUILD_CMDS - $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D) + $(IW_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef define IW_INSTALL_TARGET_CMDS From e023ef540ad1bb27e85746d36ecbdcff819c81ce Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 1 Mar 2018 07:56:37 +0200 Subject: [PATCH 0085/2640] lzip: bump to version 1.20 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/lzip/lzip.hash | 6 ++++-- package/lzip/lzip.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index e074c76005..9945f9cfe5 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,2 +1,4 @@ -# From http://lists.nongnu.org/archive/html/lzip-bug/2017-05/msg00000.html -sha256 ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 lzip-1.19.tar.gz +# From http://lists.nongnu.org/archive/html/lzip-bug/2018-02/msg00006.html +sha256 c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c lzip-1.20.tar.gz +# Locally calculated +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index b7ba5dd21d..4088662de2 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZIP_VERSION = 1.19 +LZIP_VERSION = 1.20 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING From 16956889f7f172fdfb66402660748b1592733da7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 1 Mar 2018 14:18:13 +0200 Subject: [PATCH 0086/2640] gnutls: bump to version 3.5.18 Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 173cb40683..be2913e00f 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.17.tar.xz.sig -sha256 86b142afef587c118d63f72ccf307f3321dbc40357aae528202b65d913d20919 gnutls-3.5.17.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.18.tar.xz.sig +sha256 ae2248d9e78747cf9c469dde81ff8f90b56838b707a0637f3f7d4eee90e80234 gnutls-3.5.18.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 1ce7a742e3..6be7c6e27e 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).17 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).18 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) From 3f07a64e8df0b6f1d9b11c47140ccad38ab44315 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 21:23:35 +0100 Subject: [PATCH 0087/2640] package/libmicrohttpd: bump version to 0.9.59 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index e628cb2c6c..e534e8e80b 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dec1a76487d7e48ad74b468a888bfda1c05731f185ff950f1e363ca9d39caf4e libmicrohttpd-0.9.57.tar.gz +sha256 9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c libmicrohttpd-0.9.59.tar.gz sha256 70e12e2a60151b9ed1a4c94a5ffeb99cd086fa94542b5a92fec581506e8d3121 COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 62fb7fc237..81785b91bc 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.57 +LIBMICROHTTPD_VERSION = 0.9.59 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES From 2682d77d1a7eee678a974e33d14eb4559225cf33 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 21:19:47 +0100 Subject: [PATCH 0088/2640] package/libvpx: bump version to 1.7.0 Switched _SITE to github, current _SITE is broken. The URL https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz proposed by upstream https://storage.googleapis.com/downloads.webmproject.org/releases/webm/index.html provides archives with different hashes for each download so we use Github instead. Added license hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libvpx/libvpx.hash | 4 +++- package/libvpx/libvpx.mk | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index 95ff3a8082..1397b62f7b 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,2 +1,4 @@ # Locally computed: -sha256 1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819 libvpx-1.6.1.tar.bz2 +sha256 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238 libvpx-v1.7.0.tar.gz +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE +sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index 24c39032e4..0f867eb2a9 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBVPX_VERSION = 1.6.1 -LIBVPX_SOURCE = libvpx-$(LIBVPX_VERSION).tar.bz2 -LIBVPX_SITE = http://storage.googleapis.com/downloads.webmproject.org/releases/webm +LIBVPX_VERSION = v1.7.0 +LIBVPX_SITE = $(call github,webmproject,libvpx,$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS LIBVPX_INSTALL_STAGING = YES From 0f2dbcd3c700c29d8fdfb8761add76c14906cd71 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 21:11:01 +0100 Subject: [PATCH 0089/2640] package/x265: bump version to 2.7 Upstream switched to nasm: https://mailman.videolan.org/pipermail/x265-devel/2018-March/011615.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x265/x265.hash | 2 +- package/x265/x265.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x265/x265.hash b/package/x265/x265.hash index 3e44b03692..e6f22db646 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 x265_2.5.tar.gz +sha256 d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2 x265_2.7.tar.gz diff --git a/package/x265/x265.mk b/package/x265/x265.mk index ae570e6e4c..243025c08b 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 2.5 +X265_VERSION = 2.7 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ @@ -13,7 +13,7 @@ X265_SUBDIR = source X265_INSTALL_STAGING = YES ifeq ($(BR2_i386)$(BR2_x86_64),y) -X265_DEPENDENCIES += host-yasm +X265_DEPENDENCIES += host-nasm endif # disable altivec, it has build issues From ced7bcbb253cf52f0d870cad3646d2c6a7d55adf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 21:29:42 +0100 Subject: [PATCH 0090/2640] package/libdrm: bump version to 2.4.90 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdrm/libdrm.hash | 10 +++++----- package/libdrm/libdrm.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 0842411c5a..b1784b4c07 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2017-December/160530.html -md5 5307a147dde67ac643f6753a42b5d32c libdrm-2.4.89.tar.bz2 -sha1 43123da26271df9a29deb687c1855bef3fed249c libdrm-2.4.89.tar.bz2 -sha256 629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e libdrm-2.4.89.tar.bz2 -sha512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d libdrm-2.4.89.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-February/002838.html +md5 61dcb4989c728f566e3c15c236585a17 libdrm-2.4.90.tar.bz2 +sha1 7630ba36c65433251a0494b47086fbd0b32ff7a8 libdrm-2.4.90.tar.bz2 +sha256 db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b libdrm-2.4.90.tar.bz2 +sha512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c libdrm-2.4.90.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 1c898a5b54..7121f06c9a 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.89 +LIBDRM_VERSION = 2.4.90 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From ee8d397a25dd7dfadeb74522336a9c5e990db454 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 21:09:53 +0100 Subject: [PATCH 0091/2640] package/nasm: bump version to 2.13.03 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index 260e5d7bc4..db5b857193 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8ac3235f49a6838ff7a8d7ef7c19a4430d0deecc0c2d3e3e237b5e9f53291757 nasm-2.13.02.tar.xz +sha256 812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573 nasm-2.13.03.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ee3fd9c542..76bcca3bbf 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.13.02 +NASM_VERSION = 2.13.03 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From 8304e920cb9e1728aee9e69c28f029130c42a1d8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 1 Mar 2018 23:51:42 +0200 Subject: [PATCH 0092/2640] 18xx-ti-utils: new package These are spacial RF calibration utilities for TI Wilink 18xx modules. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/18xx-ti-utils/18xx-ti-utils.hash | 3 +++ package/18xx-ti-utils/18xx-ti-utils.mk | 30 ++++++++++++++++++++++++ package/18xx-ti-utils/Config.in | 14 +++++++++++ package/Config.in | 1 + 5 files changed, 49 insertions(+) create mode 100644 package/18xx-ti-utils/18xx-ti-utils.hash create mode 100644 package/18xx-ti-utils/18xx-ti-utils.mk create mode 100644 package/18xx-ti-utils/Config.in diff --git a/DEVELOPERS b/DEVELOPERS index e2b3901425..77b6df3cd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -205,6 +205,7 @@ F: package/pulseview/ F: package/sigrok-cli/ N: Baruch Siach +F: package/18xx-ti-utils/ F: package/daemon/ F: package/dropbear/ F: package/ebtables/ diff --git a/package/18xx-ti-utils/18xx-ti-utils.hash b/package/18xx-ti-utils/18xx-ti-utils.hash new file mode 100644 index 0000000000..faa23d0b3e --- /dev/null +++ b/package/18xx-ti-utils/18xx-ti-utils.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9ce2c7228dd0ac8d3cc530a32bb92b532bdbc5dfb6a405c245abee678d878697 18xx-ti-utils-R8.7_SP3.tar.gz +sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING diff --git a/package/18xx-ti-utils/18xx-ti-utils.mk b/package/18xx-ti-utils/18xx-ti-utils.mk new file mode 100644 index 0000000000..d1f0388c3a --- /dev/null +++ b/package/18xx-ti-utils/18xx-ti-utils.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# 18xx-ti-utils +# +################################################################################ + +18XX_TI_UTILS_VERSION = R8.7_SP3 +18XX_TI_UTILS_SITE = git://git.ti.com/wilink8-wlan/18xx-ti-utils +18XX_TI_UTILS_DEPENDENCIES = libnl +18XX_TI_UTILS_LICENSE = BSD-3-Clause +18XX_TI_UTILS_LICENSE_FILES = COPYING + +18XX_TI_UTILS_CFLAGS = -I$(STAGING_DIR)/usr/include/libnl3 -DCONFIG_LIBNL32 + +ifeq ($(BR2_STATIC_LIBS),y) +18XX_TI_UTILS_BUILD_TARGET = static +endif + +define 18XX_TI_UTILS_BUILD_CMDS + $(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \ + NFSROOT="$(STAGING_DIR)" NLVER=3 $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS) $(18XX_TI_UTILS_CFLAGS)" \ + $(18XX_TI_UTILS_BUILD_TARGET) +endef + +define 18XX_TI_UTILS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/calibrator $(TARGET_DIR)/usr/bin/calibrator +endef + +$(eval $(generic-package)) diff --git a/package/18xx-ti-utils/Config.in b/package/18xx-ti-utils/Config.in new file mode 100644 index 0000000000..571d196e09 --- /dev/null +++ b/package/18xx-ti-utils/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_18XX_TI_UTILS + bool "18xx-ti-utils" + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL + help + TI Wilink calibration utilities. + + CONFIG_NL80211_TESTMODE must be enabled in the kernel + configuration for this package to work. + + http://processors.wiki.ti.com/index.php/WL18xx_TX_Testing + +comment "18xx-ti-utils needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/Config.in b/package/Config.in index 97317fdb5f..12d3d2bbff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -375,6 +375,7 @@ menu "Firmware" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu + source "package/18xx-ti-utils/Config.in" source "package/a10disp/Config.in" source "package/acpica/Config.in" source "package/acpid/Config.in" From 26a15ae6a63cf6c7f38775f4737fc1298dc3b671 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Mar 2018 20:53:16 +0100 Subject: [PATCH 0093/2640] package/busybox: bump version to 1.28.1 Added sha256 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 9 +++++---- package/busybox/busybox.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 4ca3936ada..b7067b6633 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,6 @@ -# From https://busybox.net/downloads/busybox-1.28.0.tar.bz2.sign -md5 b119b8decda796ab5cee5478dc9c642c busybox-1.28.0.tar.bz2 -sha1 a25e9a33e830e307c2a446ca234531049dd427f2 busybox-1.28.0.tar.bz2 -# License files, locally calculated +# From https://busybox.net/downloads/busybox-1.28.1.tar.bz2.sign +md5 928919a21e34d5c5507d872a4fb7b9f4 busybox-1.28.1.tar.bz2 +sha1 932e2a77c3ddaa7f0915ed6fe9232041d261f86b busybox-1.28.1.tar.bz2 +# Locally calculated +sha256 98fe1d3c311156c597cd5cfa7673bb377dc552b6fa20b5d3834579da3b13652e busybox-1.28.1.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 73353baeda..bc0c661754 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.28.0 +BUSYBOX_VERSION = 1.28.1 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 936c0e10c1c8d7f5ca9d84324dadbc337accaf59 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 2 Mar 2018 06:40:34 +0200 Subject: [PATCH 0094/2640] autofs: disable for musl autofs requires nsswitch which musl libc does not implement. Commit 873040371b14 (autofs: allow to use libtirpc) removed the BR2_TOOLCHAIN_HAS_NATIVE_RPC dependency, making autofs available for musl. Disable musl explicitly. Fixes: http://autobuild.buildroot.net/results/a54/a549b62fbf03474ffd8586869637d083de275091/ http://autobuild.buildroot.net/results/b32/b3276b2cbd1e1c260f8df4c3945f51ddc09d492f/ http://autobuild.buildroot.net/results/10b/10b5c5b13971214d0439b715f1a46c78a5249309/ Cc: Waldemar Brodkorb Cc: Jonathan Ben Avraham Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/autofs/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/autofs/Config.in b/package/autofs/Config.in index efb0ec28ee..8bb5fe276f 100644 --- a/package/autofs/Config.in +++ b/package/autofs/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_AUTOFS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # dlfcn + depends on !BR2_TOOLCHAIN_USES_MUSL # nsswitch select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help Autofs controls the operation of the automount daemons. The @@ -15,6 +16,7 @@ config BR2_PACKAGE_AUTOFS http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html -comment "autofs needs a toolchain w/ NPTL and dynamic library" +comment "autofs needs a glibc or uClibc toolchain w/ NPTL and dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL From be7be667de6f01627839fdf8794e38220951ce58 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 2 Mar 2018 15:04:28 +0200 Subject: [PATCH 0095/2640] libepoxy: bump to version 1.5.0, add license hash This release of Epoxy makes "0001-Forward-EGL-cflags-into-epoxy.pc.patch" unnecessary. Other than bugfixes and a couple of functions added to the API, this release is backwards-compatible with programs built against the 1.4.x releases. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- ...001-Forward-EGL-cflags-into-epoxy.pc.patch | 32 ------------------- package/libepoxy/libepoxy.hash | 7 ++-- package/libepoxy/libepoxy.mk | 4 +-- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch diff --git a/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch b/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch deleted file mode 100644 index 286f875bc9..0000000000 --- a/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 99b8373dbe8fb3bac835ebad90f91cfd213e4acb Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 15 Mar 2017 10:02:54 -0300 -Subject: [PATCH] Forward EGL cflags into epoxy.pc - -When building mesa egl without x11 and gles2 the headers need a -MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers. -Forward EGL CFLAGS into epoxy.pc to avoid build failures when linking -against libepoxy on this scenario. - -Signed-off-by: Gustavo Zacarias ---- -Status: pull request https://github.com/anholt/libepoxy/pull/113 - - epoxy.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/epoxy.pc.in b/epoxy.pc.in -index 7828a77..8278b7d 100644 ---- a/epoxy.pc.in -+++ b/epoxy.pc.in -@@ -10,6 +10,6 @@ epoxy_has_wgl=@epoxy_has_wgl@ - Name: epoxy - Description: epoxy GL dispatch Library - Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} -+Cflags: -I${includedir} @EGL_CFLAGS@ - Libs: -L${libdir} -lepoxy - Libs.private: @DLOPEN_LIBS@ --- -2.10.2 - diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index d7ebec5b5f..654d1675fd 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,2 +1,5 @@ -# From ftp://ftp.gnome.org/pub/GNOME/sources/libepoxy/1.4/libepoxy-1.4.3.sha256sum -sha256 0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6 libepoxy-1.4.3.tar.xz +# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.0.sha256sum +sha256 4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5 libepoxy-1.5.0.tar.xz + +# Hashes for license files: +sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index 366cc11367..b9498b17b4 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBEPOXY_VERSION_MAJOR = 1.4 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).3 +LIBEPOXY_VERSION_MAJOR = 1.5 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES From 2107518d9253b7d329caa40f674f429ebe3b7d73 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 4 Mar 2018 22:47:45 +0100 Subject: [PATCH 0096/2640] docs/website/news.html: add 2018.02 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index f729a59543..980b0cc83c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

The stable 2018.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2018.02 release.

From fb4a33e586bc041a43cd415869e91d29287dcefd Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Mon, 26 Feb 2018 21:20:51 +0200 Subject: [PATCH 0097/2640] czmq: bump to version v4.1.0 Signed-off-by: Asaf Kahlon [Arnout: correct comment about AUTORECONF] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/czmq/czmq.hash | 6 +++++- package/czmq/czmq.mk | 12 +++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/czmq/czmq.hash b/package/czmq/czmq.hash index 526ea594b9..c0a7176f8d 100644 --- a/package/czmq/czmq.hash +++ b/package/czmq/czmq.hash @@ -1,2 +1,6 @@ +# From https://github.com/zeromq/czmq/releases +md5 d29baef1079f19a2c6a360eb6be984f8 czmq-4.1.0.tar.gz +sha1 1d201a87205811367f7c92cbbd36a899edda68bf czmq-4.1.0.tar.gz # Locally calculated -sha256 5c76de41f736f0c059e0b26174ef99200f2aba2fa38333683dbe4944b2f80555 czmq-5205ec201e97c3a652c17eb86b18b70350b54512.tar.gz +sha256 3befa35b4886b5298e8329b4f0aa5bb9bde0e7439bd3c5c53295cb988371fc11 czmq-4.1.0.tar.gz +sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENCE diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index 5305789d7a..aef552415e 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -4,10 +4,10 @@ # ################################################################################ -CZMQ_VERSION = 5205ec201e97c3a652c17eb86b18b70350b54512 -CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION)) +CZMQ_VERSION = 4.1.0 +CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) -# Autoreconf required as we use the git tree +# 0001-configure.ac-remove-Werror.patch touches configure.ac CZMQ_AUTORECONF = YES CZMQ_INSTALL_STAGING = YES CZMQ_DEPENDENCIES = zeromq host-pkgconf @@ -18,10 +18,4 @@ CZMQ_LICENSE_FILES = LICENSE # host-python, so disable asciidoc entirely. CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no -define CZMQ_CREATE_CONFIG_DIR - mkdir -p $(@D)/config -endef - -CZMQ_POST_PATCH_HOOKS += CZMQ_CREATE_CONFIG_DIR - $(eval $(autotools-package)) From 528f16547689fa771bc7cb8de0885286dd439c17 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 5 Mar 2018 19:32:12 +0100 Subject: [PATCH 0098/2640] Kickoff 2018.05 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 957ba6634a..1b34818fc8 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.02 +export BR2_VERSION := 2018.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1520198000 From b405d31b48422d952e4f78e446490d611af8e2ad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 3 Mar 2018 22:28:09 +0100 Subject: [PATCH 0099/2640] cjson: bump to version 1.7.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index c75854d2ac..2e615ad447 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 726a60137ab1aa6784dc575bf7d4c92f5367e937739c8bffcddce79071cf5f50 cjson-v1.7.3.tar.gz +sha256 c3fc800cf9106db4ef5a5ef1fba7d144b21d73b68ad78234e182ebab12079277 cjson-v1.7.4.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 08020c48f6..7c302abbf5 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.7.3 +CJSON_VERSION = v1.7.4 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From a5750692fee2c205d93af0fe7718eaa5479aa790 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Mar 2018 10:06:16 +0100 Subject: [PATCH 0100/2640] cryptopp: bump to version 6.1.0 Remove patch (applied upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-DoS-in-ASN.1-decoders-CVE-2016-9939.patch | 69 ------------------- package/cryptopp/cryptopp.hash | 7 +- package/cryptopp/cryptopp.mk | 2 +- 3 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch diff --git a/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch b/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch deleted file mode 100644 index 2d0f1d91da..0000000000 --- a/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 3d9181d7bdd8e491f745dbc9e34bd20b6f6da069 Mon Sep 17 00:00:00 2001 -From: Gergely Nagy -Date: Wed, 14 Dec 2016 13:19:01 +0100 -Subject: [PATCH] Fix possible DoS in ASN.1 decoders (CVE-2016-9939) - -Signed-off-by: Peter Korsgaard ---- - asn.cpp | 10 ++++++++++ - asn.h | 2 ++ - 2 files changed, 12 insertions(+) - -diff --git a/asn.cpp b/asn.cpp -index 297ff01..2e923ef 100644 ---- a/asn.cpp -+++ b/asn.cpp -@@ -123,6 +123,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - str.New(bc); - if (bc != bt.Get(str, bc)) -@@ -139,6 +141,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation & - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - bt.TransferTo(str, bc); - return bc; -@@ -161,6 +165,8 @@ size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte as - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock temp(bc); - if (bc != bt.Get(temp, bc)) -@@ -188,6 +194,10 @@ size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigne - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc == 0) -+ BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - byte unused; - if (!bt.Get(unused)) -diff --git a/asn.h b/asn.h -index ed9de52..33f0dd0 100644 ---- a/asn.h -+++ b/asn.h -@@ -498,6 +498,8 @@ void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, - bool definite = BERLengthDecode(in, bc); - if (!definite) - BERDecodeError(); -+ if (bc > in.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock buf(bc); - --- -2.10.2 - diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index 577638c1c9..d124e11a81 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,2 +1,5 @@ -# Locally computed -sha256 a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 cryptopp565.zip +# Hash from: https://www.cryptopp.com/release610.html: +sha256 21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7 cryptopp610.zip + +# Hash for license file: +sha256 fe5f5f187e6e38ac2f833956fc5c4cab2df08797cff07f540e4ee74f12f7ee5b License.txt diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 4b121aef2d..d7aabf04b8 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTOPP_VERSION = 5.6.5 +CRYPTOPP_VERSION = 6.1.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = http://cryptopp.com/ CRYPTOPP_LICENSE = BSL-1.0 From 390643f998278a69819443502fc2c83bdc22e77d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Mar 2018 17:06:10 +0100 Subject: [PATCH 0101/2640] kvazaar: bump to version 1.2.0 Add license hash Remove patch (applied upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ILL_ARRAY-macro-to-prevent-warning-o.patch | 56 ------------------- package/kvazaar/kvazaar.hash | 3 +- package/kvazaar/kvazaar.mk | 2 +- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch diff --git a/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch b/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch deleted file mode 100644 index 633da8b36d..0000000000 --- a/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 47a9f0de049e77e866ea5bdd4bc7c795ea6dd641 Mon Sep 17 00:00:00 2001 -From: Ari Lemmetti -Date: Tue, 11 Apr 2017 12:57:22 +0300 -Subject: [PATCH] Modify and use FILL_ARRAY macro to prevent warning on GCC 7 - -Following warning was given and is false positive - -error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] - -Signed-off-by: Baruch Siach ---- -Upstream commit 47a9f0de049e7. - - src/global.h | 6 +++++- - src/rdo.c | 8 ++++---- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/global.h b/src/global.h -index bedcd49c2e02..518167443f35 100644 ---- a/src/global.h -+++ b/src/global.h -@@ -219,7 +219,11 @@ typedef int16_t coeff_t; - // Fill a structure or a static array with val bytes. - #define FILL(var, val) memset(&(var), (val), sizeof(var)) - // Fill a number of elements in an array with val bytes. --#define FILL_ARRAY(ar, val, size) memset((ar), (val), (size) * sizeof(*(ar))) -+#define FILL_ARRAY(ar, val, size) \ -+{\ -+ void *temp_ptr = (void*)(ar);\ -+ memset((temp_ptr), (val), (size) * sizeof(*(ar)));\ -+} - - #define FREE_POINTER(pointer) { free((void*)pointer); pointer = NULL; } - #define MOVE_POINTER(dst_pointer,src_pointer) { dst_pointer = src_pointer; src_pointer = NULL; } -diff --git a/src/rdo.c b/src/rdo.c -index 52305fd72fab..2579f2808441 100644 ---- a/src/rdo.c -+++ b/src/rdo.c -@@ -558,10 +558,10 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff, - // Explicitly tell the only possible numbers of elements to be zeroed. - // Hope the compiler is able to utilize this information. - switch (cg_num) { -- case 1: memset(sig_coeffgroup_flag, 0, 1 * sizeof(sig_coeffgroup_flag[0])); break; -- case 4: memset(sig_coeffgroup_flag, 0, 4 * sizeof(sig_coeffgroup_flag[0])); break; -- case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break; -- case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break; -+ case 1: FILL_ARRAY(sig_coeffgroup_flag, 0, 1); break; -+ case 4: FILL_ARRAY(sig_coeffgroup_flag, 0, 4); break; -+ case 16: FILL_ARRAY(sig_coeffgroup_flag, 0, 16); break; -+ case 64: FILL_ARRAY(sig_coeffgroup_flag, 0, 64); break; - default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups"); - } - --- -2.13.2 - diff --git a/package/kvazaar/kvazaar.hash b/package/kvazaar/kvazaar.hash index 80f480b5d5..aa746ca17e 100644 --- a/package/kvazaar/kvazaar.hash +++ b/package/kvazaar/kvazaar.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8e382738a51004bfcfca4c832e8b41fe6a17f889f3c39151dc1c1a37261a3a6d kvazaar-v1.1.0.tar.gz +sha256 480ecfd9b4d2b7d21b355e4a35fcf47b4db7a3b0315b6219d93733db42392bd9 kvazaar-v1.2.0.tar.gz +sha256 531712277c3543b9ee86c4c4e0e424f531b893a44cc021c74a24b038d8de4d2a COPYING diff --git a/package/kvazaar/kvazaar.mk b/package/kvazaar/kvazaar.mk index f9149a781f..0cf965dd86 100644 --- a/package/kvazaar/kvazaar.mk +++ b/package/kvazaar/kvazaar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVAZAAR_VERSION = v1.1.0 +KVAZAAR_VERSION = v1.2.0 KVAZAAR_SITE = $(call github,ultravideo,kvazaar,$(KVAZAAR_VERSION)) KVAZAAR_LICENSE = LGPL-2.1+ KVAZAAR_LICENSE_FILES = COPYING From 8cffa8163cd5b275eb962cf435507c1a8bc512a1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 4 Mar 2018 21:21:30 -0300 Subject: [PATCH 0102/2640] DEVELOPERS: Add some i.MX boards to my name I would like to help maintaining the following defconfigs: imx23evk_defconfig imx6-sabreauto_defconfig imx7dpico_defconfig mx25pdk_defconfig mx51evk_defconfig mx53loco_defconfig Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- DEVELOPERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index dbd90e5b8c..7fcfaadfb0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -603,11 +603,16 @@ F: package/supertuxkart/ N: Fabio Estevam F: board/warp7/ F: configs/freescale_imx* -F: configs/imx6-sabresd* +F: configs/imx23evk_defconfig +F: configs/imx6-sabre* F: configs/imx6slevk_defconfig F: configs/imx6sx-sdb_defconfig F: configs/imx6ulevk_defconfig F: configs/imx6ulpico_defconfig +F: configs/imx7dpico_defconfig +F: configs/mx25pdk_defconfig +F: configs/mx51evk_defconfig +F: configs/mx53loco_defconfig F: configs/mx6cubox_defconfig F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6udoo_defconfig From f08dd9f4cbba2b88fe62e68c37e49fba4e3895c9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 23:00:39 +0100 Subject: [PATCH 0103/2640] configs/freescale_mpc8315erdb: remove defconfig This defconfig currently fails to build the Linux kernel: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306826 In addition, the U-Boot build had already been removed in commit 12c01e4a05c8e4f4e0c4e8b74fac7824efdc8b41 ("configs/freescale_mpc8315erdb: remove U-Boot build"), back in October 2016, and nobody bothered fixing it. This defconfig was originally contributed and maintained by Gustavo Zacarias, but he is no longer active in Buildroot, and nobody expressed interest in this defconfig, so let's get rid of it. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/freescale/mpc8315erdb/linux-4.5.config | 70 -------------------- board/freescale/mpc8315erdb/readme.txt | 40 ----------- configs/freescale_mpc8315erdb_defconfig | 28 -------- 4 files changed, 139 deletions(-) delete mode 100644 board/freescale/mpc8315erdb/linux-4.5.config delete mode 100644 board/freescale/mpc8315erdb/readme.txt delete mode 100644 configs/freescale_mpc8315erdb_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30c8ff920b..779565956f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,7 +124,6 @@ freescale_imx6sololiteevk_defconfig: *defconfig freescale_imx6sxsabresd_defconfig: *defconfig freescale_imx6ulevk_defconfig: *defconfig freescale_imx7dsabresd_defconfig: *defconfig -freescale_mpc8315erdb_defconfig: *defconfig freescale_p1010rdb_pa_defconfig: *defconfig friendlyarm_nanopi_a64_defconfig: *defconfig friendlyarm_nanopi_neo2_defconfig: *defconfig diff --git a/board/freescale/mpc8315erdb/linux-4.5.config b/board/freescale/mpc8315erdb/linux-4.5.config deleted file mode 100644 index 8f56069309..0000000000 --- a/board/freescale/mpc8315erdb/linux-4.5.config +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_FSL_EMB_PERFMON=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_EMBEDDED=y -CONFIG_MODULES=y -# CONFIG_PPC_CHRP is not set -# CONFIG_PPC_PMAC is not set -CONFIG_PPC_83xx=y -CONFIG_MPC831x_RDB=y -CONFIG_MCU_MPC8349EMITX=y -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCIEASPM is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_SCSI_MQ_DEFAULT=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_NETDEVICES=y -CONFIG_GIANFAR=y -CONFIG_REALTEK_PHY=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_MPC8XXX=y -CONFIG_WATCHDOG=y -CONFIG_8xxx_WDT=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_STORAGE=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_GENERIC=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -CONFIG_ASYNC_TX_DMA=y -CONFIG_EXT4_FS=y -CONFIG_FANOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_SQUASHFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt deleted file mode 100644 index b4c87b4d4a..0000000000 --- a/board/freescale/mpc8315erdb/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -You'll need to program the files created by buildroot into the flash. -The fast way is to tftp transfer the files via one of the network interfaces. - -Alternatively you can transfer the files via serial console with an Ymodem -file transfer from your terminal program by using a "loady" command -from the u-boot prompt instead of the "tftp ..." commands stated below. -Beware that serial console file transfers are quite slow! - -1. Program the kernel to NAND flash - - => tftp $loadaddr uImage - => nand erase 0x100000 0x1e0000 - => nand write $loadaddr 0x100000 0x1e0000 - -2. Program the DTB to NAND flash - - => tftp $loadaddr mpc8315erdb.dtb - => nand erase 0x2e0000 0x20000 - => nand write $loadaddr 0x2e0000 0x20000 - -3. Program the root filesystem to NAND flash - - => tftp $loadaddr rootfs.jffs2 - => nand erase 0x400000 0x1c00000 - => nand write $loadaddr 0x400000 $filesize - -4. Booting your new system - - => setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr' - - If you want to set this boot option as default: - - => setenv bootcmd 'run nandboot' - => saveenv - - ...or for a single boot: - - => run nandboot - - You can login with user "root". diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig deleted file mode 100644 index de7e561352..0000000000 --- a/configs/freescale_mpc8315erdb_defconfig +++ /dev/null @@ -1,28 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_e300c3=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y -BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x200 -BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x4000 -BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y - -# Linux headers same as kernel, a 4.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5.3" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-4.5.config" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb" - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" From e2046ecee910c9b27869168b56c8f92d1a9a2b56 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 3 Mar 2018 15:03:15 -0300 Subject: [PATCH 0104/2640] mx25pdk: Bump U-Boot and kernel versions Bump U-Boot to version 2018.01 and kernel to 4.15.7. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/mx25pdk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index a88fb2aeb7..f86ce7af02 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx25pdk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx25-pdk" From 1296d57918fd2245f65414db6dad3cec25a97360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 5 Mar 2018 23:11:33 +0100 Subject: [PATCH 0105/2640] musl: bump to version 1.1.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add hash for the licence file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/musl/musl.hash | 5 +++-- package/musl/musl.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 68e6aab1fd..c011bbb711 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,3 +1,4 @@ # Locally calculated after checking pgp signature from -# http://www.musl-libc.org/releases/musl-1.1.18.tar.gz.asc -sha256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 musl-1.1.18.tar.gz +# http://www.musl-libc.org/releases/musl-1.1.19.tar.gz.asc +sha256 db59a8578226b98373f5b27e61f0dd29ad2456f4aa9cec587ba8c24508e4c1d9 musl-1.1.19.tar.gz +sha256 15d9afbf84041872b4d840ed7d165d3eee786ff3f97e703b10467c259ff4e7d9 COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index b1aace0400..fa775d1e78 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.18 +MUSL_VERSION = 1.1.19 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From 842138aaa5a3a0250649aa4406cdd3d31b32d2d6 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Mon, 5 Mar 2018 17:01:05 +0200 Subject: [PATCH 0106/2640] chromebook snow: bump kernel to 4.15 No other changes necessary, 4.15 builds and boots fine. Signed-off-by: Alex Suykov Signed-off-by: Peter Korsgaard --- .../{linux-4.6-dts-tpm.patch => linux-4.15-dts-tpm.patch} | 0 .../snow/{linux-4.6.fragment => linux-4.15.fragment} | 0 configs/chromebook_snow_defconfig | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename board/chromebook/snow/{linux-4.6-dts-tpm.patch => linux-4.15-dts-tpm.patch} (100%) rename board/chromebook/snow/{linux-4.6.fragment => linux-4.15.fragment} (100%) diff --git a/board/chromebook/snow/linux-4.6-dts-tpm.patch b/board/chromebook/snow/linux-4.15-dts-tpm.patch similarity index 100% rename from board/chromebook/snow/linux-4.6-dts-tpm.patch rename to board/chromebook/snow/linux-4.15-dts-tpm.patch diff --git a/board/chromebook/snow/linux-4.6.fragment b/board/chromebook/snow/linux-4.15.fragment similarity index 100% rename from board/chromebook/snow/linux-4.6.fragment rename to board/chromebook/snow/linux-4.15.fragment diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index 70cd42bb75..5558c101d6 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/snow/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.3" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.6-dts-tpm.patch" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.6.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5250-snow" BR2_PACKAGE_LINUX_FIRMWARE=y From 9a01e6d6cd05255cd24c73de8f76696025443cb9 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Mon, 5 Mar 2018 17:02:33 +0200 Subject: [PATCH 0107/2640] DEVELOPERS: add myself for chromebook snow Signed-off-by: Alex Suykov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7fcfaadfb0..1baa933ee3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -74,6 +74,8 @@ F: package/libqmi/ F: package/modem-manager/ N: Alex Suykov +F: board/chromebook/snow/ +F: configs/chromebook_snow_defconfig F: package/vboot-utils/ N: Alexander Clouter From 55459c67ad4bdfde1f0070a1ba8ba1c68757a8be Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 06:32:12 +0200 Subject: [PATCH 0108/2640] musl: drop upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 1296d57918fd2 (musl: bump to version 1.1.19) forgot to remove an upstream patch. Do that now. Fixes: http://autobuild.buildroot.net/results/3ea/3ea23854c501d12aa69012df9d38d33cd10ac83c/ Cc: Jörg Krause Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Acked-by: Jörg Krause Signed-off-by: Peter Korsgaard --- ...api-guards-for-Linux-kernel-header-f.patch | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch diff --git a/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch b/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch deleted file mode 100644 index cbfc9b668f..0000000000 --- a/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 6 Jan 2018 23:32:52 +0100 -Subject: [PATCH] add additional uapi guards for Linux kernel header files - -With Linux kernel 4.16 it will be possible to guard more parts of the -Linux header files from a libc. Make use of this in musl to guard all -the structures and other definitions from the Linux header files which -are also defined by the header files provided by musl. This will make -it possible to compile source files which include both the libc -headers and the kernel userspace headers. - -This extends the definitions done in commit 04983f227238 ("make -netinet/in.h suppress clashing definitions from kernel headers") - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit b583c5d3b4cc - - include/net/if.h | 7 +++++++ - include/netinet/if_ether.h | 1 + - include/sys/xattr.h | 2 ++ - 3 files changed, 10 insertions(+) - -diff --git a/include/net/if.h b/include/net/if.h -index 2f2fcc10e484..774cbff0b506 100644 ---- a/include/net/if.h -+++ b/include/net/if.h -@@ -125,6 +125,13 @@ struct ifconf { - #define ifc_req ifc_ifcu.ifcu_req - #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) - -+#define __UAPI_DEF_IF_IFCONF 0 -+#define __UAPI_DEF_IF_IFMAP 0 -+#define __UAPI_DEF_IF_IFNAMSIZ 0 -+#define __UAPI_DEF_IF_IFREQ 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #endif - - #ifdef __cplusplus -diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h -index d9a131aa2d1d..97134d75b480 100644 ---- a/include/netinet/if_ether.h -+++ b/include/netinet/if_ether.h -@@ -133,5 +133,6 @@ do { \ - (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ - } while(0) - -+#define __UAPI_DEF_ETHHDR 0 - - #endif -diff --git a/include/sys/xattr.h b/include/sys/xattr.h -index 6479fcc62e5f..eeeaafc44f09 100644 ---- a/include/sys/xattr.h -+++ b/include/sys/xattr.h -@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); - int lremovexattr(const char *, const char *); - int fremovexattr(int, const char *); - -+#define __UAPI_DEF_XATTR 0 -+ - #ifdef __cplusplus - } - #endif --- -2.15.1 - From 2af0f53b34d9785401a00edf93c2c1e27d0c9591 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 08:06:58 +0200 Subject: [PATCH 0109/2640] ser2net: bump to version 3.5 Remove also a redundant dot from description text. Add upstream hashes, and a license file hash. Cc: Francisco Gonzalez Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ser2net/Config.in | 2 +- package/ser2net/ser2net.hash | 6 +++++- package/ser2net/ser2net.mk | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in index 3f0d15b30d..cb4d69f741 100644 --- a/package/ser2net/Config.in +++ b/package/ser2net/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_SER2NET depends on BR2_USE_MMU # fork() help Ser2net provides a way for a user to connect from a network - connection to a serial port.. + connection to a serial port. http://ser2net.sourceforge.net diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 6778235768..c736c726ac 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,2 +1,6 @@ +# From https://sourceforge.net/projects/ser2net/files/ser2net/ +md5 e10e7c8c97e5bade5e85ce6e89bdf1f4 ser2net-3.5.tar.gz +sha1 0ad0affd37ef544c23f42a3f46d09e969d0d9116 ser2net-3.5.tar.gz # Locally computed: -sha256 d846066e27c3072565990745d030357aa0c278f96b7d1d4f59023347c1db8824 ser2net-3.4.tar.gz +sha256 ba9e1d60a89fd7ed075553b4a2074352902203f7fbd9b65b15048c05f0e3f3be ser2net-3.5.tar.gz +sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 833becc3e0..5ab5c4d2ae 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 3.4 +SER2NET_VERSION = 3.5 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING From 43500d5c85df7f73ccb55ce866cbe9293b8b4b10 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 08:36:53 +0200 Subject: [PATCH 0110/2640] nftables: bump to version 0.8.3 Disable man pages and pdf build to avoid dependency on docbook and dblatex. Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-src-fix-build-with-older-glibc.patch | 38 ------------------- package/nftables/nftables.hash | 6 +-- package/nftables/nftables.mk | 11 ++---- 3 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 package/nftables/0001-src-fix-build-with-older-glibc.patch diff --git a/package/nftables/0001-src-fix-build-with-older-glibc.patch b/package/nftables/0001-src-fix-build-with-older-glibc.patch deleted file mode 100644 index d1ba295306..0000000000 --- a/package/nftables/0001-src-fix-build-with-older-glibc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 381eaa40735385a1a60e5ab0a7daf4bb847fc2ab Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 9 Feb 2018 14:42:31 +0200 -Subject: [PATCH] src: fix build with older glibc - -glibc before 2.19 missed the definition of IPPROTO_MH. This leads to -build failure: - -parser_bison.y: In function 'nft_parse': -parser_bison.y:3793:21: error: 'IPPROTO_MH' undeclared (first use in this function) - | MH { $$ = IPPROTO_MH; } - ^ - -Since we have a local definition of IPPROTO_MH in headers.h use that to -fix the build. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=netfilter-devel&m=151818061103886&w=2 - - src/parser_bison.y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/parser_bison.y b/src/parser_bison.y -index 2e79109f4da3..578bfdc10429 100644 ---- a/src/parser_bison.y -+++ b/src/parser_bison.y -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.15.1 - diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index d6ccf7b479..3effe68f2e 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,6 +1,6 @@ # From http://www.netfilter.org/projects/nftables/downloads.html -sha1 51fd436845718f1221ee198128656ef9055c2588 nftables-0.8.1.tar.bz2 +sha1 533cb3bf17e90579d24f9621fdb22bdb4f7e3287 nftables-0.8.3.tar.bz2 # Locally calculated after checking pgp signature -# http://www.netfilter.org/projects/nftables/files/nftables-0.8.1.tar.bz2.sig -sha256 8aead66cce70d68c70e4be917813abcbcf62811ee6de4c7761d0e34391772fc4 nftables-0.8.1.tar.bz2 +# http://www.netfilter.org/projects/nftables/files/nftables-0.8.3.tar.bz2.sig +sha256 d16be1f5db88e95d29fc0b0e4df88acd079f3ee8e2b872ec7673f9a0d5d95e38 nftables-0.8.3.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 329b9871fe..571cd33ad5 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,13 +4,14 @@ # ################################################################################ -NFTABLES_VERSION = 0.8.1 +NFTABLES_VERSION = 0.8.3 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING +NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc ifeq ($(BR2_PACKAGE_READLINE),y) NFTABLES_DEPENDENCIES += readline @@ -23,12 +24,6 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) NFTABLES_LIBS += -ljansson -lm endif -NFTABLES_CONF_ENV = \ - ac_cv_prog_CONFIG_PDF=no \ - LIBS="$(NFTABLES_LIBS)" \ - DBLATEX=no \ - DOCBOOK2X_MAN=no \ - DOCBOOK2MAN=no \ - DB2X_DOCBOOK2MAN=no +NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" $(eval $(autotools-package)) From 120d492623abc59200bc556525a88ea8196a9340 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 07:05:53 +0200 Subject: [PATCH 0111/2640] iptables: fix build with older kernel headers iptables version 1.6.2 uses the BPF_OBJ_GET macro that is only available since kernel version 4.4. Add a patch fixing the detection of the feature availability. Fixes: http://autobuild.buildroot.net/results/e67/e670548c4b250e8a102a4929cafa85634fc79a3d/ http://autobuild.buildroot.net/results/1a7/1a7ab509440c9acacf606f238b8989d9b4287d52/ http://autobuild.buildroot.net/results/555/55583e20bcdf602132c074e08d1a49507d5a48ad/ Cc: Antoine Tenart Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ..._bpf-Fix-build-with-old-kernel-versi.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch diff --git a/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch b/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch new file mode 100644 index 0000000000..966cbe31ab --- /dev/null +++ b/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch @@ -0,0 +1,49 @@ +From 5beb1582d13d3bfdd0d2b277f5f3154b2fbf4a8e Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Tue, 27 Feb 2018 16:56:55 +0100 +Subject: [PATCH] extensions: libxt_bpf: Fix build with old kernel versions + +In kernel 3.18 the union bpf_attr does not have a pathname attribute and +BPF_OBJ_GET is also not defined in these versions. +This was added in Linux commit b2197755b263 ("bpf: add support for +persistent maps/progs"). Check for the BPF_FS_MAGIC define which was +also added in this Linux commit and only activate this code in case we +find that define. + +This fixes a build problem with Linux 3.18. +Netfilter bug: #1231 + +Fixes: f17f9ace8a8 ("extensions: libxt_bpf: support ebpf pinned objects") +Signed-off-by: Hauke Mehrtens +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit 5beb1582d13d + + extensions/libxt_bpf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/extensions/libxt_bpf.c b/extensions/libxt_bpf.c +index 9510c190f315..92958247c756 100644 +--- a/extensions/libxt_bpf.c ++++ b/extensions/libxt_bpf.c +@@ -22,6 +22,7 @@ + #include + #endif + ++#include + #include + + #define BCODE_FILE_MAX_LEN_B 1024 +@@ -62,7 +63,7 @@ static const struct xt_option_entry bpf_opts_v1[] = { + + static int bpf_obj_get(const char *filepath) + { +-#if defined HAVE_LINUX_BPF_H && defined __NR_bpf ++#if defined HAVE_LINUX_BPF_H && defined __NR_bpf && defined BPF_FS_MAGIC + union bpf_attr attr; + + memset(&attr, 0, sizeof(attr)); +-- +2.16.1 + From 49d2638276e2d464e016effa1f95a15545cf9208 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Mar 2018 09:25:15 +0100 Subject: [PATCH 0112/2640] configs/ci40: remove defconfig >From the original submitter of this defconfig: """ I no longer have access to ci40 board. It would be difficult for me to maintain it. """ And this defconfig currently fails to build with gcc 6.x. Therefore, drop it. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306806 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/ci40/genimage.cfg | 12 -------- board/ci40/post-build.sh | 4 --- board/ci40/readme.txt | 65 ---------------------------------------- configs/ci40_defconfig | 48 ----------------------------- 5 files changed, 130 deletions(-) delete mode 100644 board/ci40/genimage.cfg delete mode 100755 board/ci40/post-build.sh delete mode 100644 board/ci40/readme.txt delete mode 100644 configs/ci40_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 779565956f..f52487b35c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,6 @@ beaglebone_defconfig: *defconfig beaglebone_qt5_defconfig: *defconfig chromebook_snow_defconfig: *defconfig ci20_defconfig: *defconfig -ci40_defconfig: *defconfig csky_gx6605s_defconfig: *defconfig cubieboard2_defconfig: *defconfig engicam_imx6qdl_icore_defconfig: *defconfig diff --git a/board/ci40/genimage.cfg b/board/ci40/genimage.cfg deleted file mode 100644 index 0ffc91ce87..0000000000 --- a/board/ci40/genimage.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Minimal SD card image -# - -image sdcard.img { - hdimage { - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/ci40/post-build.sh b/board/ci40/post-build.sh deleted file mode 100755 index 9af74c7a7e..0000000000 --- a/board/ci40/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Copy to target -cp ${BINARIES_DIR}/vmlinux.gz.itb ${TARGET_DIR}/fitImage diff --git a/board/ci40/readme.txt b/board/ci40/readme.txt deleted file mode 100644 index ba1eb93883..0000000000 --- a/board/ci40/readme.txt +++ /dev/null @@ -1,65 +0,0 @@ -********************* -* MIPS Creator CI40 * -********************* - -This document details how to build and run a Buildroot system on the -MIPS Creator CI40 platform. For more details about the CI40, see -https://creatordev.io/ci40-iot-hub.html. - -How to build ------------- - -$ make ci40_defconfig -$ make - -Prepare USB/MMC for boot ------------------------- - -On successful build, "sdcard.img" file will be created in 'output/images' -folder. - -Use following command to write image to bootable device - -$ sudo dd if=./output/images/sdcard.img of=/dev/ - -Booting from USB/MMC --------------------- - -The boot loader is already present in NOR flash. To boot your newly generated -Linux and root filesystem, you need to interrupt U-Boot autoboot. Current -U-Boot is configured with 2 seconds of boot-delay, after expiry of this -boot-delay timeout U-Boot starts booting the default image. To interrupt -autoboot, press any key before the boot-delay time expires, U-Boot will -stop the autoboot process and give a U-Boot prompt. You can now boot to -your preferred boot method as describe below: - -From USB - pistachio # run usbboot - -From SD-Card - pistachio # run mmcboot - -Persistent boot command ------------------------ - -To boot automatically to your preferred boot method, use following command to -make it persistent, for example to automatically boot to usb: - - pistachio # setenv bootcmd run usbboot - pistachio # saveenv - -Flash new bootloader --------------------- - -The bootloader image will be available in the 'output/images' folder. To flash -the new bootloader, copy it to the device and use the following command on the -device: - -# flashcp -v u-boot-pistachio_marduk-.img /dev/mtd0 - -Online docs ------------ - -Mostly for OpenWRT but it is applicable to Buildroot -https://docs.creatordev.io/ci40/guides/openwrt-platform/#overview - diff --git a/configs/ci40_defconfig b/configs/ci40_defconfig deleted file mode 100644 index 2ea3afe47d..0000000000 --- a/configs/ci40_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -# architecture -BR2_mipsel=y -BR2_mips_32r2=y - -# linux header same as custom kernel ie 4.4.x -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,CreatorDev,linux,openwrt-4.4.14)/linux-openwrt-4.4.14.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="pistachio" -BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -# vmlinux.gz.itb image includes img/pistachio_marduk device tree -BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="vmlinux.gz.itb" - -# bootloader flash support -BR2_PACKAGE_MTD=y - -# wireless firmware -BR2_PACKAGE_UCCP420WLAN=y - -# wireless package -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pistachio_marduk" -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,CreatorDev,u-boot,v1.0.5)/u-boot-CreatorDev-v1.0.5.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-pistachio_marduk-2015.10-v1.0.5.img" - -# fitimage / image generation -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ci40/post-build.sh" - -# image generation -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci40/genimage.cfg" From b0fd706c2fe77157ec9d157568acf535d7d8daca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Mar 2018 08:51:04 +0100 Subject: [PATCH 0113/2640] configs/firefly_rk3288: remove defconfig The original submitter of this defconfig: """ Sorry, unfortunately we no longer have the firefly board, so we can't maintain it. """ And this defconfig fails to build with gcc 6.x, causing breakage in the defconfig testing. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306815 https://gitlab.com/buildroot.org/buildroot/-/jobs/55306814 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 2 -- board/firefly/firefly-rk3288/extlinux.conf | 6 ---- board/firefly/firefly-rk3288/post-build.sh | 3 -- board/firefly/firefly-rk3288/post-image.sh | 20 ----------- board/firefly/firefly-rk3288/readme.txt | 40 ---------------------- board/firefly/firefly-rk3288/sd-image.cfg | 22 ------------ configs/firefly_rk3288_defconfig | 32 ----------------- configs/firefly_rk3288_demo_defconfig | 40 ---------------------- 8 files changed, 165 deletions(-) delete mode 100644 board/firefly/firefly-rk3288/extlinux.conf delete mode 100755 board/firefly/firefly-rk3288/post-build.sh delete mode 100755 board/firefly/firefly-rk3288/post-image.sh delete mode 100644 board/firefly/firefly-rk3288/readme.txt delete mode 100644 board/firefly/firefly-rk3288/sd-image.cfg delete mode 100644 configs/firefly_rk3288_defconfig delete mode 100644 configs/firefly_rk3288_demo_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f52487b35c..5edb19f75d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,8 +111,6 @@ engicam_imx6qdl_icore_qt5_defconfig: *defconfig engicam_imx6qdl_icore_rqs_defconfig: *defconfig engicam_imx6ul_geam_defconfig: *defconfig engicam_imx6ul_isiot_defconfig: *defconfig -firefly_rk3288_defconfig: *defconfig -firefly_rk3288_demo_defconfig: *defconfig freescale_imx28evk_defconfig: *defconfig freescale_imx31_3stack_defconfig: *defconfig freescale_imx6dlsabreauto_defconfig: *defconfig diff --git a/board/firefly/firefly-rk3288/extlinux.conf b/board/firefly/firefly-rk3288/extlinux.conf deleted file mode 100644 index 39ac5b9dac..0000000000 --- a/board/firefly/firefly-rk3288/extlinux.conf +++ /dev/null @@ -1,6 +0,0 @@ -default firefly-rk3288 - -label firefly-rk3288 -kernel /boot/uImage -devicetree /boot/rk3288-firefly.dtb -append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/firefly/firefly-rk3288/post-build.sh b/board/firefly/firefly-rk3288/post-build.sh deleted file mode 100755 index 94e89ce6a4..0000000000 --- a/board/firefly/firefly-rk3288/post-build.sh +++ /dev/null @@ -1,3 +0,0 @@ -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/firefly/firefly-rk3288/post-image.sh b/board/firefly/firefly-rk3288/post-image.sh deleted file mode 100755 index d89bc7e550..0000000000 --- a/board/firefly/firefly-rk3288/post-image.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -MKIMAGE=$HOST_DIR/bin/mkimage - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/board/firefly/firefly-rk3288/readme.txt b/board/firefly/firefly-rk3288/readme.txt deleted file mode 100644 index d6210857f1..0000000000 --- a/board/firefly/firefly-rk3288/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -Firefly RK3288 - -How to build it -=============== - - $ make firefly_rk3288_defconfig - -Then you can edit the build options using - - $ make menuconfig - -Compile all and build rootfs image: - - $ make - -Result of the build -------------------- - -After building, you should get a tree like this: - - output/images/ - ├── rk3288-firefly.dtb - ├── rootfs.ext2 - ├── rootfs.ext4 -> rootfs.ext2 - ├── sdcard.img - ├── u-boot-dtb.img - ├── u-boot-spl-dtb.bin - ├── u-boot-spl-dtb.img - └── uImage - -Prepare your SDCard -=================== - -Buildroot generates a ready-to-use SD card image that you can flash directly to -the card. The image will be in output/images/sdcard.img. -You can write this image directly to an SD card device (i.e. /dev/xxx): - - $ dd if=output/images/sdcard.img of=/dev/xxx - -Finally, you can insert the SD card to the Firefly RK3288 board and boot it. diff --git a/board/firefly/firefly-rk3288/sd-image.cfg b/board/firefly/firefly-rk3288/sd-image.cfg deleted file mode 100644 index a9eb9f0142..0000000000 --- a/board/firefly/firefly-rk3288/sd-image.cfg +++ /dev/null @@ -1,22 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition u-boot-spl-dtb { - in-partition-table = "no" - image = "u-boot-spl-dtb.img" - offset = 32K - } - - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot-dtb.img" - offset = 128K - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/firefly_rk3288_defconfig b/configs/firefly_rk3288_defconfig deleted file mode 100644 index 017a7ee6d7..0000000000 --- a/configs/firefly_rk3288_defconfig +++ /dev/null @@ -1,32 +0,0 @@ -BR2_arm=y -BR2_cortex_a17=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y -BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" -BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/firefly_rk3288_demo_defconfig b/configs/firefly_rk3288_demo_defconfig deleted file mode 100644 index d394ede30e..0000000000 --- a/configs/firefly_rk3288_demo_defconfig +++ /dev/null @@ -1,40 +0,0 @@ -BR2_arm=y -BR2_cortex_a17=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" -BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_EXAMPLES=y -BR2_PACKAGE_QT5BASE_GUI=y -BR2_PACKAGE_QT5BASE_EGLFS=y -BR2_PACKAGE_MALI_T76X=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 9f13f8c2374e8240c1b85c702257341df80bd797 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Sun, 4 Mar 2018 20:47:00 -0600 Subject: [PATCH 0114/2640] freescale_p1010rdb_pa_defconfig: remove board This defconfig currently doesn't build with GCC6 (Linux 4.1). https://gitlab.com/buildroot.org/buildroot/-/jobs/55306827 A maintainer w/board isn't available to make updates, so removing this config. Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/freescale/p1010rdb/linux-4.1.config | 70 ----------------------- board/freescale/p1010rdb/readme.txt | 40 ------------- configs/freescale_p1010rdb_pa_defconfig | 27 --------- 4 files changed, 138 deletions(-) delete mode 100644 board/freescale/p1010rdb/linux-4.1.config delete mode 100644 board/freescale/p1010rdb/readme.txt delete mode 100644 configs/freescale_p1010rdb_pa_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5edb19f75d..2a1d463876 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,6 @@ freescale_imx6sololiteevk_defconfig: *defconfig freescale_imx6sxsabresd_defconfig: *defconfig freescale_imx6ulevk_defconfig: *defconfig freescale_imx7dsabresd_defconfig: *defconfig -freescale_p1010rdb_pa_defconfig: *defconfig friendlyarm_nanopi_a64_defconfig: *defconfig friendlyarm_nanopi_neo2_defconfig: *defconfig galileo_defconfig: *defconfig diff --git a/board/freescale/p1010rdb/linux-4.1.config b/board/freescale/p1010rdb/linux-4.1.config deleted file mode 100644 index 2de430cbee..0000000000 --- a/board/freescale/p1010rdb/linux-4.1.config +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_PHYS_64BIT=y -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_P1010_RDB=y -CONFIG_HIGHMEM=y -CONFIG_SWIOTLB=y -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_RAPIDIO=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_DEVTMPFS=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_NETDEVICES=y -CONFIG_GIANFAR=y -CONFIG_VITESSE_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -CONFIG_EXT4_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_SQUASHFS=y -CONFIG_CRYPTO_DEV_FSL_CAAM=y diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt deleted file mode 100644 index 025c97e8a8..0000000000 --- a/board/freescale/p1010rdb/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -You'll need to program the files created by buildroot into the flash. -The fast way is to tftp transfer the files via one of the network interfaces. - -Alternatively you can transfer the files via serial console with an Ymodem -file transfer from your terminal program by using a "loady" command -from the u-boot prompt instead of the "tftp ..." commands stated below. -Beware that serial console file transfers are quite slow! - -1. Program the DTB to NOR flash - - => tftp $loadaddr p1010rdb-pa.dtb - => erase 0xee000000 +$filesize - => cp.b $loadaddr 0xee000000 $filesize - -2. Program the kernel to NOR flash - - => tftp $loadaddr uImage - => erase 0xee080000 +$filesize - => cp.b $loadaddr 0xee080000 $filesize - -3. Program the root filesystem to NOR flash - - => tftp $loadaddr rootfs.jffs2 - => erase 0xee800000 0xeff5ffff - => cp.b $loadaddr 0xee800000 $filesize - -4. Booting your new system - - => setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000' - - If you want to set this boot option as default: - - => setenv bootcmd 'run norboot' - => saveenv - - ...or for a single boot: - - => run norboot - - You can login with user "root". diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig deleted file mode 100644 index 3497275c8a..0000000000 --- a/configs/freescale_p1010rdb_pa_defconfig +++ /dev/null @@ -1,27 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_8548=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y -BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x20 -BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000 - -# Linux headers same as kernel, a 4.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-4.1.config" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa" - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" From dde090c299b0357fdb1a4ec44ad8d332ac57f65e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:17 +0100 Subject: [PATCH 0115/2640] linux: fix passing of host CFLAGS and LDFLAGS We were passing HOSTCFLAGS="$(HOSTCFLAGS)" to Linux. However: - HOSTCFLAGS in Buildroot doesn't exist, and is empty, so this assignment never did anything. The name of the variable in Buildroot in HOST_CFLAGS. - HOSTCFLAGS in Linux isn't used everywhere, and passing it overrides the default HOSTCFLAGS value defined in the main Linux kernel Makefile. In addition, there is no way to pass additional host LDFLAGS in the Linux kernel build system. Therefore, we simply shoehorn our HOST_CFLAGS and HOST_LDFLAGS while passing HOSTCC to the Linux kernel build system. This has been tested to work fine with host OpenSSL and host libelf only available in $(HOST_DIR). Signed-off-by: Thomas Petazzoni Tested-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index ab940e7305..3b69524663 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -95,8 +95,7 @@ LINUX_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif LINUX_MAKE_FLAGS = \ - HOSTCC="$(HOSTCC)" \ - HOSTCFLAGS="$(HOSTCFLAGS)" \ + HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ From 93a7edf4bc9bfcf821f608815870d06198eb2adf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:15 +0100 Subject: [PATCH 0116/2640] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL Some Linux kernel configuration options (such as CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host program called extract-cert, which itself needs OpenSSL. Users having OpenSSL installed on their system won't see a problem, but users who don't have OpenSSL installed will get a build failure. This commit adds a new option that allows users to indicate that their Linux configuration requires building host-openssl. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- linux/Config.in | 13 +++++++++++++ linux/linux.mk | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index bc6cd1b5f7..57bb11c2cd 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -407,6 +407,19 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET /boot if DTBs have been generated by the kernel build process. +config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL + bool "Needs host OpenSSL" + help + Some Linux kernel configuration options (such as + CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host + program called extract-cert, which itself needs + OpenSSL. Enabling this option will ensure host-openssl gets + built before the Linux kernel. + + Enable this option if you get a Linux kernel build failure + such as "scripts/extract-cert.c:21:25: fatal error: + openssl/bio.h: No such file or directory". + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 3b69524663..91d8751a71 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -80,6 +80,10 @@ LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y) +LINUX_DEPENDENCIES += host-openssl +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) From f7cd72b3d4e2b1d993c293e355e350bedbed4eab Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:16 +0100 Subject: [PATCH 0117/2640] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF Some Linux kernel configuration options (such as CONFIG_UNWINDER_ORC) require building a host program that needs libelf. Users who have libelf installed on their system won't see a problem, but users who don't have libelf installed will get a build failure. Therefore, this commit adds an option that allows a user to indicate that his Linux kernel configuration requires libelf. When this option is enabled, we add host-elfutils to the dependencies of the linux package (host-elfutils provides the libelf library). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- linux/Config.in | 13 +++++++++++++ linux/linux.mk | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 57bb11c2cd..e299af4008 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -420,6 +420,19 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL such as "scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory". +config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF + bool "Needs host libelf" + help + Some Linux kernel configuration options (such as + CONFIG_UNWINDER_ORC) require building a host program that + needs libelf. Enabling this option will ensure host-elfutils + (which provides libelf) gets built before the Linux kernel. + + Enable this option if you get a Linux kernel build failure + such as "Cannot generate ORC metadata for + CONFIG_UNWINDER_ORC=y, please install libelf-dev, + libelf-devel or elfutils-libelf-devel". + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 91d8751a71..28d799f946 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -84,6 +84,10 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y) LINUX_DEPENDENCIES += host-openssl endif +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) +LINUX_DEPENDENCIES += host-elfutils +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) From 248161d6faedc928a49391dccf9f4e39838ef73e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:18 +0100 Subject: [PATCH 0118/2640] configs/qemu_x86_64_defconfig: remove kernel options that need openssl/libelf The ORC unwinder requires libelf to be available on the host, so use the frame pointer unwinder instead. Using the frame pointer unwinder is probably good enough in our default Qemu configurations. Wireless support ends up enabling CONFIG_SYSTEM_TRUSTED_KEYRING, which requires openssl to be available on the host, so disable wireless support, which isn't needed in Qemu. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- board/qemu/x86_64/linux-4.15.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/qemu/x86_64/linux-4.15.config b/board/qemu/x86_64/linux-4.15.config index 0e59b87bd6..5fa33d4424 100644 --- a/board/qemu/x86_64/linux-4.15.config +++ b/board/qemu/x86_64/linux-4.15.config @@ -9,6 +9,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +# CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -20,6 +21,7 @@ CONFIG_NETDEVICES=y CONFIG_VIRTIO_NET=y CONFIG_NE2K_PCI=y CONFIG_8139CP=y +# CONFIG_WLAN is not set CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y @@ -47,3 +49,4 @@ CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_UNWINDER_FRAME_POINTER=y From 5c5f1b07434a1d17cace941ffcec791f3633b5ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:19 +0100 Subject: [PATCH 0119/2640] configs/qemu_x86_defconfig: remove kernel options that need openssl Wireless support ends up enabling CONFIG_SYSTEM_TRUSTED_KEYRING, which requires openssl to be available on the host, so disable wireless support, which isn't needed in Qemu. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- board/qemu/x86/linux-4.15.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/qemu/x86/linux-4.15.config b/board/qemu/x86/linux-4.15.config index 0e59b87bd6..79f7537d80 100644 --- a/board/qemu/x86/linux-4.15.config +++ b/board/qemu/x86/linux-4.15.config @@ -9,6 +9,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +# CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y @@ -20,6 +21,7 @@ CONFIG_NETDEVICES=y CONFIG_VIRTIO_NET=y CONFIG_NE2K_PCI=y CONFIG_8139CP=y +# CONFIG_WLAN is not set CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y From a645de1362a16e89430b39f6a31049a3fdbc9f57 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:20 +0100 Subject: [PATCH 0120/2640] configs/orangepi_zero: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306889 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/orangepi_zero_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 2efccc0ced..fcf9b325cd 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set From 661c81b2fe8e349b83c05c60b1489eacbd47f212 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:21 +0100 Subject: [PATCH 0121/2640] configs/orangepi_pc_plus: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306885 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 053c3bffbd..edc3909ae7 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -13,6 +13,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set From bc575cf9de36750f76a232493508f63c3c18979e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:22 +0100 Subject: [PATCH 0122/2640] configs/snps_archs38_axs103: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306944 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/snps_archs38_axs103_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index 42a4feaba8..39ceeae433 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -17,6 +17,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Bootloader BR2_TARGET_UBOOT=y From 53f0ffe34a05394e4135c81ca2622be5b8741c79 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:23 +0100 Subject: [PATCH 0123/2640] configs/snps_archs38_vdk: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306946 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/snps_archs38_vdk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig index 434ed37a9e..46b539beec 100644 --- a/configs/snps_archs38_vdk_defconfig +++ b/configs/snps_archs38_vdk_defconfig @@ -17,3 +17,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From da9678f426e6664b6839e180dcc374dae2830f34 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:24 +0100 Subject: [PATCH 0124/2640] configs/mx53loco: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306856 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/mx53loco_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index aaba4767ed..8bb4014178 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -32,3 +32,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 5dac3b9b8d72ea2b4aa264bfaa54e41f32595009 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:25 +0100 Subject: [PATCH 0125/2640] configs/imx6-sabresd: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306836 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/imx6-sabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index edb4d7ed10..9999513914 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -36,3 +36,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From e929742b84651ffee8a81a1bfe014a0c9772ebf4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:26 +0100 Subject: [PATCH 0126/2640] configs/snps_arc700_axs101: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306943 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/snps_arc700_axs101_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index daa8ebb8f0..0fefaf4aa8 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_DEFCONFIG="axs101" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Bootloader BR2_TARGET_UBOOT=y From ddbfee735e9bf13ebe6bec28790d18579ec37837 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:27 +0100 Subject: [PATCH 0127/2640] configs/solidrun_macchiatobin_mainline: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306948 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/solidrun_macchiatobin_mainline_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/solidrun_macchiatobin_mainline_defconfig b/configs/solidrun_macchiatobin_mainline_defconfig index 526c021fe7..dd797d709c 100644 --- a/configs/solidrun_macchiatobin_mainline_defconfig +++ b/configs/solidrun_macchiatobin_mainline_defconfig @@ -31,6 +31,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/linux-extras.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # rootfs BR2_TARGET_ROOTFS_TAR=y From 11f07c20081fdbac6b56f81b7d03b717184fda30 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:28 +0100 Subject: [PATCH 0128/2640] configs/freescale_imx6qsabreauto: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306820 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6qsabreauto_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index f03b7101fb..bc333e1a37 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_NEEDS_DTC=y From d329ec701e1c78171528139c0c6757cdca18e94d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:29 +0100 Subject: [PATCH 0129/2640] configs/solidrun_macchiatobin_marvell: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306949 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/solidrun_macchiatobin_marvell_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/solidrun_macchiatobin_marvell_defconfig b/configs/solidrun_macchiatobin_marvell_defconfig index 1e747c344a..5489136e1c 100644 --- a/configs/solidrun_macchiatobin_marvell_defconfig +++ b/configs/solidrun_macchiatobin_marvell_defconfig @@ -22,6 +22,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/u-boot-marvell" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="u-boot-2017.03-armada-17.10" BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" +BR2_TARGET_UBOOT_NEEDS_DTC=y # Kernel BR2_LINUX_KERNEL=y From 3982d28cfbdcaf34a844fdce63ef68634adcf79f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:30 +0100 Subject: [PATCH 0130/2640] configs/freescale_imx6sololiteevk: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306822 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6sololiteevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index 1b3546255a..b840f2f185 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -36,3 +36,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_NEEDS_DTC=y From 3575f84c4e53964fc0ffb53ec7eca362c1c3973e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:31 +0100 Subject: [PATCH 0131/2640] configs/freescale_imx6dlsabresd: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306819 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6dlsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index a5c0aa6090..dc9b498aa4 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -39,3 +39,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_NEEDS_DTC=y From 770a75600ccfa0be6ec783340c2cd6cc9cfa3a72 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:32 +0100 Subject: [PATCH 0132/2640] configs/freescale_imx6dlsabreauto: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306818 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6dlsabreauto_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 19c1cc286a..55db461f44 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_NEEDS_DTC=y From 63bab546562bf69add47f01ea9c6f361d7b8f041 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:33 +0100 Subject: [PATCH 0133/2640] configs/freescale_imx7dsabresd: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306825 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx7dsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 844b547670..3563d1e1b2 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_DTC=y # required tools to create the microSD image BR2_PACKAGE_HOST_DOSFSTOOLS=y From e9151fd0be5369302933c9f0f26f97008786552d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:34 +0100 Subject: [PATCH 0134/2640] configs/imx6ulevk: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306824 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/imx6ulevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6ulevk_defconfig b/configs/imx6ulevk_defconfig index 0ae6b5308e..069f8cfc5e 100644 --- a/configs/imx6ulevk_defconfig +++ b/configs/imx6ulevk_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_DTC=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From b732fed265203a6c112007982c1ea601892f900f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:35 +0100 Subject: [PATCH 0135/2640] configs/freescale_imx6qsabresd: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306821 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6qsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 613b48a913..e0ef20c578 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -40,3 +40,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" +BR2_TARGET_UBOOT_NEEDS_DTC=y From 41dca854e641044a01402897a34518c4cab5095a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:36 +0100 Subject: [PATCH 0136/2640] configs/freescale_imx6sxsabresd: U-Boot needs host-dtc Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306823 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_imx6sxsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 01e13143b2..eb11fb8ae1 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -39,3 +39,4 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_DTC=y From a3f2e977cdda32ceea9b6e445066fc9d1ab2bdd2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:37 +0100 Subject: [PATCH 0137/2640] configs/ts4900: explicitly specify Linux kernel version The ts4900 defconfig currently fails to build because it selects kernel headers 4.12, but doesn't specify a kernel version, and therefore 4.15 is built causing the following error: Incorrect selection of kernel headers: expected 4.12.x, got 4.15.x In commit 7c3a7d808e751d4b608a4c50a0ae4d13dedebab7 ("configs/ts4900: bump kernel version to 4.12"), when this defconfig was switched from using a vendor provided kernel to the mainline kernel, the kernel version was no longer explicitly specified. Since this commit indicated 4.12, and the kernel headers version selected is also 4.12, we also use that as the fixed kernel version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306955 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/ts4900_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ts4900_defconfig b/configs/ts4900_defconfig index 082234fcad..e7950cea4b 100644 --- a/configs/ts4900_defconfig +++ b/configs/ts4900_defconfig @@ -3,6 +3,8 @@ BR2_cortex_a9=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technologic/ts4900/post-image.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" From 74295b02d4b380e5267357be0ae1281c7410cdc2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 13:38:09 +0200 Subject: [PATCH 0138/2640] ipset: bump to version 6.36 Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...t-reference-to-u_int8_t-with-uint8_t.patch | 28 ------------------- package/ipset/ipset.hash | 6 ++-- package/ipset/ipset.mk | 2 +- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch diff --git a/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch b/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch deleted file mode 100644 index 84863e6e13..0000000000 --- a/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a4212bf911026740afc7fce98d9100e2ef5dcea0 Mon Sep 17 00:00:00 2001 -From: Jozsef Kadlecsik -Date: Tue, 26 Sep 2017 07:00:13 +0200 -Subject: [PATCH] Replace the last reference to u_int8_t with uint8_t. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit a4212bf911026740 - - src/ipset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ipset.c b/src/ipset.c -index 79f56b869ea7..df0778a92d8b 100644 ---- a/src/ipset.c -+++ b/src/ipset.c -@@ -282,7 +282,7 @@ call_parser(int *argc, char *argv[], const struct ipset_type *type, - const struct ipset_arg *arg; - const char *optstr; - const struct ipset_type *t = type; -- u_int8_t revision = type->revision; -+ uint8_t revision = type->revision; - int ret = 0, i = 1; - - /* Currently CREATE and ADT may have got additional arguments */ --- -2.14.2 - diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index dcd709e8c1..9185d94d85 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,6 +1,6 @@ -# From http://ftp.netfilter.org/pub/ipset/ipset-6.34.tar.bz2.md5sum.txt -md5 51bd03f976a1501fd45e1d71a1e2e6bf ipset-6.34.tar.bz2 +# From http://ftp.netfilter.org/pub/ipset/ipset-6.36.tar.bz2.md5sum.txt +md5 fda041afefd581464e445b87beeb0681 ipset-6.36.tar.bz2 # Calculated based on the hash above -sha256 d70e831b670b7aa25dde81fd994d3a7ce0c0e801559a557105576df66cd8d680 ipset-6.34.tar.bz2 +sha256 22224a90dc6c7d97b7a7addedd0740c3841e3d9a7ff8c8d2123bae0c3620d30d ipset-6.36.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index d7299568e5..e9f8165fab 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 6.34 +IPSET_VERSION = 6.36 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From da05d748057a98254a9c4fbd6afbc8ebf7e08afd Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 19:00:47 +0200 Subject: [PATCH 0139/2640] ntp: security bump to version 4.2.8p11 Fixed or improved security issues: CVE-2016-1549 (fixed in 4.2.8p7; this release adds protection): A malicious authenticated peer can create arbitrarily-many ephemeral associations in order to win the clock selection algorithm CVE-2018-7182: Buffer read overrun leads to undefined behavior and information leak CVE-2018-7170: Multiple authenticated ephemeral associations CVE-2018-7184: Interleaved symmetric mode cannot recover from bad state CVE-2018-7185: Unauthenticated packet can reset authenticated interleaved association CVE-2018-7183: ntpq:decodearr() can write beyond its buffer limit Drop patch #3. libntpq_a_CFLAGS now includes NTP_HARD_CFLAGS via AM_CFLAGS. Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ntp/0003-ntpq-fpic.patch | 23 ----------------------- package/ntp/ntp.hash | 7 ++++--- package/ntp/ntp.mk | 3 +-- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 package/ntp/0003-ntpq-fpic.patch diff --git a/package/ntp/0003-ntpq-fpic.patch b/package/ntp/0003-ntpq-fpic.patch deleted file mode 100644 index 6e05a677c5..0000000000 --- a/package/ntp/0003-ntpq-fpic.patch +++ /dev/null @@ -1,23 +0,0 @@ -ntpq/Makefile.am: add NTP_HARD_CFLAGS - -Pass NTP_HARD_CFLAGS when building ntpq, like in all other ntp -modules, to make sure -fPIC is passed. - -Originally taken from -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494143c3b4921a5c8b8596d58f2c8b98296bf688. - -Signed-off-by: Thomas Petazzoni - -Index: b/ntpq/Makefile.am -=================================================================== ---- a/ntpq/Makefile.am -+++ b/ntpq/Makefile.am -@@ -23,7 +23,7 @@ - ntpq_LDADD += $(LDADD_NTP) - noinst_HEADERS= ntpq.h - noinst_LIBRARIES= libntpq.a --libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB -+libntpq_a_CFLAGS= $(NTP_HARD_CFLAGS) -DNO_MAIN_ALLOWED -DBUILD_AS_LIB - CLEANFILES= - DISTCLEANFILES= .version version.c config.log $(man_MANS) - ETAGS_ARGS= Makefile.am diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index d8b7083c47..ea86c1586f 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,4 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p10.tar.gz.md5 -md5 745384ed0dedb3f66b33fe84d66466f9 ntp-4.2.8p10.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz.md5 +md5 00950ca2855579541896513e78295361 ntp-4.2.8p11.tar.gz # Calculated based on the hash above -sha256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f ntp-4.2.8p10.tar.gz +sha256 f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e ntp-4.2.8p11.tar.gz +sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index cc363269c3..1f66ad996b 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p10 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p11 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox) NTP_LICENSE = NTP @@ -20,7 +20,6 @@ NTP_CONF_OPTS = \ --disable-local-libevent # 0002-ntp-syscalls-fallback.patch -# 0003-ntpq-fpic.patch NTP_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) From d233cc72c4b901f1ea0ae4ce895ff665bd0b78d9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Mar 2018 16:46:51 +0100 Subject: [PATCH 0140/2640] linux: Config.in: correct typo in kernel compression format help text s/build/built/. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index e299af4008..dadfc88da4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -284,7 +284,7 @@ endchoice choice prompt "Kernel compression format" help - This selection will just ensure that the correct host tools are build. + This selection will just ensure that the correct host tools are built. The actual compression for the kernel should be selected in the kernel configuration menu. From 5766b6fb34a897092092f7d76d6b4f2bc8c48571 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 7 Mar 2018 08:59:41 +0200 Subject: [PATCH 0141/2640] ntp: fix build without SSP support In version 4.2.8p11 ntp changed its configure script build hardening parameter to '--with-hardenfile'. Update the parameter name to avoid -fstack-protector-all when the toolchain does not support this option. Fixes: http://autobuild.buildroot.net/results/60e/60e8b9864932f2cabc7deb43234abe168bd113c5/ http://autobuild.buildroot.net/results/592/592db6836817bb078a2f1146d2ce6241bf7997a3/ http://autobuild.buildroot.net/results/b07/b070fbc66a928888df8d2561dad3632778d55e0d/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ntp/ntp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 1f66ad996b..b5e2c1e026 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -30,9 +30,9 @@ NTP_CONF_OPTS += --without-crypto --disable-openssl-random endif ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) -NTP_CONF_OPTS += --with-locfile=linux +NTP_CONF_OPTS += --with-hardenfile=linux else -NTP_CONF_OPTS += --with-locfile=default +NTP_CONF_OPTS += --with-hardenfile=default endif ifeq ($(BR2_PACKAGE_LIBCAP),y) From e5f64bed430005e502c6419317f1354728070e42 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 6 Mar 2018 22:03:25 +0200 Subject: [PATCH 0142/2640] python-jsonmodels: new package Package to create and handle json structures in Python, with very easy and convenient API. Signed-off-by: Asaf Kahlon Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-jsonmodels/Config.in | 9 +++++++++ package/python-jsonmodels/python-jsonmodels.hash | 4 ++++ package/python-jsonmodels/python-jsonmodels.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-jsonmodels/Config.in create mode 100644 package/python-jsonmodels/python-jsonmodels.hash create mode 100644 package/python-jsonmodels/python-jsonmodels.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1baa933ee3..f3590f8b52 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -178,6 +178,9 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ +N: Asaf Kahlon +F: package/python-jsonmodels/ + N: Ash Charles F: package/pru-software-support/ F: package/ti-cgt-pru/ diff --git a/package/Config.in b/package/Config.in index 12d3d2bbff..6abbb43e38 100644 --- a/package/Config.in +++ b/package/Config.in @@ -805,6 +805,7 @@ menu "External python modules" source "package/python-itsdangerous/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jinja2/Config.in" + source "package/python-jsonmodels/Config.in" source "package/python-jsonschema/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in new file mode 100644 index 0000000000..d840e2acfe --- /dev/null +++ b/package/python-jsonmodels/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_JSONMODELS + bool "python-jsonmodels" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Models to make easier to deal with structures that are converted + to, or read from JSON. + + https://github.com/beregond/jsonmodels diff --git a/package/python-jsonmodels/python-jsonmodels.hash b/package/python-jsonmodels/python-jsonmodels.hash new file mode 100644 index 0000000000..f5b1ac5ef1 --- /dev/null +++ b/package/python-jsonmodels/python-jsonmodels.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/jsonmodels/json, sha256 locally computed +md5 e42b6c0078e731035ec3f1bf8a6cdc92 jsonmodels-2.3.tar.gz +sha256 09e9639c85531e0f37991bb23a363494e37a2e89fb480dbc03d9556258f4ea47 jsonmodels-2.3.tar.gz +sha256 3b1219763eec6924ddd4c4d61dee6a53c5fc9ab62707a9ad763ee363d3050cc5 LICENSE diff --git a/package/python-jsonmodels/python-jsonmodels.mk b/package/python-jsonmodels/python-jsonmodels.mk new file mode 100644 index 0000000000..4d4da87969 --- /dev/null +++ b/package/python-jsonmodels/python-jsonmodels.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jsonmodels +# +################################################################################ + +PYTHON_JSONMODELS_VERSION = 2.3 +PYTHON_JSONMODELS_SOURCE = jsonmodels-$(PYTHON_JSONMODELS_VERSION).tar.gz +PYTHON_JSONMODELS_SITE = https://pypi.python.org/packages/ab/0f/e214845b49881d3b2bebd1f387eedc5b26ac5580353a0a38074e94439957 +PYTHON_JSONMODELS_SETUP_TYPE = setuptools +PYTHON_JSONMODELS_LICENSE = BSD-3-Clause +PYTHON_JSONMODELS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 6e56fbeaee9b4abb428a8f982be6d0c6869f52d1 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Wed, 7 Mar 2018 21:29:17 +0200 Subject: [PATCH 0143/2640] DEVELOPERS: add few items to my list Signed-off-by: Dagg Stompler Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f3590f8b52..1d09102eab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -464,6 +464,8 @@ F: arch/Config.in.powerpc F: package/kvm-unit-tests N: Dagg Stompler +F: board/hardkernel/odroidc2 +F: configs/odroidc2_defconfig F: package/libamcodec/ F: package/odroid-mali/ F: package/odroid-scripts/ From 452339abd6f8cbaebd00840ff4464f6f16182601 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 20:34:39 +0100 Subject: [PATCH 0144/2640] libminiupnpc: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 985d69d45f..c83b38aa60 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,2 +1,3 @@ # Locally computed sha256 d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b miniupnpc-2.0.tar.gz +sha256 4025f2214fa46ad40c156605b83d66e8faf45823e67eb3337af3869716e6d7dd LICENSE From c0451e4bb1ebf01ed025751d3c68548b11c832cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 20:31:08 +0100 Subject: [PATCH 0145/2640] libupnpp: fix license Add license hash and fix LICENSE: since November 2016 (release 0.15.2), libupnpp is licensed under LGPL-2.1+ and not GPL-2.0+ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libupnpp/libupnpp.hash | 3 +++ package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index f19e0b5441..fe67987c4e 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,5 @@ # Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.0.tar.gz.sha256 sha256 b34b179e69c46993cf360da9e85db646b03c15ab2927b19eb70e27bf3c359017 libupnpp-0.16.0.tar.gz + +# Hash for license file: +sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 4755b706d6..98cb515fe2 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -6,7 +6,7 @@ LIBUPNPP_VERSION = 0.16.0 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads -LIBUPNPP_LICENSE = GPL-2.0+ +LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES LIBUPNPP_DEPENDENCIES = expat libcurl libupnp From 8ee1a786ccd9561214ce78cb8410824a80fdc2bc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 21:00:59 +0100 Subject: [PATCH 0146/2640] upmpdcli: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/upmpdcli/upmpdcli.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 364fa914e9..e497352682 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,5 @@ # From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz.sha256: sha256 93d2b9cfd6cb8643c5a23d4115b44622d76c71abe15db9bb8d5b4d83f4d9b49c upmpdcli-1.2.15.tar.gz + +# Hash for license file: +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING From 2a479530b4d9428349aa325716ed0d5de6ddf01c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 21:27:22 +0100 Subject: [PATCH 0147/2640] jsoncpp: bump to version 1.8.4 Add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jsoncpp/jsoncpp.hash | 3 ++- package/jsoncpp/jsoncpp.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 09ceb58553..3391d9ecc3 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f jsoncpp-1.8.3.tar.gz +sha256 c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 jsoncpp-1.8.4.tar.gz +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 6dfaecefdd..3a2ee087b3 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.8.3 +JSONCPP_VERSION = 1.8.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From 96a52efb0951dadf6266a701febf4bef2b0ed0b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:26 +0100 Subject: [PATCH 0148/2640] package/libdrm: bump version to 2.4.91 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdrm/libdrm.hash | 10 +++++----- package/libdrm/libdrm.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index b1784b4c07..bc15ecf79f 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002838.html -md5 61dcb4989c728f566e3c15c236585a17 libdrm-2.4.90.tar.bz2 -sha1 7630ba36c65433251a0494b47086fbd0b32ff7a8 libdrm-2.4.90.tar.bz2 -sha256 db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b libdrm-2.4.90.tar.bz2 -sha512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c libdrm-2.4.90.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002853.html +md5 23d87cda92700b710a37d9b8edaa9f54 libdrm-2.4.91.tar.bz2 +sha1 44e42ce3cd41666e343ba393c73f6f1ad9fe1e74 libdrm-2.4.91.tar.bz2 +sha256 634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800 libdrm-2.4.91.tar.bz2 +sha512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772 libdrm-2.4.91.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 7121f06c9a..8f533d72d7 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.90 +LIBDRM_VERSION = 2.4.91 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From d3b065a0e1e0d2ee4607b92618a736a0e19e02ae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:27 +0100 Subject: [PATCH 0149/2640] package/x11r7/libxcb: bump version to 1.13 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/libxcb/libxcb.hash | 9 +++++++-- package/x11r7/libxcb/libxcb.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/libxcb/libxcb.hash b/package/x11r7/libxcb/libxcb.hash index 6df7d01792..d2b5da6b52 100644 --- a/package/x11r7/libxcb/libxcb.hash +++ b/package/x11r7/libxcb/libxcb.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002694.html -sha256 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b libxcb-1.12.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002851.html +md5 c2b6cf928afa16b0047c974e7aaa783f libxcb-1.13.tar.bz2 +sha1 212ad5f1f80def80536d78e3d20354a0370e7fe9 libxcb-1.13.tar.bz2 +sha256 188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa libxcb-1.13.tar.bz2 +sha512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c libxcb-1.13.tar.bz2 +# Locally computed +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index 32edbb9e90..7e467aca3f 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCB_VERSION = 1.12 +LIBXCB_VERSION = 1.13 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2 LIBXCB_SITE = http://xcb.freedesktop.org/dist LIBXCB_LICENSE = MIT From bf26f87b851291acf4c1906ce2520bb6d9e05e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 7 Mar 2018 22:13:45 +0100 Subject: [PATCH 0150/2640] mpd: bump to version 0.20.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add hash for license file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 3 ++- package/mpd/mpd.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 735ea700ff..d6e66216cf 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 c69c4f67e665380ea3bbde6cff8958edc85f7cd40e7918ae5ce0a2184ca9eb40 mpd-0.20.15.tar.xz +sha256 6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434 mpd-0.20.18.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 482859518a..26e82af0a8 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).15 +MPD_VERSION = $(MPD_VERSION_MAJOR).18 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost From 13fb1c49128d4c039fc23fcf32317008862f8b4b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Mar 2018 21:53:23 +0100 Subject: [PATCH 0151/2640] configs/teliv_evk_pro3: remove defconfig This defconfig fails to build with gcc 6.x, even though we switched to using gcc 6.x as the default gcc version in May 2017. It hasn't been updated since April 2017, and the original submitter, Fabio Porcedda said: Unfortunately a newer kernel doesn't boot and I don't have the time to fix the issue. If having a defconfig that doesn't build on gcc 6.x is unacceptable feel free to remove it. So, let's get rid of this defconfig, which will remove the following build error: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306952 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/telit/evk-pro3/barebox.fragment | 2 - board/telit/evk-pro3/linux.fragment | 3 - ...0001-watchdog-add-keep-alive-support.patch | 99 -------- ...tchdog-add-at91sam9-watchdog-support.patch | 237 ------------------ ...at91sam9260-9g20-add-wathdog-support.patch | 36 --- ...at91sam9260-9g20-fix-wathdog-support.patch | 26 -- .../0001-kernel-add-support-for-gcc-5.patch | 97 ------- ...inux-use-static-inline-in-ARM-ftrace.patch | 52 ---- board/telit/evk-pro3/readme.txt | 28 --- configs/telit_evk_pro3_defconfig | 32 --- 11 files changed, 613 deletions(-) delete mode 100644 board/telit/evk-pro3/barebox.fragment delete mode 100644 board/telit/evk-pro3/linux.fragment delete mode 100644 board/telit/evk-pro3/patches/barebox/0001-watchdog-add-keep-alive-support.patch delete mode 100644 board/telit/evk-pro3/patches/barebox/0002-watchdog-add-at91sam9-watchdog-support.patch delete mode 100644 board/telit/evk-pro3/patches/barebox/0003-at91sam9260-9g20-add-wathdog-support.patch delete mode 100644 board/telit/evk-pro3/patches/barebox/0004-at91sam9260-9g20-fix-wathdog-support.patch delete mode 100644 board/telit/evk-pro3/patches/linux/0001-kernel-add-support-for-gcc-5.patch delete mode 100644 board/telit/evk-pro3/patches/linux/0002-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch delete mode 100644 board/telit/evk-pro3/readme.txt delete mode 100644 configs/telit_evk_pro3_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a1d463876..808d66c156 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,6 @@ solidrun_macchiatobin_mainline_defconfig: *defconfig solidrun_macchiatobin_marvell_defconfig: *defconfig stm32f429_disco_defconfig: *defconfig stm32f469_disco_defconfig: *defconfig -telit_evk_pro3_defconfig: *defconfig toradex_apalis_imx6_defconfig: *defconfig ts4800_defconfig: *defconfig ts4900_defconfig: *defconfig diff --git a/board/telit/evk-pro3/barebox.fragment b/board/telit/evk-pro3/barebox.fragment deleted file mode 100644 index 750ad19cd8..0000000000 --- a/board/telit/evk-pro3/barebox.fragment +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_AT91SAM9X=y diff --git a/board/telit/evk-pro3/linux.fragment b/board/telit/evk-pro3/linux.fragment deleted file mode 100644 index d22fe8f4e4..0000000000 --- a/board/telit/evk-pro3/linux.fragment +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_KERNEL_LZO=y -CONFIG_GPIO_SYSFS=y -CONFIG_UBIFS_FS=y diff --git a/board/telit/evk-pro3/patches/barebox/0001-watchdog-add-keep-alive-support.patch b/board/telit/evk-pro3/patches/barebox/0001-watchdog-add-keep-alive-support.patch deleted file mode 100644 index 80bd459b56..0000000000 --- a/board/telit/evk-pro3/patches/barebox/0001-watchdog-add-keep-alive-support.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 76e2b190803484db033153fe8a97b381a567ed25 Mon Sep 17 00:00:00 2001 -From: Jean-Christophe PLAGNIOL-VILLARD -Date: Wed, 14 Nov 2012 19:16:35 +0800 -Subject: [PATCH 1/4] watchdog: add keep alive support - -this will allow to ping the watchdog via poller - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD -Signed-off-by: Fabio Porcedda ---- - drivers/watchdog/Kconfig | 1 + - drivers/watchdog/wd_core.c | 25 +++++++++++++++++++++++++ - include/watchdog.h | 2 ++ - 3 files changed, 28 insertions(+) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 63fb1a8c5..7ebff89b9 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -4,6 +4,7 @@ config WATCHDOG_IMX_RESET_SOURCE - - menuconfig WATCHDOG - bool "Watchdog support" -+ select GENERIC_POLLER - help - Many platforms support a watchdog to keep track of a working machine. - This framework provides routines to handle these watchdogs. -diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c -index 3a3f51964..52537afef 100644 ---- a/drivers/watchdog/wd_core.c -+++ b/drivers/watchdog/wd_core.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - static LIST_HEAD(watchdog_list); - -@@ -31,6 +32,20 @@ static const char *watchdog_name(struct watchdog *wd) - return "unknown"; - } - -+static struct watchdog *watchdog_get_default(void); -+ -+static void watchdog_poller_func(struct poller_struct *poller) -+{ -+ struct watchdog *wd = watchdog_get_default(); -+ -+ if (wd) -+ wd->keep_alive(wd); -+} -+ -+static struct poller_struct watchdog_poller = { -+ .func = watchdog_poller_func, -+}; -+ - int watchdog_register(struct watchdog *wd) - { - if (!wd->priority) -@@ -41,6 +56,16 @@ int watchdog_register(struct watchdog *wd) - pr_debug("registering watchdog %s with priority %d\n", watchdog_name(wd), - wd->priority); - -+ -+ if (wd->keep_alive) { -+ int ret; -+ -+ ret = poller_register(&watchdog_poller); -+ if (ret) { -+ return ret; -+ } -+ } -+ - return 0; - } - EXPORT_SYMBOL(watchdog_register); -diff --git a/include/watchdog.h b/include/watchdog.h -index 3e8a487a4..a2660c2e0 100644 ---- a/include/watchdog.h -+++ b/include/watchdog.h -@@ -13,12 +13,14 @@ - #ifndef INCLUDE_WATCHDOG_H - # define INCLUDE_WATCHDOG_H - -+ - struct watchdog { - int (*set_timeout)(struct watchdog *, unsigned); - const char *name; - struct device_d *dev; - unsigned int priority; - struct list_head list; -+ void (*keep_alive)(struct watchdog *); - }; - - #ifdef CONFIG_WATCHDOG --- -2.12.0 - diff --git a/board/telit/evk-pro3/patches/barebox/0002-watchdog-add-at91sam9-watchdog-support.patch b/board/telit/evk-pro3/patches/barebox/0002-watchdog-add-at91sam9-watchdog-support.patch deleted file mode 100644 index b97c126954..0000000000 --- a/board/telit/evk-pro3/patches/barebox/0002-watchdog-add-at91sam9-watchdog-support.patch +++ /dev/null @@ -1,237 +0,0 @@ -From 24d99ffc4b22e45721e74bfc10717cc5bacdbfc4 Mon Sep 17 00:00:00 2001 -From: Jean-Christophe PLAGNIOL-VILLARD -Date: Wed, 14 Nov 2012 19:17:47 +0800 -Subject: [PATCH 2/4] watchdog: add at91sam9 watchdog support - -with keep alive support - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD -Signed-off-by: Fabio Porcedda ---- - drivers/watchdog/Kconfig | 8 +++ - drivers/watchdog/Makefile | 1 + - drivers/watchdog/at91sam9_wdt.c | 131 ++++++++++++++++++++++++++++++++++++++++ - drivers/watchdog/at91sam9_wdt.h | 38 ++++++++++++ - 4 files changed, 178 insertions(+) - create mode 100644 drivers/watchdog/at91sam9_wdt.c - create mode 100644 drivers/watchdog/at91sam9_wdt.h - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 7ebff89b9..479e737f0 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -11,12 +11,20 @@ menuconfig WATCHDOG - - if WATCHDOG - -+config WATCHDOG_AT91SAM9X -+ tristate "AT91SAM9X / AT91CAP9 watchdog" -+ depends on ARCH_AT91 -+ help -+ Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will -+ reboot your system when the timeout is reached. -+ - config WATCHDOG_DAVINCI - bool "TI Davinci" - depends on ARCH_DAVINCI - help - Add support for watchdog on the TI Davinci SoC. - -+ - config WATCHDOG_DW - bool "Synopsys DesignWare watchdog" - select RESET_CONTROLLER -diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile -index 5fca4c368..245a5c84a 100644 ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -1,4 +1,5 @@ - obj-$(CONFIG_WATCHDOG) += wd_core.o -+obj-$(CONFIG_WATCHDOG_AT91SAM9X) += at91sam9_wdt.o - obj-$(CONFIG_WATCHDOG_DAVINCI) += davinci_wdt.o - obj-$(CONFIG_WATCHDOG_OMAP) += omap_wdt.o - obj-$(CONFIG_WATCHDOG_MXS28) += im28wd.o -diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c -new file mode 100644 -index 000000000..203d83aff ---- /dev/null -+++ b/drivers/watchdog/at91sam9_wdt.c -@@ -0,0 +1,131 @@ -+/* -+ * (c) 2012 Juergen Beisert -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Note: this driver works for the i.MX28 SoC. It might work for the -+ * i.MX23 Soc as well, but is not tested yet. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "at91sam9_wdt.h" -+ -+struct at91sam9_wdt { -+ struct watchdog wdt; -+ void __iomem *base; -+}; -+ -+#define to_at91sam9_wdt(h) container_of(h, struct at91sam9_wdt, wdt) -+ -+#define wdt_read(at91wdt, field) \ -+ __raw_readl(at91wdt->base + field) -+#define wdt_write(at91wdt, field, val) \ -+ __raw_writel((val), at91wdt->base + field) -+ -+static void at91sam9_wdt_keep_alive(struct watchdog *wdt) -+{ -+ struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt); -+ -+ wdt_write(at91wdt, AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT); -+} -+ -+static int at91sam9_wdt_settimeout(struct watchdog *wdt, unsigned int timeout) -+{ -+ struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt); -+ unsigned int reg; -+ unsigned int mr; -+ -+ /* Check if disabled */ -+ mr = wdt_read(at91wdt, AT91_WDT_MR); -+ if (mr & AT91_WDT_WDDIS) { -+ pr_err("sorry, watchdog is disabled\n"); -+ return -EIO; -+ } -+ -+ if (!timeout) { -+ wdt_write(at91wdt, AT91_WDT_MR, AT91_WDT_WDDIS); -+ return 0; -+ } -+ -+ /* -+ * All counting occurs at SLOW_CLOCK / 128 = 256 Hz -+ * -+ * Since WDV is a 12-bit counter, the maximum period is -+ * 4096 / 256 = 16 seconds. -+ */ -+ reg = AT91_WDT_WDRSTEN /* causes watchdog reset */ -+ /* | AT91_WDT_WDRPROC causes processor reset only */ -+ | AT91_WDT_WDDBGHLT /* disabled in debug mode */ -+ | AT91_WDT_WDD /* restart at any time */ -+ | (timeout & AT91_WDT_WDV); /* timer value */ -+ wdt_write(at91wdt, AT91_WDT_MR, reg); -+ -+ return 0; -+} -+ -+static int at91sam9_wdt_probe(struct device_d *dev) -+{ -+ struct at91sam9_wdt *priv; -+ struct watchdog *wdt; -+ int ret; -+ unsigned int mr; -+ -+ priv = xzalloc(sizeof(struct at91sam9_wdt)); -+ priv->base = dev_request_mem_region(dev, 0); -+ wdt = &priv->wdt; -+ -+ wdt->set_timeout = at91sam9_wdt_settimeout; -+ wdt->keep_alive = at91sam9_wdt_keep_alive; -+ -+ /* Check if disabled */ -+ mr = wdt_read(priv, AT91_WDT_MR); -+ if (mr & AT91_WDT_WDDIS) { -+ dev_err(dev, "sorry, watchdog is disabled\n"); -+ ret = -EIO; -+ goto err; -+ } -+ -+ ret = watchdog_register(wdt); -+ if (ret != 0) -+ goto err; -+ -+ dev->priv = priv; -+ return 0; -+ -+err: -+ free(priv); -+ return ret; -+} -+ -+static void at91sam9_wdt_remove(struct device_d *dev) -+{ -+ struct at91sam9_wdt *priv= dev->priv; -+ watchdog_deregister(&priv->wdt); -+ free(priv); -+} -+ -+static struct driver_d at91sam9_wdt_driver = { -+ .name = "at91sam9_wdt", -+ .probe = at91sam9_wdt_probe, -+ .remove = at91sam9_wdt_remove, -+}; -+ -+static int at91sam9_wdt_init(void) -+{ -+ return platform_driver_register(&at91sam9_wdt_driver); -+} -+coredevice_initcall(at91sam9_wdt_init); -diff --git a/drivers/watchdog/at91sam9_wdt.h b/drivers/watchdog/at91sam9_wdt.h -new file mode 100644 -index 000000000..2b68c1a2a ---- /dev/null -+++ b/drivers/watchdog/at91sam9_wdt.h -@@ -0,0 +1,38 @@ -+/* -+ * drivers/watchdog/at91sam9_wdt.h -+ * -+ * Copyright (C) 2007 Andrew Victor -+ * Copyright (C) 2007 Atmel Corporation. -+ * -+ * Watchdog Timer (WDT) - System peripherals regsters. -+ * Based on AT91SAM9261 datasheet revision D. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+ -+#ifndef AT91_WDT_H -+#define AT91_WDT_H -+ -+#define AT91_WDT_CR 0x00 /* Watchdog Control Register */ -+#define AT91_WDT_WDRSTT (1 << 0) /* Restart */ -+#define AT91_WDT_KEY (0xa5 << 24) /* KEY Password */ -+ -+#define AT91_WDT_MR 0x04 /* Watchdog Mode Register */ -+#define AT91_WDT_WDV (0xfff << 0) /* Counter Value */ -+#define AT91_WDT_WDFIEN (1 << 12) /* Fault Interrupt Enable */ -+#define AT91_WDT_WDRSTEN (1 << 13) /* Reset Processor */ -+#define AT91_WDT_WDRPROC (1 << 14) /* Timer Restart */ -+#define AT91_WDT_WDDIS (1 << 15) /* Watchdog Disable */ -+#define AT91_WDT_WDD (0xfff << 16) /* Delta Value */ -+#define AT91_WDT_WDDBGHLT (1 << 28) /* Debug Halt */ -+#define AT91_WDT_WDIDLEHLT (1 << 29) /* Idle Halt */ -+ -+#define AT91_WDT_SR 0x08 /* Watchdog Status Register */ -+#define AT91_WDT_WDUNF (1 << 0) /* Watchdog Underflow */ -+#define AT91_WDT_WDERR (1 << 1) /* Watchdog Error */ -+ -+ -+#endif --- -2.12.0 - diff --git a/board/telit/evk-pro3/patches/barebox/0003-at91sam9260-9g20-add-wathdog-support.patch b/board/telit/evk-pro3/patches/barebox/0003-at91sam9260-9g20-add-wathdog-support.patch deleted file mode 100644 index 6f4efaba1e..0000000000 --- a/board/telit/evk-pro3/patches/barebox/0003-at91sam9260-9g20-add-wathdog-support.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60110b93a5cbc6ec3d92035d9daf86a30a7fd791 Mon Sep 17 00:00:00 2001 -From: Jean-Christophe PLAGNIOL-VILLARD -Date: Wed, 14 Nov 2012 19:18:22 +0800 -Subject: [PATCH 3/4] at91sam9260/9g20: add wathdog support - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD -Signed-off-by: Fabio Porcedda ---- - arch/arm/mach-at91/at91sam9260_devices.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c -index 67c4ea860..51852a9a8 100644 ---- a/arch/arm/mach-at91/at91sam9260_devices.c -+++ b/arch/arm/mach-at91/at91sam9260_devices.c -@@ -400,6 +400,17 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) - void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {} - #endif - -+#ifdef CONFIG_WATCHDOG_AT91SAM9X -+static int at91_add_device_watchdog(void) -+{ -+ add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL, -+ AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL); -+ -+ return 0; -+} -+coredevice_initcall(at91_add_device_watchdog); -+#endif -+ - static int at91_fixup_device(void) - { - at91_rtt_irq_fixup(IOMEM(AT91SAM9260_BASE_RTT)); --- -2.12.0 - diff --git a/board/telit/evk-pro3/patches/barebox/0004-at91sam9260-9g20-fix-wathdog-support.patch b/board/telit/evk-pro3/patches/barebox/0004-at91sam9260-9g20-fix-wathdog-support.patch deleted file mode 100644 index edc1ea4d5b..0000000000 --- a/board/telit/evk-pro3/patches/barebox/0004-at91sam9260-9g20-fix-wathdog-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d8231b1726a020733d87c2685ec1631403e050cf Mon Sep 17 00:00:00 2001 -From: Fabio Porcedda -Date: Thu, 17 Jan 2013 11:32:35 +0100 -Subject: [PATCH 4/4] at91sam9260/9g20: fix wathdog support - -Signed-off-by: Fabio Porcedda ---- - arch/arm/mach-at91/at91sam9260_devices.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c -index 51852a9a8..20c8cac9d 100644 ---- a/arch/arm/mach-at91/at91sam9260_devices.c -+++ b/arch/arm/mach-at91/at91sam9260_devices.c -@@ -404,7 +404,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {} - static int at91_add_device_watchdog(void) - { - add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL, -- AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL); -+ AT91_BASE_WDT, 16, IORESOURCE_MEM, NULL); - - return 0; - } --- -2.12.0 - diff --git a/board/telit/evk-pro3/patches/linux/0001-kernel-add-support-for-gcc-5.patch b/board/telit/evk-pro3/patches/linux/0001-kernel-add-support-for-gcc-5.patch deleted file mode 100644 index 3aba910f8b..0000000000 --- a/board/telit/evk-pro3/patches/linux/0001-kernel-add-support-for-gcc-5.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 71458cfc782eafe4b27656e078d379a34e472adf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 13 Oct 2014 15:51:05 -0700 -Subject: [PATCH] kernel: add support for gcc 5 - -We're missing include/linux/compiler-gcc5.h which is required now -because gcc branched off to v5 in trunk. - -Just copy the relevant bits out of include/linux/compiler-gcc4.h, -no new code is added as of now. - -This fixes a build error when using gcc 5. - -Signed-off-by: Sasha Levin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -new file mode 100644 -index 000000000000..cdd1cc202d51 ---- /dev/null -+++ b/include/linux/compiler-gcc5.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.12.2 - diff --git a/board/telit/evk-pro3/patches/linux/0002-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/board/telit/evk-pro3/patches/linux/0002-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch deleted file mode 100644 index 00de10988b..0000000000 --- a/board/telit/evk-pro3/patches/linux/0002-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch +++ /dev/null @@ -1,52 +0,0 @@ -From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Wed, 24 Sep 2014 01:06:46 +0100 -Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). In this case using static inline -and removing the NULL version of return_address in return_address.c does -the right thing. - -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois -Acked-by: Steven Rostedt -Signed-off-by: Russell King ---- - arch/arm/include/asm/ftrace.h | 2 +- - arch/arm/kernel/return_address.c | 5 ----- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h -index 39eb16b0066f..bfe2a2f5a644 100644 ---- a/arch/arm/include/asm/ftrace.h -+++ b/arch/arm/include/asm/ftrace.h -@@ -45,7 +45,7 @@ void *return_address(unsigned int); - - #else - --extern inline void *return_address(unsigned int level) -+static inline void *return_address(unsigned int level) - { - return NULL; - } -diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c -index fafedd86885d..f6aa84d5b93c 100644 ---- a/arch/arm/kernel/return_address.c -+++ b/arch/arm/kernel/return_address.c -@@ -63,11 +63,6 @@ void *return_address(unsigned int level) - #warning "TODO: return_address should use unwind tables" - #endif - --void *return_address(unsigned int level) --{ -- return NULL; --} -- - #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ - - EXPORT_SYMBOL_GPL(return_address); --- -2.12.2 - diff --git a/board/telit/evk-pro3/readme.txt b/board/telit/evk-pro3/readme.txt deleted file mode 100644 index ace9dd4c17..0000000000 --- a/board/telit/evk-pro3/readme.txt +++ /dev/null @@ -1,28 +0,0 @@ -Buildroot board support for Telit EVK-PRO3 with Telit GE863-PRO3 - -Official site: - http://www.telit.com/en/products.php?p_id=3&p_ac=show&p=10 - -Build images: - make telit_evk_pro3_defconfig - make - - images built: - - output/images/barebox.bin - - output/images/zImage - - output/images/rootfs.ubi - - -Flash built images: - The first time you need to bootstrap from Telit Official Release 221.07.1007, - at the U-Boot prompt type: - U-Boot> loadb - send buildroot/output/images/barebox.bin - U-Boot> go 0x20200000 - - flash updated images using barebox through tftp: - barebox:/ erase dev/self0; cp /mnt/tftp/barebox.bin /dev/self0 - barebox:/ erase /dev/nand0.kernel.bb; cp /mnt/tftp/zImage /dev/nand0.kernel.bb - barebox:/ erase /dev/nand0.rootfs.bb; cp /mnt/tftp/rootfs.ubi /dev/nand0.rootfs.bb - barebox:/ erase dev/env0 - barebox:/ reset diff --git a/configs/telit_evk_pro3_defconfig b/configs/telit_evk_pro3_defconfig deleted file mode 100644 index 12ce470293..0000000000 --- a/configs/telit_evk_pro3_defconfig +++ /dev/null @@ -1,32 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm926t=y - -# Patches -BR2_GLOBAL_PATCH_DIR="board/telit/evk-pro3/patches" - -# Linux headers same as kernel, a 3.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y - -# Watchdog is armed by the first stage bootloader -BR2_PACKAGE_BUSYBOX_WATCHDOG=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBI=y - -# Bootloader -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2017.01.0" -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="telit_evk_pro3" -BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="board/telit/evk-pro3/barebox.fragment" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11" -BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/telit/evk-pro3/linux.fragment" -BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="evk-pro3" From 3ced4d018c1f533240977420b43898a1cef9e7be Mon Sep 17 00:00:00 2001 From: John Keeping Date: Mon, 5 Mar 2018 14:26:38 +0000 Subject: [PATCH 0152/2640] libusbgx: bump to v0.2.0 The GitHub tag is really "libusbgx-0.2.0" so we end up with a slightly strange looking version and archive name, but this is correct given the tag. Signed-off-by: John Keeping Signed-off-by: Peter Korsgaard --- package/libusbgx/libusbgx.hash | 2 +- package/libusbgx/libusbgx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index c185c5803c..c153acaf4a 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 1e258205dcde99d0eeb52404ee7ff1bc9a39eb3878e8455fb72bad7cf90c7357 libusbgx-2e3d43ee098ed928d1baa61ce791ce9ff4788c5a.tar.gz +sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-libusbgx-v0.2.0.tar.gz diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk index 1964b47d02..e7c082f9f3 100644 --- a/package/libusbgx/libusbgx.mk +++ b/package/libusbgx/libusbgx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUSBGX_VERSION = 2e3d43ee098ed928d1baa61ce791ce9ff4788c5a +LIBUSBGX_VERSION = libusbgx-v0.2.0 LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL From 7098ee7f615b88e6939ab5194d6b28b75ed5f18f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 22:47:03 +0100 Subject: [PATCH 0153/2640] jsoncpp: do not always build static library Currently, static libray is always built as BUILD_STATIC_LIBS is ON by default so correctly set BUILD_STATIC_LIBS depending on BR2_SHARED_LIBS variable Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jsoncpp/jsoncpp.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 3a2ee087b3..2b527fc303 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -15,4 +15,10 @@ JSONCPP_CONF_OPTS += \ -DJSONCPP_WITH_TESTS=OFF \ -DJSONCPP_WITH_STRICT_ISO=OFF +ifeq ($(BR2_SHARED_LIBS),y) +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +else +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +endif + $(eval $(cmake-package)) From 01d90f0d093ff16ab3c1a9466430cee6fb7842d8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 7 Mar 2018 22:51:23 +0100 Subject: [PATCH 0154/2640] spport/check-bin-arch: accept arbitrary per-package ignore paths Some packages (mostly, out-of-tree) may want to install binary blobs for another architecture, outside the locations we currently exclude, like in /opt or whatever... Add support in check-bin-arch to accept any arbitrary location, that individual package can each request to excude from the check, when they are installed. Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 7 ++++ package/pkg-generic.mk | 1 + support/scripts/check-bin-arch | 56 +++++++++++++++---------- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 63ea51bf89..eecf6e2ec0 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -453,6 +453,13 @@ information is (assuming the package name is +libfoo+) : FLAT binary format is only 4k bytes. If the application consumes more stack, append the required number here. +* +LIBFOO_BIN_ARCH_EXCLUDE+ is a space-separated list of paths (relative + to the target directory) to ignore when checking that the package + installs correctly cross-compiled binaries. You seldom need to set this + variable, unless the package installs binary blobs outside the default + locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`, and + `/usr/share`, which are automatically excluded. + The recommended way to define these variables is to use the following syntax: diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2a12e7b56..9eddaeee57 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -112,6 +112,7 @@ define check_bin_arch $(if $(filter end-install-target,$(1)-$(2)),\ support/scripts/check-bin-arch -p $(3) \ -l $(BUILD_DIR)/packages-file-list.txt \ + $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ -r $(TARGET_READELF) \ -a $(BR2_READELF_ARCH_NAME)) endef diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch index f6a4569c62..d8385b4fcf 100755 --- a/support/scripts/check-bin-arch +++ b/support/scripts/check-bin-arch @@ -1,18 +1,45 @@ #!/usr/bin/env bash -while getopts p:l:r:a: OPT ; do +# List of hardcoded paths that should be ignored, as they may +# contain binaries for an architecture different from the +# architecture of the target. +declare -a IGNORES=( + # Skip firmware files, they could be ELF files for other + # architectures + "/lib/firmware" + "/usr/lib/firmware" + + # Skip kernel modules + # When building a 32-bit userland on 64-bit architectures, the kernel + # and its modules may still be 64-bit. To keep the basic + # check-bin-arch logic simple, just skip this directory. + "/lib/modules" + + # Skip files in /usr/share, several packages (qemu, + # pru-software-support) legitimately install ELF binaries that + # are not for the target architecture + "/usr/share" +) + +while getopts p:l:r:a:i: OPT ; do case "${OPT}" in p) package="${OPTARG}";; l) pkg_list="${OPTARG}";; r) readelf="${OPTARG}";; a) arch_name="${OPTARG}";; + i) + # Ensure we do have single '/' as separators, + # and that we have a leading and a trailing one. + pattern="$(sed -r -e 's:/+:/:g; s:^/*:/:; s:/*$:/:;' <<<"${OPTARG}")" + IGNORES+=("${pattern}") + ;; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac done if test -z "${package}" -o -z "${pkg_list}" -o -z "${readelf}" -o -z "${arch_name}" ; then - echo "Usage: $0 -p -l -r -a " + echo "Usage: $0 -p -l -r -a [-i PATH ...]" exit 1 fi @@ -23,26 +50,11 @@ IFS=" " while read f; do - # Skip firmware files, they could be ELF files for other - # architectures - if [[ "${f}" =~ ^/(usr/)?lib/firmware/.* ]]; then - continue - fi - - # Skip kernel modules - # When building a 32-bit userland on 64-bit architectures, the kernel - # and its modules may still be 64-bit. To keep the basic - # check-bin-arch logic simple, just skip this directory. - if [[ "${f}" =~ ^/lib/modules/.* ]]; then - continue - fi - - # Skip files in /usr/share, several packages (qemu, - # pru-software-support) legitimately install ELF binaries that - # are not for the target architecture - if [[ "${f}" =~ ^/usr/share/.* ]]; then - continue - fi + for ignore in "${IGNORES[@]}"; do + if [[ "${f}" =~ ^"${ignore}" ]]; then + continue 2 + fi + done # Skip symlinks. Some symlinks may have absolute paths as # target, pointing to host binaries while we're building. From 1b9a57442d0a234b03585235f516d755372f29b3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 7 Mar 2018 22:51:24 +0100 Subject: [PATCH 0155/2640] support/check-bin-arch: exclude kernel modules for merged /usr When using a merged /usr, the kernel module path is really /usr/lib/modules, as /lib is a symlink to usr/lib . Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Reviewed-by: Peter Korsgaard Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 4 ++-- support/scripts/check-bin-arch | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index eecf6e2ec0..521d6d50c7 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -457,8 +457,8 @@ information is (assuming the package name is +libfoo+) : to the target directory) to ignore when checking that the package installs correctly cross-compiled binaries. You seldom need to set this variable, unless the package installs binary blobs outside the default - locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`, and - `/usr/share`, which are automatically excluded. + locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`, + `/usr/lib/modules`, and `/usr/share`, which are automatically excluded. The recommended way to define these variables is to use the following syntax: diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch index d8385b4fcf..7f97696735 100755 --- a/support/scripts/check-bin-arch +++ b/support/scripts/check-bin-arch @@ -14,6 +14,7 @@ declare -a IGNORES=( # and its modules may still be 64-bit. To keep the basic # check-bin-arch logic simple, just skip this directory. "/lib/modules" + "/usr/lib/modules" # Skip files in /usr/share, several packages (qemu, # pru-software-support) legitimately install ELF binaries that From 95e0751ab42f71aaf1a833e912d618915d9251cc Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 7 Mar 2018 19:41:27 -0300 Subject: [PATCH 0156/2640] DEVELOPERS: Add myself to Ci20 Signed-off-by: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1d09102eab..b0aab54d8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -597,6 +597,8 @@ N: Evan Zelkowitz F: package/sdl_gfx/ N: Ezequiel Garcia +F: board/ci20/ +F: configs/ci20_defconfig F: arch/Config.in.nios2 F: package/fio/ F: package/iptraf-ng/ From bd7b8085576d2fbe79c0887343e68a82c4028e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 7 Mar 2018 23:50:55 +0100 Subject: [PATCH 0157/2640] meson: bump to version 0.45.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 279dd93a51..c460302f00 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.44.0/meson-0.44.0.tar.gz.asc -sha256 50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b meson-0.44.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.45.0/meson-0.45.0.tar.gz.asc +sha256 3455abbc30a3fbd9cc8abb6d5fcdc42ce618665b95ac2c3ad7792a4a6ba47ce4 meson-0.45.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 764c187ee7..2e0db90236 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.44.0 +MESON_VERSION = 0.45.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 9cd9c2ddf533f480d5fc502493c04dd7d82ccc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 7 Mar 2018 23:52:57 +0100 Subject: [PATCH 0158/2640] libmpdclient: bump to version 2.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since version 2.13 libmpdclient only supports the meson build. Therefore, adapt to package infrastructure according to the user manual. Also add a hash for the license file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libmpdclient/libmpdclient.hash | 5 ++-- package/libmpdclient/libmpdclient.mk | 32 +++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash index 2fd20a41fb..eb32786419 100644 --- a/package/libmpdclient/libmpdclient.hash +++ b/package/libmpdclient/libmpdclient.hash @@ -1,2 +1,3 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig, sha256 locally computed -sha256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 libmpdclient-2.10.tar.xz +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.14.tar.xz.sig, sha256 locally computed +sha256 0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372 libmpdclient-2.14.tar.xz +sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 691aba9f71..5574bde948 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -5,12 +5,38 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).10 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).14 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) -LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBMPDCLIENT_INSTALL_STAGING = YES LIBMPDCLIENT_LICENSE = BSD-3-Clause LIBMPDCLIENT_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +LIBMPDCLIENT_CONF_OPTS += \ + --prefix=/usr \ + --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ + --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf + +LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v) + +define LIBMPDCLIENT_CONFIGURE_CMDS + rm -rf $(@D)/build + mkdir -p $(@D)/build + $(TARGET_MAKE_ENV) meson $(LIBMPDCLIENT_CONF_OPTS) $(@D) $(@D)/build +endef + +define LIBMPDCLIENT_BUILD_CMDS + $(TARGET_MAKE_ENV) ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build +endef + +define LIBMPDCLIENT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ + ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install +endef + +define LIBMPDCLIENT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) \ + ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install +endef + +$(eval $(generic-package)) From 4af097fb38ff8ee8baacfd44e4d7adba03cd1684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 7 Mar 2018 23:54:21 +0100 Subject: [PATCH 0159/2640] mpd-mpc: bump to version 0.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since version 0.29 MPDs mpc only supports the meson build. Therefore, adapt the package infrastructure according to the user manual. Also add a hash for the license file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.hash | 3 ++- package/mpd-mpc/mpd-mpc.mk | 29 +++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/package/mpd-mpc/mpd-mpc.hash b/package/mpd-mpc/mpd-mpc.hash index 8336893744..972d169438 100644 --- a/package/mpd-mpc/mpd-mpc.hash +++ b/package/mpd-mpc/mpd-mpc.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 mpc-0.28.tar.xz +sha256 02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3 mpc-0.29.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 6c15c0d9a3..3eecf8a3ef 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -5,12 +5,33 @@ ################################################################################ MPD_MPC_VERSION_MAJOR = 0 -MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).28 +MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).29 MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING -MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient -MPD_MPC_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' +MPD_MPC_DEPENDENCIES = host-meson host-pkgconf libmpdclient -$(eval $(autotools-package)) +MPD_MPC_CONF_OPTS += \ + --prefix=/usr \ + --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ + --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf + +MPD_MPC_NINJA_OPTS = $(if $(VERBOSE),-v) + +define MPD_MPC_CONFIGURE_CMDS + rm -rf $(@D)/build + mkdir -p $(@D)/build + $(TARGET_MAKE_ENV) meson $(MPD_MPC_CONF_OPTS) $(@D) $(@D)/build +endef + +define MPD_MPC_BUILD_CMDS + $(TARGET_MAKE_ENV) ninja $(MPD_MPC_NINJA_OPTS) -C $(@D)/build +endef + +define MPD_MPC_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(MPD_MPC_NINJA_OPTS) \ + -C $(@D)/build install +endef + +$(eval $(generic-package)) From daa534f48cc19b7510309eda9956ac358a736c60 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:00 +0100 Subject: [PATCH 0160/2640] rapidjson: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rapidjson/rapidjson.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index bde8319cd8..a4b02cffb9 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-v1.1.0.tar.gz +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt From ae8f5b0d440d3cb7b37b69cfe03c26af52111172 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:15 +0100 Subject: [PATCH 0161/2640] libcoap: add licenses hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcoap/libcoap.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 708ca1b6e7..deb94ecd6d 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,2 +1,5 @@ # Locally calculated sha256 f7e26dc232c177336474a14487771037a8fb32e311f5ccd076a00dc04b6d7b7a libcoap-v4.1.2.tar.gz +sha256 28b61fbf3c5477611d7f6ead97d15348934496d27dca815b34d45e622730e72e COPYING +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE.GPL +sha256 9d5aeec17bdf82369bbe6e89efb07b7b35abefa044ea1d25cb2feeb70df1c208 LICENSE.BSD From 8eee2fbf09e56f7a3db86302a8d693391ef04630 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:29 +0100 Subject: [PATCH 0162/2640] gtest: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gtest/gtest.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 474008d2cd..0a8d8ba096 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 gtest-release-1.8.0.tar.gz +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE From 5be0b3440e81aa364fb337b5e981f3396bdf8e02 Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 09:22:05 +0200 Subject: [PATCH 0163/2640] fbgrab: add patch fixing pixel format report When verbosive, fbgrab reports pixel format. Green and blue offset and msb_right fields are accidentally swapped there. This commit adds a patch which straightens them up. Upstream-Status: Submitted [Gunnar Monell ] Signed-off-by: Timo Ketola Signed-off-by: Peter Korsgaard --- package/fbgrab/0100-fix-pixfmt-report.patch | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/fbgrab/0100-fix-pixfmt-report.patch diff --git a/package/fbgrab/0100-fix-pixfmt-report.patch b/package/fbgrab/0100-fix-pixfmt-report.patch new file mode 100644 index 0000000000..18bcf96df2 --- /dev/null +++ b/package/fbgrab/0100-fix-pixfmt-report.patch @@ -0,0 +1,22 @@ +Fix pixel format report + +When fbgrab tells about the framebuffer pixel format, blue and green +are accidentally swapped in 'length' and 'msb_right' columns. Let's +order everything as RGB. + +Signed-off-by timo.ketola@exertus.fi + +diff -u a/fbgrab.c b/fbgrab.c +--- a/fbgrab.c 2018-03-07 11:42:04.739250433 +0200 ++++ b/fbgrab.c 2018-03-07 11:43:26.128043877 +0200 +@@ -169,8 +169,8 @@ + fprintf(stderr, "bits_per_pixel: %i\n", fb_varinfo_p->bits_per_pixel); + fprintf(stderr, "grayscale: %s\n", fb_varinfo_p->grayscale ? "true" : "false"); + fprintf(stderr, "red: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->red.offset, fb_varinfo_p->red.length, fb_varinfo_p->red.msb_right); +- fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); +- fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); ++ fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right); ++ fprintf(stderr, "blue: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right); + fprintf(stderr, "alpha: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->transp.offset, fb_varinfo_p->transp.length, fb_varinfo_p->transp.msb_right); + fprintf(stderr, "pixel format: %s\n", fb_varinfo_p->nonstd == 0 ? "standard" : "non-standard"); + } From f142f23ecf9ee69326fd6a4387133443513afdd2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 26 Feb 2018 18:47:21 +0100 Subject: [PATCH 0164/2640] package/linux: drop useless intermediate DTS booleans Just use whatever the user specified in the list. An empty list means no DTS was specified. No need to add legacy option, as the behaviour does not change. Signed-off-by: "Yann E. MORIN" Cc: Simon van der Veldt Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Thomas Petazzoni Tested-by: Joshua Henderson Signed-off-by: Peter Korsgaard --- linux/Config.in | 28 ++++++---------------------- linux/linux.mk | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index dadfc88da4..3447290a69 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -363,35 +363,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT config BR2_LINUX_KERNEL_APPENDED_DTB bool -config BR2_LINUX_KERNEL_USE_INTREE_DTS - bool "Use a device tree present in the kernel" - help - Use a device tree source distributed with - the kernel sources. The dts files are located - in the arch//boot/dts folder. - config BR2_LINUX_KERNEL_INTREE_DTS_NAME - string "Device Tree Source file names" - depends on BR2_LINUX_KERNEL_USE_INTREE_DTS + string "In-tree Device Tree Source file names" help - Name of the device tree source file, without + Name of in-tree device tree source file, without the trailing .dts. You can provide a list of dts files to build, separated by spaces. -config BR2_LINUX_KERNEL_USE_CUSTOM_DTS - bool "Use a custom device tree file" - help - Use a custom device tree file, i.e, a device - tree file that does not belong to the kernel - source tree. - config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH - string "Device Tree Source file paths" - depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS + string "Out-of-tree Device Tree Source file paths" help - Path to the device tree source files. You can - provide a list of dts paths to copy and build, - separated by spaces. + Path to to out-of-tree device tree source files. + You can provide a list of dts paths to copy and + build, separated by spaces. endif diff --git a/linux/linux.mk b/linux/linux.mk index 28d799f946..e98b25cb72 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -125,17 +125,13 @@ endif # going to be installed in the target filesystem. LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` -ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y) KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) -endif -ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y) # We keep only the .dts files, so that the user can specify both .dts # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) -endif KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME)) From 8ea3dd2d6258cabecaa5796d58bce31d94abe056 Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 10:28:37 +0200 Subject: [PATCH 0165/2640] DEVELOPERS: Add myself as a maintainer of fbgrab Daniel's address is bouncing and my touch on fbgrab is now the most recent one. Signed-off-by: Timo Ketola Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index b0aab54d8f..dba0e58757 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -476,7 +476,6 @@ F: package/log4cpp/ N: Daniel Nyström F: package/e2tools/ -F: package/fbgrab/ N: Daniel Price F: package/nodejs/ @@ -1819,6 +1818,9 @@ F: toolchain/ N: Tiago Brusamarello F: package/aer-inject/ +N: Timo Ketola +F: package/fbgrab/ + N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ From 55ee1bd958885a2f2abe8a2bb07fd0af846e1c1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Mar 2018 09:29:05 +0100 Subject: [PATCH 0166/2640] zyre: bump to v2.0.0 v2.0.0 has been released after commit 1d949e4bf79b694ea883c325f5813e87ddc2a687, which we currently use, and it has the advantage of fixing the build with recent versions of czmq. Fixes: http://autobuild.buildroot.net/results/f5804474033d5ff781af2bf195de2b81362f7be2/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/zyre/zyre.hash | 2 +- package/zyre/zyre.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zyre/zyre.hash b/package/zyre/zyre.hash index 5b38b8039d..8cc860232a 100644 --- a/package/zyre/zyre.hash +++ b/package/zyre/zyre.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0ce8328a2b9fe46aafc4627fc4ebd4d815f4d9f7d9708088459306c87bf5fb4b zyre-1d949e4bf79b694ea883c325f5813e87ddc2a687.tar.gz +sha256 b978a999947ddb6722d956db2427869b313225e50518c4fbbf960a68109e3e91 zyre-v2.0.0.tar.gz diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk index baaa57f5f6..82a0f517ce 100644 --- a/package/zyre/zyre.mk +++ b/package/zyre/zyre.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZYRE_VERSION = 1d949e4bf79b694ea883c325f5813e87ddc2a687 +ZYRE_VERSION = v2.0.0 ZYRE_SITE = $(call github,zeromq,zyre,$(ZYRE_VERSION)) ZYRE_LICENSE = MPL-2.0 ZYRE_LICENSE_FILES = LICENSE From 7b3bb51809517ea045dedc8544db51fc0515d5b4 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 2 Feb 2018 13:56:11 -0200 Subject: [PATCH 0167/2640] tpm2-tss: new package OSS implementation of the TCG TPM2 Software Stack (TSS2). This stack consists of the following layers from top to bottom: * System API (SAPI) as described in the system level API and TPM command transmission interface specification. This API is a 1-to-1 mapping of the TPM2 commands documented in Part 3 of the TPM2 specification. Additionally there are asynchronous versions of each command. These asynchronous variants may be useful for integration into event-driven programming environments. Both the synchronous and asynchronous API are exposed through a single library: libsapi. * TPM Command Transmission Interface (TCTI) that is described in the same specification. This API provides a standard interface to transmit / receive TPM command / response buffers. It is expected that any number of libraries implementing the TCTI API will be implemented as a way to abstract various platform specific IPC mechanisms. Currently this repository provides two TCTI implementations: libtcti-device and libtcti-socket. The prior should be used for direct access to the TPM through the Linux kernel driver. The later implements the protocol exposed by the Microsoft software TPM2 simulator. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/tpm2-tss/Config.in | 32 ++++++++++++++++++++++++++++++++ package/tpm2-tss/tpm2-tss.hash | 3 +++ package/tpm2-tss/tpm2-tss.mk | 14 ++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 package/tpm2-tss/Config.in create mode 100644 package/tpm2-tss/tpm2-tss.hash create mode 100644 package/tpm2-tss/tpm2-tss.mk diff --git a/package/Config.in b/package/Config.in index 6abbb43e38..f455e74735 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1063,6 +1063,7 @@ menu "Crypto" source "package/openssl/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" + source "package/tpm2-tss/Config.in" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" source "package/wolfssl/Config.in" diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in new file mode 100644 index 0000000000..1eb69d3e93 --- /dev/null +++ b/package/tpm2-tss/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_TPM2_TSS + bool "tpm2-tss" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_LIBURIPARSER + help + OSS implementation of the Trusted Computing Group's (TCG) TPM2 + Software Stack (TSS). This stack consists of the following + layers from top to bottom: + + * System API (SAPI) as described in the system level API and + TPM command transmission interface specification. This API + is a 1-to-1 mapping of the TPM2 commands documented in Part + 3 of the TPM2 specification. Additionally there are + asynchronous versions of each command. These asynchronous + variants may be useful for integration into event-driven + programming environments. Both the synchronous and + asynchronous API are exposed through a single library: + libsapi. + + * TPM Command Transmission Interface (TCTI) that is described + in the same specification. This API provides a standard + interface to transmit / receive TPM command / response + buffers. It is expected that any number of libraries + implementing the TCTI API will be implemented as a way to + abstract various platform specific IPC mechanisms. Currently + this repository provides two TCTI implementations: + libtcti-device and libtcti-socket. The prior should be used + for direct access to the TPM through the Linux kernel + driver. The later implements the protocol exposed by the + Microsoft software TPM2 simulator. + + https://github.com/tpm2-software/tpm2-tss diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash new file mode 100644 index 0000000000..df1c6d8b58 --- /dev/null +++ b/package/tpm2-tss/tpm2-tss.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 c7d627de50394e9a02593edb1ce74e1bbac17831be726c54f689507f0c41a78a tpm2-tss-1.3.0.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk new file mode 100644 index 0000000000..709602860f --- /dev/null +++ b/package/tpm2-tss/tpm2-tss.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# tpm2-tss +# +################################################################################ + +TPM2_TSS_VERSION = 1.3.0 +TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) +TPM2_TSS_LICENSE = BSD-2-Clause +TPM2_TSS_LICENSE_FILES = LICENSE +TPM2_TSS_INSTALL_STAGING = YES +TPM2_TSS_DEPENDENCIES = liburiparser host-pkgconf + +$(eval $(autotools-package)) From 22508657e5616062946550ab31233cdf7287ba48 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 9 Mar 2018 16:55:31 -0300 Subject: [PATCH 0168/2640] linux: bump default to version 4.15.8 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 3447290a69..3e039c5549 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 324cc39ba13a3cbdd1f146cf59d0f145661830bc Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 9 Mar 2018 16:55:32 -0300 Subject: [PATCH 0169/2640] linux-headers: bump 4.{14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d74f267a2e..3723e8edec 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -248,6 +248,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.24" if BR2_KERNEL_HEADERS_4_14 - default "4.15.7" if BR2_KERNEL_HEADERS_4_15 + default "4.14.25" if BR2_KERNEL_HEADERS_4_14 + default "4.15.8" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7cfceeb91e2d14907cd48226ccc7bcb6df10ee1c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 15:30:43 +0100 Subject: [PATCH 0170/2640] utils/scanpypi: correctly handle license dirs in subdirs for .hash files create_hash_file() used basename(licensefile) when it writes the entry for the license file in the .hash, which is obviously not correct when license file is locate in a sub directory. Instead copy the logic from __create_mk_license() to strip the directory prefix from the absolute filename instead. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 2b3188dbf6..b9006ee4f7 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -554,7 +554,7 @@ class BuildrootPackage(): hash_line = '{method}\t{digest} {filename}\n'.format( method='sha256', digest=sha256.hexdigest(), - filename=os.path.basename(license_file)) + filename=license_file.replace(self.tmp_extract, '')[1:]) lines.append(hash_line) with open(path_to_hash, 'w') as hash_file: From 95e9851b881e91ecd0e4aec59ce393efb6bc062d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 9 Mar 2018 07:21:06 +0200 Subject: [PATCH 0171/2640] rhash: bump to version 1.3.5 Add sha256 and license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/rhash/rhash.hash | 9 ++++++--- package/rhash/rhash.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/rhash/rhash.hash b/package/rhash/rhash.hash index 5efc3a67bd..9a29b988a6 100644 --- a/package/rhash/rhash.hash +++ b/package/rhash/rhash.hash @@ -1,3 +1,6 @@ -# From https://sourceforge.net/projects/rhash/files/rhash/1.3.4/ -md5 0b51010604659e9e99f6307b053ba13b rhash-1.3.4-src.tar.gz -sha1 411d8c7ba84fa9763bc49fa2fd3a7587712fd52c rhash-1.3.4-src.tar.gz +# From https://sourceforge.net/projects/rhash/files/rhash/1.3.5/ +md5 f586644019c10c83c6b6835de4b99e74 rhash-1.3.5-src.tar.gz +sha1 990c9a0135afe48dee4ce1dbf83578e44735f302 rhash-1.3.5-src.tar.gz +# Locally calculated +sha256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e rhash-1.3.5-src.tar.gz +sha256 8cf876d3406a2eed6c17ae804c8958bd78d3a0f63c30d6e2e789ab575e9fde40 COPYING diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 53f49d8d3c..28fffe4528 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -RHASH_VERSION = 1.3.4 +RHASH_VERSION = 1.3.5 RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = MIT From d314d9cc2aea106f52fff18d9120eb4ea80769a1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 9 Mar 2018 09:12:00 +0200 Subject: [PATCH 0172/2640] btrfs-progs: bump to version 4.15.1 Disable libzstd support explicitly to avoid configure failure. The Buildroot zstd package does not currently install its library. Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ogs-convert-add-missing-types-header.patch | 39 ------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 4 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch diff --git a/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch b/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch deleted file mode 100644 index 7b09f2785c..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dda485a3d788c47bb6849218f695db7b51822872 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 31 Oct 2017 14:51:51 +0200 -Subject: [PATCH] btrfs-progs: convert: add missing types header - -Build with musl libc needs the sys/types.h header for the dev_t type, -since this header is not included indirectly. This fixes the following -build failure: - -In file included from convert/source-fs.c:23:0: -./convert/source-fs.h:112:1: error: unknown type name ‘dev_t’ - dev_t decode_dev(u32 dev); - ^~~~~ -convert/source-fs.c:31:1: error: unknown type name ‘dev_t’ - dev_t decode_dev(u32 dev) - ^~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-btrfs&m=150945479718731&w=2 - - convert/source-fs.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/convert/source-fs.h b/convert/source-fs.h -index 23f33567b42d..4e5babefe6a2 100644 ---- a/convert/source-fs.h -+++ b/convert/source-fs.h -@@ -19,6 +19,7 @@ - - #include "kerncompat.h" - #include -+#include - #include - - #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID --- -2.14.2 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index bdcb8bada1..54d34c9191 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 btrfs-progs-v4.13.3.tar.xz +sha256 67102ac0d6795f368acc94efaca29b6626d972638790a4a0c9f89a27cd543f96 btrfs-progs-v4.15.1.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96c4350d26..776a3ef841 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,11 +4,11 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.13.3 +BTRFS_PROGS_VERSION = 4.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd BTRFS_PROGS_LICENSE = GPL-2.0 BTRFS_PROGS_LICENSE_FILES = COPYING BTRFS_PROGS_INSTALL_STAGING = YES From 3df649aa4206bc68181f3e8bb7f624d1adcacba6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 8 Mar 2018 21:39:01 +0100 Subject: [PATCH 0173/2640] libevdev: bump version to 1.5.9 - for details see [1] - add hash for license file [1] https://lists.freedesktop.org/archives/input-tools/2018-March/001464.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/libevdev/libevdev.hash | 13 ++++++++----- package/libevdev/libevdev.mk | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 0702a7b006..e4294dcade 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,5 +1,8 @@ -# From https://lists.freedesktop.org/archives/input-tools/2018-January/001447.html -md5 c25a8c3939e4ad59a5e9e5e1e354832d libevdev-1.5.8.tar.xz -sha1 a60e7a43570cdbc64af5adf99ca80023d21a1174 libevdev-1.5.8.tar.xz -sha256 6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d libevdev-1.5.8.tar.xz -sha512 e9485d8c6b48ebf762b32b003bc6b761c548024ad3bc34a0793485b53383746881fcc9b206a078d571937291e519d9822e50c5d8816778d347094691b65ec3fa libevdev-1.5.8.tar.xz +# https://lists.freedesktop.org/archives/input-tools/2018-March/001464.html +md5 a1ca11e961c1efed720fac4130881904 libevdev-1.5.9.tar.xz +sha1 9457e33af5c1e66e29c1385a5550fe60aef8e42e libevdev-1.5.9.tar.xz +sha256 e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75 libevdev-1.5.9.tar.xz +sha512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c libevdev-1.5.9.tar.xz + +# Hash for license files: +sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 1893863efd..880d75dfbd 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.5.8 +LIBEVDEV_VERSION = 1.5.9 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 From 183d2097ffef5d8d7e1ac07d3b613ecacdd8c876 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 8 Mar 2018 16:25:09 +0200 Subject: [PATCH 0174/2640] systemd: do not use host system-uid/gid ranges systemd meson.build uses values from host /etc/login.defs if system-uid-max and system-gid-max build options are not explicitly specified. Avoid that by setting system-uid-max and system-gid-max to 999 which is the systemd default if SYSTEM_UID_MAX and SYSTEM_GID_MAX are not set in /etc/login.defs. Signed-off-by: Anssi Hannula Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 34b70c754a..76b7e8382f 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -40,6 +40,8 @@ SYSTEMD_CONF_OPTS += \ -Dldconfig=false \ -Ddefault-dnssec=no \ -Dtests=false \ + -Dsystem-uid-max=999 \ + -Dsystem-gid-max=999 \ -Dtelinit-path=$(TARGET_DIR)/sbin/telinit \ -Dkill-path=/usr/bin/kill \ -Dkmod-path=/usr/bin/kmod \ From 1a0b4b2be2c76b836f4461fcf59f5e95dcd8549b Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 12:42:33 +0200 Subject: [PATCH 0175/2640] fbgrab: Fix some problems in the patch metadata The patch description was missing Upstream-Status tag. It was given in the commit which added this patch but not in the patch itself as should be. Signed-off-by tag accidentally didn't follow the usual format. Signed-off-by: Timo Ketola Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/fbgrab/0100-fix-pixfmt-report.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/fbgrab/0100-fix-pixfmt-report.patch b/package/fbgrab/0100-fix-pixfmt-report.patch index 18bcf96df2..8cff7ef8c3 100644 --- a/package/fbgrab/0100-fix-pixfmt-report.patch +++ b/package/fbgrab/0100-fix-pixfmt-report.patch @@ -4,7 +4,9 @@ When fbgrab tells about the framebuffer pixel format, blue and green are accidentally swapped in 'length' and 'msb_right' columns. Let's order everything as RGB. -Signed-off-by timo.ketola@exertus.fi +Upstream-Status: Submitted [Gunnar Monell ] + +Signed-off-by: Timo Ketola diff -u a/fbgrab.c b/fbgrab.c --- a/fbgrab.c 2018-03-07 11:42:04.739250433 +0200 From cf69551e941b530ad84b1ec7995041c7ad86ae3f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 8 Mar 2018 17:50:06 +0100 Subject: [PATCH 0176/2640] libmpdclient: add host-meson dependency Fixes: - http://autobuild.buildroot.net/results/00a/00af3302c4029670a585beb3cb65bd8623cf12da Add a libmpdclient entry for myself in DEVELOPERS Signed-off-by: Fabrice Fontaine Tested-by: Adam Duskett Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/libmpdclient/libmpdclient.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dba0e58757..78a0721201 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -652,6 +652,7 @@ F: package/gupnp-dlna/ F: package/gupnp-tools/ F: package/hiredis/ F: package/igd2-for-linux/ +F: package/libmpdclient/ F: package/libupnp/ F: package/libupnp18/ F: package/minissdpd/ diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 5574bde948..3148fd2873 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -11,6 +11,7 @@ LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_ LIBMPDCLIENT_INSTALL_STAGING = YES LIBMPDCLIENT_LICENSE = BSD-3-Clause LIBMPDCLIENT_LICENSE_FILES = COPYING +LIBMPDCLIENT_DEPENDENCIES = host-meson LIBMPDCLIENT_CONF_OPTS += \ --prefix=/usr \ From f124c2f0765b1098f86cca71f2df18d1788cba57 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Mar 2018 21:30:48 +0100 Subject: [PATCH 0177/2640] configs/riotboard: remove defconfig This defconfig fails to build with gcc 6.x, even though we switched to using gcc 6.x as the default gcc version in May 2017. This defconfig also hasn't seen any non-mechanical update since November 2015. So it's time to get rid of it, in order to remove the following build failure: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306938 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/embest/riotboard/readme.txt | 46 ------------------- .../boot/extlinux/extlinux.conf | 6 --- configs/riotboard_defconfig | 36 --------------- 4 files changed, 89 deletions(-) delete mode 100644 board/embest/riotboard/readme.txt delete mode 100644 board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf delete mode 100644 configs/riotboard_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 808d66c156..4cdaa09da5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,7 +214,6 @@ raspberrypi3_64_defconfig: *defconfig raspberrypi3_defconfig: *defconfig raspberrypi3_qt5we_defconfig: *defconfig raspberrypi_defconfig: *defconfig -riotboard_defconfig: *defconfig roseapplepi_defconfig: *defconfig s6lx9_microboard_defconfig: *defconfig sheevaplug_defconfig: *defconfig diff --git a/board/embest/riotboard/readme.txt b/board/embest/riotboard/readme.txt deleted file mode 100644 index b7390d0d57..0000000000 --- a/board/embest/riotboard/readme.txt +++ /dev/null @@ -1,46 +0,0 @@ -Buildroot for Embest RIoTboard -============================== - -1. Compiling buildroot ----------------------- - -make riotboard_defconfig -make - -2. Installing buildroot ------------------------ - -Prepare an SD-card and plug it into your card reader. Write the bootloader to -your SD-card: - -sudo dd if=output/images/u-boot.imx of=/dev/sdX bs=1k seek=1 - -Create 1 partition on the SD-card using your favourite tool. The -partition should be big enough to hold your rootfs, for example -128MiB. Here's an example partition layout: - - Device Boot Start End Blocks Id System -/dev/sdX1 2048 264191 131072 83 Linux - -Format the SD-card partition with your favourite filesystem: - -sudo mkfs.ext2 /dev/sdX1 - -Deploy your rootfs to the SD-card: - -sudo mkdir /mnt/sdcard/ -sudo mount /dev/sdX1 /mnt/sdcard/ -sudo tar xf output/images/rootfs.tar -C /mnt/sdcard/ -sudo umount /dev/sdX1 - -3. Running buildroot --------------------- - -Position the board so you can read the label "RIoTboard" on the right side of -SW1 DIP switches. Configure the SW1 swiches like this: - -10100101 (1 means ON position, 0 means OFF position) - -Now plug your prepared SD-card in slot J6. Connect a serial console (115200, 8, -N, 1) to header J18. Connect a 5V/1A power supply to the board and enjoy your -new toy. diff --git a/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf b/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf deleted file mode 100644 index c7d32e0097..0000000000 --- a/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf +++ /dev/null @@ -1,6 +0,0 @@ -default buildroot - -label buildroot -kernel /boot/uImage -devicetree /boot/imx6dl-riotboard.dtb -append console=ttymxc1,115200 root=/dev/mmcblk0p1 rw diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig deleted file mode 100644 index c2281058f5..0000000000 --- a/configs/riotboard_defconfig +++ /dev/null @@ -1,36 +0,0 @@ -# architecture -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" - -# rootfs -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_2r1=y -BR2_ROOTFS_OVERLAY="board/embest/riotboard/rootfs_overlay" - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10" -BR2_TARGET_UBOOT_BOARDNAME="riotboard" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Linux headers same as kernel, a 4.2 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2.6" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-riotboard" -BR2_LINUX_KERNEL_INSTALL_TARGET=y From 46a2f5089731a58da3b78827df5dab3fc95cf975 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:43 +0100 Subject: [PATCH 0178/2640] package/x11r7/xdriver_xf86-video-ati: bump version to 18.0.0 Added license hash. Signed-off-by: Bernd Kuhls Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-ati.hash | 12 +++++++----- .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index 117c5749ff..54c553e6ce 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-September/002806.html -md5 0ff538f78ae82ccce384dadf7a705863 xf86-video-ati-7.10.0.tar.bz2 -sha1 38e535ecc8445c1b9464ac34db959337929887f7 xf86-video-ati-7.10.0.tar.bz2 -sha256 ee51d642e3105cb5424f02622dc2966b87b42d498bb34104a70fcf6d4a8f4e79 xf86-video-ati-7.10.0.tar.bz2 -sha512 1f2f4af1d299af62644693e6fbc47a5078c9bc5e7887a1ac217121ef2fd29d8c9f50a8d9be9ddb0887d0b49141bb33484f82c1313a472ad6867266b53b4a11ad xf86-video-ati-7.10.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002854.html +md5 4d41bfe860dc719654cad3f82d00f6f3 xf86-video-ati-18.0.0.tar.bz2 +sha1 da1b89a747264d976d824ddc7b5b4f803d3cf765 xf86-video-ati-18.0.0.tar.bz2 +sha256 2c0368fb620d1fdfa2b435e672d65444c2fb9df21bbaf979298484b89ef83981 xf86-video-ati-18.0.0.tar.bz2 +sha512 a9a634091f208099885039d42433cee061e03968417c0d535691833abcc9162d8d0a46f99bac902f0885beb14dcc9a011d104b535ffe492562fd5bb740ad4721 xf86-video-ati-18.0.0.tar.bz2 +# Locally computed +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index f8b8f70cb6..0e9d412b75 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 7.10.0 +XDRIVER_XF86_VIDEO_ATI_VERSION = 18.0.0 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT From 354e83283ba29e320bc419f1648a086b356dfd01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:44 +0100 Subject: [PATCH 0179/2640] package/x11r7/xdriver_xf86-video-vesa: bump version to 2.4.0 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash | 9 +++++++-- .../xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index 84c0b08a92..ee27690093 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002615.html -sha256 7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1 xf86-video-vesa-2.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-February/002837.html +md5 8134201beaf6f77150c7809c3cc802e6 xf86-video-vesa-2.4.0.tar.bz2 +sha1 99b69044c34292ba062e365c07dcd024462e794b xf86-video-vesa-2.4.0.tar.bz2 +sha256 bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c xf86-video-vesa-2.4.0.tar.bz2 +sha512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de xf86-video-vesa-2.4.0.tar.bz2 +# Locally computed +sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index 1184821d9c..d2a9205197 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.4 +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.4.0 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT From df33aae5f59eaaf40e800acdfefc83e57216ffe8 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:38 +0000 Subject: [PATCH 0180/2640] package/nodejs: bump version to 8.10.0 See https://nodejs.org/en/blog/release/v8.10.0/ Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 107a24f7bf..4adef79dca 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,2 +1,2 @@ -# From http://nodejs.org/dist/v8.9.4/SHASUMS256.txt -sha256 6cdcde9c9c1ca9f450a0b24eafa229ca759e576daa0fae892ce74d541ecdc86f node-v8.9.4.tar.xz +# From http://nodejs.org/dist/v8.10.0/SHASUMS256.txt +sha256 b72d4e71618d6bcbd039b487b51fa7543631a4ac3331d7caf69bdf55b5b2901a node-v8.10.0.tar.xz diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index a72b9a704f..e1dd11cef5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.9.4 +NODEJS_VERSION = 8.10.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 2d2dbca68b32ec040ecd00728f3e2b9bfc484222 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:39 +0000 Subject: [PATCH 0181/2640] package/libuv: bump version to 1.19.2 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index cc5a30ae10..1a2833e786 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d96a6230af4f9f33d6ec021b599e157279a2af72ed38cf4a8c25e6d58d952ef libuv-v1.19.1.tar.gz +sha256 ccc5f3b43ed171640513786e5e809508cb6308279b4d71a016e4550ad62f1686 libuv-v1.19.2.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 2666c14f93..2e07d3a0fa 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.19.1 +LIBUV_VERSION = v1.19.2 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 103855a2e0ef04851cd460176c31393589ceb1de Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:40 +0000 Subject: [PATCH 0182/2640] package/c-ares: bump version to 1.14.0 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 79928ae843..832c4dfcfb 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7 c-ares-1.13.0.tar.gz +sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 72019a0425..67254244a1 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.13.0 +C_ARES_VERSION = 1.14.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From 4a646da62850a6e4e38d422988e1c5bd123943cd Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:41 +0000 Subject: [PATCH 0183/2640] package/libhttpparser: bump version to 2.8.0 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- ...tion-when-calling-ln-at-install-time.patch | 30 +++++++++++-------- package/libhttpparser/libhttpparser.hash | 2 +- package/libhttpparser/libhttpparser.mk | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch index df166565f9..70f16f662f 100644 --- a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +++ b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch @@ -8,28 +8,32 @@ This allows "make install; make install" to work properly. Signed-off-by: Thomas Petazzoni Signed-off-by: Renaud AUBIN --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 33c8ba0..b36d95a 100644 +index 6cf63bd..c182e5c 100644 --- a/Makefile +++ b/Makefile -@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c +@@ -133,14 +133,14 @@ tags: http_parser.c http_parser.h test.c install: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) install-strip: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) uninstall: - rm $(INCLUDEDIR)/http_parser.h + rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h -- 2.6.2 diff --git a/package/libhttpparser/libhttpparser.hash b/package/libhttpparser/libhttpparser.hash index a1b772e54c..8ffceb24d9 100644 --- a/package/libhttpparser/libhttpparser.hash +++ b/package/libhttpparser/libhttpparser.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 70409ad324e5de2da6a0f39e859e566d497c1ff0a249c0c38a5012df91b386b3 libhttpparser-v2.7.1.tar.gz +sha256 7277c6f99bf6fc272eb5d8fc3dca01e7cc1d4ae609b5d2c5d5e18added98479d libhttpparser-v2.8.0.tar.gz diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk index 1df26017e7..5f50d877d9 100644 --- a/package/libhttpparser/libhttpparser.mk +++ b/package/libhttpparser/libhttpparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = v2.7.1 +LIBHTTPPARSER_VERSION = v2.8.0 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT From 5fe319305f032e07478197f09b13083819c3ed8a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 8 Mar 2018 11:51:18 +0100 Subject: [PATCH 0184/2640] ympd: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ympd/ympd.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ympd/ympd.hash b/package/ympd/ympd.hash index 7483083b4d..1c4ad8dc8f 100644 --- a/package/ympd/ympd.hash +++ b/package/ympd/ympd.hash @@ -1,2 +1,3 @@ # locally computed sha256 092c26c51166d1d1f025cd06742981783dea7e42bfe4f73f10c4418fc003de94 ympd-v1.2.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE From db1d9da6d6ea6dbf7049dfb8bf58d579fdcc01b0 Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Thu, 8 Mar 2018 13:35:58 +0200 Subject: [PATCH 0185/2640] cups-filters: bump to 1.20.1 Signed-off-by: Olivier Schonken Signed-off-by: Peter Korsgaard --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index da9d31c998..043252803f 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 95254d7950df4c74d293ed7dfa0b714f51cff329a82da74a4ac976d342bb35ab cups-filters-1.17.9.tar.gz +sha256 f7b3853f9567e0213b4e1602bc670a626c3060e2a043e31b6dee21174d5469a5 cups-filters-1.20.1.tar.gz diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 6d05aa7e31..fd21bff6d4 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.17.9 +CUPS_FILTERS_VERSION = 1.20.1 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING From ef60ef83c9e27899666c3c093007208c1203b3e1 Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Thu, 8 Mar 2018 13:35:59 +0200 Subject: [PATCH 0186/2640] cups-filters: Add patch to remove relative symbolic link from install On older build systems with old coreutils, using relative symbolic link (ln -r) does not work, and causes failed builds. Workaround is to use normal symbolic link with a relative path. e.g. ../../$(BINDIR) This fix is dependent on bumping cups-filters version to 1.20.1 because of autotools issue with Makefile.am changes. Fixes: http://autobuild.buildroot.net/results/77a6369f3530a2a6a055f7fd664f1ad424274d77 Signed-off-by: Olivier Schonken Signed-off-by: Peter Korsgaard --- ...lative-linking-with-absolute-linking.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch diff --git a/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch b/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch new file mode 100644 index 0000000000..e4b35cda39 --- /dev/null +++ b/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch @@ -0,0 +1,46 @@ +From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Thu, 8 Mar 2018 12:32:23 +0200 +Subject: [PATCH] install: don't use ln -r + +Oldish enterprise-class distributions have too old versions of +coreutils, with ln not supporting -r. + +So we fake it. + +ln -r would create minimalist relative paths, but they are not +trivial to generate. Instead, we always create paths relative to the +root, i.e.: + + ln -s -r /usr/bin/foo /usr/sbin/foo + +would create: /usr/sbin/foo -> ../bin/foo +while we do : /usr/sbin/foo -> ../../usr/bin/foo + +Signed-off-by: Olivier Schonken +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d959227..b49914a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -998,11 +998,11 @@ install-exec-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir) + $(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir) + if ENABLE_FOOMATIC +- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) ++ $(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) + endif + if ENABLE_DRIVERLESS +- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) +- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) ++ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) ++ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) + endif + if ENABLE_BRAILLE + $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl +-- +2.14.1 + From 23696d610f7eeacbcda6421334b321c89ddda2a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:42 +0100 Subject: [PATCH 0187/2640] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 18.0.0 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-amdgpu.hash | 12 +++++++----- .../xdriver_xf86-video-amdgpu.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index b5910f3c0f..b03a010f84 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-September/002805.html -md5 15a54f0a7870a57e3f611c9114924137 xf86-video-amdgpu-1.4.0.tar.bz2 -sha1 d9971cc6177095219a6687328aef25a72df3dd9d xf86-video-amdgpu-1.4.0.tar.bz2 -sha256 f8cac4bf3dd795b93cc337e5c0c62618026f597890a10d996f09c73eb88ba67c xf86-video-amdgpu-1.4.0.tar.bz2 -sha512 cae6417a45f6b981e007e080486083f1c38eaca58c6e331b04bbf46c86f23394742a722ae0d798d8dcad66879e99d90e57f04ae9ccb198f3ed26ec745878ccc2 xf86-video-amdgpu-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002844.html +md5 24b2c9dc27a6083289bc86023eb3b1fe xf86-video-amdgpu-18.0.0.tar.bz2 +sha1 360d619de1629913d356c60f1e155553e0e55dbb xf86-video-amdgpu-18.0.0.tar.bz2 +sha256 e909b9707d2562dfc36d8075a8cbddbc93901aaa8f2522d9a429c3fc5ad66d94 xf86-video-amdgpu-18.0.0.tar.bz2 +sha512 5f9fa173c1b2f90878a9cc961e49abb0ad56db16fd80ec9fe6788fcc90eaa1906f3bff74437cb9afa95b9212ff946e1558736739f27e959a3848e77e4dabbd17 xf86-video-amdgpu-18.0.0.tar.bz2 +# Locally computed +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 50e5310e46..2c3986252c 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 18.0.0 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT From 93cc6b6cb0cbf90c1eac13f4546e54d423d06233 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:52 +0100 Subject: [PATCH 0188/2640] package: add python-docker-pycreds Python bindings for the docker credentials store API. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-docker-pycreds/Config.in | 7 +++++++ .../python-docker-pycreds.hash | 4 ++++ .../python-docker-pycreds/python-docker-pycreds.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-docker-pycreds/Config.in create mode 100644 package/python-docker-pycreds/python-docker-pycreds.hash create mode 100644 package/python-docker-pycreds/python-docker-pycreds.mk diff --git a/DEVELOPERS b/DEVELOPERS index 78a0721201..845aece54e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1385,6 +1385,7 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ +F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ F: package/python-ipaddr/ diff --git a/package/Config.in b/package/Config.in index f455e74735..a5604fc36b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -765,6 +765,7 @@ menu "External python modules" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-django/Config.in" + source "package/python-docker-pycreds/Config.in" source "package/python-docopt/Config.in" source "package/python-docutils/Config.in" source "package/python-dominate/Config.in" diff --git a/package/python-docker-pycreds/Config.in b/package/python-docker-pycreds/Config.in new file mode 100644 index 0000000000..584c1dbc0e --- /dev/null +++ b/package/python-docker-pycreds/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_DOCKER_PYCREDS + bool "python-docker-pycreds" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Python bindings for the docker credentials store API. + + https://github.com/shin-/dockerpy-creds diff --git a/package/python-docker-pycreds/python-docker-pycreds.hash b/package/python-docker-pycreds/python-docker-pycreds.hash new file mode 100644 index 0000000000..9e1182d4a4 --- /dev/null +++ b/package/python-docker-pycreds/python-docker-pycreds.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/docker-pycreds/json, sha256 locally computed +md5 ae63c7def3e58cb51a4d8f5810683030 docker-pycreds-0.2.2.tar.gz +sha256 c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299 docker-pycreds-0.2.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-docker-pycreds/python-docker-pycreds.mk b/package/python-docker-pycreds/python-docker-pycreds.mk new file mode 100644 index 0000000000..e7ffd0eb51 --- /dev/null +++ b/package/python-docker-pycreds/python-docker-pycreds.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-docker-pycreds +# +################################################################################ + +PYTHON_DOCKER_PYCREDS_VERSION = 0.2.2 +PYTHON_DOCKER_PYCREDS_SOURCE = docker-pycreds-$(PYTHON_DOCKER_PYCREDS_VERSION).tar.gz +PYTHON_DOCKER_PYCREDS_SITE = https://pypi.python.org/packages/db/73/42d4c698e70633d99f7f7c4c87c6de45ead5ad7b36dcfccd998fd1556ac9 +PYTHON_DOCKER_PYCREDS_SETUP_TYPE = setuptools +PYTHON_DOCKER_PYCREDS_LICENSE = Apache-2.0 +PYTHON_DOCKER_PYCREDS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 6fccba603342e8538f41ec25c7fd76b7afe6695a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:53 +0100 Subject: [PATCH 0189/2640] package: add python-websocket-client WebSocket client module for python. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-websocket-client/Config.in | 9 +++++++++ .../python-websocket-client.hash | 4 ++++ .../python-websocket-client.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-websocket-client/Config.in create mode 100644 package/python-websocket-client/python-websocket-client.hash create mode 100644 package/python-websocket-client/python-websocket-client.mk diff --git a/DEVELOPERS b/DEVELOPERS index 845aece54e..c13bb448f5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1391,6 +1391,7 @@ F: package/python-enum34/ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ +F: package/python-websocket-client/ F: package/triggerhappy/ N: Peter Seiderer diff --git a/package/Config.in b/package/Config.in index a5604fc36b..9c727cad6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -949,6 +949,7 @@ menu "External python modules" source "package/python-wcwidth/Config.in" source "package/python-web2py/Config.in" source "package/python-webpy/Config.in" + source "package/python-websocket-client/Config.in" source "package/python-websockets/Config.in" source "package/python-werkzeug/Config.in" source "package/python-whoosh/Config.in" diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in new file mode 100644 index 0000000000..0fbb15b328 --- /dev/null +++ b/package/python-websocket-client/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT + bool "python-websocket-client" + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + help + WebSocket client for python. hybi13 is supported. + + https://github.com/websocket-client/websocket-client.git diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash new file mode 100644 index 0000000000..3672ca074b --- /dev/null +++ b/package/python-websocket-client/python-websocket-client.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/websocket-client/json, sha256 locally computed +md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz +sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz +sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk new file mode 100644 index 0000000000..58c8407db3 --- /dev/null +++ b/package/python-websocket-client/python-websocket-client.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-websocket-client +# +################################################################################ + +PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0 +PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz +PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27 +PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools +PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ +PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 9757f6d11aeb672904b62df28702bdce5097fc6f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:54 +0100 Subject: [PATCH 0190/2640] package: add python-backports-ssl-match-hostname The ssl.match_hostname() function from Python 3.5. This function IS available in python 2.7 since 2.7.9, but it doesn't support matching on IP addresses which is needed for some use cases. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + .../python-backports-ssl-match-hostname/Config.in | 7 +++++++ .../python-backports-ssl-match-hostname.hash | 4 ++++ .../python-backports-ssl-match-hostname.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-backports-ssl-match-hostname/Config.in create mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash create mode 100644 package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk diff --git a/DEVELOPERS b/DEVELOPERS index c13bb448f5..14f12e36ec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1385,6 +1385,7 @@ F: package/lzop/ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ +F: package/python-backports-ssl-match-hostname/ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ diff --git a/package/Config.in b/package/Config.in index 9c727cad6c..d3018aee47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -732,6 +732,7 @@ menu "External python modules" source "package/python-babel/Config.in" source "package/python-backports-abc/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" + source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-backports-ssl-match-hostname/Config.in b/package/python-backports-ssl-match-hostname/Config.in new file mode 100644 index 0000000000..8e55191a9e --- /dev/null +++ b/package/python-backports-ssl-match-hostname/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME + bool "python-backports-ssl-match-hostname" + depends on BR2_PACKAGE_PYTHON + help + The ssl.match_hostname() function from Python 3.5. + + http://bitbucket.org/brandon/backports.ssl_match_hostname diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash new file mode 100644 index 0000000000..b43e1af5a6 --- /dev/null +++ b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/backports.ssl_match_hostname/json, sha256 locally computed +md5 c03fc5e2c7b3da46b81acf5cbacfe1e6 backports.ssl_match_hostname-3.5.0.1.tar.gz +sha256 502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2 backports.ssl_match_hostname-3.5.0.1.tar.gz +sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e backports/ssl_match_hostname/LICENSE.txt diff --git a/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk new file mode 100644 index 0000000000..01c8bc448c --- /dev/null +++ b/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-backports-ssl-match-hostname +# +################################################################################ + +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.5.0.1 +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://pypi.python.org/packages/76/21/2dc61178a2038a5cb35d14b61467c6ac632791ed05131dda72c20e7b9e23 +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = backports/ssl_match_hostname/LICENSE.txt + +$(eval $(python-package)) From 8b46a14d174235b284e2ae72610dcb967e590d12 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:55 +0100 Subject: [PATCH 0191/2640] package: add python-docker Python library for the Docker Engine API. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-setup.py-make-pip-optional.patch | 50 +++++++++++++++++++ package/python-docker/Config.in | 15 ++++++ package/python-docker/python-docker.hash | 4 ++ package/python-docker/python-docker.mk | 14 ++++++ 6 files changed, 85 insertions(+) create mode 100644 package/python-docker/0001-setup.py-make-pip-optional.patch create mode 100644 package/python-docker/Config.in create mode 100644 package/python-docker/python-docker.hash create mode 100644 package/python-docker/python-docker.mk diff --git a/DEVELOPERS b/DEVELOPERS index 14f12e36ec..0bb140ec98 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1386,6 +1386,7 @@ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ F: package/python-backports-ssl-match-hostname/ +F: package/python-docker/ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ diff --git a/package/Config.in b/package/Config.in index d3018aee47..c1bf7067aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -766,6 +766,7 @@ menu "External python modules" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-django/Config.in" + source "package/python-docker/Config.in" source "package/python-docker-pycreds/Config.in" source "package/python-docopt/Config.in" source "package/python-docutils/Config.in" diff --git a/package/python-docker/0001-setup.py-make-pip-optional.patch b/package/python-docker/0001-setup.py-make-pip-optional.patch new file mode 100644 index 0000000000..d9c958311d --- /dev/null +++ b/package/python-docker/0001-setup.py-make-pip-optional.patch @@ -0,0 +1,50 @@ +From 978643b7222db66837d39037f884be01fb9af234 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Fri, 9 Mar 2018 18:40:16 +0100 +Subject: [PATCH] setup.py: make pip optional + +pip may not be available on the build host, and it is only used to check if +docker-py is already installed, so skip the check if pip isn't available. + +[Upstream-status: submitted (https://github.com/docker/docker-py/pull/1948)] +Signed-off-by: Peter Korsgaard +--- + setup.py | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index 271d94f..c9b91a3 100644 +--- a/setup.py ++++ b/setup.py +@@ -5,16 +5,20 @@ import codecs + import os + import sys + +-import pip +- + from setuptools import setup, find_packages + +-if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]: +- print( +- 'ERROR: "docker-py" needs to be uninstalled before installing this' +- ' package:\npip uninstall docker-py', file=sys.stderr +- ) +- sys.exit(1) ++try: ++ import pip ++ ++ if 'docker-py' in \ ++ [x.project_name for x in pip.get_installed_distributions()]: ++ print( ++ 'ERROR: "docker-py" needs to be uninstalled before installing this' ++ ' package:\npip uninstall docker-py', file=sys.stderr ++ ) ++ sys.exit(1) ++except ImportError: ++ pass + + ROOT_DIR = os.path.dirname(__file__) + SOURCE_DIR = os.path.join(ROOT_DIR) +-- +2.11.0 + diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in new file mode 100644 index 0000000000..35f7666f19 --- /dev/null +++ b/package/python-docker/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_DOCKER + bool "python-docker" + # docker-engine may be running on another host, so no dependency + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \ + if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime + select BR2_PACKAGE_PYTHON_DOCKER_PYCREDS # runtime + help + A Python library for the Docker Engine API. + + https://github.com/docker/docker-py diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash new file mode 100644 index 0000000000..c09ccc3859 --- /dev/null +++ b/package/python-docker/python-docker.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/docker/json, sha256 locally computed +md5 71e97726a8bdc56effa7df8321c47af1 docker-3.1.1.tar.gz +sha256 462165ca6367f802280684ab44e581cd2efba8995d78d07ea994e42194927c3b docker-3.1.1.tar.gz +sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk new file mode 100644 index 0000000000..fb9b32a603 --- /dev/null +++ b/package/python-docker/python-docker.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-docker +# +################################################################################ + +PYTHON_DOCKER_VERSION = 3.1.1 +PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz +PYTHON_DOCKER_SITE = https://pypi.python.org/packages/0d/17/ad98e025e5528337c4dc5835a5874898eb226da17e4ffed732c894cb1938 +PYTHON_DOCKER_SETUP_TYPE = setuptools +PYTHON_DOCKER_LICENSE = Apache-2.0 +PYTHON_DOCKER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From aa2a309b603044db39f7b8e0c54ad5c4159f04c6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:56 +0100 Subject: [PATCH 0192/2640] package: add python-cached-property A decorator for caching properties in classes. [Peter: Correct license as pointed out by Yegor] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-cached-property/Config.in | 6 ++++++ .../python-cached-property.hash | 4 ++++ .../python-cached-property.mk | 14 ++++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/python-cached-property/Config.in create mode 100644 package/python-cached-property/python-cached-property.hash create mode 100644 package/python-cached-property/python-cached-property.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0bb140ec98..27a906c19f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1386,6 +1386,7 @@ F: package/memtool/ F: package/mosquitto/ F: package/python-alsaaudio/ F: package/python-backports-ssl-match-hostname/ +F: package/python-cached-property/ F: package/python-docker/ F: package/python-docker-pycreds/ F: package/python-enum/ diff --git a/package/Config.in b/package/Config.in index c1bf7067aa..1043338a7e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -737,6 +737,7 @@ menu "External python modules" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" source "package/python-bottle/Config.in" + source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-cbor/Config.in" source "package/python-certifi/Config.in" diff --git a/package/python-cached-property/Config.in b/package/python-cached-property/Config.in new file mode 100644 index 0000000000..8343973342 --- /dev/null +++ b/package/python-cached-property/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CACHED_PROPERTY + bool "python-cached-property" + help + A decorator for caching properties in classes. + + https://github.com/pydanny/cached-property diff --git a/package/python-cached-property/python-cached-property.hash b/package/python-cached-property/python-cached-property.hash new file mode 100644 index 0000000000..255b2d9ec6 --- /dev/null +++ b/package/python-cached-property/python-cached-property.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/cached-property/json, sha256 locally computed +md5 fc7a49d2c4b7987f92b00c7b49128530 cached-property-1.4.0.tar.gz +sha256 a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0 cached-property-1.4.0.tar.gz +sha256 ba4756c8039b25b66e3c456cc5bf635aa528cf459b97ee1499d06684ccd89b9a LICENSE diff --git a/package/python-cached-property/python-cached-property.mk b/package/python-cached-property/python-cached-property.mk new file mode 100644 index 0000000000..3e1363853f --- /dev/null +++ b/package/python-cached-property/python-cached-property.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cached-property +# +################################################################################ + +PYTHON_CACHED_PROPERTY_VERSION = 1.4.0 +PYTHON_CACHED_PROPERTY_SOURCE = cached-property-$(PYTHON_CACHED_PROPERTY_VERSION).tar.gz +PYTHON_CACHED_PROPERTY_SITE = https://pypi.python.org/packages/ce/87/72b7a5a0504ad8d5d5ea6804ac5b24ce4f07869f61c47ea00cd4382320ba +PYTHON_CACHED_PROPERTY_SETUP_TYPE = setuptools +PYTHON_CACHED_PROPERTY_LICENSE = BSD-3-Clause +PYTHON_CACHED_PROPERTY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From a68ced9432b511033025831ab62fcd8e202a8163 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:57 +0100 Subject: [PATCH 0193/2640] package: add python-texttable Module for creating simple ASCII tables. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-texttable/Config.in | 6 ++++++ package/python-texttable/python-texttable.hash | 4 ++++ package/python-texttable/python-texttable.mk | 14 ++++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/python-texttable/Config.in create mode 100644 package/python-texttable/python-texttable.hash create mode 100644 package/python-texttable/python-texttable.mk diff --git a/DEVELOPERS b/DEVELOPERS index 27a906c19f..877ad8a8db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1394,6 +1394,7 @@ F: package/python-enum34/ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ +F: package/python-texttable/ F: package/python-websocket-client/ F: package/triggerhappy/ diff --git a/package/Config.in b/package/Config.in index 1043338a7e..6068ef573e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -932,6 +932,7 @@ menu "External python modules" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" + source "package/python-texttable/Config.in" source "package/python-typepy/Config.in" source "package/python-thrift/Config.in" source "package/python-tomako/Config.in" diff --git a/package/python-texttable/Config.in b/package/python-texttable/Config.in new file mode 100644 index 0000000000..1c8dde8d3f --- /dev/null +++ b/package/python-texttable/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TEXTTABLE + bool "python-texttable" + help + module for creating simple ASCII tables. + + https://github.com/foutaise/texttable/ diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash new file mode 100644 index 0000000000..448d6b7dd1 --- /dev/null +++ b/package/python-texttable/python-texttable.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/texttable/json, sha256 locally computed +md5 a712b5a5464d51c5fc43c64d9d2cd0de texttable-0.9.1.tar.gz +sha256 119041773ff03596b56392532f9315cb3a3116e404fd6f36e76a7dc088d95c79 texttable-0.9.1.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/python-texttable/python-texttable.mk b/package/python-texttable/python-texttable.mk new file mode 100644 index 0000000000..96fe6cf882 --- /dev/null +++ b/package/python-texttable/python-texttable.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-texttable +# +################################################################################ + +PYTHON_TEXTTABLE_VERSION = 0.9.1 +PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz +PYTHON_TEXTTABLE_SITE = https://pypi.python.org/packages/02/e1/2565e6b842de7945af0555167d33acfc8a615584ef7abd30d1eae00a4d80 +PYTHON_TEXTTABLE_SETUP_TYPE = distutils +PYTHON_TEXTTABLE_LICENSE = LGPL-3.0+ +PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 7096961385541eca22cbd89e852468b16ef384d6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:58 +0100 Subject: [PATCH 0194/2640] package: add python-dockerpty Library to use the pseudo-tty of a docker container. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-dockerpty/Config.in | 7 +++++++ package/python-dockerpty/python-dockerpty.hash | 4 ++++ package/python-dockerpty/python-dockerpty.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-dockerpty/Config.in create mode 100644 package/python-dockerpty/python-dockerpty.hash create mode 100644 package/python-dockerpty/python-dockerpty.mk diff --git a/DEVELOPERS b/DEVELOPERS index 877ad8a8db..7809b5182b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1388,6 +1388,7 @@ F: package/python-alsaaudio/ F: package/python-backports-ssl-match-hostname/ F: package/python-cached-property/ F: package/python-docker/ +F: package/python-dockerpty/ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ diff --git a/package/Config.in b/package/Config.in index 6068ef573e..b7e0da6dd4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -768,6 +768,7 @@ menu "External python modules" source "package/python-dicttoxml/Config.in" source "package/python-django/Config.in" source "package/python-docker/Config.in" + source "package/python-dockerpty/Config.in" source "package/python-docker-pycreds/Config.in" source "package/python-docopt/Config.in" source "package/python-docutils/Config.in" diff --git a/package/python-dockerpty/Config.in b/package/python-dockerpty/Config.in new file mode 100644 index 0000000000..f0bd85a68f --- /dev/null +++ b/package/python-dockerpty/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_DOCKERPTY + bool "python-dockerpty" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Python library to use the pseudo-tty of a docker container. + + https://github.com/d11wtq/dockerpty diff --git a/package/python-dockerpty/python-dockerpty.hash b/package/python-dockerpty/python-dockerpty.hash new file mode 100644 index 0000000000..f5ed252bcf --- /dev/null +++ b/package/python-dockerpty/python-dockerpty.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/dockerpty/json, sha256 locally computed +md5 028bacb34536f3ee6a2ccd668c27e8e4 dockerpty-0.4.1.tar.gz +sha256 69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce dockerpty-0.4.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-dockerpty/python-dockerpty.mk b/package/python-dockerpty/python-dockerpty.mk new file mode 100644 index 0000000000..e6fe6e3b49 --- /dev/null +++ b/package/python-dockerpty/python-dockerpty.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-dockerpty +# +################################################################################ + +PYTHON_DOCKERPTY_VERSION = 0.4.1 +PYTHON_DOCKERPTY_SOURCE = dockerpty-$(PYTHON_DOCKERPTY_VERSION).tar.gz +PYTHON_DOCKERPTY_SITE = https://pypi.python.org/packages/8d/ee/e9ecce4c32204a6738e0a5d5883d3413794d7498fe8b06f44becc028d3ba +PYTHON_DOCKERPTY_SETUP_TYPE = setuptools +PYTHON_DOCKERPTY_LICENSE = Apache-2.0 +PYTHON_DOCKERPTY_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 146b8d31ea9d96212eb2e6458b3bc69b5a391e73 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:59 +0100 Subject: [PATCH 0195/2640] package: add python-functools32 Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-functools32/Config.in | 8 ++++++++ package/python-functools32/python-functools32.hash | 4 ++++ package/python-functools32/python-functools32.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-functools32/Config.in create mode 100644 package/python-functools32/python-functools32.hash create mode 100644 package/python-functools32/python-functools32.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7809b5182b..d0c3894ecc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1392,6 +1392,7 @@ F: package/python-dockerpty/ F: package/python-docker-pycreds/ F: package/python-enum/ F: package/python-enum34/ +F: package/python-functools32/ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ diff --git a/package/Config.in b/package/Config.in index b7e0da6dd4..6fd61a0dea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -785,6 +785,7 @@ menu "External python modules" source "package/python-flask-login/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flup/Config.in" + source "package/python-functools32/Config.in" source "package/python-futures/Config.in" source "package/python-gobject/Config.in" source "package/python-gunicorn/Config.in" diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in new file mode 100644 index 0000000000..cc12557edc --- /dev/null +++ b/package/python-functools32/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32" + depends on BR2_PACKAGE_PYTHON + help + Backport of the functools module from Python 3.2.3 for use on 2.7 + and PyPy. + + https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.hash b/package/python-functools32/python-functools32.hash new file mode 100644 index 0000000000..606de81774 --- /dev/null +++ b/package/python-functools32/python-functools32.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed +md5 09f24ffd9af9f6cd0f63cb9f4e23d4b2 functools32-3.2.3-2.tar.gz +sha256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d functools32-3.2.3-2.tar.gz +sha256 3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1 LICENSE diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk new file mode 100644 index 0000000000..8a88bb2a7f --- /dev/null +++ b/package/python-functools32/python-functools32.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-functools32 +# +################################################################################ + +PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 +PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz +PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db +PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils +PYTHON_FUNCTOOLS32_LICENSE = Python-2.0 +PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From dab4285f853889ab85fc130831f91187b4ad3242 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:17:00 +0100 Subject: [PATCH 0196/2640] python-jsonschema: needs python-functools32 when used with python 2.7 >From setup.py: extras_require = { .. ":python_version=='2.7'": ["functools32"], Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-jsonschema/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index 7002653722..b547f4ae1a 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" + select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime help An implementation of JSON Schema validation for Python. From 0877a047aa002822b37844fd3007d4e1d12bb9c0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:17:01 +0100 Subject: [PATCH 0197/2640] package: add docker-compose Python based multi-container orchestration for Docker. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/docker-compose/Config.in | 29 ++++++++++++++++++++++ package/docker-compose/docker-compose.hash | 4 +++ package/docker-compose/docker-compose.mk | 13 ++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/docker-compose/Config.in create mode 100644 package/docker-compose/docker-compose.hash create mode 100644 package/docker-compose/docker-compose.mk diff --git a/DEVELOPERS b/DEVELOPERS index d0c3894ecc..a2bfdabb88 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1374,6 +1374,7 @@ F: package/libunistring/ N: Peter Korsgaard F: board/orangepi/ F: configs/orangepi_pc_defconfig +F: package/docker-compose/ F: package/dump1090/ F: package/flickcurl/ F: package/fscryptctl/ diff --git a/package/Config.in b/package/Config.in index 6fd61a0dea..37465c7f5b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1959,6 +1959,7 @@ menu "System tools" source "package/dcron/Config.in" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" + source "package/docker-compose/Config.in" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" source "package/dsp-tools/Config.in" diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in new file mode 100644 index 0000000000..393b5f1a0d --- /dev/null +++ b/package/docker-compose/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_DOCKER_COMPOSE + bool "docker-compose" + depends on BR2_USE_MMU # python + depends on BR2_USE_WCHAR # python + depends on BR2_TOOLCHAIN_HAS_THREADS # python + depends on !BR2_STATIC_LIBS # python + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \ + if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime + select BR2_PACKAGE_PYTHON_DOCOPT # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime + select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime + select BR2_PACKAGE_PYTHON_DOCKER # runtime + select BR2_PACKAGE_PYTHON_DOCKERPTY # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime + help + Multi-container orchestration for Docker. + + https://www.docker.com/ + +comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash new file mode 100644 index 0000000000..df4d915469 --- /dev/null +++ b/package/docker-compose/docker-compose.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/docker-compose/json, sha256 locally computed +md5 bd703d931f159b08ed5fe4fadcb12652 docker-compose-1.20.0rc1.tar.gz +sha256 ad14f8dda3eb5c999f6195bf88420dafd1aada80535dab3afd3350fe8438e0a3 docker-compose-1.20.0rc1.tar.gz +sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk new file mode 100644 index 0000000000..155c529391 --- /dev/null +++ b/package/docker-compose/docker-compose.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# docker-compose +# +################################################################################ + +DOCKER_COMPOSE_VERSION = 1.20.0rc1 +DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/ca/d9/21266285a3c34e8e023f2504c13ffb48e6acd1e43ccdd0c55188d7039505 +DOCKER_COMPOSE_SETUP_TYPE = setuptools +DOCKER_COMPOSE_LICENSE = Apache-2.0 +DOCKER_COMPOSE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 2524acd4179fccc627a72ff188bf51c95fed9867 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:28 +0100 Subject: [PATCH 0198/2640] package/x11r7/xlib_libxshmfence: bump version to 1.3 Removed patch applied upstream, added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch | 31 ------------------- .../xlib_libxshmfence/xlib_libxshmfence.hash | 9 ++++-- .../xlib_libxshmfence/xlib_libxshmfence.mk | 2 +- 3 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch diff --git a/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch b/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch deleted file mode 100644 index 1ca1303267..0000000000 --- a/package/x11r7/xlib_libxshmfence/0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0b550a4e7acf02d3478602848f6afbfcbfb0d4b2 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 29 Jan 2018 16:24:36 +0000 -Subject: [PATCH] configure.ac: call AC_USE_SYSTEM_EXTENSIONS - -With glibc 2.27 memfd_create() is inside a _GNU_SOURCE guard, so call -AC_USE_SYSTEM_EXTENSIONS to get this defined. - -Signed-off-by: Ross Burton -Upstream: https://cgit.freedesktop.org/xorg/lib/libxshmfence/commit/?id=0b550a4e7acf02d3478602848f6afbfcbfb0d4b2 -Signed-off-by: Romain Naour ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 55772d0..ed77e6d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,6 +28,8 @@ AC_INIT([libxshmfence], [1.2], - AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_HEADERS([config.h]) - -+AC_USE_SYSTEM_EXTENSIONS -+ - # Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --- -2.14.3 - diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index 05eb07111b..afdffb827f 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002515.html -sha256 d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c libxshmfence-1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-February/002840.html +md5 42dda8016943dc12aff2c03a036e0937 libxshmfence-1.3.tar.bz2 +sha1 3472218fc0e8ee8183533d22dbcd4bbe90bf3ab8 libxshmfence-1.3.tar.bz2 +sha256 b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 libxshmfence-1.3.tar.bz2 +sha512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 libxshmfence-1.3.tar.bz2 +# Locally computed +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 9686c408c1..f51cf0d5cb 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.2 +XLIB_LIBXSHMFENCE_VERSION = 1.3 XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2 XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT From a14c3f03d5c7053a0a2167aac49e08a2a78e3ef9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:29 +0100 Subject: [PATCH 0199/2640] package/xutil_util-macros: bump version to 1.19.2 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xutil_util-macros/xutil_util-macros.hash | 9 +++++++-- package/xutil_util-macros/xutil_util-macros.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 0f0509a132..49c057fd21 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002773.html -sha256 18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6 util-macros-1.19.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002845.html +md5 58edef899364f78fbde9479ded20211e util-macros-1.19.2.tar.bz2 +sha1 e8b3a6f2bfde22440fca0974da53da18821a4ee6 util-macros-1.19.2.tar.bz2 +sha256 d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712 util-macros-1.19.2.tar.bz2 +sha512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 util-macros-1.19.2.tar.bz2 +# Locally computed +sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index d01b3e0d24..6f66c76692 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.1 +XUTIL_UTIL_MACROS_VERSION = 1.19.2 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT From b55f593c2a5746d275719d468674f9c8f1dc2727 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:30 +0100 Subject: [PATCH 0200/2640] package/x11r7/xkeyboard-config: bump version to 2.23.1 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 11 +++++++---- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index a0f781d881..56ea0e5251 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,4 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-October/002811.html -md5 eb61fb3fd419e817df572b0c8d94a883 xkeyboard-config-2.22.tar.bz2 -sha1 1e252098685afc3e802c98f3fd70d683654a13ab xkeyboard-config-2.22.tar.bz2 -sha256 deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd xkeyboard-config-2.22.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-February/002833.html +md5 875cbd09ab8394277fd16070326abbae xkeyboard-config-2.23.1.tar.bz2 +sha1 184c9ce35f4fa44188acbf549f80d36407697ac3 xkeyboard-config-2.23.1.tar.bz2 +sha256 2a4bbc05fea22151b7a7c8ac2655d549aa9b0486bedc7f5a68c72716343b02f3 xkeyboard-config-2.23.1.tar.bz2 +sha512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba xkeyboard-config-2.23.1.tar.bz2 +# Locally computed +sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index ae88db785f..d9998aa489 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.22 +XKEYBOARD_CONFIG_VERSION = 2.23.1 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From 80950fc78191a4e00eef8bac90fbcaf0ae2f0aa5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:31 +0100 Subject: [PATCH 0201/2640] package/x11r7/xcb-proto: bump version to 1.13 Removed patches applied upstream, added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Make-whitespace-use-consistent.patch | 212 ------------------ ...-is-a-function-and-needs-parentheses.patch | 70 ------ package/x11r7/xcb-proto/xcb-proto.hash | 9 +- package/x11r7/xcb-proto/xcb-proto.mk | 2 +- 4 files changed, 8 insertions(+), 285 deletions(-) delete mode 100644 package/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch delete mode 100644 package/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch diff --git a/package/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch b/package/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch deleted file mode 100644 index 67adada505..0000000000 --- a/package/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch +++ /dev/null @@ -1,212 +0,0 @@ -From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 19 May 2016 17:30:04 +0200 -Subject: [PATCH] Make whitespace use consistent. - -At least python-3.5.x complains about this forcefully. - -Signed-off-by: Thomas Klausner -Signed-off-by: Uli Schlachter -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - xcbgen/align.py | 96 ++++++++++++++++++++++++++++----------------------------- - 1 file changed, 48 insertions(+), 48 deletions(-) - -diff --git a/xcbgen/align.py b/xcbgen/align.py -index 5e31838..d4c12ee 100644 ---- a/xcbgen/align.py -+++ b/xcbgen/align.py -@@ -16,12 +16,12 @@ class Alignment(object): - return self.align == other.align and self.offset == other.offset - - def __str__(self): -- return "(align=%d, offset=%d)" % (self.align, self.offset) -+ return "(align=%d, offset=%d)" % (self.align, self.offset) - - @staticmethod - def for_primitive_type(size): -- # compute the required start_alignment based on the size of the type -- if size % 8 == 0: -+ # compute the required start_alignment based on the size of the type -+ if size % 8 == 0: - # do 8-byte primitives require 8-byte alignment in X11? - return Alignment(8,0) - elif size % 4 == 0: -@@ -33,7 +33,7 @@ class Alignment(object): - - - def align_after_fixed_size(self, size): -- new_offset = (self.offset + size) % self.align -+ new_offset = (self.offset + size) % self.align - return Alignment(self.align, new_offset) - - -@@ -41,7 +41,7 @@ class Alignment(object): - ''' - Assuming the given external_align, checks whether - self is fulfilled for all cases. -- Returns True if yes, False otherwise. -+ Returns True if yes, False otherwise. - ''' - if self.align == 1 and self.offset == 0: - # alignment 1 with offset 0 is always fulfilled -@@ -55,9 +55,9 @@ class Alignment(object): - # the external align guarantees less alignment -> not guaranteed - return False - -- if external_align.align % self.align != 0: -+ if external_align.align % self.align != 0: - # the external align cannot be divided by our align -- # -> not guaranteed -+ # -> not guaranteed - # (this can only happen if there are alignments that are not - # a power of 2, which is highly discouraged. But better be - # safe and check for it) -@@ -72,7 +72,7 @@ class Alignment(object): - - def combine_with(self, other): - # returns the alignment that is guaranteed when -- # both, self or other, can happen -+ # both, self or other, can happen - new_align = gcd(self.align, other.align) - new_offset_candidate1 = self.offset % new_align - new_offset_candidate2 = other.offset % new_align -@@ -83,8 +83,8 @@ class Alignment(object): - new_align = gcd(new_align, offset_diff) - new_offset_candidate1 = self.offset % new_align - new_offset_candidate2 = other.offset % new_align -- assert new_offset_candidate1 == new_offset_candidate2 -- new_offset = new_offset_candidate1 -+ assert new_offset_candidate1 == new_offset_candidate2 -+ new_offset = new_offset_candidate1 - # return the result - return Alignment(new_align, new_offset) - -@@ -92,44 +92,44 @@ class Alignment(object): - class AlignmentLog(object): - - def __init__(self): -- self.ok_list = [] -- self.fail_list = [] -- self.verbosity = 1 -+ self.ok_list = [] -+ self.fail_list = [] -+ self.verbosity = 1 - - def __str__(self): -- result = "" -+ result = "" - -- # output the OK-list -- for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: -- stacksize = len(callstack) -+ # output the OK-list -+ for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: -+ stacksize = len(callstack) - indent = ' ' * stacksize -- if self.ok_callstack_is_relevant(callstack): -+ if self.ok_callstack_is_relevant(callstack): - if field_name is None or field_name == "": -- result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" -- % (indent, str(type_obj), indent, str(align_before), str(align_after))) -- else: -- result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" -- % (indent, str(field_name), str(type_obj), -- indent, str(align_before), str(align_after))) -+ result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" -+ % (indent, str(type_obj), indent, str(align_before), str(align_after))) -+ else: -+ result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" -+ % (indent, str(field_name), str(type_obj), -+ indent, str(align_before), str(align_after))) - if self.verbosity >= 1: -- result += self.callstack_to_str(indent, callstack) -+ result += self.callstack_to_str(indent, callstack) - -- # output the fail-list -- for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: -- stacksize = len(callstack) -+ # output the fail-list -+ for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: -+ stacksize = len(callstack) - indent = ' ' * stacksize -- if field_name is None or field_name == "": -- result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" -- % (indent, str(align_before), indent, str(type_obj), indent, reason)) -- else: -- result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" -- % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) -+ if field_name is None or field_name == "": -+ result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" -+ % (indent, str(align_before), indent, str(type_obj), indent, reason)) -+ else: -+ result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" -+ % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) - - if self.verbosity >= 1: -- result += self.callstack_to_str(indent, callstack) -+ result += self.callstack_to_str(indent, callstack) - - -- return result -+ return result - - - def callstack_to_str(self, indent, callstack): -@@ -137,41 +137,41 @@ class AlignmentLog(object): - for stack_elem in callstack: - result += "\t %s%s\n" % (indent, str(stack_elem)) - result += "\t%s]\n" % indent -- return result -+ return result - - - def ok_callstack_is_relevant(self, ok_callstack): - # determine whether an ok callstack is relevant for logging -- if self.verbosity >= 2: -- return True -+ if self.verbosity >= 2: -+ return True - - # empty callstacks are always relevant -- if len(ok_callstack) == 0: -+ if len(ok_callstack) == 0: - return True - -- # check whether the ok_callstack is a subset or equal to a fail_callstack -+ # check whether the ok_callstack is a subset or equal to a fail_callstack - for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list: - if len(ok_callstack) <= len(fail_callstack): - zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)]) -- is_subset = all([i == j for i, j in zipped]) -- if is_subset: -+ is_subset = all([i == j for i, j in zipped]) -+ if is_subset: - return True - - return False - - - def ok(self, align_before, field_name, type_obj, callstack, align_after): -- self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) -+ self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) - - def fail(self, align_before, field_name, type_obj, callstack, reason): -- self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) -+ self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) - - def append(self, other): -- self.ok_list.extend(other.ok_list) -- self.fail_list.extend(other.fail_list) -+ self.ok_list.extend(other.ok_list) -+ self.fail_list.extend(other.fail_list) - - def ok_count(self): -- return len(self.ok_list) -+ return len(self.ok_list) - - - --- -2.8.1 - diff --git a/package/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch b/package/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch deleted file mode 100644 index 6fa5d48de2..0000000000 --- a/package/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 19 May 2016 17:30:05 +0200 -Subject: print() is a function and needs parentheses. - -Fixes build with python-3.x. - -Signed-off-by: Thomas Klausner -Signed-off-by: Uli Schlachter -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: "Yann E. MORIN" - -diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py -index c3b5758..b83b119 100644 ---- a/xcbgen/xtypes.py -+++ b/xcbgen/xtypes.py -@@ -501,7 +501,7 @@ class ComplexType(Type): - int(required_start_align_element.get('align', "4"), 0), - int(required_start_align_element.get('offset', "0"), 0)) - if verbose_align_log: -- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align) -+ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align)) - - def resolve(self, module): - if self.resolved: -@@ -592,7 +592,7 @@ class ComplexType(Type): - if verbose_align_log: - print ("calc_required_start_align: %s has start-align %s" - % (str(self), str(self.required_start_align))) -- print "Details:\n" + str(log) -+ print ("Details:\n" + str(log)) - if self.required_start_align.offset != 0: - print (("WARNING: %s\n\thas start-align with non-zero offset: %s" - + "\n\tsuggest to add explicit definition with:" -@@ -619,12 +619,12 @@ class ComplexType(Type): - for offset in range(0,align): - align_candidate = Alignment(align, offset) - if verbose_align_log: -- print "trying %s for %s" % (str(align_candidate), str(self)) -+ print ("trying %s for %s" % (str(align_candidate), str(self))) - my_log = AlignmentLog() - if self.is_possible_start_align(align_candidate, callstack, my_log): - log.append(my_log) - if verbose_align_log: -- print "found start-align %s for %s" % (str(align_candidate), str(self)) -+ print ("found start-align %s for %s" % (str(align_candidate), str(self))) - return align_candidate - else: - my_ok_count = my_log.ok_count() -@@ -641,7 +641,7 @@ class ComplexType(Type): - # none of the candidates applies - # this type has illegal internal aligns for all possible start_aligns - if verbose_align_log: -- print "didn't find start-align for %s" % str(self) -+ print ("didn't find start-align for %s" % str(self)) - log.append(best_log) - return None - -@@ -900,7 +900,7 @@ class SwitchType(ComplexType): - # aux function for unchecked_get_alignment_after - def get_align_for_selected_case_field(self, case_field, start_align, callstack, log): - if verbose_align_log: -- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)) -+ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))) - total_align = start_align - for field in self.bitcases: - my_callstack = callstack[:] --- -cgit v0.10.2 - diff --git a/package/x11r7/xcb-proto/xcb-proto.hash b/package/x11r7/xcb-proto/xcb-proto.hash index 3f43485492..b2ef3ee20b 100644 --- a/package/x11r7/xcb-proto/xcb-proto.hash +++ b/package/x11r7/xcb-proto/xcb-proto.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002693.html -sha256 5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906 xcb-proto-1.12.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002852.html +md5 abe9aa4886138150bbc04ae4f29b90e3 xcb-proto-1.13.tar.bz2 +sha1 f7fa35ab59af18cecadbe83fe705281dcfd82ffd xcb-proto-1.13.tar.bz2 +sha256 7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1 xcb-proto-1.13.tar.bz2 +sha512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 xcb-proto-1.13.tar.bz2 +# Locally computed +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk index 84555d07f0..b85dad7f2c 100644 --- a/package/x11r7/xcb-proto/xcb-proto.mk +++ b/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.12 +XCB_PROTO_VERSION = 1.13 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist XCB_PROTO_LICENSE = MIT From 768244aeb31b121de2d6747862b6039ea5a562c9 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 9 Mar 2018 07:52:33 -0500 Subject: [PATCH 0202/2640] libcpprestsdk: bump to v2.10.2 Remove upstream patches as well. Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- .../0001-fix-xlocale-header-check.patch | 55 ------------------- ...dk-fix-building-as-a-static-library.patch} | 0 ...-include-sys-time-for-struct-timeval.patch | 28 ---------- package/libcpprestsdk/0003-fix-strand.patch | 28 ---------- package/libcpprestsdk/libcpprestsdk.hash | 2 +- package/libcpprestsdk/libcpprestsdk.mk | 2 +- 6 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 package/libcpprestsdk/0001-fix-xlocale-header-check.patch rename package/libcpprestsdk/{0004-libcpprestsdk-fix-building-as-a-static-library.patch => 0001-libcpprestsdk-fix-building-as-a-static-library.patch} (100%) delete mode 100644 package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch delete mode 100644 package/libcpprestsdk/0003-fix-strand.patch diff --git a/package/libcpprestsdk/0001-fix-xlocale-header-check.patch b/package/libcpprestsdk/0001-fix-xlocale-header-check.patch deleted file mode 100644 index ffed94a07f..0000000000 --- a/package/libcpprestsdk/0001-fix-xlocale-header-check.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a826b7b656c165bc35746d9af3ec371387d2bca1 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 23 Oct 2017 08:11:21 -0400 -Subject: [PATCH] fix xlocale header check - -asyncrt_utils.h checks if __GLIBC__ is not defined before including -xlocal.h. This will cause a compilation failure on uclibc and musl. - -Add a proper check in CMakeLists.txt and check for HAVE_XLOCALE_H -instead of __GLIBC__ - -Upstream-Status: Accepted -Signed-off-by: Adam Duskett ---- - Release/CMakeLists.txt | 3 +++ - Release/include/cpprest/asyncrt_utils.h | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt -index d57aa3d..eefae75 100644 ---- a/Release/CMakeLists.txt -+++ b/Release/CMakeLists.txt -@@ -42,6 +42,7 @@ include(cmake/cpprest_find_boost.cmake) - include(cmake/cpprest_find_zlib.cmake) - include(cmake/cpprest_find_openssl.cmake) - include(cmake/cpprest_find_websocketpp.cmake) -+include(CheckIncludeFiles) - - find_package(Threads REQUIRED) - if(THREADS_HAVE_PTHREAD_ARG) -@@ -56,6 +57,8 @@ if(CPPREST_EXCLUDE_WEBSOCKETS) - set(CPPREST_WEBSOCKETS_IMPL none CACHE STRING "Internal use.") - endif() - -+CHECK_INCLUDE_FILES(xlocale.h HAVE_XLOCALE_H) -+ - if(APPLE) # Note: also iOS - set(CPPREST_PPLX_IMPL apple CACHE STRING "Internal use.") - set(CPPREST_WEBSOCKETS_IMPL wspp CACHE STRING "Internal use.") -diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h -index fac70a9..8faa2dc 100644 ---- a/Release/include/cpprest/asyncrt_utils.h -+++ b/Release/include/cpprest/asyncrt_utils.h -@@ -29,7 +29,7 @@ - - #ifndef _WIN32 - #include --#if !defined(ANDROID) && !defined(__ANDROID__) && !defined(__GLIBC__) // CodePlex 269 -+#if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269 - /* Systems using glibc: xlocale.h has been removed from glibc 2.26 - The above include of locale.h is sufficient - Further details: https://sourceware.org/git/?p=glibc.git;a=commit;h=f0be25b6336db7492e47d2e8e72eb8af53b5506d */ --- -2.13.6 - diff --git a/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch b/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch similarity index 100% rename from package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch rename to package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch diff --git a/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch b/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch deleted file mode 100644 index 12f049bf7b..0000000000 --- a/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 25453f9c186cf441881b06bc5503d979acb0ab75 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 23 Oct 2017 09:38:11 -0400 -Subject: [PATCH] Include sys/time.h for struct timeval - -This is needed with musl. - -Upstream-Status: Accepted -Signed-off-by: Adam Duskett ---- - Release/include/cpprest/asyncrt_utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h -index 8faa2dc..aab87a5 100644 ---- a/Release/include/cpprest/asyncrt_utils.h -+++ b/Release/include/cpprest/asyncrt_utils.h -@@ -28,6 +28,7 @@ - #endif - - #ifndef _WIN32 -+#include - #include - #if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269 - /* Systems using glibc: xlocale.h has been removed from glibc 2.26 --- -2.13.6 - diff --git a/package/libcpprestsdk/0003-fix-strand.patch b/package/libcpprestsdk/0003-fix-strand.patch deleted file mode 100644 index f5710b38b9..0000000000 --- a/package/libcpprestsdk/0003-fix-strand.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e75d642726c4c78c368e74660ef4bc5503f3ec12 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sun, 14 Jan 2018 14:44:02 -0500 -Subject: [PATCH] fix strand - -From upstream, fixes compiling against boost 1.66 strand. - -Commit IDs 6b2e0480018530b616f61d5cdc786c92ba148bb7 - -Signed-off-by: Adam Duskett ---- - Release/include/pplx/threadpool.h | 2 +- - Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -index 0be40f6b..395632c3 100644 ---- a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -+++ b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -+ m_strand = lib::make_shared( - lib::ref(*io_service)); - - m_async_read_handler = m_strand->wrap(lib::bind( diff --git a/package/libcpprestsdk/libcpprestsdk.hash b/package/libcpprestsdk/libcpprestsdk.hash index 0bddfc916e..20a9395329 100644 --- a/package/libcpprestsdk/libcpprestsdk.hash +++ b/package/libcpprestsdk/libcpprestsdk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71 libcpprestsdk-v2.10.1.tar.gz +sha256 fb0b611007732d8de9528bc37bd67468e7ef371672f89c88f225f73cdc4ffcf1 libcpprestsdk-v2.10.2.tar.gz sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk index 4d30f07c39..20700ae2b2 100644 --- a/package/libcpprestsdk/libcpprestsdk.mk +++ b/package/libcpprestsdk/libcpprestsdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCPPRESTSDK_VERSION = v2.10.1 +LIBCPPRESTSDK_VERSION = v2.10.2 LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION)) LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt From 4832b04c95af9f2cea9502f6cf3425b01eefa213 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 9 Mar 2018 08:18:16 -0500 Subject: [PATCH 0203/2640] libcpprestsdk: fix template whitespace-syntax some files don't have a space inbetween the '<' and '::' charachters, which will cause build failures on older toolchains. Adding a space inbetween these two characters fixes the issue. upstream-status: pending https://github.com/Microsoft/cpprestsdk/pull/715 fixes: http://autobuild.buildroot.net/results/797a9b5fdf6ab0f16f2249324b48292dfab61d9f Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- .../0002-fix-template-whitespace-syntax.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch diff --git a/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch b/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch new file mode 100644 index 0000000000..81f7ea19ec --- /dev/null +++ b/package/libcpprestsdk/0002-fix-template-whitespace-syntax.patch @@ -0,0 +1,75 @@ +From 546e89a29a82cc4f7de6c99be5a07221aa7443df Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Fri, 9 Mar 2018 08:09:52 -0500 +Subject: [PATCH] fix template whitespace syntax + +Some files don't have a space inbetween the '<' and '::' charachters, which +will cause build failures on older toolchains. Adding a space inbetween these +two characters fixes the issue. + +upstream-status: pending +https://github.com/Microsoft/cpprestsdk/pull/715 + +Signed-off-by: Adam Duskett +--- + Release/include/cpprest/details/web_utilities.h | 2 +- + Release/include/cpprest/http_client.h | 2 +- + Release/include/cpprest/json.h | 2 +- + Release/include/cpprest/ws_client.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Release/include/cpprest/details/web_utilities.h b/Release/include/cpprest/details/web_utilities.h +index ba641654..9855c315 100644 +--- a/Release/include/cpprest/details/web_utilities.h ++++ b/Release/include/cpprest/details/web_utilities.h +@@ -33,7 +33,7 @@ class zero_memory_deleter + public: + _ASYNCRTIMP void operator()(::utility::string_t *data) const; + }; +-typedef std::unique_ptr<::utility::string_t, zero_memory_deleter> plaintext_string; ++typedef std::unique_ptr< ::utility::string_t, zero_memory_deleter> plaintext_string; + + #if defined(_WIN32) && !defined(CPPREST_TARGET_XP) + #if defined(__cplusplus_winrt) +diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h +index a936a23e..f5ad8fac 100644 +--- a/Release/include/cpprest/http_client.h ++++ b/Release/include/cpprest/http_client.h +@@ -757,7 +757,7 @@ public: + + private: + +- std::shared_ptr<::web::http::client::http_pipeline> m_pipeline; ++ std::shared_ptr< ::web::http::client::http_pipeline> m_pipeline; + }; + + namespace details { +diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h +index 07c54502..dfdeead4 100644 +--- a/Release/include/cpprest/json.h ++++ b/Release/include/cpprest/json.h +@@ -301,7 +301,7 @@ public: + /// Field names associated with JSON values + /// Whether to preserve the original order of the fields + /// A non-empty JSON object value +- static _ASYNCRTIMP json::value __cdecl object(std::vector> fields, bool keep_order = false); ++ static _ASYNCRTIMP json::value __cdecl object(std::vector> fields, bool keep_order = false); + + /// + /// Creates an empty JSON array +diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h +index 9a324cde..98f933e1 100644 +--- a/Release/include/cpprest/ws_client.h ++++ b/Release/include/cpprest/ws_client.h +@@ -184,7 +184,7 @@ public: + /// Vector of all the subprotocols + /// If you want all the subprotocols in a comma separated string + /// they can be directly looked up in the headers using 'Sec-WebSocket-Protocol'. +- _ASYNCRTIMP std::vector<::utility::string_t> subprotocols() const; ++ _ASYNCRTIMP std::vector< ::utility::string_t> subprotocols() const; + + /// + /// Gets the server certificate validation property. +-- +2.14.3 + From 22ee82bb93c80a6cda5ca1734d140626115c6fa3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 10 Mar 2018 16:29:43 +0100 Subject: [PATCH 0204/2640] cryptopp: fix build with host-gcc 4.7.x Fixes: - http://autobuild.buildroot.org/results/9ab386124e4a09b50598c6f95ad40b25a83d227e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...Fix-GCC-version-for-RDSEED-intrinsic.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch diff --git a/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch b/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch new file mode 100644 index 0000000000..e0596017ad --- /dev/null +++ b/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch @@ -0,0 +1,49 @@ +From 31465400675c75d8ea0556d708a7efbf915bc366 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Mar 2018 12:14:23 +0100 +Subject: [PATCH] Fix GCC version for RDSEED intrinsic + +rdseed is only available on gcc 4.8.x, not on gcc 4.7.x + +Fixes: + - http://autobuild.buildroot.org/results/9ab386124e4a09b50598c6f95ad40b25a83d227e + +Signed-off-by: Fabrice Fontaine +--- + rdrand.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rdrand.cpp b/rdrand.cpp +index 900fcd96..64b12208 100644 +--- a/rdrand.cpp ++++ b/rdrand.cpp +@@ -74,7 +74,7 @@ + # else + # define GCC_RDRAND_ASM_AVAILABLE 1 + # endif +-# if defined(__RDSEED__) && (CRYPTOPP_GCC_VERSION >= 40700) && !defined(__OPTIMIZE__) ++# if defined(__RDSEED__) && (CRYPTOPP_GCC_VERSION >= 40800) && !defined(__OPTIMIZE__) + # define ALL_RDSEED_INTRIN_AVAILABLE 1 + # else + # define GCC_RDSEED_ASM_AVAILABLE 1 +@@ -291,7 +291,7 @@ inline void RDSEED32(void* output) + : "=a" (*reinterpret_cast(output)) + : : "cc" + ); +-#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40700) ++#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40800) + __asm__ __volatile__ + ( + INTEL_NOPREFIX +@@ -333,7 +333,7 @@ inline void RDSEED64(void* output) + : "=a" (*reinterpret_cast(output)) + : : "cc" + ); +-#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40700) ++#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40800) + __asm__ __volatile__ + ( + INTEL_NOPREFIX +-- +2.11.0 + From be2d79150503f6b2dd3ba5c26d1b854920ae0fea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 9 Mar 2018 23:49:12 +0100 Subject: [PATCH 0205/2640] ympd: bump to version 1.3.0 Remove mkdata hook as this is not needed since version 1.2.3. Indeed, when CMAKE_CROSSCOMPILING is defined, ympd will use a perl script (mkdata.pl) instead of mkdata binary Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ympd/ympd.hash | 2 +- package/ympd/ympd.mk | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/package/ympd/ympd.hash b/package/ympd/ympd.hash index 1c4ad8dc8f..6d45d63862 100644 --- a/package/ympd/ympd.hash +++ b/package/ympd/ympd.hash @@ -1,3 +1,3 @@ # locally computed -sha256 092c26c51166d1d1f025cd06742981783dea7e42bfe4f73f10c4418fc003de94 ympd-v1.2.3.tar.gz +sha256 d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5 ympd-v1.3.0.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE diff --git a/package/ympd/ympd.mk b/package/ympd/ympd.mk index a50aee074e..e3f21e9eb0 100644 --- a/package/ympd/ympd.mk +++ b/package/ympd/ympd.mk @@ -4,18 +4,10 @@ # ################################################################################ -YMPD_VERSION = v1.2.3 +YMPD_VERSION = v1.3.0 YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION)) YMPD_LICENSE = GPL-2.0 YMPD_LICENSE_FILES = LICENSE YMPD_DEPENDENCIES = libmpdclient -define YMPD_MAKE_HOST_TOOL - $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata -endef - -YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL - -YMPD_CONF_OPTS += -DMKDATA_EXE=$(@D)/mkdata - $(eval $(cmake-package)) From 2669422c00a160de5bdf813ed3a69d2078a491b8 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Thu, 8 Mar 2018 10:37:31 +0000 Subject: [PATCH 0206/2640] libusbgx: add license hashes Signed-off-by: John Keeping Signed-off-by: Peter Korsgaard --- package/libusbgx/libusbgx.hash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index c153acaf4a..107123ae11 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,2 +1,4 @@ # Locally computed: sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-libusbgx-v0.2.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL From 19bda730323e71c4f3078feb391e09f77a2b06fa Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Wed, 7 Mar 2018 14:02:37 -0800 Subject: [PATCH 0207/2640] python-schedule: bump to version 0.5.0 Signed-off-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- package/python-schedule/python-schedule.hash | 4 ++-- package/python-schedule/python-schedule.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-schedule/python-schedule.hash b/package/python-schedule/python-schedule.hash index 2b2f0489e8..92475f973c 100644 --- a/package/python-schedule/python-schedule.hash +++ b/package/python-schedule/python-schedule.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/schedule/json, sha256 locally computed -md5 ab135a73458547d2b836beddd168528b schedule-0.4.3.tar.gz -sha256 31a160546a17838842199c792ba267575cf41339ca730aaf060567b798f4f46e schedule-0.4.3.tar.gz +md5 53fb2e550b2539264eeceb5d85e82759 schedule-0.5.0.tar.gz +sha256 1003a07c2dce12828c25a03a611a7371cedfa956e5f1b4abc32bcc94eb5a335b schedule-0.5.0.tar.gz # License file, locally calculated sha256 30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/package/python-schedule/python-schedule.mk b/package/python-schedule/python-schedule.mk index 26a3f5bce1..16612a0881 100644 --- a/package/python-schedule/python-schedule.mk +++ b/package/python-schedule/python-schedule.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCHEDULE_VERSION = 0.4.3 +PYTHON_SCHEDULE_VERSION = 0.5.0 PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz -PYTHON_SCHEDULE_SITE = https://pypi.python.org/packages/ee/68/ba6b0bb69b2be13b32983971bca6c5adf22df6321945232e1419bc34a82f +PYTHON_SCHEDULE_SITE = https://pypi.python.org/packages/fd/31/599a3387c2e98c270d5ac21a1575f3eb60a3712c192a0ca97a494a207739 PYTHON_SCHEDULE_SETUP_TYPE = setuptools PYTHON_SCHEDULE_LICENSE = MIT PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt From 33e78575467f6e36311a6ab9b26fd8184495edd6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 10 Mar 2018 22:45:34 +0100 Subject: [PATCH 0208/2640] libmpdclient: fix install By default, meson adds the build machine architecture for installation, see: https://github.com/mesonbuild/meson/issues/2535 Use --libdir to override this default behavior Fixes: - http://autobuild.buildroot.net/results/aec/aec9f3de545a832b66cd00c217fbaa99246e1715 - http://autobuild.buildroot.net/results/07a/07adcba71106a2dca963e4071f4673791b41a603 - http://autobuild.buildroot.net/results/a27/a272a8e521863374901a5e3c0fb9da0b8daa4076 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmpdclient/libmpdclient.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 3148fd2873..3ab8e9884c 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -15,6 +15,7 @@ LIBMPDCLIENT_DEPENDENCIES = host-meson LIBMPDCLIENT_CONF_OPTS += \ --prefix=/usr \ + --libdir=/usr/lib \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf From bf733342324b414a1142b57781504111f81c97ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Mar 2018 10:58:45 +0100 Subject: [PATCH 0209/2640] uboot: fix build when libfdt-devel is installed system-wide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When libfdt-devel is installed system-wide, the build of U-Boot host programs currently fails with lots of: HOSTCC tools/aisimage.o In file included from tools/../include/../lib/libfdt/libfdt.h:10:0, from tools/../include/libfdt.h:1, from tools/fdt_host.h:11, from tools/imagetool.h:24, from tools/aisimage.c:8: /usr/include/libfdt_env.h:70:30: error: conflicting types for ‘fdt64_t’ typedef uint64_t FDT_BITWISE fdt64_t; ^~~~~~~ In file included from :0:0: ././include/libfdt_env.h:19:16: note: previous declaration of ‘fdt64_t’ was here typedef __be64 fdt64_t; ^~~~~~~ In file included from ././include/libfdt_env.h:12:0, from :0: /usr/include/libfdt_env.h:90:24: error: expected ‘)’ before ‘x’ static inline uint32_t fdt32_to_cpu(fdt32_t x) ^ This commit adds a fixup in the U-Boot code to fix this problem. The fixup is equivalent to applying upstream commit http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a, but we can't use a patch for the uboot package, since people are using arbitrary versions. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 5da339850d..58dd906a27 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -188,6 +188,14 @@ define UBOOT_APPLY_LOCAL_PATCHES endef UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES +# This is equivalent to upstream commit +# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It +# fixes a build failure when libfdt-devel is installed system-wide. +define UBOOT_FIXUP_LIBFDT_INCLUDE + $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile +endef +UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE + ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ From 1cbfc94c5a0ac4120925aa8c7337eb7957dc4678 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Mar 2018 10:58:46 +0100 Subject: [PATCH 0210/2640] uboot-tools: backport patch fixing build failure with libfdt-devel installed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit U-Boot host programs fail to build when libfdt-devel is installed system-wide, with errors like this: HOSTCC tools/aisimage.o In file included from tools/../include/../lib/libfdt/libfdt.h:10:0, from tools/../include/libfdt.h:1, from tools/fdt_host.h:11, from tools/imagetool.h:24, from tools/aisimage.c:8: /usr/include/libfdt_env.h:70:30: error: conflicting types for ‘fdt64_t’ typedef uint64_t FDT_BITWISE fdt64_t; ^~~~~~~ In file included from :0:0: ././include/libfdt_env.h:19:16: note: previous declaration of ‘fdt64_t’ was here typedef __be64 fdt64_t; ^~~~~~~ In file included from ././include/libfdt_env.h:12:0, from :0: /usr/include/libfdt_env.h:90:24: error: expected ‘)’ before ‘x’ static inline uint32_t fdt32_to_cpu(fdt32_t x) ^ This commit backports an upstream patch that fixes this problem. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...Boot-libfdt-headers-from-their-actua.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch diff --git a/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch b/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch new file mode 100644 index 0000000000..9f18342868 --- /dev/null +++ b/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch @@ -0,0 +1,33 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +[Backport from upstream commit e0d20dc1521e74b82dbd69be53a048847798a90a] +Signed-off-by: Thomas Petazzoni +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +2.14.3 + From 24b70f68eadde7509d5fda8a37b6757dc9e32c73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:32 +0100 Subject: [PATCH 0211/2640] package/x11r7/xapp_appres: bump version to 1.0.5 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_appres/xapp_appres.hash | 9 +++++++-- package/x11r7/xapp_appres/xapp_appres.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_appres/xapp_appres.hash b/package/x11r7/xapp_appres/xapp_appres.hash index a1cbf0b4b9..8750e2d14c 100644 --- a/package/x11r7/xapp_appres/xapp_appres.hash +++ b/package/x11r7/xapp_appres/xapp_appres.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002211.html -sha256 9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d appres-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002847.html +md5 f544e701043249d2bb3deed48314bc55 appres-1.0.5.tar.bz2 +sha1 5e5dbffd0a125732bb8bb8a202e04555a9604089 appres-1.0.5.tar.bz2 +sha256 ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928 appres-1.0.5.tar.bz2 +sha512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137 appres-1.0.5.tar.bz2 +# Locally computed +sha256 5969302729a9621fd526a7f9942a51a29b858e0b682ffd28eeda5fc4dfaddf55 COPYING diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk index b84d7426c6..4159332bd3 100644 --- a/package/x11r7/xapp_appres/xapp_appres.mk +++ b/package/x11r7/xapp_appres/xapp_appres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_APPRES_VERSION = 1.0.4 +XAPP_APPRES_VERSION = 1.0.5 XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2 XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_APPRES_LICENSE = MIT From c317465e95d75d6f38f519fde52b5ea07c2a7308 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:33 +0100 Subject: [PATCH 0212/2640] package/x11r7/xapp_editres: bump version to 1.0.7 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_editres/xapp_editres.hash | 9 +++++++-- package/x11r7/xapp_editres/xapp_editres.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_editres/xapp_editres.hash b/package/x11r7/xapp_editres/xapp_editres.hash index 74fc98d63c..1536795515 100644 --- a/package/x11r7/xapp_editres/xapp_editres.hash +++ b/package/x11r7/xapp_editres/xapp_editres.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002120.html -sha256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 editres-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002846.html +md5 526cf79edc0c5e379aefb21539243f96 editres-1.0.7.tar.bz2 +sha1 389e953ebb5080564a6780cb34b72bafae7f5540 editres-1.0.7.tar.bz2 +sha256 089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11 editres-1.0.7.tar.bz2 +sha512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32 editres-1.0.7.tar.bz2 +# Locally computed +sha256 b1049cf96db2c00428b8313541ab333ec4e06f102955f3edd44f88ec43b0acd6 COPYING diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk index 6cc4805f5f..1a947d478e 100644 --- a/package/x11r7/xapp_editres/xapp_editres.mk +++ b/package/x11r7/xapp_editres/xapp_editres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_EDITRES_VERSION = 1.0.6 +XAPP_EDITRES_VERSION = 1.0.7 XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_EDITRES_LICENSE = MIT From 427e229d9281232358bbde102942854ad46a32a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:34 +0100 Subject: [PATCH 0213/2640] package/x11r7/xapp_iceauth: bump version to 1.0.8 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_iceauth/xapp_iceauth.hash | 9 +++++++-- package/x11r7/xapp_iceauth/xapp_iceauth.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.hash b/package/x11r7/xapp_iceauth/xapp_iceauth.hash index 90c5f70bfa..f1ea73a7af 100644 --- a/package/x11r7/xapp_iceauth/xapp_iceauth.hash +++ b/package/x11r7/xapp_iceauth/xapp_iceauth.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002519.html -sha256 1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a iceauth-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002850.html +md5 3b9b79fa0f9928161f4bad94273de7ae iceauth-1.0.8.tar.bz2 +sha1 2ce23c40a17d98badeb8ce70d26e81a5ac0e178c iceauth-1.0.8.tar.bz2 +sha256 e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6 iceauth-1.0.8.tar.bz2 +sha512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1 iceauth-1.0.8.tar.bz2 +# Locally computed +sha256 fdd9ba8ccb92af2f31f542e7b7a18c27257e6cdce147d231bc9ba3654ad84976 COPYING diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk index d30ff6f786..0e0e001705 100644 --- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk +++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_ICEAUTH_VERSION = 1.0.7 +XAPP_ICEAUTH_VERSION = 1.0.8 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_ICEAUTH_LICENSE = MIT From e5309f9fb43dee0c4c60362f57137ab6d431d5f0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:35 +0100 Subject: [PATCH 0214/2640] package/x11r7/xapp_listres: bump version to 1.0.4 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_listres/xapp_listres.hash | 9 +++++++-- package/x11r7/xapp_listres/xapp_listres.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_listres/xapp_listres.hash b/package/x11r7/xapp_listres/xapp_listres.hash index ffc9f7eecb..1e1c11953a 100644 --- a/package/x11r7/xapp_listres/xapp_listres.hash +++ b/package/x11r7/xapp_listres/xapp_listres.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001838.html -sha256 c3d71e9a01650e3fd470189a749cd0202ef03d9e399350a7a7443d7595ed478e listres-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002848.html +md5 24e05349f2881aaa58cbe160e49223ac listres-1.0.4.tar.bz2 +sha1 903857c7a9ec3d8edc8a88101aef33cd27796649 listres-1.0.4.tar.bz2 +sha256 6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10 listres-1.0.4.tar.bz2 +sha512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a listres-1.0.4.tar.bz2 +# Locally computed +sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk index 88cdd4f033..b4ac3e1de8 100644 --- a/package/x11r7/xapp_listres/xapp_listres.mk +++ b/package/x11r7/xapp_listres/xapp_listres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_LISTRES_VERSION = 1.0.3 +XAPP_LISTRES_VERSION = 1.0.4 XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_LISTRES_LICENSE = MIT From ddc63729cb3041c0fa5a771b34ca711ca08765fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:36 +0100 Subject: [PATCH 0215/2640] package/x11r7/xapp_mkfontscale: bump version to 1.1.3 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash | 9 +++++++-- package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash index 0cab2b2d1b..b0776a412b 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002520.html -sha256 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20 mkfontscale-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002855.html +md5 987c438e79f5ddb84a9c5726a1610819 mkfontscale-1.1.3.tar.bz2 +sha1 2fdbd7c6cc5b0678f2c5d10d2350a809d576e9e5 mkfontscale-1.1.3.tar.bz2 +sha256 1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a mkfontscale-1.1.3.tar.bz2 +sha512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 mkfontscale-1.1.3.tar.bz2 +# Locally computed +sha256 90f0a1bfee2ed42c63473ded631c0463bf38b3d193733ccfc35394c713a0701d COPYING diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index d7abf6c5bb..12416b4d6b 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_MKFONTSCALE_VERSION = 1.1.2 +XAPP_MKFONTSCALE_VERSION = 1.1.3 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_LICENSE = MIT From 799b23d9de0a2f828ffc11962e00b3906b670b53 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:37 +0100 Subject: [PATCH 0216/2640] package/x11r7/xapp_oclock: bump version to 1.0.4 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_oclock/xapp_oclock.hash | 9 +++++++-- package/x11r7/xapp_oclock/xapp_oclock.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_oclock/xapp_oclock.hash b/package/x11r7/xapp_oclock/xapp_oclock.hash index ad54499c5e..b345b448f9 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.hash +++ b/package/x11r7/xapp_oclock/xapp_oclock.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001820.html -sha256 54f5fb85f5828705683f457e559fb18753332db15ae82da561b0ae5a63915091 oclock-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002856.html +md5 973f6d25a6f0990720b98a15c9436b92 oclock-1.0.4.tar.bz2 +sha1 0bc8f3f44290950f60af894e20e0ceb0c5e8e862 oclock-1.0.4.tar.bz2 +sha256 cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe oclock-1.0.4.tar.bz2 +sha512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2 +# Locally computed +sha256 f6cae4b0c603ef5bd76da2df96b38aa43aa7547e482adb8cb8b83f09af35e4a2 COPYING diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk index 17d544ccc4..833d151404 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.mk +++ b/package/x11r7/xapp_oclock/xapp_oclock.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_OCLOCK_VERSION = 1.0.3 +XAPP_OCLOCK_VERSION = 1.0.4 XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2 XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_OCLOCK_LICENSE = MIT From 4e0d1741985349bbae7c882014302f91158edb55 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:38 +0100 Subject: [PATCH 0217/2640] package/x11r7/xapp_twm: bump version to 1.0.10 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_twm/xapp_twm.hash | 9 +++++++-- package/x11r7/xapp_twm/xapp_twm.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_twm/xapp_twm.hash b/package/x11r7/xapp_twm/xapp_twm.hash index eecc5c4e51..572ecb9820 100644 --- a/package/x11r7/xapp_twm/xapp_twm.hash +++ b/package/x11r7/xapp_twm/xapp_twm.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002565.html -sha256 c575167ac33edf3bd1592f1bedfe0559debb128ed5fb4873c1278e3be166310a twm-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002857.html +md5 e322c08eeb635f924ede5b8eba3db54e twm-1.0.10.tar.bz2 +sha1 f632a47620dfe6d75b003839d269b14fa22b262e twm-1.0.10.tar.bz2 +sha256 6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7 twm-1.0.10.tar.bz2 +sha512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e twm-1.0.10.tar.bz2 +# Locally computed +sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk index 1f576e15bd..0af30f737c 100644 --- a/package/x11r7/xapp_twm/xapp_twm.mk +++ b/package/x11r7/xapp_twm/xapp_twm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_TWM_VERSION = 1.0.9 +XAPP_TWM_VERSION = 1.0.10 XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2 XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_TWM_LICENSE = MIT From be4449e701b885eee3e68b2375816e8e83bcc8c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:39 +0100 Subject: [PATCH 0218/2640] package/x11r7/xapp_viewres: bump version to 1.0.5 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_viewres/xapp_viewres.hash | 9 +++++++-- package/x11r7/xapp_viewres/xapp_viewres.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_viewres/xapp_viewres.hash b/package/x11r7/xapp_viewres/xapp_viewres.hash index c45b1b25f7..539bb431ee 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002122.html -sha256 d9c11b44908d91926df8b33428ae04c86c85e4f8380e9b5e68326a651c872e59 viewres-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002849.html +md5 08def461f135832136624855763b20fa viewres-1.0.5.tar.bz2 +sha1 d03832456dde6c2a91086e6563d52fd936425948 viewres-1.0.5.tar.bz2 +sha256 5ed818e84c39bcf26dadc885c9860432b85843caad3621e26d99edea660ae3d7 viewres-1.0.5.tar.bz2 +sha512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2 +# Locally computed +sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk index 3e1fd8ddca..95205b4352 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.4 +XAPP_VIEWRES_VERSION = 1.0.5 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_VIEWRES_LICENSE = MIT From 33b9dcd5e10f1eeb43d1d4565b1e673127d464c3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:40 +0100 Subject: [PATCH 0219/2640] package/x11r7/xapp_xdriinfo: bump version to 1.0.6 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash | 9 +++++++-- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash index 264ec9a016..80a4ac48f4 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -sha256 4cba3766ef89557422062287248adeb933999071bad6f3ef9c0a478a3c680119 xdriinfo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002858.html +md5 480e63cd365f03eb2515a6527d5f4ca6 xdriinfo-1.0.6.tar.bz2 +sha1 11682ae1f04a311b832651d78bbf4c6ac77f0ed9 xdriinfo-1.0.6.tar.bz2 +sha256 d9ccd2c3e87899417acc9ea1f3e319a4198112babe1dc711273584f607449d51 xdriinfo-1.0.6.tar.bz2 +sha512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2 +# Locally computed +sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index ffab5170dc..00dea8c7ad 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XDRIINFO_VERSION = 1.0.5 +XAPP_XDRIINFO_VERSION = 1.0.6 XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDRIINFO_LICENSE = MIT From 9ff99c45fbf3298853aeb7c87ee4aedbcf874555 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Mar 2018 21:58:41 +0100 Subject: [PATCH 0220/2640] package/x11r7/xapp_xkbcomp: bump version to 1.4.1 Added all upstream hashes and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 12 +++++++----- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index 4d0b5feed9..56631411d4 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-May/002797.html -md5 cc22b232bc78a303371983e1b48794ab xkbcomp-1.4.0.tar.bz2 -sha1 9578a564ff8fcf96581fb52860828fbab8c67b4f xkbcomp-1.4.0.tar.bz2 -sha256 bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b xkbcomp-1.4.0.tar.bz2 -sha512 c96a63fc2d9a6ac17123297574966c45d0dcfd4ae3d4073ce863c7738d453f4c0a5f7a87c06efdec19f0b270207a7170fe1aa72a73ef1b50f95c7ca262f4882e xkbcomp-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002843.html +md5 07df9790d30f9a369d20a418af784de0 xkbcomp-1.4.1.tar.bz2 +sha1 e7585cdb357b9d20c8f3c8a9d06f7e897934a772 xkbcomp-1.4.1.tar.bz2 +sha256 748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736 xkbcomp-1.4.1.tar.bz2 +sha512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23 xkbcomp-1.4.1.tar.bz2 +# Locally computed +sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3 COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index cc88561892..369e1f3fe3 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.0 +XAPP_XKBCOMP_VERSION = 1.4.1 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT From 6461d76992ec2ceffabd7a5ccb59bb707ea2cb0a Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:03 -0500 Subject: [PATCH 0221/2640] board/technologic/ts5x00: bump kernel to 4.14 Bump the 3.17 kernel used for the Technologic Systems TS-5500 platform to the latest LTS kernel 4.14. This fixes the ts5x00_defconfig build with GCC 6.x. The linux-3.17.config file has been renamed to linux-4.14.config to match the new kernel version, and its changes are the result of make linux-update-defconfig. However only comments are affected. Signed-off-by: Vivien Didelot Signed-off-by: Peter Korsgaard --- .../ts5x00/{linux-3.17.config => linux-4.14.config} | 4 +--- configs/ts5x00_defconfig | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) rename board/technologic/ts5x00/{linux-3.17.config => linux-4.14.config} (98%) diff --git a/board/technologic/ts5x00/linux-3.17.config b/board/technologic/ts5x00/linux-4.14.config similarity index 98% rename from board/technologic/ts5x00/linux-3.17.config rename to board/technologic/ts5x00/linux-4.14.config index 60cd8a0fe3..eb81596e25 100644 --- a/board/technologic/ts5x00/linux-3.17.config +++ b/board/technologic/ts5x00/linux-4.14.config @@ -1,3 +1,4 @@ +# CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_MELAN=y @@ -6,7 +7,6 @@ CONFIG_X86_REBOOTFIXUPS=y CONFIG_NOHIGHMEM=y # CONFIG_COMPACTION is not set # CONFIG_BOUNCE is not set -# CONFIG_CROSS_MEMORY_ATTACH is not set # CONFIG_RELOCATABLE is not set # CONFIG_SUSPEND is not set # CONFIG_ACPI is not set @@ -19,7 +19,6 @@ CONFIG_INET=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set @@ -76,7 +75,6 @@ CONFIG_DM9102=y CONFIG_PHYLIB=y CONFIG_DAVICOM_PHY=y # CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set diff --git a/configs/ts5x00_defconfig b/configs/ts5x00_defconfig index 531088661c..19259260b7 100644 --- a/configs/ts5x00_defconfig +++ b/configs/ts5x00_defconfig @@ -2,8 +2,8 @@ BR2_i386=y BR2_x86_i586=y -# Linux headers same as kernel, a 3.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" @@ -12,9 +12,9 @@ BR2_ROOTFS_OVERLAY="board/technologic/ts5x00/fs-overlay" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5x00/linux-3.17.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5x00/linux-4.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y # rootfs From 9f17540b170395d5c29eb111bfcacdb2540a2fb0 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:04 -0500 Subject: [PATCH 0222/2640] board/technologic/ts5x00: rename to ts5500 Rename the confusing and misleading ts5x00 directory to a real reference platform name, ts5500. The readme.txt file already states the support for both TS-5500 and TS-5400 platforms. Signed-off-by: Vivien Didelot Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 2 +- .../{ts5x00 => ts5500}/fs-overlay/boot/syslinux/syslinux.cfg | 0 board/technologic/{ts5x00 => ts5500}/linux-4.14.config | 0 board/technologic/{ts5x00 => ts5500}/readme.txt | 2 +- configs/{ts5x00_defconfig => ts5500_defconfig} | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename board/technologic/{ts5x00 => ts5500}/fs-overlay/boot/syslinux/syslinux.cfg (100%) rename board/technologic/{ts5x00 => ts5500}/linux-4.14.config (100%) rename board/technologic/{ts5x00 => ts5500}/readme.txt (98%) rename configs/{ts5x00_defconfig => ts5500_defconfig} (80%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cdaa09da5..e2de78d89c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,7 +230,7 @@ stm32f469_disco_defconfig: *defconfig toradex_apalis_imx6_defconfig: *defconfig ts4800_defconfig: *defconfig ts4900_defconfig: *defconfig -ts5x00_defconfig: *defconfig +ts5500_defconfig: *defconfig ts7680_defconfig: *defconfig wandboard_defconfig: *defconfig warp7_defconfig: *defconfig diff --git a/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg b/board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg similarity index 100% rename from board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg rename to board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg diff --git a/board/technologic/ts5x00/linux-4.14.config b/board/technologic/ts5500/linux-4.14.config similarity index 100% rename from board/technologic/ts5x00/linux-4.14.config rename to board/technologic/ts5500/linux-4.14.config diff --git a/board/technologic/ts5x00/readme.txt b/board/technologic/ts5500/readme.txt similarity index 98% rename from board/technologic/ts5x00/readme.txt rename to board/technologic/ts5500/readme.txt index 1e50682980..1e73ab3ea1 100644 --- a/board/technologic/ts5x00/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -13,7 +13,7 @@ and additional sysfs attributes under /sys/devices/platform/). To build the default configuration you only have to: - $ make ts5x00_defconfig + $ make ts5500_defconfig $ make You will need a Compact Flash card of sufficient size and the first or only diff --git a/configs/ts5x00_defconfig b/configs/ts5500_defconfig similarity index 80% rename from configs/ts5x00_defconfig rename to configs/ts5500_defconfig index 19259260b7..871c02e95f 100644 --- a/configs/ts5x00_defconfig +++ b/configs/ts5500_defconfig @@ -7,14 +7,14 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" -BR2_ROOTFS_OVERLAY="board/technologic/ts5x00/fs-overlay" +BR2_ROOTFS_OVERLAY="board/technologic/ts5500/fs-overlay" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5x00/linux-4.14.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5500/linux-4.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y # rootfs From 79586d2ed5c47a59a3142678e9c414c74589194f Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:05 -0500 Subject: [PATCH 0223/2640] DEVELOPERS: add myself as the ts5500 maintainer Add a new entry for myself listing the TS-5500 board directory and defconfig file. Signed-off-by: Vivien Didelot Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a2bfdabb88..e3c4a9c824 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1859,6 +1859,10 @@ F: package/pixz/ N: Vinicius Tinti F: package/python-thrift/ +N: Vivien Didelot +F: board/technologic/ts5500/ +F: configs/ts5500_defconfig + N: Volkov Viacheslav F: package/v4l2grab/ F: package/zbar/ From 1314459a863daf92bd952f42e0180bc8fbb666fa Mon Sep 17 00:00:00 2001 From: James Knight Date: Tue, 6 Mar 2018 02:22:15 +0000 Subject: [PATCH 0224/2640] inotify-tools: bump to version 3.20.1 Bumping this package to the most recent stable version. Drops the need for the GCC 6.x patch as a related fix has been merged in [1]. [1]: https://github.com/rvoicilas/inotify-tools/pull/65 Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/inotify-tools/0001-gcc6.patch | 49 ------------------------ package/inotify-tools/inotify-tools.hash | 2 +- package/inotify-tools/inotify-tools.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/inotify-tools/0001-gcc6.patch diff --git a/package/inotify-tools/0001-gcc6.patch b/package/inotify-tools/0001-gcc6.patch deleted file mode 100644 index aae622ebf5..0000000000 --- a/package/inotify-tools/0001-gcc6.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5fe3ba82134d8b85adc69cf1d6c5742b4bde20b4 Mon Sep 17 00:00:00 2001 -From: James Knight -Date: Thu, 16 Jun 2016 00:00:57 -0400 -Subject: [PATCH] correct code alignment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The following replaces the indented section of code from spaces to tabs. -No functional changes. Aside from consistency, this resolves a GCC 6 -build issue with the flag `-Werror=misleading-indentation` enabled: - - inotifywait.c: In function ‘output_event_csv’: - inotifywait.c:126:5: error: this ‘if’ clause does not guard... - [-Werror=misleading-indentation] - if (filename != NULL) - ^~ - inotifywait.c:129:2: note: ...this statement, but the latter is - misleadingly indented as if it is guarded - by the ‘if’ - printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) - ) ); - ^~~~~~ - -Signed-off-by: James Knight -Signed-off-by: Bernd Kuhls -(downloaded from upstream pull request - https://github.com/rvoicilas/inotify-tools/pull/65) ---- - src/inotifywait.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/inotifywait.c b/src/inotifywait.c -index c5ce5e3..404a85b 100644 ---- a/src/inotifywait.c -+++ b/src/inotifywait.c -@@ -122,9 +122,9 @@ void validate_format( char * fmt ) { - - - void output_event_csv( struct inotify_event * event ) { -- char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -- if (filename != NULL) -- printf("%s,", filename); -+ char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -+ if (filename != NULL) -+ printf("%s,", filename); - - printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); - if ( event->len > 0 ) diff --git a/package/inotify-tools/inotify-tools.hash b/package/inotify-tools/inotify-tools.hash index 0993dc44c4..83ad5b9212 100644 --- a/package/inotify-tools/inotify-tools.hash +++ b/package/inotify-tools/inotify-tools.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 628b8efabb65a739dd747fe43b73b29a609b5cfa9628caa127764ed77766a6e1 inotify-tools-1df9af4d6cd0f4af4b1b19254bcf056aed4ae395.tar.gz +sha256 a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac inotify-tools-3.20.1.tar.gz diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk index e8b1498e6f..407aefb69f 100644 --- a/package/inotify-tools/inotify-tools.mk +++ b/package/inotify-tools/inotify-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -INOTIFY_TOOLS_VERSION = 1df9af4d6cd0f4af4b1b19254bcf056aed4ae395 +INOTIFY_TOOLS_VERSION = 3.20.1 INOTIFY_TOOLS_SITE = $(call github,rvoicilas,inotify-tools,$(INOTIFY_TOOLS_VERSION)) INOTIFY_TOOLS_LICENSE = GPL INOTIFY_TOOLS_LICENSE_FILES = COPYING From 0d56bb4f6fa839aaa26b5d27bd047edb446f14a3 Mon Sep 17 00:00:00 2001 From: James Knight Date: Tue, 6 Mar 2018 02:22:23 +0000 Subject: [PATCH 0225/2640] inotify-tools: update license information Explicitly indicate that this package is GPL v2.0+ as well as provide a hash for the source's license file (COPYING). Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/inotify-tools/inotify-tools.hash | 1 + package/inotify-tools/inotify-tools.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/inotify-tools/inotify-tools.hash b/package/inotify-tools/inotify-tools.hash index 83ad5b9212..83dc22b4a2 100644 --- a/package/inotify-tools/inotify-tools.hash +++ b/package/inotify-tools/inotify-tools.hash @@ -1,2 +1,3 @@ # Locally computed sha256 a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac inotify-tools-3.20.1.tar.gz +sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk index 407aefb69f..63626307c2 100644 --- a/package/inotify-tools/inotify-tools.mk +++ b/package/inotify-tools/inotify-tools.mk @@ -6,7 +6,7 @@ INOTIFY_TOOLS_VERSION = 3.20.1 INOTIFY_TOOLS_SITE = $(call github,rvoicilas,inotify-tools,$(INOTIFY_TOOLS_VERSION)) -INOTIFY_TOOLS_LICENSE = GPL +INOTIFY_TOOLS_LICENSE = GPL-2.0+ INOTIFY_TOOLS_LICENSE_FILES = COPYING INOTIFY_TOOLS_INSTALL_STAGING = YES INOTIFY_TOOLS_AUTORECONF = YES From be40c05dc5865feeb36436b5d4be5a1dc51598f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Mar 2018 14:42:30 +0100 Subject: [PATCH 0226/2640] libmpdclient: fix static linking Fixes: - http://autobuild.buildroot.net/results/45208e51814b777a5a133b0e345e800ee51d8a53 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmpdclient/libmpdclient.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 3ab8e9884c..a399516fe3 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -16,6 +16,7 @@ LIBMPDCLIENT_DEPENDENCIES = host-meson LIBMPDCLIENT_CONF_OPTS += \ --prefix=/usr \ --libdir=/usr/lib \ + --default-library $(if $(BR2_STATIC_LIBS),static,shared) \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf From fac1550c851a5a514ae29f16b423935ce45dcdb2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Mar 2018 23:31:13 +0100 Subject: [PATCH 0227/2640] safeclib: bump to version 03032018 Remove patch (applied upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...Fix-install-when-HAVE_WCHAR-is-unset.patch | 50 ------------------- package/safeclib/safeclib.hash | 2 +- package/safeclib/safeclib.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch diff --git a/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch b/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch deleted file mode 100644 index c34002d24e..0000000000 --- a/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5991f0d4b86c02a3d7739509b96815ccfa734be7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 18 Dec 2017 17:17:54 +0100 -Subject: [PATCH] Fix install when HAVE_WCHAR is unset - -Don't build WCSNORM_xxx man pages if HAVE_WHCAR is not set otherwise -installation will fail as the wcsnorm_mode enum is not defined in -safe_str_lib.h when SAFECLIB_DISABLE_WCHAR is set - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 31398d1..b7e65a5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -142,12 +142,6 @@ dist_man_MANS += \ - doc/man/man3/SAFE_STR_PASSWORD_MIN_LENGTH.3 \ - doc/man/man3/STRTOK_DELIM_MAX_LEN.3 \ - doc/man/man3/TMP_MAX_S.3 \ -- doc/man/man3/WCSNORM_FCC.3 \ -- doc/man/man3/WCSNORM_FCD.3 \ -- doc/man/man3/WCSNORM_NFC.3 \ -- doc/man/man3/WCSNORM_NFD.3 \ -- doc/man/man3/WCSNORM_NFKC.3 \ -- doc/man/man3/WCSNORM_NFKD.3 \ - doc/man/man3/abort_handler_s.3 \ - doc/man/man3/abort_handler_s.c.3 \ - doc/man/man3/asctime_s.3 \ -@@ -461,6 +455,15 @@ dist_man_MANS += \ - doc/man/man3/wprintf_s.c.3 \ - doc/man/man3/wscanf_s.3 \ - doc/man/man3/wscanf_s.c.3 -+if ENABLE_WCHAR -+dist_man_MANS += \ -+ doc/man/man3/WCSNORM_FCC.3 \ -+ doc/man/man3/WCSNORM_FCD.3 \ -+ doc/man/man3/WCSNORM_NFC.3 \ -+ doc/man/man3/WCSNORM_NFD.3 \ -+ doc/man/man3/WCSNORM_NFKC.3 \ -+ doc/man/man3/WCSNORM_NFKD.3 -+endif - CLEANFILES += Doxyfile doc/footer README.md - - # avoid parallel doxygen --- -2.7.4 - diff --git a/package/safeclib/safeclib.hash b/package/safeclib/safeclib.hash index 95a862eef0..2a6fe86a53 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9c09c6e9fc95207c7d45944f8b669f2454056bef2bbaef70c94ba3f81be1cbb2 safeclib-v09102017.tar.gz +sha256 51f66832853322a4fbe677e196ab4c68317261829edb5e56725ed96a07ea50e6 safeclib-v03032018.tar.gz sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index b1aa25992c..e4aaa3ff57 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAFECLIB_VERSION = v09102017 +SAFECLIB_VERSION = v03032018 SAFECLIB_SITE = $(call github,rurban,safeclib,$(SAFECLIB_VERSION)) SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING From b98e5414133e032e4f3733c76823b61c4c2d197b Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 8 Mar 2018 20:36:38 -0600 Subject: [PATCH 0228/2640] configs/freescale_p1025twr_defconfig: new board Replacing the p1010rdb, this board is based on the tower development system still available by NXP. The board is setup to track upstream Linux and has been bumped from 4.1 to 4.15 (compared to p1010). The target does not build uboot and assumes the user still uses the NXP suggested prebuilts in the SDK2.0 (last release for PowerPC). If a uboot is required, the source for SDK2.0 can be found in the following repo. http://git.freescale.com/git/cgit.cgi/ppc/sdk/u-boot.git/tag/?id=fsl-sdk-v2.0-1703 Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/freescale/p1025twr/readme.txt | 25 +++++++++++++++++++++++++ configs/freescale_p1025twr_defconfig | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 board/freescale/p1025twr/readme.txt create mode 100644 configs/freescale_p1025twr_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2de78d89c..0fe91ae586 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,6 +121,7 @@ freescale_imx6sololiteevk_defconfig: *defconfig freescale_imx6sxsabresd_defconfig: *defconfig freescale_imx6ulevk_defconfig: *defconfig freescale_imx7dsabresd_defconfig: *defconfig +freescale_p1025twr_defconfig: *defconfig friendlyarm_nanopi_a64_defconfig: *defconfig friendlyarm_nanopi_neo2_defconfig: *defconfig galileo_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index e3c4a9c824..b42e28dfa0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1150,6 +1150,8 @@ F: configs/ts4900_defconfig F: package/ts4900-fpga/ N: Matt Weber +F: board/freescale/p* +F: configs/freescale_p* F: package/argp-standalone/ F: package/aufs/ F: package/aufs-util/ diff --git a/board/freescale/p1025twr/readme.txt b/board/freescale/p1025twr/readme.txt new file mode 100644 index 0000000000..9179aeac64 --- /dev/null +++ b/board/freescale/p1025twr/readme.txt @@ -0,0 +1,25 @@ +The bootloader is no longer buildable in the latest Freescale/NXP tree or +upstream. As such, retrieve the "Image: SDK V1.2 e500v2 Binary ISO" from +NXP downloads and follow the release notes for reflashing. + +For programming the kernel and rootfs created by buildroot into the flash. +The fast way is to tftp transfer the files via one of the network interfaces. +Make sure your devkit has ipaddr and serverip defined to reach your tftp +server. + +(Assuming the default u-boot env from NXP) +1. Program the DTB to NOR flash + + => setenv dtbfile p1025twr.dtb + => run dtbflash + +2. Program the kernel and rootfs to NOR flash (reusing orignal rootfs + NOR location, as the kernel location is to small) + + => tftpboot $loadaddr uImage; protect off 0xeeb80000 +$filesize; erase 0xeeb80000 +$filesize; cp.b $loadaddr 0xeeb80000 $filesize; protect on 0xeeb80000 +$filesize; cmp.b $loadaddr 0xefa80000 $filesize + +3. Booting your new system + + => bootm 0xeeb80000 - 0xefe80000 + + You can login with user "root". diff --git a/configs/freescale_p1025twr_defconfig b/configs/freescale_p1025twr_defconfig new file mode 100644 index 0000000000..f7cc50f093 --- /dev/null +++ b/configs/freescale_p1025twr_defconfig @@ -0,0 +1,20 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_8548=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/p1025twr" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +# BR2_TARGET_ROOTFS_TAR is not set From ad6ed6643aa806f05fb14bb699d10c88d8f97c90 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 8 Mar 2018 21:10:06 -0600 Subject: [PATCH 0229/2640] configs/freescale_t1040d4rdb_defconfig: new board The T1 QoriQ from NXP has had a few varients of RDB dev boards. This target is against the latest D4RDB version. Any of the other versions before D4RDB (plain RDB), may require backing off the uboot version to SDK 1.6 and/or adjusting the kernel dtb used. This board configuration provides an upstream kernel build which has been verified to boot on target. The target assumes the user still uses the NXP suggested prebuilts in the SDK2.0 (last release for PowerPC). If a uboot rebuild is required, the source for SDK2.0 can be found in the following repo. http://git.freescale.com/git/cgit.cgi/ppc/sdk/u-boot.git/tag/?id=fsl-sdk-v2.0-1703 Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/freescale/t1040d4rdb/readme.txt | 24 ++++++++++++++++++++++++ configs/freescale_t1040d4rdb_defconfig | 20 ++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 board/freescale/t1040d4rdb/readme.txt create mode 100644 configs/freescale_t1040d4rdb_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fe91ae586..f44c3a9bf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,6 +122,7 @@ freescale_imx6sxsabresd_defconfig: *defconfig freescale_imx6ulevk_defconfig: *defconfig freescale_imx7dsabresd_defconfig: *defconfig freescale_p1025twr_defconfig: *defconfig +freescale_t1040d4rdb_defconfig: *defconfig friendlyarm_nanopi_a64_defconfig: *defconfig friendlyarm_nanopi_neo2_defconfig: *defconfig galileo_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index b42e28dfa0..c5a1a6a1f7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,7 +1151,9 @@ F: package/ts4900-fpga/ N: Matt Weber F: board/freescale/p* +F: board/freescale/t* F: configs/freescale_p* +F: configs/freescale_t* F: package/argp-standalone/ F: package/aufs/ F: package/aufs-util/ diff --git a/board/freescale/t1040d4rdb/readme.txt b/board/freescale/t1040d4rdb/readme.txt new file mode 100644 index 0000000000..04d6b01531 --- /dev/null +++ b/board/freescale/t1040d4rdb/readme.txt @@ -0,0 +1,24 @@ +For the bootloader, NXP has stablized at SDK2.0 (final release). It is +suggested to download the prebuilt from NXP downloads and follow the +release notes for reflashing. + +To program the kernel and rootfs created by buildroot into the flash. The +fast way is to tftp transfer the files via one of the network interfaces. +Make sure your devkit has ipaddr and serverip defined to reach your tftp +server. + +(Assuming the default u-boot env from NXP) +1. Program the DTB to NOR flash + + => tftpboot $loadaddr t1040d4rdb.dtb; protect off 0xe8800000 +$filesize; erase 0xe8800000 +$filesize; cp.b $loadaddr 0xe8800000 $filesize; protect on 0xe8800000 +$filesize; cmp.b $loadaddr 0xe8800000 $filesize + +2. Program the kernel and rootfs to NOR flash + + => tftpboot $loadaddr uImage; protect off 0xe8020000 +$filesize; erase 0xe8020000 +$filesize; cp.b $loadaddr 0xe8020000 $filesize; protect on 0xe8020000 +$filesize; cmp.b $loadaddr 0xe8020000 $filesize + => tftpboot $loadaddr rootfs.cpio.uboot; protect off 0xe9300000 +$filesize; erase 0xe9300000 +$filesize; cp.b $loadaddr 0xe9300000 $filesize; protect on 0xe9300000 +$filesize; cmp.b $loadaddr 0xe9300000 $filesize + +3. Booting your new system + + => boot + + You can login with user "root". diff --git a/configs/freescale_t1040d4rdb_defconfig b/configs/freescale_t1040d4rdb_defconfig new file mode 100644 index 0000000000..6b09e69646 --- /dev/null +++ b/configs/freescale_t1040d4rdb_defconfig @@ -0,0 +1,20 @@ +# Architecture +BR2_powerpc64=y +BR2_powerpc_e5500=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t1040d4rdb" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +# BR2_TARGET_ROOTFS_TAR is not set From 5bc71f825dae8b2605a3617b929f827946c81ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Fri, 9 Mar 2018 11:20:42 +0100 Subject: [PATCH 0230/2640] wine: Drop glibc requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I noticed it's not needed anymore, musl went upstream at some point and uClibc is now build with bessel functions: https://git.buildroot.net/buildroot/commit/package/uclibc?id=de56d58e5d26d78161ca3b7a1a2a4decfe4e89db Signed-off-by: André Hentschel Signed-off-by: Peter Korsgaard --- package/wine/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/wine/Config.in b/package/wine/Config.in index c674288446..627a9a71f4 100644 --- a/package/wine/Config.in +++ b/package/wine/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_WINE bool "wine" - depends on BR2_TOOLCHAIN_USES_GLIBC # Wine only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" || \ BR2_HOSTARCH = "powerpc" || BR2_HOSTARCH = "arm" || \ @@ -16,8 +15,3 @@ config BR2_PACKAGE_WINE methods. http://www.winehq.org - -comment "wine needs a glibc toolchain" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_i386 - depends on !BR2_TOOLCHAIN_USES_GLIBC From 81750410033ab5ebeec8257d80297f05e9534f36 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 3 Mar 2018 19:43:42 -0500 Subject: [PATCH 0231/2640] docker-proxy: new package Add docker-proxy package to Buildroot. Needed by docker-engine at runtime, and previously not included. This leads to the following error when attempting to port-map ports to a container: $ docker run -p 8080:8080 nginx docker: Error response from daemon: driver failed programming external connectivity on endpoint: exec: "docker-proxy": executable file not found in $PATH. Docker expects the docker-proxy binary to exist in the PATH. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/docker-proxy/Config.in | 19 +++++++++++ package/docker-proxy/docker-proxy.hash | 2 ++ package/docker-proxy/docker-proxy.mk | 46 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 package/docker-proxy/Config.in create mode 100644 package/docker-proxy/docker-proxy.hash create mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/DEVELOPERS b/DEVELOPERS index c5a1a6a1f7..3df820e712 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -427,6 +427,7 @@ F: package/aufs-util/ F: package/batman-adv/ F: package/docker-containerd/ F: package/docker-engine/ +F: package/docker-proxy/ F: package/mosh/ F: package/rtl8821au/ F: package/runc/ diff --git a/package/Config.in b/package/Config.in index 37465c7f5b..449ffcc47b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1962,6 +1962,7 @@ menu "System tools" source "package/docker-compose/Config.in" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" + source "package/docker-proxy/Config.in" source "package/dsp-tools/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in new file mode 100644 index 0000000000..596e18a3f3 --- /dev/null +++ b/package/docker-proxy/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Libnetwork is a Container Network Model that provides a + consistent programming interface and the required network + abstractions for applications. + + This package provides docker-proxy, a run-time dependency of + Docker. + + https://github.com/docker/libnetwork + +comment "docker-proxy needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash new file mode 100644 index 0000000000..3ec184f54f --- /dev/null +++ b/package/docker-proxy/docker-proxy.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk new file mode 100644 index 0000000000..3bf6546d26 --- /dev/null +++ b/package/docker-proxy/docker-proxy.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# docker-proxy +# +################################################################################ + +DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e +DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) + +DOCKER_PROXY_LICENSE = Apache-2.0 +DOCKER_PROXY_LICENSE_FILES = LICENSE + +DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf + +DOCKER_PROXY_GOPATH = "$(@D)/gopath" +DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + CGO_NO_EMULATION=1 \ + GOBIN="$(@D)/bin" \ + GOPATH="$(DOCKER_PROXY_GOPATH)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + $(TARGET_MAKE_ENV) + +ifeq ($(BR2_STATIC_LIBS),y) +DOCKER_PROXY_GLDFLAGS += -extldflags '-static' +endif + +define DOCKER_PROXY_CONFIGURE_CMDS + mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker + ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork +endef + +define DOCKER_PROXY_BUILD_CMDS + cd $(@D)/gopath/src/github.com/docker/libnetwork; \ + $(DOCKER_PROXY_MAKE_ENV) \ + $(HOST_DIR)/usr/bin/go build -v \ + -o $(@D)/bin/docker-proxy \ + -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \ + github.com/docker/libnetwork/cmd/proxy +endef + +define DOCKER_PROXY_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy +endef + +$(eval $(generic-package)) From 8d125cd9f646420467aa1426ebb45078eb815ef7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 3 Mar 2018 19:43:43 -0500 Subject: [PATCH 0232/2640] docker-engine: add dependency on docker-proxy docker-proxy is needed by docker-engine at runtime, and was previously not included. This leads to the following error when attempting to port-map ports to a container: $ docker run -p 8080:8080 nginx docker: Error response from daemon: driver failed programming external connectivity on endpoint: exec: "docker-proxy": executable file not found in $PATH. Docker expects the docker-proxy binary to exist in the PATH. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 05670a716e..8feb11b48c 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON default y depends on BR2_USE_MMU # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency + select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency help From b076e05950fcd1efad46e2ffebf378f8973dde0a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Mar 2018 23:30:26 -0300 Subject: [PATCH 0233/2640] linux: bump default to version 4.15.9 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 3e039c5549..02c39b3e89 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 03b5b444f155ead9c73c2ed2596948de671c5fb9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Mar 2018 23:30:27 -0300 Subject: [PATCH 0234/2640] linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3723e8edec..1560df031b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,12 +242,12 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.99" if BR2_KERNEL_HEADERS_3_2 default "4.1.49" if BR2_KERNEL_HEADERS_4_1 - default "4.4.119" if BR2_KERNEL_HEADERS_4_4 - default "4.9.86" if BR2_KERNEL_HEADERS_4_9 + default "4.4.121" if BR2_KERNEL_HEADERS_4_4 + default "4.9.87" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.25" if BR2_KERNEL_HEADERS_4_14 - default "4.15.8" if BR2_KERNEL_HEADERS_4_15 + default "4.14.26" if BR2_KERNEL_HEADERS_4_14 + default "4.15.9" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From f437bf547ca44849db4578c31707afdd96b85018 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 12 Mar 2018 14:34:09 +0200 Subject: [PATCH 0235/2640] uboot: fix build for older uboot source trees The change in commit bf733342324b414a1142b57781504111f81c97ea only works for newer uboot source trees. Add a check that scripts/dtc/libfdt directory exists before making this change. [Peter: add comment explaining why] Signed-off-by: Stefan Becker Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 58dd906a27..b7032d5901 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -191,8 +191,12 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES # This is equivalent to upstream commit # http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It # fixes a build failure when libfdt-devel is installed system-wide. +# This only works when scripts/dtc/libfdt exists (E.G. versions containing +# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893) define UBOOT_FIXUP_LIBFDT_INCLUDE - $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile + if [ -d $(@D)/scripts/dtc/libfdt ]; then \ + $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \ + fi endef UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE From 412443fb8fe309086c1da99d9ee441492d142211 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 09:19:39 +0200 Subject: [PATCH 0236/2640] trinity: fix build with glibc 2.27 glibc 2.27 added a system call wrapper for memfd_create() which collides with the local definition of the same symbol in trinity. Add a patch to detect the presence of memfd_create(), and avoid collision. Fixes: http://autobuild.buildroot.net/results/fda/fda07327395921fdc79cbb4f24b662209fee1be1/ http://autobuild.buildroot.net/results/f98/f98f43657cbf519a626257af5a21c8c228423856/ http://autobuild.buildroot.net/results/575/57558c418ea5c5011ac22e5236beff4d823c825b/ Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...0002-memfd-fix-build-with-glibc-2.27.patch | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch diff --git a/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch b/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch new file mode 100644 index 0000000000..9ea3634688 --- /dev/null +++ b/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch @@ -0,0 +1,87 @@ +From c93bb184ce996c4d77eefbae2ab0bf74f396ec45 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 13 Mar 2018 06:53:06 +0200 +Subject: [PATCH] memfd: fix build with glibc 2.27 + +glibc 2.27 added a wrapper for memfd_create(). This causes build +failure: + +fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration + static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag) + ^~~~~~~~~~~~ + +Don't use the local definition when the libc provides one. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/kernelslacker/trinity/pull/23 + + configure | 23 +++++++++++++++++++++++ + fds/memfd.c | 3 +++ + 2 files changed, 26 insertions(+) + +diff --git a/configure b/configure +index dc0a87d8c1ad..c0166af33048 100755 +--- a/configure ++++ b/configure +@@ -288,6 +288,29 @@ else + echo "#define USE_BTRFS 1" >> $CONFIGH + fi + ++############################################################################################# ++# Does glibc provide memfd_create() syscall wrapper ++# ++echo -n "[*] Checking if glibc provides memfd_create.. " ++rm -f "$TMP" || exit 1 ++ ++cat >"$TMP.c" << EOF ++#include ++ ++void main() ++{ ++ memfd_create(); ++} ++EOF ++ ++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log" ++if [ ! -x "$TMP" ]; then ++ echo $RED "[NO]" $COL_RESET ++else ++ echo $GREEN "[YES]" $COL_RESET ++ echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH ++fi ++ + ############################################################################################# + + check_header linux/caif/caif_socket.h USE_CAIF +diff --git a/fds/memfd.c b/fds/memfd.c +index 210678e4571c..aaaac2f78f54 100644 +--- a/fds/memfd.c ++++ b/fds/memfd.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "fd.h" + #include "memfd.h" +@@ -16,6 +17,7 @@ + #include "trinity.h" + #include "udp.h" + ++#ifndef USE_MEMFD_CREATE + static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag) + { + #ifdef SYS_memfd_create +@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl + return -ENOSYS; + #endif + } ++#endif + + static void memfd_destructor(struct object *obj) + { +-- +2.16.1 + From 814a9c32aed47eb7fb3240ae58175846c7e2de48 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 10:04:34 +0200 Subject: [PATCH 0237/2640] xfsprogs: bump to version 4.15.1 Fixes compatibility with glibc 2.27. Fixes: http://autobuild.buildroot.net/results/bd7/bd7e1af33e6e937c75b44c7c9ab991d2b10f2931/ http://autobuild.buildroot.net/results/58b/58b59b74f6a138b51206f24481f7268104f0a052/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...re-do-not-do-dynamic-linking-of-libtool-libra.patch | 10 ++++++---- package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch index 2bb0b7dbcd..4eb43480c0 100644 --- a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch +++ b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch @@ -11,23 +11,25 @@ ld: attempted static link of dynamic object `/usr/lib/libuuid.so' Signed-off-by: Vicente Olivert Riera [Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html] +[baruch: update for v4.15.1] +Signed-off-by: Baruch Siach --- mdrestore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdrestore/Makefile b/mdrestore/Makefile -index 5171306..1b34a0e 100644 +index 136ae716d691..75ff1bad78e9 100644 --- a/mdrestore/Makefile +++ b/mdrestore/Makefile @@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c - LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) - LTDEPENDENCIES = $(LIBXFS) + LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXFS) $(LIBFROG) -LLDFLAGS = -static +LLDFLAGS = -static-libtool-libs default: depend $(LTCOMMAND) -- -2.7.4 +2.16.1 diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 886a8f10c5..c58dbb0766 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec xfsprogs-4.14.0.tar.xz +sha256 27c36de9346a274143ad06c65b2fdbafd2806f3f37fa2c1235a08ed920d2bf3c xfsprogs-4.15.1.tar.xz sha256 ee304b1b1da08b261f1d1f31d229fc70d2d0c552c7429e9e84c0fac878d94209 doc/COPYING diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index e6e8493684..7f49e2312f 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 4.14.0 +XFSPROGS_VERSION = 4.15.1 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) From 7d43534625ac06ae01987113e912ffaf1aec2302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Mon, 12 Mar 2018 19:41:00 +0100 Subject: [PATCH 0238/2640] cmake: Fix RPATH for host libraries built by CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The host shared libraries produced by CMake were missing a proper DT_RPATH. That became a problem because the DT_RPATH handling is not transitive by design. Consider the following scenario: - pkg-a provides a library (`liba`) which links to `libpcre` - pkg-b provides a binary (`foo`) and a shared library (`libb`) which is needed by that binary - `libb` links to `liba` - pkg-a and pkg-b are both built by CMake In this scenario, `foo` is correctly marked with DT_RPATH pointing to host/lib/, but that path is not used when (recursively) resolving PCRE's symbols in `liba`. When attempting to run the `foo` binary, the linker correctly finds both `liba` and `libb`, but it cannot find the libpcre.so as built by Buildroot for host. Signed-off-by: Jan Kundrát Reviewed-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 14ffe4a88f..9b07798a1e 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -132,6 +132,7 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ From 54e210522faf7dff3e68e22bb802102f891098c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Mar 2018 07:21:45 +0100 Subject: [PATCH 0239/2640] wireguard: bump version to 0.0.20180304 Signed-off-by: Peter Korsgaard --- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index 4961d4fd14..969b9e1962 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2018-February/002406.html -sha256 4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52 WireGuard-0.0.20180218.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2018-March/002446.html +sha256 efb1652f0da67fb2731040439b6abb820a5e2f1bc177aa15c5dce68ea3327787 WireGuard-0.0.20180304.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index aa86b5782b..7c5e6a3e09 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20180218 +WIREGUARD_VERSION = 0.0.20180304 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 From 5b85b59709b444d3fb0a2a6edfd4caafdcf105be Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 14:12:36 +0200 Subject: [PATCH 0240/2640] cryptsetup: bump to version 2.0.2 Cc: Martin Hicks Signed-off-by: Baruch Siach Acked-by: Martin Hicks Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index c54b0dc607..7629691a66 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc -sha256 adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199 cryptsetup-2.0.0.tar.xz +sha256 4f8105d7f3bf758d58da3058b3cbd66c0ca81492b2dafe8ae7c049cc9e939e97 cryptsetup-2.0.2.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 0d8480ba48..39c9b7b0bc 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.0 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \ From 09378b474f916c76ef6d09cfb1b7d7dde5c10fc9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 14:45:58 +0200 Subject: [PATCH 0241/2640] flashrom: bump to version 1.0 Add license file hash. Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/flashrom/flashrom.hash | 6 ++++-- package/flashrom/flashrom.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 64b67b99cf..3a68e8acb7 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,2 +1,4 @@ -# Locally computed -sha256 cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45 flashrom-0.9.9.tar.bz2 +# Locally computed after checking pgp signature +# https://download.flashrom.org/releases/flashrom-1.0.tar.bz2.asc +sha256 3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64 flashrom-1.0.tar.bz2 +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index f9ab6294a5..95ce86c52c 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 0.9.9 +FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = http://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf From 02940d8ccf0503fb5fff83da4ed48fbafa00911d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 14:54:01 +0200 Subject: [PATCH 0242/2640] uclibc-ng-test: fix build with musl and older kernel headers musl libc provides its own system call macros, including preadv2/pwritev2. Having these macros defined is not enough to determine availability of other related macros in kernel headers. Add a patch to check these macros directly. Fixes: http://autobuild.buildroot.net/results/7e9/7e9945f46ef9e0f6de7e1c85b0ca1104df6c86f5/ http://autobuild.buildroot.net/results/782/782652193bb6770ae68d509b3a7087667622d627/ http://autobuild.buildroot.net/results/582/5827a724c7f24218010f4cdd24924dca457b0361/ Cc: Waldemar Brodkorb Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...6-fix-build-with-musl-and-older-kenr.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch diff --git a/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch b/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch new file mode 100644 index 0000000000..ca433261ba --- /dev/null +++ b/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch @@ -0,0 +1,45 @@ +From 9a09c89fdd0e0cebec48d1bb7bc187bf92ae361c Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 13 Mar 2018 12:58:59 +0200 +Subject: [PATCH] misc/tst-syscall6: fix build with musl and older kenrel + headers + +The RWF_DSYNC and RWF_HIPRI macros were introduced in kernel version 4.6 +with the preadv2/pwritev2 system calls. musl libc provides its own +syscall definitions, even when the kernel headers are older. This leads +to the following build failure: + +tst-syscall6.c: In function 'main': +tst-syscall6.c:32:48: error: 'RWF_DSYNC' undeclared (first use in this function) + nio = syscall(SYS_pwritev2, fd, iov, 2, 0, 0, RWF_DSYNC); + ^~~~~~~~~ +tst-syscall6.c:32:48: note: each undeclared identifier is reported only once for each function it appears in +tst-syscall6.c:42:58: error: 'RWF_HIPRI' undeclared (first use in this function) + nio = syscall(SYS_preadv2, fd, iov, 1, strlen(str0), 0, RWF_HIPRI); + ^~~~~~~~~ + +Make the code depend also on RWF_HIPRI to fix this failure. + +Signed-off-by: Baruch Siach +--- +Upstream status: patch sent to Waldemar Brodkorb + + test/misc/tst-syscall6.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/misc/tst-syscall6.c b/test/misc/tst-syscall6.c +index fa51c275e4a5..9ad2ddac2b8f 100644 +--- a/test/misc/tst-syscall6.c ++++ b/test/misc/tst-syscall6.c +@@ -9,7 +9,7 @@ + + int main() + { +-#if defined SYS_preadv2 && defined SYS_pwritev2 ++#if defined SYS_preadv2 && defined SYS_pwritev2 && defined RWF_HIPRI + char tmp[] = "/tmp/tst-preadv2-XXXXXX"; + int fd; + struct iovec iov[2]; +-- +2.16.1 + From 6c3c8ffac100f2618972173510542d69e8511dee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Mar 2018 14:49:41 +0100 Subject: [PATCH 0243/2640] docker-compose: bump version to 1.20-rc2 Fixes a race condition in ParallelStreamWriter. Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 4 ++-- package/docker-compose/docker-compose.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index df4d915469..abcb424d09 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docker-compose/json, sha256 locally computed -md5 bd703d931f159b08ed5fe4fadcb12652 docker-compose-1.20.0rc1.tar.gz -sha256 ad14f8dda3eb5c999f6195bf88420dafd1aada80535dab3afd3350fe8438e0a3 docker-compose-1.20.0rc1.tar.gz +md5 0c62ffccfbf22195dc8f168d7ce104b0 docker-compose-1.20.0rc2.tar.gz +sha256 8f4c7d1d8bef2f137f28332f13187af159ea55ceb58338dfc70cda3800f65d11 docker-compose-1.20.0rc2.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 155c529391..d5f71c05a0 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 1.20.0rc1 -DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/ca/d9/21266285a3c34e8e023f2504c13ffb48e6acd1e43ccdd0c55188d7039505 +DOCKER_COMPOSE_VERSION = 1.20.0rc2 +DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/b9/fe/44a2d249d86ef04ccf792c841fc73ffcf96e6138ca3a926de8ba032cf912 DOCKER_COMPOSE_SETUP_TYPE = setuptools DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 8c08116f4cb98fd322dd5ef54326f36953668d63 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 13 Mar 2018 17:08:08 +0100 Subject: [PATCH 0244/2640] sunxi-mali-mainline-driver: bump version For stop using cma. git shortlog --invert-grep --grep travis --no-merges 94ccbc8924c12a818d61d36a4b389b74a89fde3c.. Maxime Ripard (1): mali: Stop using the reserved-memory region to setup the fb area Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- .../sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index 24e759aaa7..24817b07c7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = 94ccbc8924c12a818d61d36a4b389b74a89fde3c +SUNXI_MALI_MAINLINE_DRIVER_VERSION = 52ef1c5e133cc5fd791ca636239dc5e7b19c26d5 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux From 6b68c83282bc6abe6781b7c79f7d8f228f12978e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 13 Mar 2018 18:29:35 +0100 Subject: [PATCH 0245/2640] luarocks: bump to version 2.4.4 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 27845a46c4..7c3f96606f 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4d414d32fed5bb121c72d3ff1280b7f2dc9027a9bc012e41dfbffd5b519b362e luarocks-2.4.3.tar.gz +sha256 3938df33de33752ff2c526e604410af3dceb4b7ff06a770bc4a240de80a1f934 luarocks-2.4.4.tar.gz diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index e050cb553c..389d521832 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 2.4.3 +LUAROCKS_VERSION = 2.4.4 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 40275643432c974dca8d4b6ba1886bba19fe6317 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 19:30:59 +0200 Subject: [PATCH 0246/2640] samba4: security bump to version 4.7.6 CVE-2018-1050: Vulnerability to a denial of service attack when the RPC spoolss service is configured to be run as an external daemon. https://www.samba.org/samba/security/CVE-2018-1050.html CVE-2018-1057: Authenticated users might change any other users' passwords, including administrative users and privileged service accounts (eg Domain Controllers). https://www.samba.org/samba/security/CVE-2018-1057.html Add clnt_create() test result to cache to fix cross configure breakage. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 5 +++-- package/samba4/samba4.mk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index 4a6471dd7a..0485f0dbb1 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -38,3 +38,4 @@ Checking value of _NSIG: "65" Checking value of SIGRTMAX: "64" Checking value of SIGRTMIN: "34" Checking errno of iconv for illegal multibyte sequence: "0" +checking for clnt_create(): OK diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 28765440d1..dddd132d24 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,3 +1,4 @@ -# Locally calculated -sha256 fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247 samba-4.7.4.tar.gz +# Locally calculated after checking pgp signature +# https://download.samba.org/pub/samba/stable/samba-4.7.6.tar.asc +sha256 1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e samba-4.7.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 6f3207fb64..ada03c024f 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.7.4 +SAMBA4_VERSION = 4.7.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From f6809dba0ff6139bcc7d77ae5d237a8de0ed5ea1 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:39 -0300 Subject: [PATCH 0247/2640] genrandconfig: fix code style Fix these warnings: E201 whitespace after '[' E202 whitespace before ']' E501 line too long (138 > 132 characters) -> isolate the common part of the external toolchain url in a variable to make the long lines shorter and more readable. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 0d08570bc5..d958664572 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -127,7 +127,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): with open(toolchains_csv) as r: # filter empty lines and comments - lines = [ t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#' ] + lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] toolchains = decode_byte_list(lines) configs = [] @@ -210,6 +210,8 @@ def fixup_config(configfile): with open(configfile) as configf: configlines = configf.readlines() + BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): return False if "BR2_NEEDS_HOST_JAVAC=y\n" in configlines and not sysinfo.has("javac"): @@ -221,36 +223,36 @@ def fixup_config(configfile): return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: return False # The ctng toolchain tigger an assembler error with guile package when compiled with -Os (same issue as for CS ARM 2014.05-29) if 'BR2_PACKAGE_GUILE=y\n' in configlines and \ 'BR2_OPTIMIZE_S=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv6-ctng-linux-uclibcgnueabi.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'armv6-ctng-linux-uclibcgnueabi.tar.xz"\n' in configlines: return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv7-ctng-linux-gnueabihf.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'armv7-ctng-linux-gnueabihf.tar.xz"\n' in configlines: return False # The ctng toolchain is affected by PR60155 if 'BR2_PACKAGE_SDL=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # The ctng toolchain is affected by PR60155 if 'BR2_PACKAGE_LIBMPEG2=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'powerpc-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS toolchain uses eglibc-2.18 which lacks SYS_getdents64 if 'BR2_PACKAGE_STRONGSWAN=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: return False # This MIPS toolchain uses eglibc-2.18 which lacks SYS_getdents64 if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: return False # libffi not available on sh2a and ARMv7-M, but propagating libffi # arch dependencies in Buildroot is really too much work, so we @@ -266,37 +268,37 @@ def fixup_config(configfile): configlines.append('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/hackberry.fex"\n') # This MIPS uClibc toolchain fails to build the gdb package if 'BR2_PACKAGE_GDB=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS uClibc toolchain fails to build the rt-tests package if 'BR2_PACKAGE_RT_TESTS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS uClibc toolchain fails to build the civetweb package if 'BR2_PACKAGE_CIVETWEB=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS ctng toolchain fails to build the python3 package if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: return False # This MIPS uClibc toolchain fails to build the strace package if 'BR2_PACKAGE_STRACE=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS uClibc toolchain fails to build the cdrkit package if 'BR2_PACKAGE_CDRKIT=y\n' in configlines and \ 'BR2_STATIC_LIBS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # uClibc vfork static linking issue if 'BR2_PACKAGE_ALSA_LIB=y\n' in configlines and \ 'BR2_STATIC_LIBS=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/i486-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'i486-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # This MIPS uClibc toolchain fails to build the weston package if 'BR2_PACKAGE_WESTON=y\n' in configlines and \ - 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: + BR2_TOOLCHAIN_EXTERNAL_URL + 'mipsel-ctng-linux-uclibc.tar.xz"\n' in configlines: return False # The cs nios2 2017.02 toolchain is affected by binutils PR19405 if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ From 19aaf8c3f1623d178e136b737ff93d2e5ed11740 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:40 -0300 Subject: [PATCH 0248/2640] size-stats-compare: fix code style Fix these warnings: E129 visually indented line with same indent as next logical line E302 expected 2 blank lines, found 1 Signed-off-by: Ricardo Martincoski Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- utils/size-stats-compare | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index e5a1ec3f94..a3d7f250c6 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -24,14 +24,15 @@ import csv import argparse import sys + def read_file_size_csv(inputf, detail=None): """Extract package or file sizes from CSV file into size dictionary""" sizes = {} reader = csv.reader(inputf) header = next(reader) - if (header[0] != 'File name' or header[1] != 'Package name' or - header[2] != 'File size' or header[3] != 'Package size'): + if header[0] != 'File name' or header[1] != 'Package name' or \ + header[2] != 'File size' or header[3] != 'Package size': print(("Input file %s does not contain the expected header. Are you " "sure this file corresponds to the file-size-stats.csv " "file created by 'make graph-size'?") % inputf.name) @@ -45,6 +46,7 @@ def read_file_size_csv(inputf, detail=None): return sizes + def compare_sizes(old, new): """Return delta/added/removed dictionaries based on two input size dictionaries""" @@ -64,6 +66,7 @@ def compare_sizes(old, new): return delta + def print_results(result, threshold): """Print the given result dictionary sorted by size, ignoring any entries below or equal to threshold""" From d44816f611a552716c878642f397a58cb034088b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:41 -0300 Subject: [PATCH 0249/2640] test_python_cryptography: fix code style Fix these warnings: E122 continuation line missing indentation or outdented E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 1 F401 'os' imported but unused Signed-off-by: Ricardo Martincoski Cc: Yegor Yefremov Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- .../tests/package/test_python_cryptography.py | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index b60152de1c..78c3ef55b3 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -1,7 +1,6 @@ -import os - from tests.package.test_python import TestPythonBase + class TestPythonCryptography(TestPythonBase): def fernet_test(self, timeout=-1): cmd = self.interpreter + " -c 'from cryptography.fernet import Fernet;" @@ -10,22 +9,26 @@ class TestPythonCryptography(TestPythonBase): _, exit_code = self.emulator.run(cmd, timeout) self.assertEqual(exit_code, 0) + class TestPythonPy2Cryptography(TestPythonCryptography): config = TestPythonBase.config + \ -""" -BR2_PACKAGE_PYTHON=y -BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y -""" + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + """ + def test_run(self): self.login() self.fernet_test(40) + class TestPythonPy3Cryptography(TestPythonCryptography): config = TestPythonBase.config + \ -""" -BR2_PACKAGE_PYTHON3=y -BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y -""" + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + """ + def test_run(self): self.login() self.fernet_test(40) From ede92be10dc1260765a83ed2e7f83f9315adce39 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:42 -0300 Subject: [PATCH 0250/2640] scanpypi: fix code style Fix these warnings: E401 multiple imports on one line Signed-off-by: Ricardo Martincoski Cc: Yegor Yefremov Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index b9006ee4f7..505ba0a246 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -10,7 +10,9 @@ from __future__ import print_function from __future__ import absolute_import import argparse import json -import six.moves.urllib.request, six.moves.urllib.error, six.moves.urllib.parse +import six.moves.urllib.request +import six.moves.urllib.error +import six.moves.urllib.parse import sys import os import shutil From 14aa15a5a583cf1621880f422f27296180a3d73a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:43 -0300 Subject: [PATCH 0251/2640] support/dockerfile: install flake8 Use the latest version of the tool because it is actively maintained. But use a fixed version of the tool and its dependencies to get stable results. It can be manually bumped from time to time. Before installing any Python packages, ensure pip, setuptools, and wheel are up to date as recommended in the docs [1]. [1] https://packaging.python.org/tutorials/installing-packages/ Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Yann E. MORIN Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index ce3fdd9cc2..f01ac25f93 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -27,10 +27,19 @@ RUN dpkg --add-architecture i386 && \ cvs bzr git mercurial subversion wget \ cpio unzip \ libncurses5-dev \ - python-nose2 python-pexpect qemu-system-arm qemu-system-x86 && \ + python-nose2 python-pexpect qemu-system-arm qemu-system-x86 \ + python-pip && \ apt-get -y autoremove && \ apt-get -y clean +# For check-flake8 +RUN python -m pip install --upgrade pip setuptools wheel && \ + pip install -q \ + flake8==3.5.0 \ + mccabe==0.6.1 \ + pycodestyle==2.3.1 \ + pyflakes==1.6.0 + # To be able to generate a toolchain with locales, enable one UTF-8 locale RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen From 9324167b8090fa4703703c28e8cefff7fa001d21 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:45 -0300 Subject: [PATCH 0252/2640] .flake8: ignore utils/diffconfig This script comes from the kernel source, so ignore any code style warnings for it in order to keep it as close as possible to the original one, making synchronization between repos easier. The option --exclude for flake8/pycodestyle is an absolute list and has a default, so ideally the default values should be added too. But the use cases for flake8 in the tree are: - when developing a new script or changing an existing one, the developer calls flake8 only on that script; - in the GitLab job, a list of all Python files to be tested is created and then passed to flake8. None of these involve calling 'flake8' without parameters, so don't care about adding the default value. Signed-off-by: Ricardo Martincoski Cc: Marcus Folkesson Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .flake8 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.flake8 b/.flake8 index afdb967930..7dd7b541cc 100644 --- a/.flake8 +++ b/.flake8 @@ -1,2 +1,5 @@ [flake8] +exclude= + # copied from the kernel sources + utils/diffconfig max-line-length=132 From ed0d9d6f36dfc3e99ee70cc34de0c380925e871f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 12 Mar 2018 04:44:44 -0400 Subject: [PATCH 0253/2640] libpjsip: security bump to 2.7.2 Fixes the following vulnerabilities: - CVE-2018-1000098: Crash when parsing SDP with an invalid media format description - CVE-2018-1000099: Crash when receiving SDP with invalid fmtp attribute [Peter: add CVE info] Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 6 +++--- package/libpjsip/libpjsip.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index edac3d578f..36c2ea1289 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,6 +1,6 @@ -# From http://www.pjsip.org/release/2.7.1/MD5SUM.TXT -md5 99a64110fa5c2debff40e0e8d4676380 pjproject-2.7.1.tar.bz2 +# From http://www.pjsip.org/release/2.7.2/MD5SUM.TXT +md5 fa3f0bc098c4bff48ddd92db1c016a7a pjproject-2.7.2.tar.bz2 # Locally computed -sha256 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126 pjproject-2.7.1.tar.bz2 +sha256 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772 pjproject-2.7.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 53b654d072..db9e474be7 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.7.1 +LIBPJSIP_VERSION = 2.7.2 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp From 32d2de2a6fb823a8eacb02d203b260c729522837 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Mar 2018 23:36:03 +0100 Subject: [PATCH 0254/2640] pkg-virtual.mk: explicitly set _VERSION / _SOURCE for robustness Recently a build failure was reported which was traced back to to the fact that the user had a TOOLCHAIN_VERSION environment variable set which leads to a strange looking error message: toolchain/toolchain/toolchain.mk:40: *** TOOLCHAIN_SITE cannot be empty when TOOLCHAIN_SOURCE is not. Stop. Environment variables automatically gets converted to make variables by GNU make - E.G. from the manual (https://www.gnu.org/software/make/manual/html_node/Environment.html): Variables in make can come from the environment in which make is run. Every environment variable that make sees when it starts up is transformed into a make variable with the same name and value So we end up in make with TOOLCHAIN_VERSION set to the value of the environment variable. As virtual packages do not have a version, there is no explicit TOOLCHAIN_VERSION = .. line in toolchain.mk overriding this value, and the logic in package/pkg-generic.mk sets a default value for TOOLCHAIN_SOURCE when TOOLCHAIN_VERSION is set, and finally errors out as TOOLCHAIN_SITE isn't set. As a workaround, explicitly set _VERSION and _SOURCE to the empty string in the virtual package infrastructure. Signed-off-by: Peter Korsgaard --- package/pkg-virtual.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk index 0de79d49be..05bd63eb18 100644 --- a/package/pkg-virtual.mk +++ b/package/pkg-virtual.mk @@ -41,6 +41,11 @@ $$(error No implementation selected for virtual package $(1). Configuration erro endif endif +# explicitly set these so we do not get confused by environment +# variables with the same names. +$(2)_VERSION = +$(2)_SOURCE = + $(2)_IS_VIRTUAL = YES # Add dependency against the provider From dbeb43e97626df988534b9cf62b5618b0b6ccfa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Wed, 14 Mar 2018 17:58:40 +0100 Subject: [PATCH 0255/2640] package/busybox: Unbreak the `tar` implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `tar` implementation in Busybox 1.28.0 and 1.28.1 won't extract a rootfs with some symlinks that appear to look "dangerous". This completely (and silently!) breaks on-target updates via RAUC for me, for example. In the meanwhile, upstream already reverted the commit in question (in their commit a84db18fc71d09e801df0ebca048d82e90b32c6a), so this patch simply applies that revert in Buildroot. The fix has not made it to a release, yet. Signed-off-by: Jan Kundrát Bug: https://bugs.busybox.net/show_bug.cgi?id=8411 Bug: https://github.com/rauc/rauc/issues/249 Signed-off-by: Peter Korsgaard --- ...ne-creation-of-symlinks-with-suspici.patch | 358 ++++++++++++++++++ 1 file changed, 358 insertions(+) create mode 100644 package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch diff --git a/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch b/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch new file mode 100644 index 0000000000..f6f1359654 --- /dev/null +++ b/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch @@ -0,0 +1,358 @@ +From a84db18fc71d09e801df0ebca048d82e90b32c6a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Tue, 20 Feb 2018 15:57:45 +0100 +Subject: [PATCH] tar,unzip: postpone creation of symlinks with "suspicious" + targets + +This mostly reverts commit bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7 +"libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1" + +Users report that it is somewhat too restrictive. See +https://bugs.busybox.net/show_bug.cgi?id=8411 + +In particular, this interferes with unpacking of busybox-based +filesystems with links like "sbin/applet" -> "../bin/busybox". + +The change is made smaller by deleting ARCHIVE_EXTRACT_QUIET flag - +it is unused since 2010, and removing conditionals on it +allows commonalizing some error message codes. + +function old new delta +create_or_remember_symlink - 94 +94 +create_symlinks_from_list - 64 +64 +tar_main 1002 1006 +4 +unzip_main 2732 2724 -8 +data_extract_all 984 891 -93 +unsafe_symlink_target 147 - -147 +------------------------------------------------------------------------------ +(add/remove: 2/1 grow/shrink: 1/2 up/down: 162/-248) Total: -86 bytes + +Signed-off-by: Denys Vlasenko +--- + archival/libarchive/data_extract_all.c | 28 ++++---------- + archival/libarchive/unsafe_symlink_target.c | 59 +++++++++++++---------------- + archival/tar.c | 2 + + archival/unzip.c | 25 ++++++------ + include/bb_archive.h | 23 ++++++----- + testsuite/tar.tests | 10 ++--- + 6 files changed, 68 insertions(+), 79 deletions(-) + +diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c +index d3a6df5e8..8fa69ffaf 100644 +--- a/archival/libarchive/data_extract_all.c ++++ b/archival/libarchive/data_extract_all.c +@@ -107,9 +107,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + } + } + else if (existing_sb.st_mtime >= file_header->mtime) { +- if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- && !S_ISDIR(file_header->mode) +- ) { ++ if (!S_ISDIR(file_header->mode)) { + bb_error_msg("%s not created: newer or " + "same age file exists", dst_name); + } +@@ -125,7 +123,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + /* Handle hard links separately */ + if (hard_link) { + res = link(hard_link, dst_name); +- if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { ++ if (res != 0) { + /* shared message */ + bb_perror_msg("can't create %slink '%s' to '%s'", + "hard", dst_name, hard_link +@@ -165,10 +163,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + } + case S_IFDIR: + res = mkdir(dst_name, file_header->mode); +- if ((res == -1) ++ if ((res != 0) + && (errno != EISDIR) /* btw, Linux doesn't return this */ + && (errno != EEXIST) +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) + ) { + bb_perror_msg("can't make dir %s", dst_name); + } +@@ -198,27 +195,16 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + * + * Untarring bug.tar would otherwise place evil.py in '/tmp'. + */ +- if (!unsafe_symlink_target(file_header->link_target)) { +- res = symlink(file_header->link_target, dst_name); +- if (res != 0 +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- ) { +- /* shared message */ +- bb_perror_msg("can't create %slink '%s' to '%s'", +- "sym", +- dst_name, file_header->link_target +- ); +- } +- } ++ create_or_remember_symlink(&archive_handle->symlink_placeholders, ++ file_header->link_target, ++ dst_name); + break; + case S_IFSOCK: + case S_IFBLK: + case S_IFCHR: + case S_IFIFO: + res = mknod(dst_name, file_header->mode, file_header->device); +- if ((res == -1) +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- ) { ++ if (res != 0) { + bb_perror_msg("can't create node %s", dst_name); + } + break; +diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c +index 441ba8b24..8dcafeaa1 100644 +--- a/archival/libarchive/unsafe_symlink_target.c ++++ b/archival/libarchive/unsafe_symlink_target.c +@@ -5,44 +5,37 @@ + #include "libbb.h" + #include "bb_archive.h" + +-int FAST_FUNC unsafe_symlink_target(const char *target) ++void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, ++ const char *target, ++ const char *linkname) + { +- const char *dot; +- +- if (target[0] == '/') { +- const char *var; +- unsafe: +- var = getenv("EXTRACT_UNSAFE_SYMLINKS"); +- if (var) { +- if (LONE_CHAR(var, '1')) +- return 0; /* pretend it's safe */ +- return 1; /* "UNSAFE!" */ +- } +- bb_error_msg("skipping unsafe symlink to '%s' in archive," +- " set %s=1 to extract", +- target, +- "EXTRACT_UNSAFE_SYMLINKS" ++ if (target[0] == '/' || strstr(target, "..")) { ++ llist_add_to(symlink_placeholders, ++ xasprintf("%s%c%s", linkname, '\0', target) ++ ); ++ return; ++ } ++ if (symlink(target, linkname) != 0) { ++ /* shared message */ ++ bb_perror_msg_and_die("can't create %slink '%s' to '%s'", ++ "sym", linkname, target + ); +- /* Prevent further messages */ +- setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0); +- return 1; /* "UNSAFE!" */ + } ++} + +- dot = target; +- for (;;) { +- dot = strchr(dot, '.'); +- if (!dot) +- return 0; /* safe target */ ++void FAST_FUNC create_symlinks_from_list(llist_t *list) ++{ ++ while (list) { ++ char *target; + +- /* Is it a path component starting with ".."? */ +- if ((dot[1] == '.') +- && (dot == target || dot[-1] == '/') +- /* Is it exactly ".."? */ +- && (dot[2] == '/' || dot[2] == '\0') +- ) { +- goto unsafe; ++ target = list->data + strlen(list->data) + 1; ++ if (symlink(target, list->data)) { ++ /* shared message */ ++ bb_error_msg_and_die("can't create %slink '%s' to '%s'", ++ "sym", ++ list->data, target ++ ); + } +- /* NB: it can even be trailing ".", should only add 1 */ +- dot += 1; ++ list = list->link; + } + } +diff --git a/archival/tar.c b/archival/tar.c +index 9ed3821d5..415ebde0d 100644 +--- a/archival/tar.c ++++ b/archival/tar.c +@@ -1244,6 +1244,8 @@ int tar_main(int argc UNUSED_PARAM, char **argv) + while (get_header_tar(tar_handle) == EXIT_SUCCESS) + bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */ + ++ create_symlinks_from_list(tar_handle->symlink_placeholders); ++ + /* Check that every file that should have been extracted was */ + while (tar_handle->accept) { + if (!find_list_entry(tar_handle->reject, tar_handle->accept->data) +diff --git a/archival/unzip.c b/archival/unzip.c +index da4b2a544..0d00d8dc9 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -345,7 +345,9 @@ static void unzip_create_leading_dirs(const char *fn) + } + + #if ENABLE_FEATURE_UNZIP_CDF +-static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) ++static void unzip_extract_symlink(llist_t **symlink_placeholders, ++ zip_header_t *zip, ++ const char *dst_fn) + { + char *target; + +@@ -370,15 +372,9 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) + target[xstate.mem_output_size] = '\0'; + #endif + } +- if (!unsafe_symlink_target(target)) { +-//TODO: libbb candidate +- if (symlink(target, dst_fn)) { +- /* shared message */ +- bb_perror_msg_and_die("can't create %slink '%s' to '%s'", +- "sym", dst_fn, target +- ); +- } +- } ++ create_or_remember_symlink(symlink_placeholders, ++ target, ++ dst_fn); + free(target); + } + #endif +@@ -490,6 +486,9 @@ int unzip_main(int argc, char **argv) + llist_t *zaccept = NULL; + llist_t *zreject = NULL; + char *base_dir = NULL; ++#if ENABLE_FEATURE_UNZIP_CDF ++ llist_t *symlink_placeholders = NULL; ++#endif + int i; + char key_buf[80]; /* must match size used by my_fgets80 */ + +@@ -954,7 +953,7 @@ int unzip_main(int argc, char **argv) + #if ENABLE_FEATURE_UNZIP_CDF + if (S_ISLNK(file_mode)) { + if (dst_fd != STDOUT_FILENO) /* not -p? */ +- unzip_extract_symlink(&zip, dst_fn); ++ unzip_extract_symlink(&symlink_placeholders, &zip, dst_fn); + } else + #endif + { +@@ -990,6 +989,10 @@ int unzip_main(int argc, char **argv) + total_entries++; + } + ++#if ENABLE_FEATURE_UNZIP_CDF ++ create_symlinks_from_list(symlink_placeholders); ++#endif ++ + if ((opts & OPT_l) && quiet <= 1) { + if (!verbose) { + // " Length Date Time Name\n" +diff --git a/include/bb_archive.h b/include/bb_archive.h +index 8ed20d70e..a5c61e95b 100644 +--- a/include/bb_archive.h ++++ b/include/bb_archive.h +@@ -64,6 +64,9 @@ typedef struct archive_handle_t { + /* Currently processed file's header */ + file_header_t *file_header; + ++ /* List of symlink placeholders */ ++ llist_t *symlink_placeholders; ++ + /* Process the header component, e.g. tar -t */ + void FAST_FUNC (*action_header)(const file_header_t *); + +@@ -119,15 +122,14 @@ typedef struct archive_handle_t { + #define ARCHIVE_RESTORE_DATE (1 << 0) + #define ARCHIVE_CREATE_LEADING_DIRS (1 << 1) + #define ARCHIVE_UNLINK_OLD (1 << 2) +-#define ARCHIVE_EXTRACT_QUIET (1 << 3) +-#define ARCHIVE_EXTRACT_NEWER (1 << 4) +-#define ARCHIVE_DONT_RESTORE_OWNER (1 << 5) +-#define ARCHIVE_DONT_RESTORE_PERM (1 << 6) +-#define ARCHIVE_NUMERIC_OWNER (1 << 7) +-#define ARCHIVE_O_TRUNC (1 << 8) +-#define ARCHIVE_REMEMBER_NAMES (1 << 9) ++#define ARCHIVE_EXTRACT_NEWER (1 << 3) ++#define ARCHIVE_DONT_RESTORE_OWNER (1 << 4) ++#define ARCHIVE_DONT_RESTORE_PERM (1 << 5) ++#define ARCHIVE_NUMERIC_OWNER (1 << 6) ++#define ARCHIVE_O_TRUNC (1 << 7) ++#define ARCHIVE_REMEMBER_NAMES (1 << 8) + #if ENABLE_RPM +-#define ARCHIVE_REPLACE_VIA_RENAME (1 << 10) ++#define ARCHIVE_REPLACE_VIA_RENAME (1 << 9) + #endif + + +@@ -197,7 +199,10 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC; + void seek_by_read(int fd, off_t amount) FAST_FUNC; + + const char *strip_unsafe_prefix(const char *str) FAST_FUNC; +-int unsafe_symlink_target(const char *target) FAST_FUNC; ++void create_or_remember_symlink(llist_t **symlink_placeholders, ++ const char *target, ++ const char *linkname) FAST_FUNC; ++void create_symlinks_from_list(llist_t *list) FAST_FUNC; + + void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; + const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; +diff --git a/testsuite/tar.tests b/testsuite/tar.tests +index b7cd74ca5..1675b07b1 100755 +--- a/testsuite/tar.tests ++++ b/testsuite/tar.tests +@@ -279,7 +279,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 + testing "tar does not extract into symlinks" "\ + >>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$? + " "\ +-tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract ++tar: can't create symlink 'passwd' to '/tmp/passwd' + 0 + " \ + "" "\ +@@ -299,7 +299,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 + testing "tar -k does not extract into symlinks" "\ + >>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$? + " "\ +-tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract ++tar: can't create symlink 'passwd' to '/tmp/passwd' + 0 + " \ + "" "\ +@@ -324,11 +324,11 @@ rm -rf etc usr + ' "\ + etc/ssl/certs/3b2716e5.0 + etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem +-tar: skipping unsafe symlink to '/usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract + etc/ssl/certs/f80cc7f6.0 + usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt + 0 + etc/ssl/certs/3b2716e5.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem ++etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem -> /usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt + etc/ssl/certs/f80cc7f6.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem + " \ + "" "" +@@ -346,9 +346,9 @@ ls symlink/bb_test_evilfile + ' "\ + anything.txt + symlink +-tar: skipping unsafe symlink to '/tmp' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract + symlink/bb_test_evilfile +-0 ++tar: can't create symlink 'symlink' to '/tmp' ++1 + ls: /tmp/bb_test_evilfile: No such file or directory + ls: bb_test_evilfile: No such file or directory + symlink/bb_test_evilfile +-- +2.16.2 + From bf3476e5b1527ac91c0a12949be7da5253ea66c1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Mar 2018 20:06:19 +0200 Subject: [PATCH 0256/2640] libcurl: security bump to version 7.59.0 CVE-2018-1000120: curl could be fooled into writing a zero byte out of bounds when curl is told to work on an FTP URL with the setting to only issue a single CWD command, if the directory part of the URL contains a "%00" sequence. https://curl.haxx.se/docs/adv_2018-9cd6.html CVE-2018-1000121: curl might dereference a near-NULL address when getting an LDAP URL. https://curl.haxx.se/docs/adv_2018-97a2.html CVE-2018-1000122: When asked to transfer an RTSP URL, curl could calculate a wrong data length to copy from the read buffer. https://curl.haxx.se/docs/adv_2018-b047.html Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index b1afe1891d..aec61e3f83 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.58.0.tar.xz.asc -sha256 6a813875243609eb75f37fa72044e4ad618b55ec15a4eafdac2df6a7e800e3e3 curl-7.58.0.tar.xz +# https://curl.haxx.se/download/curl-7.59.0.tar.xz.asc +sha256 e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc curl-7.59.0.tar.xz sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 39ed3e4da5..c6289e05f4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.58.0 +LIBCURL_VERSION = 7.59.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b67b65b3bab01f8dc3b06a3af69bdc8537b55ed8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Mar 2018 23:03:47 +0100 Subject: [PATCH 0257/2640] intel-microcode: bump to version 20180312 Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 12e1dfbf8f..999b27299d 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130 microcode-20180108.tgz +sha256 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779 microcode-20180312.tgz sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3 license.txt diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index d6c35b21c7..e3134b6408 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20180108 +INTEL_MICROCODE_VERSION = 20180312 INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz -INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27431/eng +INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27591/eng INTEL_MICROCODE_STRIP_COMPONENTS = 0 INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license.txt From faf31a87f4dc4c03785ee55fb92818bd59cf5dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Mar 2018 22:58:28 +0100 Subject: [PATCH 0258/2640] bluez5_utils: bump to version 5.49 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop musl patch, which is not necessary anymore as netinet vs linux header clash is fixed. Also add hash for the license files. musl build successfully tested with: * armv7-eabihf--musl--stable-2017.05-toolchains-1-1 (GCC 5.4.0, Linux headers 3.10.105, musl 1.1.16) * armv7-eabihf--musl--bleeding-edge-2018.02-1 (GCC 7.3.0, Linux headers 4.9.80, musl 1.1.18) Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- ...-Remove-include-linux-if_bridge.h-to.patch | 45 ------------------- package/bluez5_utils/bluez5_utils.hash | 4 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch diff --git a/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch b/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch deleted file mode 100644 index e8a3ff47bf..0000000000 --- a/package/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7c136b4f1941e5bb2a6c8d93985c5734c6aefb29 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 22 May 2016 09:48:57 +0200 -Subject: [PATCH 1/1] tools/bneptest.c: Remove include linux/if_bridge.h to fix - musl build - -Inspired by busybox commit: -https://git.busybox.net/busybox/commit/networking/brctl.c?id=5fa6d1a632505789409a2ba6cf8e112529f9db18 - -The build error was found by the autobuilders of the buildroot project: -http://autobuild.buildroot.net/results/eba/ebaa0bcb9c325aa6ed0bbd6c7ec75d44befa7645/build-end.log - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: - http://article.gmane.org/gmane.linux.bluez.kernel/67621) ---- - tools/bneptest.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/tools/bneptest.c b/tools/bneptest.c -index 1404252..b832d72 100644 ---- a/tools/bneptest.c -+++ b/tools/bneptest.c -@@ -36,7 +36,17 @@ - #include - #include - #include --#include -+/* #include -+ * breaks on musl: we already included netinet/in.h, -+ * if we also include here, we get this: -+ * In file included from /usr/include/linux/if_bridge.h:18, -+ * from networking/brctl.c:67: -+ * /usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr' -+ * /usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6' -+ * /usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq' -+ */ -+/* From */ -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 - - #include - --- -2.8.1 - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index dc331b5a0d..8d142b755c 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90 bluez-5.48.tar.xz +sha256 33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95 bluez-5.49.tar.xz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 395340a3e6..e1c67bd622 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ5_UTILS_VERSION = 5.48 +BLUEZ5_UTILS_VERSION = 5.49 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From 710976e7481b6d9ef450655c70523c2d6163b55a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 15 Mar 2018 08:55:35 -0400 Subject: [PATCH 0259/2640] libwebsockets: bump to v2.4.2 Also add hash for license. Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/libwebsockets/libwebsockets.hash | 3 ++- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 490139746f..ea7c8ca6ba 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2 libwebsockets-v2.2.1.tar.gz +sha256 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6 libwebsockets-v2.4.2.tar.gz +sha256 078fbbbeab357fc6d4f8090e95e9022fa4cb9eac1efd77b2f1387e9ccc51917a LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index b29a2f14c7..28fd183393 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v2.2.1 +LIBWEBSOCKETS_VERSION = v2.4.2 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From 2f55ca3a952c33267b6b13340b30da0ae4555eaa Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 16 Mar 2018 11:57:05 -0300 Subject: [PATCH 0260/2640] linux: bump default to version 4.15.10 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 02c39b3e89..75dd1c1555 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 81c28e83ce2364512ef8741dc3a8dd39fe0f3fa9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 16 Mar 2018 11:57:06 -0300 Subject: [PATCH 0261/2640] linux-headers: bump 4.{14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1560df031b..fd82049fe9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -248,6 +248,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.26" if BR2_KERNEL_HEADERS_4_14 - default "4.15.9" if BR2_KERNEL_HEADERS_4_15 + default "4.14.27" if BR2_KERNEL_HEADERS_4_14 + default "4.15.10" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 4d3448b09929a12706f763de9a056d0fbceb4663 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Mar 2018 08:31:20 +0200 Subject: [PATCH 0262/2640] xfsprogs: fix build with musl Add two patches to fix missing header files that trigger build failure with musl libc. Fixes: http://autobuild.buildroot.net/results/a39/a3989394aba0bd3a52146e2a5e6b87b586efb6c6/ http://autobuild.buildroot.net/results/b3b/b3b3c06ea565125bf9f9ad2ebc16bb21f6c7228f/ http://autobuild.buildroot.net/results/223/2238475d2c21c65960a56f86a08fe35d1021080f/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...orkqueue-add-missing-pthreads-header.patch | 41 +++++++++++++++++++ ...4-xfs_scrub-add-missing-paths-header.patch | 37 +++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch create mode 100644 package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch diff --git a/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch b/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch new file mode 100644 index 0000000000..e19261f033 --- /dev/null +++ b/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch @@ -0,0 +1,41 @@ +From c05fc32d43b3870b63539c57428e1c52e3e7c3cd Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 16 Mar 2018 07:14:56 +0200 +Subject: [PATCH] workqueue: add missing pthreads header + +Fix the following build failure with musl libc: + +In file included from read_verify.c:25:0: +../include/workqueue.h:39:2: error: unknown type name 'pthread_t' + pthread_t *threads; + ^~~~~~~~~ +../include/workqueue.h:42:2: error: unknown type name 'pthread_mutex_t' + pthread_mutex_t lock; + ^~~~~~~~~~~~~~~ +../include/workqueue.h:43:2: error: unknown type name 'pthread_cond_t' + pthread_cond_t wakeup; + ^~~~~~~~~~~~~~ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://marc.info/?l=linux-xfs&m=152117771313565&w=2 + + include/workqueue.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/workqueue.h b/include/workqueue.h +index b4b3541701df..edb2f8ac5991 100644 +--- a/include/workqueue.h ++++ b/include/workqueue.h +@@ -22,6 +22,8 @@ + #ifndef _WORKQUEUE_H_ + #define _WORKQUEUE_H_ + ++#include ++ + struct workqueue; + + typedef void workqueue_func_t(struct workqueue *wq, uint32_t index, void *arg); +-- +2.16.2 + diff --git a/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch b/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch new file mode 100644 index 0000000000..7695cf35a7 --- /dev/null +++ b/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch @@ -0,0 +1,37 @@ +From 27747dcbfbde8a767b1a873716fce1d3aaf17c2f Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 16 Mar 2018 07:16:19 +0200 +Subject: [PATCH] xfs_scrub: add missing paths header +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following build failure with musl libc: + +xfs_scrub.c: In function ‘main’: +xfs_scrub.c:670:11: error: ‘_PATH_MOUNTED’ undeclared (first use in this function) + mtab = _PATH_MOUNTED; + ^~~~~~~~~~~~~ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://marc.info/?l=linux-xfs&m=152117771313566&w=2 + + scrub/xfs_scrub.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c +index ab26e6335948..eedbe34ec7b3 100644 +--- a/scrub/xfs_scrub.c ++++ b/scrub/xfs_scrub.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.16.2 + From 66a978d15eb9cf013d88ec298cdab7bd13eb661d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 17 Mar 2018 08:06:29 +0100 Subject: [PATCH 0263/2640] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot versions Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_mali_defconfig | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 509b050296..64618c5e6d 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.26" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 6c926b5dae..b124bd93cb 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.26" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index d240e79e03..d076581ede 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -41,7 +41,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From e5607fc4dd1f63da09bbe09e6cf51ce5c585fd7b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:07 +0100 Subject: [PATCH 0264/2640] package/efl: bump to 1.20.7 See https://www.enlightenment.org/news/efl-1.20.7 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 5507bda3ef..1391d1f707 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256 -sha256 56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1 efl-1.20.6.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz.sha256 +sha256 b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe efl-1.20.7.tar.xz sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING sha256 781ee841d15835b393bfe7d4c6497dc1b05217479abd40daceaf7aa102a758e1 licenses/COPYING.BSD diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 7085796756..6ef7d53385 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.20.6 +EFL_VERSION = 1.20.7 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT From b582d137a121a456635d29735a27a0144a18b75e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:08 +0100 Subject: [PATCH 0265/2640] package/enlightenment: fix meson warning --disable-rpath was added by m4/lib-link.m4 with autotools based buildsystem. Now we use meson, we don't have such option anymore. The autotools eet-eet and eldbus_codegen options are named respectively eet and eldbus-codegen with meson. Fixes: WARNING: Unknown command line options: "eet-eet, eldbus_codegen, rpath" Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 17309619ad..0d87119bb3 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -22,10 +22,9 @@ ENLIGHTENMENT_MESON_OPTS += \ --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ - -Deet-eet=$(HOST_DIR)/bin/eet \ - -Deldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \ - -Dpam=false \ - -Drpath=false + -Deet=$(HOST_DIR)/bin/eet \ + -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ + -Dpam=false ifeq ($(BR2_PACKAGE_SYSTEMD),y) ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true From 13796a1c0a0734683e66815db055b664c368ec30 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:09 +0100 Subject: [PATCH 0266/2640] package/enlightenment: bump to 0.22.2 See https://www.enlightenment.org/news/e0.22.2_release Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 10e8facf35..686d0ef3be 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,3 +1,3 @@ -# From https://www.enlightenment.org/news/e0.22.1_release -sha256 207b6b88dafc4932ab007a835510823c5a1dd8c191876ac037628176ca77a7e0 enlightenment-0.22.1.tar.xz +# From https://www.enlightenment.org/news/e0.22.2_release +sha256 4d581ef85246f0cba003427bb9b3758e3de137babea1cdd2affd70a2cbe1632c enlightenment-0.22.2.tar.xz sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 0d87119bb3..6ee983db76 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.22.1 +ENLIGHTENMENT_VERSION = 0.22.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause From 438041c365fceef7d598f97c27ef94716e146af4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:10 +0100 Subject: [PATCH 0267/2640] package/x11r7/xkeyboard-config: install to staging enlightenment doesn't detect xkeyboard-config since it's missing from staging. Fixes: Dependency xkeyboard-config found: NO Signed-off-by: Romain Naour Cc: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index d9998aa489..9a8838dde1 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -10,6 +10,9 @@ XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-conf XKEYBOARD_CONFIG_LICENSE = MIT XKEYBOARD_CONFIG_LICENSE_FILES = COPYING +# xkeyboard-config.pc +XKEYBOARD_CONFIG_INSTALL_STAGING = YES + XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp From 47c7a8c2b3f20b76b4a8937d31419f40ed6a60df Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:11 +0100 Subject: [PATCH 0268/2640] package/enlightenment: add xkeyboard-config optional dependency The meson build systemd is checking for xkeyboard-config optional dependency but there is no option to handle it. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 6ee983db76..ae68888aac 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -41,6 +41,10 @@ else ENLIGHTENMENT_MESON_OPTS += -Dmixer=false endif +ifeq ($(BR2_PACKAGE_XKEYBOARD_CONFIG),y) +ENLIGHTENMENT_DEPENDENCIES += xkeyboard-config +endif + define ENLIGHTENMENT_CONFIGURE_CMDS rm -rf $(@D)/build mkdir -p $(@D)/build From b71a4e2067996beb102aaef6af6f14356c95be8f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:12 +0100 Subject: [PATCH 0269/2640] package/enlightenment: install to staging enlightenment provide enlightenment.pc and some shared libraries. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index ae68888aac..ba6b54143e 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -26,6 +26,9 @@ ENLIGHTENMENT_MESON_OPTS += \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ -Dpam=false +# enlightenment.pc and /usr/lib/enlightenment/modules/*.so +ENLIGHTENMENT_INSTALL_STAGING = YES + ifeq ($(BR2_PACKAGE_SYSTEMD),y) ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true ENLIGHTENMENT_DEPENDENCIES += systemd From eca03d677448000f9c5387e8359c116508e03f79 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Mar 2018 22:35:29 +0100 Subject: [PATCH 0270/2640] libvorbis: security bump to version 1.3.6 Fixes CVE-2018-5146: Prevent out-of-bounds write in codebook decoding. Drop 0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch and 0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch as they are now upstream, and add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard --- ...on-t-allow-for-more-than-256-channel.patch | 36 ------------ ...orbis_analysis_header_out-Don-t-clea.patch | 56 ------------------- package/libvorbis/libvorbis.hash | 4 +- package/libvorbis/libvorbis.mk | 2 +- 4 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch delete mode 100644 package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch diff --git a/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch b/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch deleted file mode 100644 index 416aa66ddf..0000000000 --- a/package/libvorbis/0001-CVE-2017-14633-Don-t-allow-for-more-than-256-channel.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a79ec216cd119069c68b8f3542c6a425a74ab993 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Tue, 31 Oct 2017 18:32:46 +0100 -Subject: [PATCH] CVE-2017-14633: Don't allow for more than 256 channels - -Otherwise - - for(i=0;ichannels;i++){ - /* the encoder setup assumes that all the modes used by any - specific bitrate tweaking use the same floor */ - int submap=info->chmuxlist[i]; - -overreads later in mapping0_forward since chmuxlist is a fixed array of -256 elements max. - -Signed-off-by: Peter Korsgaard ---- - lib/info.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/info.c b/lib/info.c -index fe759ed..7bc4ea4 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -588,7 +588,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, - oggpack_buffer opb; - private_state *b=v->backend_state; - -- if(!b||vi->channels<=0){ -+ if(!b||vi->channels<=0||vi->channels>256){ - ret=OV_EFAULT; - goto err_out; - } --- -2.11.0 - diff --git a/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch b/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch deleted file mode 100644 index ffb4cc92f2..0000000000 --- a/package/libvorbis/0002-CVE-2017-14632-vorbis_analysis_header_out-Don-t-clea.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c1c2831fc7306d5fbd7bc800324efd12b28d327f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Wed, 15 Nov 2017 18:22:59 +0100 -Subject: [PATCH] CVE-2017-14632: vorbis_analysis_header_out: Don't clear opb - if not initialized - -If the number of channels is not within the allowed range -we call oggback_writeclear altough it's not initialized yet. - -This fixes - - =23371== Invalid free() / delete / delete[] / realloc() - ==23371== at 0x4C2CE1B: free (vg_replace_malloc.c:530) - ==23371== by 0x829CA31: oggpack_writeclear (in /usr/lib/x86_64-linux-gnu/libogg.so.0.8.2) - ==23371== by 0x84B96EE: vorbis_analysis_headerout (info.c:652) - ==23371== by 0x9FBCBCC: ??? (in /usr/lib/x86_64-linux-gnu/sox/libsox_fmt_vorbis.so) - ==23371== by 0x4E524F1: ??? (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x4E52CCA: sox_open_write (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x10D82A: open_output_file (sox.c:1556) - ==23371== by 0x10D82A: process (sox.c:1753) - ==23371== by 0x10D82A: main (sox.c:3012) - ==23371== Address 0x68768c8 is 488 bytes inside a block of size 880 alloc'd - ==23371== at 0x4C2BB1F: malloc (vg_replace_malloc.c:298) - ==23371== by 0x4C2DE9F: realloc (vg_replace_malloc.c:785) - ==23371== by 0x4E545C2: lsx_realloc (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x9FBC9A0: ??? (in /usr/lib/x86_64-linux-gnu/sox/libsox_fmt_vorbis.so) - ==23371== by 0x4E524F1: ??? (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x4E52CCA: sox_open_write (in /usr/lib/x86_64-linux-gnu/libsox.so.2.0.1) - ==23371== by 0x10D82A: open_output_file (sox.c:1556) - ==23371== by 0x10D82A: process (sox.c:1753) - ==23371== by 0x10D82A: main (sox.c:3012) - -as seen when using the testcase from CVE-2017-11333 with -008d23b782be09c8d75ba8190b1794abd66c7121 applied. However the error was -there before. - -Signed-off-by: Peter Korsgaard ---- - lib/info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/info.c b/lib/info.c -index 7bc4ea4..8d0b2ed 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -589,6 +589,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, - private_state *b=v->backend_state; - - if(!b||vi->channels<=0||vi->channels>256){ -+ b = NULL; - ret=OV_EFAULT; - goto err_out; - } --- -2.11.0 - diff --git a/package/libvorbis/libvorbis.hash b/package/libvorbis/libvorbis.hash index e990f4d74f..15bd01f22a 100644 --- a/package/libvorbis/libvorbis.hash +++ b/package/libvorbis/libvorbis.hash @@ -1,2 +1,4 @@ # From http://www.xiph.org/downloads/ -sha256 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 libvorbis-1.3.5.tar.xz +sha256 af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 libvorbis-1.3.6.tar.xz +# License files, locally calculated +sha256 29e9914e6173b7061b7d48c25e6159fc1438326738bc047cc7248abc01b271f6 COPYING diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk index 98ec97bfd6..ae2c1efffe 100644 --- a/package/libvorbis/libvorbis.mk +++ b/package/libvorbis/libvorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVORBIS_VERSION = 1.3.5 +LIBVORBIS_VERSION = 1.3.6 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis LIBVORBIS_INSTALL_STAGING = YES From 7fb6e782542fc440c2da226ec4525236d0508b77 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 15 Mar 2018 21:35:08 +0100 Subject: [PATCH 0271/2640] core/instrumentation: shave minutes off the build time As part of the build, we run some instrumentation hooks to gather statistics about the usage of the target/, staging/ and host/ directories, so that we can generate reports for the user, that shows: - for each file, what package installed it, - for each package,the size that it installed. In so doing, we run a double md5 pass on all files of the affected directories (before/after installation). These passes were mostly invisible when we were only scanning target/, but has greatly increased in time now that we also scan staging/ and host/ (but only in the corresponding _CMDS, of course). This md5 was mostly aimed at catching packages that would "cheat" with mtime/atime/ctime somehow. They can't really cheat on md5, though [0]. Timings however speak for themselves, with this defconfig (slightly biggish-but-still-manageable build) [1]. host/ 20965 files 1.2GiB staging/ 4715 files 333MiB target/ 1801 files 44MiB All instrumentation steps, using md5: 19min 27s All instrumentation steps, using mtime: 14min 45s No instrumentation step at all: 14min 31s So, using mtime is an almost-5min improvement, i.e. about 25% faster, while removing all instrumentation steps does not gain that much more... So, we switch to using mtime, because in the end that's still good-enough for our use-case: generating some graphs. It is not mission-critical, and if a graph is slightly off, that's not a biggy. It can anyway be attributed to a broken package's buildsystem, which should get fixed. However, we lose the ability to track directories. Non-empty directories can be tracked back by a bit of scripting, but empty directories are simply not caught. If we were to also look for directories using mtime, we would catch parents of installed files: - /foo/bar/ exists - a package installs /foo/bar/buz - mtime of /foo/bar/ is changed to account for the new file in it. So we do not track directories at all, and we lose empty directories. The existing tracking was mostly happenstance, with the original submission and comments not really accounting for a real use-case. Now, we also change the way we handle symlinks. Previously, we would hash the file pointed to by the symlink. Now, we only look at the mtime of the symlink itself, which still detects modifications. Eventually, this also means that we now no longer need to establish a list before the install step; we can now simply run after the install step, finding any files newer than the build stamp. [0] Yeah, md5 is very weak, but we're not guarding against malicious attacks, just about careless modifications. [1] defconfig used for tests: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_SYSTEMD=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OSMESA=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y BR2_PACKAGE_SYSTEMD_BACKLIGHT=y BR2_PACKAGE_SYSTEMD_BINFMT=y BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y BR2_PACKAGE_SYSTEMD_HIBERNATE=y BR2_PACKAGE_SYSTEMD_IMPORTD=y BR2_PACKAGE_SYSTEMD_LOCALED=y BR2_PACKAGE_SYSTEMD_LOGIND=y BR2_PACKAGE_SYSTEMD_MACHINED=y BR2_PACKAGE_SYSTEMD_POLKIT=y BR2_PACKAGE_SYSTEMD_QUOTACHECK=y BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_SYSTEMD_RFKILL=y BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y BR2_PACKAGE_SYSTEMD_SYSUSERS=y BR2_PACKAGE_SYSTEMD_VCONSOLE=y [Peter: tweak commit message, use find -type l] Reported-by: Trent Piepho Signed-off-by: "Yann E. MORIN" Cc: Trent Piepho Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 47 +++++++++--------------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 9eddaeee57..5edb4b0838 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -57,53 +57,26 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # Hooks to collect statistics about installed files -define _step_pkg_size_get_file_list - (cd $(2) ; \ - ( \ - find . -xtype f -print0 | xargs -0 md5sum ; \ - find . -xtype d -print0 | xargs -0 -I{} printf 'directory {}\n'; \ - ) \ - ) | sort > $1 -endef - -# This hook will be called before the installation of a package. We store in -# a file named .br_filelist_before the list of files currently installed. -# Note that the MD5 is also stored, in order to identify if the files are -# overwritten. -# $(1): package name (ignored) -# $(2): base directory to search in -define step_pkg_size_start - $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_before,$(2)) -endef - -# This hook will be called after the installation of a package. We store in -# a file named .br_filelist_after the list of files (and their MD5) currently -# installed. We then do a diff with the .br_filelist_before to compute the -# list of files installed by this package. # The suffix is typically empty for the target variant, for legacy backward # compatibility. -# $(1): package name (ignored) +# $(1): package name # $(2): base directory to search in # $(3): suffix of file (optional) -define step_pkg_size_end - $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_after,$(2)) - comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \ - while read hash file ; do \ - echo "$(1),$${file}" ; \ - done >> $(BUILD_DIR)/packages-file-list$(3).txt - rm -f $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after +define step_pkg_size_inner + cd $(2); \ + find . \( -type f -o -type l \) \ + -newer $($(PKG)_DIR)/.stamp_built \ + -exec printf '$(1),%s\n' {} + \ + >> $(BUILD_DIR)/packages-file-list$(3).txt endef define step_pkg_size $(if $(filter install-target,$(2)),\ - $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(TARGET_DIR))) \ - $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(TARGET_DIR)))) + $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(TARGET_DIR)))) $(if $(filter install-staging,$(2)),\ - $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(STAGING_DIR),-staging)) \ - $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(STAGING_DIR),-staging))) + $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging))) $(if $(filter install-host,$(2)),\ - $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(HOST_DIR),-host)) \ - $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(HOST_DIR),-host))) + $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host))) endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size From 157231405d219e484aa3829acff23569f6a60d00 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 17 Mar 2018 23:11:06 +0200 Subject: [PATCH 0272/2640] make: fix build with glibc 2.27 glibc 2.27 changed _GNU_GLOB_INTERFACE_VERSION to 2. This triggers build of the internal glob implementation in make. This internal implementation needs the __alloca symbol that glibc does not define. Add upstream patch that adds support for _GNU_GLOB_INTERFACE_VERSION 2. Add host-pkgconf dependency for the PKG_CHECK_MODULES macro. This macro is only used for guile, which we currently disable unconditionally. So host-pkgconf is only needed now so that autoreconf generates a valid configure script. Fixes: http://autobuild.buildroot.net/results/8ff/8ff06ad8438cfcac85577b24675dd1d66f7d3d03/ http://autobuild.buildroot.net/results/5cc/5ccee6bb332e800e81052a3094746edde83403b1/ http://autobuild.buildroot.net/results/841/8418f5ed56dacd6900946e7d56ad36ad03c7bf7e/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...pport-GLIBC-glob-interface-version-2.patch | 31 +++++++++++++++++++ package/make/make.mk | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch diff --git a/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch new file mode 100644 index 0000000000..62e67f850a --- /dev/null +++ b/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch @@ -0,0 +1,31 @@ +From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sun, 19 Nov 2017 15:09:16 -0500 +Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2 + +Signed-off-by: Baruch Siach +--- +Upstream status: commit 48c8a116a914a3 + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8c72568cf276..4710832ae568 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], +-- +2.16.2 + diff --git a/package/make/make.mk b/package/make/make.mk index 5717628fa3..01cd2eaa18 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -7,9 +7,11 @@ MAKE_VERSION = 4.2.1 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2 MAKE_SITE = $(BR2_GNU_MIRROR)/make -MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf MAKE_LICENSE = GPL-3.0+ MAKE_LICENSE_FILES = COPYING +# Patching configure.ac +MAKE_AUTORECONF = YES MAKE_CONF_OPTS = --without-guile From 03a82765b1238bc57ce39f164c2de8c471b91f33 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 15 Mar 2018 09:55:58 -0300 Subject: [PATCH 0273/2640] tmp2-tss: remove architecture restriction Followingig a suggestion from Peter Korsgaard, remove the restriction to x86 and x86_64. It is preferable to expose the package unless there is a build time dependency on an architecture or the package is specific to a certain SoC or board. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 1eb69d3e93..ebf0fd262d 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" - depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_LIBURIPARSER help OSS implementation of the Trusted Computing Group's (TCG) TPM2 From 832e83f9f484d25b4b6ff1aa39ddada9d2adff5d Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 15 Mar 2018 09:55:59 -0300 Subject: [PATCH 0274/2640] tmp2-tss: bump to version 1.4.0 Improved compliance to the last public review spec and some bug fixes. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index df1c6d8b58..67c5a85842 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c7d627de50394e9a02593edb1ce74e1bbac17831be726c54f689507f0c41a78a tpm2-tss-1.3.0.tar.gz +sha256 cf8784cc536be16e6fba47f77033e093a6aeaed8420877ac9f42f77fb7b09031 tpm2-tss-1.4.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 709602860f..f5169a2770 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 1.3.0 +TPM2_TSS_VERSION = 1.4.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE From dab335d901be0b26a1e8ea4e0c3343352d442e35 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 15 Mar 2018 09:56:00 -0300 Subject: [PATCH 0275/2640] tpm2-abrmd: new package This is a system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG. The daemon (tpm2-abrmd) is implemented using Glib and the GObject system. Communication between the daemon and clients using the TPM is done with a combination of DBus and Unix pipes. DBus is used for discovery, session management and the 'cancel', 'setLocality', and 'getPollHandles' API calls (mostly these aren't yet implemented). Pipes are used to send and receive TPM commands and responses (respectively) between client and server. The daemon owns the com.intel.tss2.Tabrmd name on dbus. It can be configured to connect to either the system or the session bus. The package also provides a client library for interacting with the daemon via TPM Command Transmission Interface (TCTI). It is intended for use with the SAPI library (libsapi) like any other TCTI. [Peter: drop add default DAEMON_ARGS to init script, drop /etc/default file, drop S30devtpmperms and fix permissions in S80tpm2-abrmd] Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/tpm2-abrmd/Config.in | 25 ++++++++++ package/tpm2-abrmd/S80tpm2-abrmd | 78 ++++++++++++++++++++++++++++++ package/tpm2-abrmd/tpm2-abrmd.hash | 3 ++ package/tpm2-abrmd/tpm2-abrmd.mk | 32 ++++++++++++ 5 files changed, 139 insertions(+) create mode 100644 package/tpm2-abrmd/Config.in create mode 100755 package/tpm2-abrmd/S80tpm2-abrmd create mode 100644 package/tpm2-abrmd/tpm2-abrmd.hash create mode 100644 package/tpm2-abrmd/tpm2-abrmd.mk diff --git a/package/Config.in b/package/Config.in index 449ffcc47b..af94c0ad91 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "System tools" source "package/sysvinit/Config.in" source "package/tar/Config.in" source "package/tpm-tools/Config.in" + source "package/tpm2-abrmd/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" source "package/xen/Config.in" diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in new file mode 100644 index 0000000000..31c5ae7d6b --- /dev/null +++ b/package/tpm2-abrmd/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_TPM2_ABRMD + bool "tpm2-abrmd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 + depends on BR2_USE_MMU # dbus, libglib2 + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_TPM2_TSS + help + A system daemon implementing the TPM2 access broker (TAB) & + Resource Manager (RM) spec from the TCG. It should be started + during the OS boot process. Communication between the daemon + and clients using the TPM is done with a combination of DBus + and Unix pipes. + + The package also provides a client library for interacting + with the daemon via TPM Command Transmission Interface (TCTI). + It is intended for use with the SAPI library (libsapi) like + any other TCTI. + + https://github.com/tpm2-software/tpm2-abrmd + +comment "tpm2-abrmd needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/tpm2-abrmd/S80tpm2-abrmd b/package/tpm2-abrmd/S80tpm2-abrmd new file mode 100755 index 0000000000..3db5e6fa1d --- /dev/null +++ b/package/tpm2-abrmd/S80tpm2-abrmd @@ -0,0 +1,78 @@ +#!/bin/sh + +my_name="$0" + +check_required_files() { + [ -x "$1" ] || { + echo "$my_name: $1 is missing" + exit 1 + } + [ -z "$2" ] || [ -f "$2" ] || { + echo "$my_name: $2 is missing" + exit 1 + } +} + +check_device() { + ls -1 /dev/tpm[0-9]* > /dev/null 2>&1 || { + echo "device driver not loaded, skipping." + exit 0 + } + chown tss:tss /dev/tpm[0-9]* && chmod 600 /dev/tpm* +} + +rm_stale_pidfile() { + if [ -e "$1" ]; then + exe="/proc/$(cat "$1")/exe" + { [ -s "$exe" ] && [ "$(readlink -f "$exe")" = "$2" ]; } || rm -f "$1" + fi +} + +start() { + printf "Starting tpm2-abrmd: " + check_device + rm_stale_pidfile /var/run/tpm2-abrmd.pid /usr/sbin/tpm2-abrmd + start-stop-daemon -S -q -o -b -p /var/run/tpm2-abrmd.pid -c tss:tss -x /usr/sbin/tpm2-abrmd -- ${DAEMON_OPTS} || { + echo "FAIL" + exit 1 + } + pidof /usr/sbin/tpm2-abrmd > /var/run/tpm2-abrmd.pid + echo "OK" +} + +stop() { + printf "Stopping tpm2-abrmd: " + start-stop-daemon -K -q -o -p /var/run/tpm2-abrmd.pid -u tss -x /usr/sbin/tpm2-abrmd || { + echo "FAIL" + exit 1 + } + rm_stale_pidfile /var/run/tpm2-abrmd.pid /usr/sbin/tpm2-abrmd + echo "OK" +} + +check_required_files /usr/sbin/tpm2-abrmd /etc/dbus-1/system.d/tpm2-abrmd.conf + +# defaults +DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans" + +# Read configuration variable file if it is present +[ -r /etc/default/tpm2-abrmd ] && . /etc/default/tpm2-abrmd + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + sleep 1 + start + ;; + *) + echo "Usage: tpm2-abrmd {start|stop|restart|reload}" >&2 + exit 1 +esac + +exit 0 diff --git a/package/tpm2-abrmd/tpm2-abrmd.hash b/package/tpm2-abrmd/tpm2-abrmd.hash new file mode 100644 index 0000000000..6af991d469 --- /dev/null +++ b/package/tpm2-abrmd/tpm2-abrmd.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e32e19de93b539374a485d9df7fe9415ce147ec03c8d9ba6593e50f7a67a7a51 tpm2-abrmd-1.3.0.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk new file mode 100644 index 0000000000..0d6a167210 --- /dev/null +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# tpm2-abrmd +# +################################################################################ + +TPM2_ABRMD_VERSION = 1.3.0 +TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) +TPM2_ABRMD_LICENSE = BSD-2-Clause +TPM2_ABRMD_LICENSE_FILES = LICENSE +TPM2_ABRMD_INSTALL_STAGING = YES +TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf + +TPM2_ABRMD_CONF_OPTS += \ + --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \ + --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no) + +define TPM2_ABRMD_INSTALL_INIT_SYSTEMD + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \ + install-systemdpresetDATA install-systemdsystemunitDATA +endef + +define TPM2_ABRMD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(TPM2_ABRMD_PKGDIR)/S80tpm2-abrmd \ + $(TARGET_DIR)/etc/init.d/S80tpm2-abrmd +endef + +define TPM2_ABRMD_USERS + tss -1 tss -1 * - - - TPM2 Access Broker & Resource Management daemon +endef + +$(eval $(autotools-package)) From 3a10ff51278b917c85e2f8d74559e035cbd7d55f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 15 Mar 2018 09:56:01 -0300 Subject: [PATCH 0276/2640] tpm2-tools: new package TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, perform encryption/decryption/signing/etc crypto operations, and manage non-volatile storage through a TPM2.0 HW implementation. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + .../0001-Fix-build-with-LibreSSL.patch | 64 +++++++++++++++++++ package/tpm2-tools/Config.in | 16 +++++ package/tpm2-tools/tpm2-tools.hash | 3 + package/tpm2-tools/tpm2-tools.mk | 13 ++++ 5 files changed, 97 insertions(+) create mode 100644 package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch create mode 100644 package/tpm2-tools/Config.in create mode 100644 package/tpm2-tools/tpm2-tools.hash create mode 100644 package/tpm2-tools/tpm2-tools.mk diff --git a/package/Config.in b/package/Config.in index af94c0ad91..58dfd6306d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2013,6 +2013,7 @@ menu "System tools" source "package/tar/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" + source "package/tpm2-tools/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" source "package/xen/Config.in" diff --git a/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch b/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch new file mode 100644 index 0000000000..0fdd2dc4dd --- /dev/null +++ b/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch @@ -0,0 +1,64 @@ +From 7f8d9359dcf9edbb13bb447f70234397afa4fb05 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Tue, 30 Jan 2018 11:21:14 -0200 +Subject: [PATCH] Fix build with LibreSSL + +OPENSSL_VERSION_NUMBER is used to test the version of OpenSSL but this +test alone breaks the build with LibreSSL due to implicit declarations +of functions 'RSA_set0_key' and 'HMAC_CTX_free'. + +Test if OpenSSL < 1.1.0 or LIBRESSL_VERSION_NUMBER is defined, instead. + +Signed-off-by: Carlos Santos +--- + lib/conversion.c | 2 +- + lib/tpm_kdfa.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/conversion.c b/lib/conversion.c +index 1d0a0b7..df02de4 100644 +--- a/lib/conversion.c ++++ b/lib/conversion.c +@@ -133,7 +133,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */ ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL 1.1.0 */ + ssl_rsa_key->e = e; + ssl_rsa_key->n = n; + #else +diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c +index ee3cf8a..e43bdeb 100644 +--- a/lib/tpm_kdfa.c ++++ b/lib/tpm_kdfa.c +@@ -54,7 +54,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) { + static HMAC_CTX *hmac_alloc() + { + HMAC_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */ ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL 1.1.0 */ + ctx = malloc(sizeof(*ctx)); + #else + ctx = HMAC_CTX_new(); +@@ -62,7 +62,7 @@ static HMAC_CTX *hmac_alloc() + if (!ctx) + return NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX_init(ctx); + #endif + +@@ -71,7 +71,7 @@ static HMAC_CTX *hmac_alloc() + + static void hmac_del(HMAC_CTX *ctx) + { +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX_cleanup(ctx); + free(ctx); + #else +-- +2.14.3 + diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in new file mode 100644 index 0000000000..6429b24531 --- /dev/null +++ b/package/tpm2-tools/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_TPM2_TOOLS + bool "tpm2-tools" + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_TPM2_ABRMD # run-time + select BR2_PACKAGE_TPM2_TSS + help + TPM (Trusted Platform Module) 2.0 CLI tools based on system + API of TPM2-TSS. These tools can be used to manage keys, + perform encryption/decryption/signing/etc crypto operations, + and manage non-volatile storage through a TPM2.0 HW + implementation. + + https://github.com/tpm2-software/tpm2-tools diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash new file mode 100644 index 0000000000..e33b3e5945 --- /dev/null +++ b/package/tpm2-tools/tpm2-tools.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 c990c0656165afef0fad61e1852a9a189a4b93b43d2a684b151a5dc0b3c6249d tpm2-tools-3.0.3.tar.gz +sha256 3d6b149c8b042bd5f3db678d587fbe55230d071ca084bd38dcae451679c6dd45 LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk new file mode 100644 index 0000000000..0697900d2d --- /dev/null +++ b/package/tpm2-tools/tpm2-tools.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tpm2-tools +# +################################################################################ + +TPM2_TOOLS_VERSION = 3.0.3 +TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) +TPM2_TOOLS_LICENSE = BSD-2-Clause +TPM2_TOOLS_LICENSE_FILES = LICENSE +TPM2_TOOLS_DEPENDENCIES = dbus libcurl libglib2 openssl tpm2-tss host-pkgconf + +$(eval $(autotools-package)) From ad2b4255e255dcc00bc27d66a149cd35f9656fe2 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 15 Mar 2018 09:56:02 -0300 Subject: [PATCH 0277/2640] DEVELOPERS: add myself for tpm2-{abrmd, tools, tss}. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3df820e712..1faefc45fc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -394,6 +394,9 @@ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ F: package/perl-file-util/ F: package/util-linux/ +F: package/tpm2-abrmd/ +F: package/tpm2-tools/ +F: package/tpm2-tss/ N: Carsten Schoenert F: package/dvbsnoop/ From 28a5247aaf78e7eac23230878429875734380235 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Mar 2018 19:48:44 +0100 Subject: [PATCH 0278/2640] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 18.0.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-amdgpu.hash | 10 +++++----- .../xdriver_xf86-video-amdgpu.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index b03a010f84..d0fae63e61 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002844.html -md5 24b2c9dc27a6083289bc86023eb3b1fe xf86-video-amdgpu-18.0.0.tar.bz2 -sha1 360d619de1629913d356c60f1e155553e0e55dbb xf86-video-amdgpu-18.0.0.tar.bz2 -sha256 e909b9707d2562dfc36d8075a8cbddbc93901aaa8f2522d9a429c3fc5ad66d94 xf86-video-amdgpu-18.0.0.tar.bz2 -sha512 5f9fa173c1b2f90878a9cc961e49abb0ad56db16fd80ec9fe6788fcc90eaa1906f3bff74437cb9afa95b9212ff946e1558736739f27e959a3848e77e4dabbd17 xf86-video-amdgpu-18.0.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002883.html +md5 d8368d204cb98d4387c8890562db1143 xf86-video-amdgpu-18.0.1.tar.bz2 +sha1 a9c7125eae9870f26afa5167d5683f8d5e1b43c0 xf86-video-amdgpu-18.0.1.tar.bz2 +sha256 7484682ccb403b3ca9e26d1c980572f08cdfa3469e2b2c9a9affc3d51b52691b xf86-video-amdgpu-18.0.1.tar.bz2 +sha512 eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4 xf86-video-amdgpu-18.0.1.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 2c3986252c..5c1fb3f844 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 18.0.0 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 18.0.1 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT From ba40447fc56e66bc5ba31b7d0be6c99cf8d57d2d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Mar 2018 19:48:45 +0100 Subject: [PATCH 0279/2640] package/x11r7/xdriver_xf86-video-ati: bump version to 18.0.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 10 +++++----- .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index 54c553e6ce..d37096e9e4 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002854.html -md5 4d41bfe860dc719654cad3f82d00f6f3 xf86-video-ati-18.0.0.tar.bz2 -sha1 da1b89a747264d976d824ddc7b5b4f803d3cf765 xf86-video-ati-18.0.0.tar.bz2 -sha256 2c0368fb620d1fdfa2b435e672d65444c2fb9df21bbaf979298484b89ef83981 xf86-video-ati-18.0.0.tar.bz2 -sha512 a9a634091f208099885039d42433cee061e03968417c0d535691833abcc9162d8d0a46f99bac902f0885beb14dcc9a011d104b535ffe492562fd5bb740ad4721 xf86-video-ati-18.0.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002884.html +md5 40e7c0a5a69aba3d84e0958f58705ea7 xf86-video-ati-18.0.1.tar.bz2 +sha1 b5a0b6a2fa839d668a3fb90280fede95f0bc130d xf86-video-ati-18.0.1.tar.bz2 +sha256 72ea3b8127d4550b64f797457f5a7851a541fa4ee2cc3f345b6c1886b81714a0 xf86-video-ati-18.0.1.tar.bz2 +sha512 b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14 xf86-video-ati-18.0.1.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 0e9d412b75..8726695399 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 18.0.0 +XDRIVER_XF86_VIDEO_ATI_VERSION = 18.0.1 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT From 5e2406a4e6b1419f10610137eb6b789ed2584bd1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Mar 2018 21:39:47 +0200 Subject: [PATCH 0280/2640] e2fsprogs: bump to version 1.44.0 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 3def51f95b..812dfbe320 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.9/sha256sums.asc -sha256 926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f e2fsprogs-1.43.9.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.0/sha256sums.asc +sha256 a3567042f03fcee0e01db8f923b24cec92e2ba5b11f8e39e245672ad5392723d e2fsprogs-1.44.0.tar.xz # Locally calculated sha256 680f852df303874fe9c722283a7da571ae9a0477768df8af1e363298e2adc51e NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 99019c7317..e9dff32abc 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.43.9 +E2FSPROGS_VERSION = 1.44.0 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From d98b61c01247e989db3b41a4e28d025c8614863b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Mar 2018 11:04:26 +0100 Subject: [PATCH 0281/2640] package/tor: bump version to 0.3.2.10 Bump to latest stable release, rebased patch 0001. Release notes for 0.3.2.10: https://blog.torproject.org/new-stable-tor-releases-security-fixes-and-dos-prevention-03210-03110-02915 Release notes for the first stable release of the 0.3.2 series, 0.3.2.9: https://blog.torproject.org/tor-0329-released-we-have-new-stable-series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/0001-openssl-libz.patch | 108 ++++++++++++++-------------- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/package/tor/0001-openssl-libz.patch b/package/tor/0001-openssl-libz.patch index 9d3cf6e124..62a9a4a0ec 100644 --- a/package/tor/0001-openssl-libz.patch +++ b/package/tor/0001-openssl-libz.patch @@ -3,7 +3,7 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9 & 0.3.1.7] +[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7 & 0.3.2.10] Signed-off-by: Bernd Kuhls Signed-off-by: Vicente Olivert Riera @@ -11,91 +11,95 @@ Signed-off-by: Vicente Olivert Riera diff -uNr tor-0.3.1.7.org/configure.ac tor-0.3.1.7/configure.ac --- tor-0.3.1.7.org/configure.ac 2017-09-15 15:34:06.000000000 +0200 +++ tor-0.3.1.7/configure.ac 2017-09-19 19:40:17.090538467 +0200 -@@ -709,11 +709,11 @@ - fi +@@ -735,7 +735,7 @@ ]) --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI], -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI], - [#include ], - [void RAND_add(const void *buf, int num, double entropy);], - [RAND_add((void*)0,0,0);], [], -- [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) -+ []) - - dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay() - + AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) +-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32], ++TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32], + [#include ], + [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);], + [TLSv1_1_method();], [], diff -uNr tor-0.3.1.7.org/src/or/include.am tor-0.3.1.7/src/or/include.am --- tor-0.3.1.7.org/src/or/include.am 2017-06-19 17:56:51.000000000 +0200 +++ tor-0.3.1.7/src/or/include.am 2017-09-19 19:41:02.015861546 +0200 -@@ -122,7 +122,7 @@ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ +@@ -135,7 +135,7 @@ src/common/libor-event.a src/trunnel/libor-trunnel.a \ src/trace/libor-trace.a \ + $(rust_ldadd) \ +- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ ++ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ +@@ -149,7 +149,7 @@ + src/common/libor-ctime-testing.a \ + src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ + src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ - @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \ - $(rust_ldadd) + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ + endif diff -uNr tor-0.3.1.7.org/src/test/include.am tor-0.3.1.7/src/test/include.am --- tor-0.3.1.7.org/src/test/include.am 2017-08-29 17:01:19.000000000 +0200 +++ tor-0.3.1.7/src/test/include.am 2017-09-19 19:42:39.103903406 +0200 -@@ -206,8 +206,8 @@ - src/common/libor-event-testing.a \ +@@ -222,8 +222,8 @@ src/trunnel/libor-trunnel-testing.a \ src/trace/libor-trace.a \ + $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ +- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \ - $(rust_ldadd) ++ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ + @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ -@@ -231,8 +231,8 @@ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ +@@ -248,8 +248,8 @@ src/common/libor-event.a src/trunnel/libor-trunnel.a \ src/trace/libor-trace.a \ + $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ +- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \ - $(rust_ldadd) ++ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ + @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ -@@ -244,8 +244,8 @@ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ +@@ -262,8 +262,8 @@ src/common/libor-event-testing.a \ src/trace/libor-trace.a \ + $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ +- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \ - $(rust_ldadd) ++ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ -@@ -256,8 +256,8 @@ - src/common/libor-ctime-testing.a \ +@@ -275,8 +275,8 @@ src/common/libor-event-testing.a \ src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ + $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ +- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_LZMA_LIBS@ \ - $(rust_ldadd) ++ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ + @TOR_LZMA_LIBS@ src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS) -@@ -286,8 +286,8 @@ - src/common/libor-ctime.a \ +@@ -307,8 +307,8 @@ src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ src/trace/libor-trace.a \ + $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ +- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_LZMA_LIBS@ \ - $(rust_ldadd) ++ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -@@ -298,8 +298,8 @@ + -I"$(top_srcdir)/src/or" +@@ -318,8 +318,8 @@ src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-ctime.a \ src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ @@ -109,15 +113,15 @@ diff -uNr tor-0.3.1.7.org/src/test/include.am tor-0.3.1.7/src/test/include.am diff -uNr tor-0.3.1.7.org/src/tools/include.am tor-0.3.1.7/src/tools/include.am --- tor-0.3.1.7.org/src/tools/include.am 2017-06-19 17:56:51.000000000 +0200 +++ tor-0.3.1.7/src/tools/include.am 2017-09-19 19:43:08.880223260 +0200 -@@ -26,7 +26,7 @@ - src/common/libor-ctime.a \ +@@ -27,7 +27,7 @@ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ + $(rust_ldadd) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - $(rust_ldadd) + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ + if COVERAGE_ENABLED @@ -40,7 +40,7 @@ src/common/libor-ctime-testing.a \ $(LIBKECCAK_TINY) \ diff --git a/package/tor/tor.hash b/package/tor/tor.hash index db946eec07..2841d4099a 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c0e1a71e8e079ddd7951f846bcbd79d5e716b602faa5b890c70762fe95cd04e0 tor-0.3.1.10.tar.gz +sha256 60df77c31dcf94fdd686c8ca8c34f3b70243b33a7344ecc0b719d5ca2617cbee tor-0.3.2.10.tar.gz sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index ddf912fe18..4a1a48357f 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.1.10 +TOR_VERSION = 0.3.2.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 181ef8a1d01ddfa2be0b59ea85eb8902b0ce12c0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Mar 2018 15:40:08 +0100 Subject: [PATCH 0282/2640] irssi: security bump to version 1.0.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: Use after free when server is disconnected during netsplits. Incomplete fix of CVE-2017-7191. Found by Joseph Bisch. (CWE-416, CWE-825) - CVE-2018-7054 [2] was assigned to this issue. Use after free when SASL messages are received in unexpected order. Found by Joseph Bisch. (CWE-416, CWE-691) - CVE-2018-7053 [3] was assigned to this issue. Null pointer dereference when an “empty” nick has been observed by Irssi. Found by Joseph Bisch. (CWE-476, CWE-475) - CVE-2018-7050 [4] was assigned to this issue. When the number of windows exceed the available space, Irssi would crash due to Null pointer dereference. Found by Joseph Bisch. (CWE-690) - CVE-2018-7052 [5] was assigned to this issue. Certain nick names could result in out of bounds access when printing theme strings. Found by Oss-Fuzz. (CWE-126) - CVE-2018-7051 [6] was assigned to this issue. Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index 83dde00352..0f298137ba 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 irssi-1.0.6.tar.xz +sha256 1b386ca026aa1875c380fd00ef1d24b71fb87cdae39ef5349ecca16c4567feac irssi-1.0.7.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index d49b5d7e46..611365f88e 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.6 +IRSSI_VERSION = 1.0.7 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. From 50cd46b39f4af495a4c9d15f0e5d3df272e33c7c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Mar 2018 21:14:49 +0100 Subject: [PATCH 0283/2640] linux-headers: bump 4.{4,9}.x series Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fd82049fe9..3b0bf84de1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,8 +242,8 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.99" if BR2_KERNEL_HEADERS_3_2 default "4.1.49" if BR2_KERNEL_HEADERS_4_1 - default "4.4.121" if BR2_KERNEL_HEADERS_4_4 - default "4.9.87" if BR2_KERNEL_HEADERS_4_9 + default "4.4.122" if BR2_KERNEL_HEADERS_4_4 + default "4.9.88" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 From 398747f5fafca8c07e696612d8eded53d4f935c7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 17:59:40 +0200 Subject: [PATCH 0284/2640] glibc: install the obsolete libnsl glibc 2.27 stopped installing libnsl by default. Restore libnsl install to fix packages, like exim, that use that library. Fixes (exim): http://autobuild.buildroot.net/results/a19/a19df43be7d27cf8815e1257122d25aa8285d75b/ http://autobuild.buildroot.net/results/8ec/8ecfc42a81efec8485784f945e231eb40a087b5b/ http://autobuild.buildroot.net/results/054/054eb702a9b8c66454970333ef45a0afccb7cc80/ Cc: Waldemar Brodkorb Signed-off-by: Baruch Siach Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 00e114566c..f724ced857 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -100,6 +100,7 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --without-gd \ --enable-obsolete-rpc \ + --enable-obsolete-nsl \ --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) From 16623babdd045374b97ccbca1fe1d61596cfe3bd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 18 Mar 2018 22:26:44 +0100 Subject: [PATCH 0285/2640] package/htop: open files using binary mode Imlement Arnout's suggestion [1] for MakeHeader script. [1] http://lists.busybox.net/pipermail/buildroot/2018-February/214373.html Fixes: http://autobuild.buildroot.net/results/9ce/9ce2ef5ef694253b9759016c9702c5c6be7849a1 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...eHeader-open-files-using-binary-mode.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/htop/0002-MakeHeader-open-files-using-binary-mode.patch diff --git a/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch b/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch new file mode 100644 index 0000000000..bcc3e6564c --- /dev/null +++ b/package/htop/0002-MakeHeader-open-files-using-binary-mode.patch @@ -0,0 +1,50 @@ +From 1a83a3e6ae0841a0dc4c7eb08a1a71930e99666c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 18 Mar 2018 21:57:54 +0100 +Subject: [PATCH] MakeHeader: open files using binary mode + +By default, open(sys.argv[1]) use Unicode mode. +The readlines() will try to convert with the default codec +(which depends on the i18n settings, so 'ascii' under +LC_ALL=C) + +Open files using binary mode so no conversion will be done +by readlines(). But then, normal strings can't be used in +the rest of the code; either all strings have to be prefixed +with b'' or (simpler) the read line has to be converted to +a unicode string by calling decode() on it. + +http://lists.busybox.net/pipermail/buildroot/2018-February/214373.html + +Fixes: +http://autobuild.buildroot.net/results/9ce/9ce2ef5ef694253b9759016c9702c5c6be7849a1 + +Signed-off-by: Romain Naour +--- + scripts/MakeHeader.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py +index 4841bda..dd0798c 100755 +--- a/scripts/MakeHeader.py ++++ b/scripts/MakeHeader.py +@@ -16,7 +16,7 @@ SKIPONE=4 + state = ANY + static = 0 + +-file = open(sys.argv[1]) ++file = open(sys.argv[1], 'rb') + name = sys.argv[1][:-2] + + out = StringIO() +@@ -31,6 +31,7 @@ out.write( "#define HEADER_" + os.path.basename(name) + "\n") + is_blank = False + for line in file.readlines(): + line = line[:-1] ++ line = line.decode('utf-8') + if state == ANY: + if line == '/*{': + state = COPY +-- +2.14.3 + From ce2875e1cfc7898aaf71cd9f49828fbf8c5134a1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Mar 2018 07:57:29 -0300 Subject: [PATCH 0286/2640] linux: bump default to version 4.15.11 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 75dd1c1555..ce1e121fde 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From cd0fd093523b558cdcf282c1d1497bc2a494f4e0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Mar 2018 07:57:30 -0300 Subject: [PATCH 0287/2640] linux-headers: bump 3.2.x and 4.{1, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3b0bf84de1..a99f0fa137 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -240,14 +240,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.99" if BR2_KERNEL_HEADERS_3_2 - default "4.1.49" if BR2_KERNEL_HEADERS_4_1 + default "3.2.100" if BR2_KERNEL_HEADERS_3_2 + default "4.1.50" if BR2_KERNEL_HEADERS_4_1 default "4.4.122" if BR2_KERNEL_HEADERS_4_4 default "4.9.88" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.27" if BR2_KERNEL_HEADERS_4_14 - default "4.15.10" if BR2_KERNEL_HEADERS_4_15 + default "4.14.28" if BR2_KERNEL_HEADERS_4_14 + default "4.15.11" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 3aeb295ab88fd8be6c1c03b1b1087f0768f4d124 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 19 Mar 2018 12:44:04 +0200 Subject: [PATCH 0288/2640] linux-firmware: add QCA6174 multi-board firmware The board-2.bin file is a new format that support multiple board files. This file is required for for recent QCA6174 modules. Cc: Yann E. MORIN Cc: Yegor Yefremov Cc: Erik Larsson Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index a6fd8ebba4..3f710a2f09 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -146,6 +146,7 @@ endif # ath10k-qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174/hw3.0/board.bin \ + ath10k/QCA6174/hw3.0/board-2.bin \ ath10k/QCA6174/hw3.0/firmware-4.bin \ ath10k/QCA6174/hw3.0/firmware-6.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware From 12b01c98a4b21a8b48034e93029835429abe5cc1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 19 Mar 2018 12:44:05 +0200 Subject: [PATCH 0289/2640] linux-firmware: add QCA6174 firmware legal notice files Cc: Yann E. MORIN Cc: Yegor Yefremov Cc: Erik Larsson Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.hash | 2 ++ package/linux-firmware/linux-firmware.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 1beb1f76da..14c1935b27 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -3,6 +3,8 @@ sha256 d253f7abb32e0407bcc840a5bddba1dc20190bb4a4bb6d40512f279fde384671 linux-fi sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis sha256 38f2037aa14631b4b29826d7a99379613c41a97064d1defdee30a7a022138b20 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware +sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt +sha256 c565861ff7c42f5df98e15239241f1f42614e5e15f362094a2d3e8da724dc842 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 3f710a2f09..6f0ba53800 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -149,7 +149,9 @@ LINUX_FIRMWARE_FILES += ath10k/QCA6174/hw3.0/board.bin \ ath10k/QCA6174/hw3.0/board-2.bin \ ath10k/QCA6174/hw3.0/firmware-4.bin \ ath10k/QCA6174/hw3.0/firmware-6.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt \ + ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt endif # sd8686 v8 From c4d2c9cafb19312f6d2f2a9bc0740f45b65559c7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 19 Mar 2018 19:44:09 +0200 Subject: [PATCH 0290/2640] btrfs-progs: fix build with e2fsprogs 1.44.0 e2fsprogs 1.44.0 renamed a struct field name, breaking the build of code using it. Add a patch suggested upstream to fix that. Fixes: http://autobuild.buildroot.net/results/d6b/d6b5fb377f44d0b6eef96c08e550ec7277a9e3cd/ http://autobuild.buildroot.net/results/651/651518f12b8a98d53cb5402445a476bd2bf32155/ http://autobuild.buildroot.net/results/3c7/3c771455cbc8460fffab6c4dd9835ee4a5776c19/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ert-ext2-Remove-check-for-ext2_ext_a.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/btrfs-progs/0003-btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_a.patch diff --git a/package/btrfs-progs/0003-btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_a.patch b/package/btrfs-progs/0003-btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_a.patch new file mode 100644 index 0000000000..cb92837d21 --- /dev/null +++ b/package/btrfs-progs/0003-btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_a.patch @@ -0,0 +1,38 @@ +From 3dd9cc2b2411a691f321c01a91bcdac42d476150 Mon Sep 17 00:00:00 2001 +From: Qu Wenruo +Date: Wed, 14 Mar 2018 08:56:57 +0800 +Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for + ext2_ext_attr_entry->e_value_block + +In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has +removed member e_value_block, as currently ext* doesn't support it set +anyway. + +So remove such check so that we can pass compile. + +Signed-off-by: Qu Wenruo +Signed-off-by: Baruch Siach +--- +Upstream status: https://patchwork.kernel.org/patch/10281327/ (applied; not +yet in git) + + convert/source-ext2.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/convert/source-ext2.c b/convert/source-ext2.c +index b1492c78693d..070126ec38ec 100644 +--- a/convert/source-ext2.c ++++ b/convert/source-ext2.c +@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry, + { + size_t value_size = entry->e_value_size; + +- if (entry->e_value_block != 0 || value_size > size || +- entry->e_value_offs + value_size > size) ++ if (value_size > size || entry->e_value_offs + value_size > size) + return -EIO; + return 0; + } +-- +2.16.2 + From f7479b538a3e1548172ba256001ebd96f1e7076c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Mar 2018 21:18:35 +0100 Subject: [PATCH 0291/2640] docs/manual: pass PARALLEL_JOBS to NINJA_OPTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ninja understands the `-j` option which defines how many jobs are run in parallel. Signed-off-by: Jörg Krause Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-meson.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt index 65a0f6a962..f3b4b30e48 100644 --- a/docs/manual/adding-packages-meson.txt +++ b/docs/manual/adding-packages-meson.txt @@ -35,7 +35,7 @@ package. Let's start with an example: 18: --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ 19: --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf 20: -21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) +21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) 22: 23: ifeq ($(BR2_PACKAGE_BAZ),y) 24: FOO_CONF_OPTS += -Dbaz From 20994334a0aaeab357581eeb9178b91a763cdac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Mar 2018 21:18:36 +0100 Subject: [PATCH 0292/2640] libmpdclient: pass PARALLEL_JOBS to NINJA_OPTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/libmpdclient/libmpdclient.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index a399516fe3..6ff27241c0 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -20,7 +20,7 @@ LIBMPDCLIENT_CONF_OPTS += \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf -LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v) +LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) define LIBMPDCLIENT_CONFIGURE_CMDS rm -rf $(@D)/build From 12262ab50d6968189adcdfb64dffe75191f11187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Mar 2018 21:18:37 +0100 Subject: [PATCH 0293/2640] mpd-mpc: pass PARALLEL_JOBS to NINJA_OPTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 3eecf8a3ef..e16f600491 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -17,7 +17,7 @@ MPD_MPC_CONF_OPTS += \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf -MPD_MPC_NINJA_OPTS = $(if $(VERBOSE),-v) +MPD_MPC_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) define MPD_MPC_CONFIGURE_CMDS rm -rf $(@D)/build From 80266c95052024381898cada4c51d44207fddd80 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Mar 2018 22:40:05 +0100 Subject: [PATCH 0294/2640] tremor: security bump to fix CVE-2018-5146 Prevent out-of-bounds write in codebook decoding. Codebooks that are not an exact divisor of the partition size are now truncated to fit within the partition. Upstream has migrated from subversion to git, so change to git and bump the version to include the fix for CVE-2018-5146. While we're at it, also add a hash file. Signed-off-by: Peter Korsgaard --- package/tremor/tremor.hash | 3 +++ package/tremor/tremor.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 package/tremor/tremor.hash diff --git a/package/tremor/tremor.hash b/package/tremor/tremor.hash new file mode 100644 index 0000000000..89661a64cd --- /dev/null +++ b/package/tremor/tremor.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ba94cfdf886399c550f76908285bfa9e322f24085de6f1810c2abea565c13a15 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8.tar.gz +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk index 05996e2a8a..835fe36172 100644 --- a/package/tremor/tremor.mk +++ b/package/tremor/tremor.mk @@ -4,9 +4,9 @@ # ################################################################################ -TREMOR_SITE = http://svn.xiph.org/trunk/Tremor -TREMOR_SITE_METHOD = svn -TREMOR_VERSION = 19427 +TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8 +TREMOR_SITE = https://git.xiph.org/tremor.git +TREMOR_SITE_METHOD = git TREMOR_LICENSE = BSD-3-Clause TREMOR_LICENSE_FILES = COPYING From 1b383e4bf4151b9232b2e66f0d6ae822546576a5 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 21 Mar 2018 13:00:08 +1030 Subject: [PATCH 0295/2640] powerpc-utils: Update URL to new upstream powerpc-utils changed upstream git repositories again. Signed-off-by: Joel Stanley Signed-off-by: Peter Korsgaard --- package/powerpc-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/powerpc-utils/Config.in b/package/powerpc-utils/Config.in index b0ca84789e..d04d81c08a 100644 --- a/package/powerpc-utils/Config.in +++ b/package/powerpc-utils/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POWERPC_UTILS help System utilities for PowerPC machines. - https://github.com/nfont/powerpc-utils + https://github.com/ibm-power-utilities/powerpc-utils.git if BR2_PACKAGE_POWERPC_UTILS From c2fe7b6bc88e89ae26d8ec37a5d190c9359de54b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Mar 2018 19:06:31 +0100 Subject: [PATCH 0296/2640] linux: bump default to version 4.15.12 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index ce1e121fde..4aa13cd442 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From b83a4d3d69d5daa871812bd4c4803acef789e318 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Mar 2018 19:06:32 +0100 Subject: [PATCH 0297/2640] linux-headers: bump 3.2.x and 4.{14, 15}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a99f0fa137..3d94ca986d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -240,7 +240,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.100" if BR2_KERNEL_HEADERS_3_2 + default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.50" if BR2_KERNEL_HEADERS_4_1 default "4.4.122" if BR2_KERNEL_HEADERS_4_4 default "4.9.88" if BR2_KERNEL_HEADERS_4_9 @@ -248,6 +248,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.28" if BR2_KERNEL_HEADERS_4_14 - default "4.15.11" if BR2_KERNEL_HEADERS_4_15 + default "4.14.29" if BR2_KERNEL_HEADERS_4_14 + default "4.15.12" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 69a2d15d1c5aea9a23564763ba022b1ca572a24e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Mar 2018 19:09:14 +0100 Subject: [PATCH 0298/2640] package/{mesa3d, mesa3d-headers}: bump version to 17.3.7 Signed-off-by: Bernd Kuhls Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 4eb57b3ad4..50dcb67278 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 17.3.6 +MESA3D_HEADERS_VERSION = 17.3.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index a61fe02b6d..4bc4e820b8 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-February/000403.html -md5 ba66ae0f09b9b84482268608557cd175 mesa-17.3.6.tar.xz -sha1 eff29cb8c284a813977d4201dd646d949b1d8fc4 mesa-17.3.6.tar.xz -sha256 e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8 mesa-17.3.6.tar.xz -sha512 5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f mesa-17.3.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-March/000410.html +md5 769137f2538562c300c4b76bcb097377 mesa-17.3.7.tar.xz +sha1 c66108a562cc94a9559357ca2b424f99c7f995e8 mesa-17.3.7.tar.xz +sha256 0595904a8fba65a8fe853a84ad3c940205503b94af41e8ceed245fada777ac1e mesa-17.3.7.tar.xz +sha512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e mesa-17.3.7.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f4832c0f0..8e4aa7d5ac 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 17.3.6 +MESA3D_VERSION = 17.3.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 864dd4c80dee4b5d620ee25b16fe0d3b892a18f4 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Wed, 21 Mar 2018 19:39:30 +0100 Subject: [PATCH 0299/2640] libostree: bump to version 2018.3 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 6ae4824007..096c094300 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 37661de4a0ac73af5d921f494f17dd052ae2844111ba7c5aaeb1cbc4aae94bea libostree-2018.2.tar.xz +sha256 e54d0ac024f718cfa77b93d57c91c574bebcb937c88e1e30c3d1127e9360fd4b libostree-2018.3.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 236657e9fa..ad20d2a593 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.2 +LIBOSTREE_VERSION = 2018.3 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From 3bc6d100315553b135e1f4131b50229c66046b71 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 21 Mar 2018 22:13:16 +0200 Subject: [PATCH 0300/2640] flashrom: avoid download URL redirect Use the https URL to avoid HTTP 308 redirect. Older wget releases treat it as a hard error. Fixes: http://autobuild.buildroot.net/results/ee6/ee66e5ead70e73f1d2dae1c5ba31ccf054fe15a7/ http://autobuild.buildroot.net/results/fb8/fb8509bf9cf03933e45355fd9a6c3fa53d33c44f/ http://autobuild.buildroot.net/results/0e1/0e196570207e459c3440d50cecf0032eee6edfc2/ Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/flashrom/flashrom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 95ce86c52c..70f47b5a04 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -6,7 +6,7 @@ FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 -FLASHROM_SITE = http://download.flashrom.org/releases +FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING From 6898144768e03c68d740406cc6947e503eb31366 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Mar 2018 13:51:53 +0100 Subject: [PATCH 0301/2640] efibootmgr: bump version Drop 0001-dont-use-fshort-wchar-when-building.patch and 0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch as they are now upstream. The upstream repo moved to the 'rhboot' github project, so adjust upstream URL in .mk and help text to match. Version 15 introduces build time configuration of the default EFI directory (E.G. the subdirectory in the EFI system partition where the loader is installed). This used to be hardcoded to redhat, but now a value must be specified at build time. Given that, it is unlikely that people relied on the default value so set it to the more sensible 'buildroot'. While we are at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard --- ...tch => 0001-Allow-build-with-uClibc.patch} | 0 ...-dont-use-fshort-wchar-when-building.patch | 28 ---------- ...ra-const-keywords-gcc-7-gripes-about.patch | 51 ------------------- package/efibootmgr/Config.in | 2 +- package/efibootmgr/efibootmgr.hash | 3 +- package/efibootmgr/efibootmgr.mk | 10 ++-- 6 files changed, 9 insertions(+), 85 deletions(-) rename package/efibootmgr/{0002-Allow-build-with-uClibc.patch => 0001-Allow-build-with-uClibc.patch} (100%) delete mode 100644 package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch delete mode 100644 package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch diff --git a/package/efibootmgr/0002-Allow-build-with-uClibc.patch b/package/efibootmgr/0001-Allow-build-with-uClibc.patch similarity index 100% rename from package/efibootmgr/0002-Allow-build-with-uClibc.patch rename to package/efibootmgr/0001-Allow-build-with-uClibc.patch diff --git a/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch b/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch deleted file mode 100644 index abafcec524..0000000000 --- a/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3466fd05c8c6f1052e0426d64eed40f8a88fd78f Mon Sep 17 00:00:00 2001 -From: steve-mcintyre -Date: Fri, 6 Jan 2017 18:18:47 +0000 -Subject: [PATCH] Don't use -fshort-wchar when building (#63) - -It's not needed and is causing build failures with gcc 6. Closes -Debian bug #849651 - -Signed-off-by: Steve McIntyre -[Upstream commit: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f] -Signed-off-by: Thomas Petazzoni ---- - Make.defaults | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make.defaults b/Make.defaults -index 50f1f4d..0ac50ef 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -26,7 +26,7 @@ clang_cflags = - gcc_cflags = - cflags = $(CFLAGS) $(SUBDIR_CFLAGS) \ - -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \ -- -std=gnu11 -fshort-wchar -fPIC \ -+ -std=gnu11 -fPIC \ - -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \ - -DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \ - $(if $(findstring clang,$(CC)),$(clang_cflags),) \ diff --git a/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch b/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch deleted file mode 100644 index 8bc6f01ef4..0000000000 --- a/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a542b169003c2ef95ce6c00d40050eb10568b612 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 6 Feb 2017 16:34:54 -0500 -Subject: [PATCH] Remove extra const keywords gcc 7 gripes about. - -Signed-off-by: Peter Jones -[Backported from upstream commit a542b169003c2ef95ce6c00d40050eb10568b612] -Signed-off-by: Thomas Petazzoni ---- - src/efibootdump.c | 2 +- - src/efibootmgr.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/efibootdump.c b/src/efibootdump.c -index 6ff8360..30a1943 100644 ---- a/src/efibootdump.c -+++ b/src/efibootdump.c -@@ -39,7 +39,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size) - uint8_t *optional_data = NULL; - size_t optional_data_len = 0; - uint16_t pathlen; -- const unsigned char const *desc; -+ const unsigned char *desc; - char *raw; - size_t raw_len; - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index 493f2cf..90a0998 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -221,7 +221,7 @@ warn_duplicate_name(list_t *var_list) - list_t *pos; - var_entry_t *entry; - efi_load_option *load_option; -- const unsigned char const *desc; -+ const unsigned char *desc; - - list_for_each(pos, var_list) { - entry = list_entry(pos, var_entry_t, list); -@@ -873,7 +873,7 @@ show_vars(const char *prefix) - { - list_t *pos; - var_entry_t *boot; -- const unsigned char const *description; -+ const unsigned char *description; - efi_load_option *load_option; - efidp dp = NULL; - unsigned char *optional_data = NULL; --- -2.9.4 - diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 0d36ffd6e7..492ebe6e6e 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_EFIBOOTMGR create and destroy boot entries, change the boot order, change the next running boot option, and more. - https://github.com/rhinstaller/efibootmgr + https://github.com/rhboot/efibootmgr comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash index f71dced53f..b786a415a8 100644 --- a/package/efibootmgr/efibootmgr.hash +++ b/package/efibootmgr/efibootmgr.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz +sha256 5a708b9690cdc631fd75d8f598128d20cad007e711b975b0143f9517c2dd1bf4 efibootmgr-15.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index b32d9cbcfd..cdd500f088 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -4,12 +4,13 @@ # ################################################################################ -EFIBOOTMGR_VERSION = 14 -EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) +EFIBOOTMGR_VERSION = 15 +EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING EFIBOOTMGR_DEPENDENCIES = efivar $(TARGET_NLS_DEPENDENCIES) EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) +EFIBOOTMGR_MAKE_ARGS = EFIDIR=buildroot define EFIBOOTMSR_PATCH_HEADER_PATH $(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile @@ -19,12 +20,13 @@ EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH define EFIBOOTMGR_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) + LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) \ + $(EFIBOOTMGR_MAKE_ARGS) endef define EFIBOOTMGR_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install + $(EFIBOOTMGR_MAKE_ARGS) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 319078d5dec8388f13a863546cf7ee2d79880d98 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:47 -0300 Subject: [PATCH 0302/2640] tpm2-tss: declare dependency on a toolchain with C++ Version 1.4.0 still contains some C++ code. This has already changed on upstream, so future versions will drop the dependency on a C++ compiler. [Peter: fix indentation, add dependency to config option] Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tss/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index ebf0fd262d..7a757bd70a 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBURIPARSER help OSS implementation of the Trusted Computing Group's (TCG) TPM2 @@ -29,3 +30,6 @@ config BR2_PACKAGE_TPM2_TSS Microsoft software TPM2 simulator. https://github.com/tpm2-software/tpm2-tss + +comment "tpm2-tss needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From 0f95f93b3947df06bb5a49c1be4d27f0f6f4013a Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:48 -0300 Subject: [PATCH 0303/2640] tpm2-tss: allow building without stack smashing protection (SSP) Disable SSP if the toolchain does not support it. This must be done explicitly because configure.ac passes -fstack-protector-all to the compiler but doesn't contain a link test, so it doesn't detect when libssp is missing. Fixes: http://autobuild.buildroot.net/results/f98749311c5a4338f5fbd6d29c9ca29ac6c24abd http://autobuild.buildroot.net/results/4112a001038eb5e04c67c7b5c79280813d196911 http://autobuild.buildroot.net/results/451fcf7e36ea8774967b84279abb89ffb0fd6923 http://autobuild.buildroot.net/results/8e1181836249105be28f04a59cf6d31afcea91d7 http://autobuild.buildroot.net/results/49151df111ad3d03c70551e4516c3d3b36e12d70 http://autobuild.buildroot.net/results/42d625c579a8a16fb0c0a3df441ea186c3d52b9a http://autobuild.buildroot.net/results/b0af881e080c4fcc6094489c037ee853fdf42869 http://autobuild.buildroot.net/results/0909d94af3f9589dd6b8897e2501c05b421262c4 http://autobuild.buildroot.net/results/2fd0ee29c0b28cb1fee1b43433ab8373f49ca397 http://autobuild.buildroot.net/results/3fa19441fd2594b064c8ff759df8849705100a65 http://autobuild.buildroot.net/results/8675d2aa8f1e8e568a42bc0dbfae8f3721e86796 http://autobuild.buildroot.net/results/786de50b53fa9a325c92a5d48f3928082eff0045 http://autobuild.buildroot.net/results/a575b340f7cc562c1b87eb31d4304131b52698a7 http://autobuild.buildroot.net/results/0b1d50d9e266d889d7e848275ebfbce45ccb419d http://autobuild.buildroot.net/results/d632b0e1efbb5e133dfb6595554badea9e31c492 http://autobuild.buildroot.net/results/0c95459bfa82048d7e99661cf5f2d6d393179090 http://autobuild.buildroot.net/results/bd494dc69fb0da46065f10a3cd8a4cab0bcbcc9b http://autobuild.buildroot.net/results/b397e44cd17b3d576cc55f02d5463e9c14743907 http://autobuild.buildroot.net/results/40ed7a3b519c18102df515b5c4b993ed9a488236 http://autobuild.buildroot.net/results/e5fc04c2ded86e03eb174a89845a50f52e407d48 http://autobuild.buildroot.net/results/95a7c14da225d9e42545ee7a155f461303c62aa6 http://autobuild.buildroot.net/results/25ebda7a13afa4790ad28018f42c46a795f3c284 http://autobuild.buildroot.net/results/1bc081b78c625f13327c733fc734e36fe28ecc2a http://autobuild.buildroot.net/results/273108e2798155464109b9fb4d16884e7d0f9ab3 http://autobuild.buildroot.net/results/f677d340cd42ea7242d4102fbb5fa6091a05e8ef http://autobuild.buildroot.net/results/ae15b625260801b494bbfa541ef86edcdbaedfe0 Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index f5169a2770..dcc1e5d74d 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,4 +11,8 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser host-pkgconf +# configure.ac doesn't contain a link test, so it doesn't detect when +# libssp is missing. +TPM2_TSS_CONF_ENV = ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) + $(eval $(autotools-package)) From 003269a6692d146ca9c8a94f965244cf11f58738 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:49 -0300 Subject: [PATCH 0304/2640] tpm2-abrmd: declare dependency on a toolchain with C++ It depends on tpm2-tss, whose current version contains C++ code. [Peter: add dependency to config option] Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-abrmd/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in index 31c5ae7d6b..25c27c0abb 100644 --- a/package/tpm2-abrmd/Config.in +++ b/package/tpm2-abrmd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_ABRMD bool "tpm2-abrmd" + depends on BR2_INSTALL_LIBSTDCPP # tpm2-tss depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus, libglib2 @@ -20,6 +21,7 @@ config BR2_PACKAGE_TPM2_ABRMD https://github.com/tpm2-software/tpm2-abrmd -comment "tpm2-abrmd needs a toolchain w/ wchar, threads" +comment "tpm2-abrmd needs a toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS From f2bd679c9dcd48a5ba3445f99524303bed9cf252 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:50 -0300 Subject: [PATCH 0305/2640] tpm2-abrmd: allow building without stack smashing protection (SSP) Disable SSP if the toolchain does not support it. This must be done explicitly because configure.ac passes -fstack-protector-all to the compiler but doesn't contain a link test, so it doesn't detect when libssp is missing. Fixes: http://autobuild.buildroot.net/results/83ad1f33f523321f841e70d2d8cf5ce861dee217 http://autobuild.buildroot.net/results/cef047751534fef23d1022e9a276424bc84bf461 http://autobuild.buildroot.net/results/6048355337804f7841dffa1655f44b9f6db56314 http://autobuild.buildroot.net/results/d934a2ea90e7bf1c7b93dbb367998abab536daf4 http://autobuild.buildroot.net/results/c0daaf37b8d1515d62d2441ba6aa57125437e191 http://autobuild.buildroot.net/results/9482ea5554938865e0061dcbdcf3c2c918b96954 http://autobuild.buildroot.net/results/282a8b6769f19f0a40089207bc54e7302663751f Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 0d6a167210..b918ceaa4b 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -11,6 +11,10 @@ TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf +# configure.ac doesn't contain a link test, so it doesn't detect when +# libssp is missing. +TPM2_ABRMD_CONF_ENV = ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) + TPM2_ABRMD_CONF_OPTS += \ --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \ --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no) From 4be409f401c0b1daba6ca84e79d3185c7cf10bbc Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:51 -0300 Subject: [PATCH 0306/2640] tpm2-tools: propagate dependencies of selected packages - C++ (tpm2-tss) - MMU (dbus, libglib) - threads (libglib) - wchar (libglib -> gettext) Fixes (libglib): http://autobuild.buildroot.net/results/786859fccc477de1519d85d8a180626bb8ebe062 http://autobuild.buildroot.net/results/df6518f331c16b477c6e934914d0e56dc102c228 [Peter: add C++ dependency to config option] Signed-off-by: Baruch Siach Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tools/Config.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 6429b24531..685b75c475 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -1,5 +1,9 @@ config BR2_PACKAGE_TPM2_TOOLS bool "tpm2-tools" + depends on BR2_INSTALL_LIBSTDCPP # tpm2-tss + depends on BR2_USE_MMU # dbus, libglib + depends on BR2_USE_WCHAR # libglib -> gettext + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGLIB2 @@ -14,3 +18,8 @@ config BR2_PACKAGE_TPM2_TOOLS implementation. https://github.com/tpm2-software/tpm2-tools + +comment "tpm2-tools needs a toolchain w/ C++, wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS From 428dfe71f337a5de4540d57a244442d64b2d8e75 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 22 Mar 2018 17:27:52 -0300 Subject: [PATCH 0307/2640] tpm2-tools: allow building without stack smashing protection (SSP) Disable SSP if the toolchain does not support it. This must be done explicitly because configure enables hardening by default but doesn't contain a link test, so it doesn't detect when libssp is missing. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-tools/tpm2-tools.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 0697900d2d..13fdb163bb 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -10,4 +10,8 @@ TPM2_TOOLS_LICENSE = BSD-2-Clause TPM2_TOOLS_LICENSE_FILES = LICENSE TPM2_TOOLS_DEPENDENCIES = dbus libcurl libglib2 openssl tpm2-tss host-pkgconf +# configure.ac doesn't contain a link test, so it doesn't detect when +# libssp is missing. +TPM2_TOOLS_CONF_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),--enable-hardening,--disable-hardening) + $(eval $(autotools-package)) From 21070fb9aec363aa435dc48145eff3aad55032cb Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Mar 2018 20:15:07 -0300 Subject: [PATCH 0308/2640] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3d94ca986d..3a8adfd6bf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,8 +242,8 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.50" if BR2_KERNEL_HEADERS_4_1 - default "4.4.122" if BR2_KERNEL_HEADERS_4_4 - default "4.9.88" if BR2_KERNEL_HEADERS_4_9 + default "4.4.123" if BR2_KERNEL_HEADERS_4_4 + default "4.9.89" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 From 3def8a8c7fe78c8348d0d6f6465a96b95d94690a Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Fri, 23 Mar 2018 09:00:33 +0100 Subject: [PATCH 0309/2640] libostree: bump to version 2018.4 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 096c094300..1f0e9ce95f 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e54d0ac024f718cfa77b93d57c91c574bebcb937c88e1e30c3d1127e9360fd4b libostree-2018.3.tar.xz +sha256 f5b1e083ed630fd32a263731fe9595ecdd07cfd5cba3e354931f481c4181de1c libostree-2018.4.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index ad20d2a593..ba6379d7e7 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.3 +LIBOSTREE_VERSION = 2018.4 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From 83867e47f2557ff60cd9b3896e4ec4a9fddcba6b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 23 Mar 2018 11:55:06 +0300 Subject: [PATCH 0310/2640] dbus: bump to version 1.12.6 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 1aa5aa445d..66fce31461 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.2.tar.gz.asc -sha256 272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88 dbus-1.12.2.tar.gz +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.6.tar.gz.asc +sha256 621b902a07badec16c9e43eda43903cd0e1e69e11b13143da71c1889b062f116 dbus-1.12.6.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 22ba22e17e..8771412be4 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.2 +DBUS_VERSION = 1.12.6 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From c8dec6271a1c99a57be1a016b14ceb8965a30a7c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 23 Mar 2018 12:11:46 +0300 Subject: [PATCH 0311/2640] dnsmasq: bump to version 2.79 Drop upstream patches. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ildcard-NSEC-records.-CVE-2017-15107.patch | 212 ------------------ ...ation-errors-introduced-in-4fe6744a2.patch | 29 --- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 2 +- 4 files changed, 3 insertions(+), 244 deletions(-) delete mode 100644 package/dnsmasq/0001-DNSSEC-fix-for-wildcard-NSEC-records.-CVE-2017-15107.patch delete mode 100644 package/dnsmasq/0002-Fix-DNSSEC-validation-errors-introduced-in-4fe6744a2.patch diff --git a/package/dnsmasq/0001-DNSSEC-fix-for-wildcard-NSEC-records.-CVE-2017-15107.patch b/package/dnsmasq/0001-DNSSEC-fix-for-wildcard-NSEC-records.-CVE-2017-15107.patch deleted file mode 100644 index 7b834e80e2..0000000000 --- a/package/dnsmasq/0001-DNSSEC-fix-for-wildcard-NSEC-records.-CVE-2017-15107.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 4fe6744a220eddd3f1749b40cac3dfc510787de6 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Fri, 19 Jan 2018 12:26:08 +0000 -Subject: [PATCH] DNSSEC fix for wildcard NSEC records. CVE-2017-15107 applies. - -It's OK for NSEC records to be expanded from wildcards, -but in that case, the proof of non-existence is only valid -starting at the wildcard name, *. NOT the name expanded -from the wildcard. Without this check it's possible for an -attacker to craft an NSEC which wrongly proves non-existence -in a domain which includes a wildcard for NSEC. - -[baruch: drop the CHANGELOG hunk] -Signed-off-by: Baruch Siach ---- -Upstream status: upstream commit 4fe6744a220e - - CHANGELOG | 12 +++++- - src/dnssec.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 114 insertions(+), 15 deletions(-) - -diff --git a/src/dnssec.c b/src/dnssec.c -index eb6c11cbe00f..a54a0b4f14cf 100644 ---- a/src/dnssec.c -+++ b/src/dnssec.c -@@ -103,15 +103,17 @@ static void from_wire(char *name) - static int count_labels(char *name) - { - int i; -- -+ char *p; -+ - if (*name == 0) - return 0; - -- for (i = 0; *name; name++) -- if (*name == '.') -+ for (p = name, i = 0; *p; p++) -+ if (*p == '.') - i++; - -- return i+1; -+ /* Don't count empty first label. */ -+ return *name == '.' ? i : i+1; - } - - /* Implement RFC1982 wrapped compare for 32-bit numbers */ -@@ -1094,8 +1096,8 @@ static int hostname_cmp(const char *a, const char *b) - } - } - --static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsigned char **nsecs, int nsec_count, -- char *workspace1, char *workspace2, char *name, int type, int *nons) -+static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsigned char **nsecs, unsigned char **labels, int nsec_count, -+ char *workspace1_in, char *workspace2, char *name, int type, int *nons) - { - int i, rc, rdlen; - unsigned char *p, *psave; -@@ -1108,6 +1110,9 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi - /* Find NSEC record that proves name doesn't exist */ - for (i = 0; i < nsec_count; i++) - { -+ char *workspace1 = workspace1_in; -+ int sig_labels, name_labels; -+ - p = nsecs[i]; - if (!extract_name(header, plen, &p, workspace1, 1, 10)) - return 0; -@@ -1116,7 +1121,27 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi - psave = p; - if (!extract_name(header, plen, &p, workspace2, 1, 10)) - return 0; -- -+ -+ /* If NSEC comes from wildcard expansion, use original wildcard -+ as name for computation. */ -+ sig_labels = *labels[i]; -+ name_labels = count_labels(workspace1); -+ -+ if (sig_labels < name_labels) -+ { -+ int k; -+ for (k = name_labels - sig_labels; k != 0; k--) -+ { -+ while (*workspace1 != '.' && *workspace1 != 0) -+ workspace1++; -+ if (k != 1 && *workspace1 == '.') -+ workspace1++; -+ } -+ -+ workspace1--; -+ *workspace1 = '*'; -+ } -+ - rc = hostname_cmp(workspace1, name); - - if (rc == 0) -@@ -1514,24 +1539,26 @@ static int prove_non_existence_nsec3(struct dns_header *header, size_t plen, uns - - static int prove_non_existence(struct dns_header *header, size_t plen, char *keyname, char *name, int qtype, int qclass, char *wildname, int *nons) - { -- static unsigned char **nsecset = NULL; -- static int nsecset_sz = 0; -+ static unsigned char **nsecset = NULL, **rrsig_labels = NULL; -+ static int nsecset_sz = 0, rrsig_labels_sz = 0; - - int type_found = 0; -- unsigned char *p = skip_questions(header, plen); -+ unsigned char *auth_start, *p = skip_questions(header, plen); - int type, class, rdlen, i, nsecs_found; - - /* Move to NS section */ - if (!p || !(p = skip_section(p, ntohs(header->ancount), header, plen))) - return 0; -+ -+ auth_start = p; - - for (nsecs_found = 0, i = ntohs(header->nscount); i != 0; i--) - { - unsigned char *pstart = p; - -- if (!(p = skip_name(p, header, plen, 10))) -+ if (!extract_name(header, plen, &p, daemon->workspacename, 1, 10)) - return 0; -- -+ - GETSHORT(type, p); - GETSHORT(class, p); - p += 4; /* TTL */ -@@ -1548,7 +1575,69 @@ static int prove_non_existence(struct dns_header *header, size_t plen, char *key - if (!expand_workspace(&nsecset, &nsecset_sz, nsecs_found)) - return 0; - -- nsecset[nsecs_found++] = pstart; -+ if (type == T_NSEC) -+ { -+ /* If we're looking for NSECs, find the corresponding SIGs, to -+ extract the labels value, which we need in case the NSECs -+ are the result of wildcard expansion. -+ Note that the NSEC may not have been validated yet -+ so if there are multiple SIGs, make sure the label value -+ is the same in all, to avoid be duped by a rogue one. -+ If there are no SIGs, that's an error */ -+ unsigned char *p1 = auth_start; -+ int res, j, rdlen1, type1, class1; -+ -+ if (!expand_workspace(&rrsig_labels, &rrsig_labels_sz, nsecs_found)) -+ return 0; -+ -+ rrsig_labels[nsecs_found] = NULL; -+ -+ for (j = ntohs(header->nscount); j != 0; j--) -+ { -+ if (!(res = extract_name(header, plen, &p1, daemon->workspacename, 0, 10))) -+ return 0; -+ -+ GETSHORT(type1, p1); -+ GETSHORT(class1, p1); -+ p1 += 4; /* TTL */ -+ GETSHORT(rdlen1, p1); -+ -+ if (!CHECK_LEN(header, p1, plen, rdlen1)) -+ return 0; -+ -+ if (res == 1 && class1 == qclass && type1 == T_RRSIG) -+ { -+ int type_covered; -+ unsigned char *psav = p1; -+ -+ if (rdlen < 18) -+ return 0; /* bad packet */ -+ -+ GETSHORT(type_covered, p1); -+ -+ if (type_covered == T_NSEC) -+ { -+ p1++; /* algo */ -+ -+ /* labels field must be the same in every SIG we find. */ -+ if (!rrsig_labels[nsecs_found]) -+ rrsig_labels[nsecs_found] = p1; -+ else if (*rrsig_labels[nsecs_found] != *p1) /* algo */ -+ return 0; -+ } -+ p1 = psav; -+ } -+ -+ if (!ADD_RDLEN(header, p1, plen, rdlen1)) -+ return 0; -+ } -+ -+ /* Must have found at least one sig. */ -+ if (!rrsig_labels[nsecs_found]) -+ return 0; -+ } -+ -+ nsecset[nsecs_found++] = pstart; - } - - if (!ADD_RDLEN(header, p, plen, rdlen)) -@@ -1556,7 +1645,7 @@ static int prove_non_existence(struct dns_header *header, size_t plen, char *key - } - - if (type_found == T_NSEC) -- return prove_non_existence_nsec(header, plen, nsecset, nsecs_found, daemon->workspacename, keyname, name, qtype, nons); -+ return prove_non_existence_nsec(header, plen, nsecset, rrsig_labels, nsecs_found, daemon->workspacename, keyname, name, qtype, nons); - else if (type_found == T_NSEC3) - return prove_non_existence_nsec3(header, plen, nsecset, nsecs_found, daemon->workspacename, keyname, name, qtype, wildname, nons); - else --- -2.15.1 - diff --git a/package/dnsmasq/0002-Fix-DNSSEC-validation-errors-introduced-in-4fe6744a2.patch b/package/dnsmasq/0002-Fix-DNSSEC-validation-errors-introduced-in-4fe6744a2.patch deleted file mode 100644 index ef28b90c58..0000000000 --- a/package/dnsmasq/0002-Fix-DNSSEC-validation-errors-introduced-in-4fe6744a2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cd7df612b14ec1bf831a966ccaf076be0dae7404 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Sat, 20 Jan 2018 00:10:55 +0000 -Subject: [PATCH] Fix DNSSEC validation errors introduced in - 4fe6744a220eddd3f1749b40cac3dfc510787de6 - -Signed-off-by: Baruch Siach ---- -Upstream status: upstream commit cd7df612b14ec - - src/dnssec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dnssec.c b/src/dnssec.c -index a54a0b4f14cf..c47e33569f96 100644 ---- a/src/dnssec.c -+++ b/src/dnssec.c -@@ -1610,7 +1610,7 @@ static int prove_non_existence(struct dns_header *header, size_t plen, char *key - int type_covered; - unsigned char *psav = p1; - -- if (rdlen < 18) -+ if (rdlen1 < 18) - return 0; /* bad packet */ - - GETSHORT(type_covered, p1); --- -2.15.1 - diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 28e2e658e2..322f8df5cc 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz.asc -sha256 89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b dnsmasq-2.78.tar.xz +# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz.asc +sha256 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f dnsmasq-2.79.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9f96030eb6..f519835828 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.78 +DNSMASQ_VERSION = 2.79 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From 4b54bd3ae87058af72797a7febf2d02f9aabfec2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 23 Mar 2018 11:35:40 +0300 Subject: [PATCH 0312/2640] util-linux: bump to version 2.32 Leave both _VERSION_MAJOR and _VERSION to reduce churn. We are likely to need _MAJOR on the next bump. Drop ac_cv_header_sys_timex_h override; not needed with current uClibc-ng. Drop scanf_cv_type_modifier override; not used in configure script since v2.21. Drop upstream patch. Cc: Carlos Santos Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-docs-add-ISC-licence.patch | 38 ------------------- package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 9 +---- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 package/util-linux/0001-docs-add-ISC-licence.patch diff --git a/package/util-linux/0001-docs-add-ISC-licence.patch b/package/util-linux/0001-docs-add-ISC-licence.patch deleted file mode 100644 index aea7b9719c..0000000000 --- a/package/util-linux/0001-docs-add-ISC-licence.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a9e4662d26b10789b28282d7e77ab189ef34cf5c Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 14 Jan 2018 16:39:31 -0200 -Subject: [PATCH] docs: add ISC licence - -Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC. This is -useful for Linux distributions an integration tools like Buildroot, -to collect detailed legal information for each package. - -[kzak@redhat.com: - remove C-comments and rfkill header] - -Signed-off-by: Carlos Santos -Signed-off-by: Karel Zak ---- - Documentation/licenses/COPYING.ISC | 11 +++++++++++ - 1 file changed, 11 insertions(+) - create mode 100644 Documentation/licenses/COPYING.ISC - -diff --git a/Documentation/licenses/COPYING.ISC b/Documentation/licenses/COPYING.ISC -new file mode 100644 -index 000000000..8351a30e3 ---- /dev/null -+++ b/Documentation/licenses/COPYING.ISC -@@ -0,0 +1,11 @@ -+Permission to use, copy, modify, and/or distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -2.14.3 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 068bb45e6c..8f93d793c8 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.31/sha256sums.asc -sha256 1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11 util-linux-2.31.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.32/sha256sums.asc +sha256 6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734 util-linux-2.32.tar.xz # License files, locally calculated sha256 1e4b65802b0df8115395c697029d03339f983d451a473a08643309c684410d9a README.licensing sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPLv2 diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72a6d18178..80a8a08051 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,9 +4,8 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.31 -UTIL_LINUX_VERSION_MINOR = 1 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR) +UTIL_LINUX_VERSION_MAJOR = 2.32 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -16,10 +15,6 @@ UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libm UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) -# uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support -# (used in logger.c), and the common default is N. -UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \ - $(if $(BR2_TOOLCHAIN_USES_UCLIBC),ac_cv_header_sys_timex_h=no) UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown From 283f45e807f0d534a56f31ffabfcc5a3954c976a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Mar 2018 10:57:40 +0100 Subject: [PATCH 0313/2640] efibootmgr: explicitly depend on host-pkgconf and popt efibootmgr uses host-pkgconf and popt, so explicitly add them to _DEPENDENCIES instead of relying on them getting pulled in by efivar. [Peter: reword as suggested by Thomas] Signed-off-by: Peter Korsgaard --- package/efibootmgr/Config.in | 1 + package/efibootmgr/efibootmgr.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 492ebe6e6e..b87fb53225 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_EFIBOOTMGR depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_PACKAGE_EFIVAR + select BR2_PACKAGE_POPT help A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager. This application can diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index cdd500f088..bdc0019d99 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -8,7 +8,7 @@ EFIBOOTMGR_VERSION = 15 EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING -EFIBOOTMGR_DEPENDENCIES = efivar $(TARGET_NLS_DEPENDENCIES) +EFIBOOTMGR_DEPENDENCIES = host-pkgconf efivar popt $(TARGET_NLS_DEPENDENCIES) EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) EFIBOOTMGR_MAKE_ARGS = EFIDIR=buildroot From bb7a698001302249abf57762a0483fa2c3edb50a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Mar 2018 10:57:41 +0100 Subject: [PATCH 0314/2640] efivar: bump version Drop 0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch and 0003-Remove-some-extra-const-that-gcc-complains-about.patch as they are now upstream. The upstream repo moved to the 'rhboot' github project, so adjust upstream URL in .mk and help text to match. Drop dependency on !musl as it is now support since e04281e60cf0d (makeguids: Ensure compatibility with other libcs). Drop BINTARGETS workaround as this is fixed since 6c674283697 (Don't build static by default). Drop popt dependency as it is no longer needed since 1aec5e7891 (Replace popt usage with getopt_long in efivar.c). While we are at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard --- package/efibootmgr/Config.in | 2 - ...tch => 0001-Allow-build-with-uClibc.patch} | 2 +- ...-avoid-the-multiple-definitions-bug-.patch | 29 ------------ ...extra-const-that-gcc-complains-about.patch | 47 ------------------- package/efivar/Config.in | 8 +--- package/efivar/efivar.hash | 3 +- package/efivar/efivar.mk | 9 +--- 7 files changed, 7 insertions(+), 93 deletions(-) rename package/efivar/{0002-Allow-build-with-uClibc.patch => 0001-Allow-build-with-uClibc.patch} (96%) delete mode 100644 package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch delete mode 100644 package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index b87fb53225..d31f9b13ee 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_EFIBOOTMGR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar - depends on !BR2_TOOLCHAIN_USES_MUSL # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_PACKAGE_EFIVAR @@ -20,6 +19,5 @@ comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, header depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/0002-Allow-build-with-uClibc.patch b/package/efivar/0001-Allow-build-with-uClibc.patch similarity index 96% rename from package/efivar/0002-Allow-build-with-uClibc.patch rename to package/efivar/0001-Allow-build-with-uClibc.patch index 7c195872b0..01fa9dee70 100644 --- a/package/efivar/0002-Allow-build-with-uClibc.patch +++ b/package/efivar/0001-Allow-build-with-uClibc.patch @@ -20,7 +20,7 @@ index 7f2d4dd..72c02d1 100644 #include -#include - #include + #include #include "lib.h" +#ifdef __UCLIBC__ diff --git a/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch b/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch deleted file mode 100644 index 2bc3ff243f..0000000000 --- a/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 314eb67b239e60c2ed3700e2baf9cd0e590465f3 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 27 Oct 2016 09:19:18 -0400 -Subject: [PATCH] Use -z muldefs to avoid the multiple definitions bug - without -flto - -This fixes github issue #64 - -Signed-off-by: Peter Jones -Signed-off-by: Andy Shevchenko ---- - Make.defaults | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Make.defaults b/Make.defaults -index aa974d9..c9d599f 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -32,6 +32,7 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ - clang_ccldflags = - gcc_ccldflags = - ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \ -+ -Wl,-z,muldefs \ - $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ - $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ - $(call pkg-config-ccldflags) --- -2.10.2 - diff --git a/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch b/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch deleted file mode 100644 index 6b9f77eb8b..0000000000 --- a/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1c7c0f71c9d22efda4156881eb187b8c69d1cca7 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones -Signed-off-by: Baruch Siach ---- -Upstream commit 1c7c0f71c9d22e. - - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h b/src/include/efivar/efiboot-loadopt.h -index 07db5c4c53e3..efc29c69d47e 100644 ---- a/src/include/efivar/efiboot-loadopt.h -+++ b/src/include/efivar/efiboot-loadopt.h -@@ -32,8 +32,8 @@ extern ssize_t efi_loadopt_create(uint8_t *buf, ssize_t size, - - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option *opt, -- ssize_t limit) -+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt, -+ ssize_t limit) - __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index a63ca792d2dc..ce889867fd29 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -357,7 +357,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.13.2 - diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 0fa9adf387..74f2bb5abb 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -16,19 +16,15 @@ config BR2_PACKAGE_EFIVAR # failures. So, prevent this package to be built using those # toolchains. depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS - # doesn't build with musl due to lack of __bswap_constant_16 - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_PACKAGE_POPT help Tools and libraries to manipulate EFI variables - https://github.com/rhinstaller/efivar + https://github.com/rhboot/efivar -comment "efivar needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/efivar.hash b/package/efivar/efivar.hash index e337b96450..e8a65adc4b 100644 --- a/package/efivar/efivar.hash +++ b/package/efivar/efivar.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 efivar-30.tar.gz +sha256 9691399a424b8e3776b7ed2df1893c4162285a93697d781f387d0f0d258a7f4b efivar-34.tar.gz +sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index d06192ed22..492a4468bf 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -4,21 +4,16 @@ # ################################################################################ -EFIVAR_VERSION = 30 -EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION)) +EFIVAR_VERSION = 34 +EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPL-2.1 EFIVAR_LICENSE_FILES = COPYING -EFIVAR_DEPENDENCIES = popt EFIVAR_INSTALL_STAGING = YES -# BINTARGETS is set to skip efivar-static which requires static popt, -# and since we depend on dynamic libraries, efivar will never be built -# in a static-only environment. # -fPIC is needed at least on MIPS, otherwise fails to build shared # -library. EFIVAR_MAKE_OPTS = \ libdir=/usr/lib \ - BINTARGETS=efivar \ LDFLAGS="$(TARGET_LDFLAGS) -fPIC" define EFIVAR_BUILD_CMDS From a81601589ef87c4ebb69517455f0fef8df7dd6ed Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 14:34:57 +0200 Subject: [PATCH 0315/2640] xfsprogs: fix build with libunistring The latest xfsprogs bump to version 4.15.1 added an optional dependency on libunistring. Make sure we build libunistring before xfsprogs. xfsprogs also added -lunistring to its make dependency. This does not work very well with cross compilation because make does not know about sysroot. Add a patch to remove this dependency. To make shared only link with libunistring work, we also need to extend the -static-libtool-libs patch to cover xfs_scrub as well. Fixes: http://autobuild.buildroot.net/results/66e/66e425b00a06f928be0951ac4196190fe88b0f62/ http://autobuild.buildroot.net/results/1cd/1cde87d1daf3c6009220ff47512794cef6a2938f/ http://autobuild.buildroot.net/results/8ba/8ba4e94cfbb8a5cbb166423a671bdbcdf535f86b/ Signed-off-by: Baruch Siach Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- ...-do-dynamic-linking-of-libtool-libra.patch | 25 ++++++++++--- ...-fix-cross-compile-with-libunistring.patch | 37 +++++++++++++++++++ package/xfsprogs/xfsprogs.mk | 4 ++ 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch diff --git a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch index 4eb43480c0..74636c2ebb 100644 --- a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch +++ b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch @@ -1,7 +1,8 @@ -From 770902a0a29fb4ac62358f7eacb3a83d0d9af1c7 Mon Sep 17 00:00:00 2001 +From d5cbb4f43cc9c30100fbf18a3e0d1fb95e1c1b0a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 10:50:00 +0000 -Subject: [PATCH] mdrestore: do not do dynamic linking of libtool libraries +Subject: [PATCH] mdrestore, scrub: do not do dynamic linking of libtool + libraries As explained in commit ece49daeff1a3cad765e106d678c608925c9d768, use -static-libtool-libs instead of -static to allow fallback to the dynamic @@ -11,11 +12,12 @@ ld: attempted static link of dynamic object `/usr/lib/libuuid.so' Signed-off-by: Vicente Olivert Riera [Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html] -[baruch: update for v4.15.1] +[baruch: update for v4.15.1; extend to include scrub] Signed-off-by: Baruch Siach --- mdrestore/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + scrub/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mdrestore/Makefile b/mdrestore/Makefile index 136ae716d691..75ff1bad78e9 100644 @@ -30,6 +32,19 @@ index 136ae716d691..75ff1bad78e9 100644 default: depend $(LTCOMMAND) +diff --git a/scrub/Makefile b/scrub/Makefile +index 063279400262..949f6fd8ba94 100644 +--- a/scrub/Makefile ++++ b/scrub/Makefile +@@ -70,7 +70,7 @@ xfs_scrub.c + + LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT) + LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT) +-LLDFLAGS = -static ++LLDFLAGS = -static-libtool-libs + + ifeq ($(HAVE_MALLINFO),yes) + LCFLAGS += -DHAVE_MALLINFO -- -2.16.1 +2.16.2 diff --git a/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch b/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch new file mode 100644 index 0000000000..dfb66c6630 --- /dev/null +++ b/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch @@ -0,0 +1,37 @@ +From 45d9ba0f01cceb75f72d157a9e4d9aaeb753a9c4 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 20 Mar 2018 14:13:28 +0200 +Subject: [PATCH] xfs_scrub: fix cross compile with libunistring + +Commit 4bbed4ecc2a (xfs_scrub: warn about normalized Unicode name collisions) +added -lunistring to the list of the xfs_scrub dependencies. When cross +compiling make fails to find the library on the target sysroot: + +make[3]: *** No rule to make target `-lunistring', needed by `xfs_scrub'. Stop. + +Remove -lunistring from make dependencies of xfs_scrub to fix that. + +Cc: Darrick J. Wong +Signed-off-by: Baruch Siach +--- +Upstream status: https://patchwork.kernel.org/patch/10296957/ + + scrub/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scrub/Makefile b/scrub/Makefile +index 949f6fd8ba94..979603f524ff 100644 +--- a/scrub/Makefile ++++ b/scrub/Makefile +@@ -69,7 +69,7 @@ vfs.c \ + xfs_scrub.c + + LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT) +-LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT) ++LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBRT) + LLDFLAGS = -static-libtool-libs + + ifeq ($(HAVE_MALLINFO),yes) +-- +2.16.2 + diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 7f49e2312f..dffcc28ab7 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -20,6 +20,10 @@ XFSPROGS_CONF_OPTS = \ INSTALL_GROUP=root \ --enable-static +ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) +XFSPROGS_DEPENDENCIES += libunistring +endif + XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install $(eval $(autotools-package)) From 86ad2d92070c3024b2cf5de74dede294b56d5fd2 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 23 Mar 2018 14:00:30 -0300 Subject: [PATCH 0316/2640] tpm2-tss: fix build with musl Add a missing inclusion, needed for the definition of the fd_set type. This patch can't be sent upstream because the changed file does not exist anymore on the master branch. Fixes: http://autobuild.buildroot.net/results/09e8b3b85d7113d60e8967a2d41a6aea8f8197c0 http://autobuild.buildroot.net/results/2e4c70f2f1239eb19235ae04a936a6492daf316d http://autobuild.buildroot.net/results/bbd68f52781da735e983b1260de5b804787374b1 Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- ....cpp-add-missing-inclusion-of-sys-se.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch diff --git a/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch b/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch new file mode 100644 index 0000000000..e8e0d842f2 --- /dev/null +++ b/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch @@ -0,0 +1,33 @@ +From 2fdbf9f56bd6e7b00c695881a81c0df2f5088760 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Fri, 23 Mar 2018 09:15:44 -0300 +Subject: [PATCH] tcti/tcti_socket.cpp: add missing inclusion of sys/select.h + +Prevents compilation errors due to undeclared "fd_set" type. + +Fixes: + http://autobuild.buildroot.net/results/09e8b3b85d7113d60e8967a2d41a6aea8f8197c0 + http://autobuild.buildroot.net/results/2e4c70f2f1239eb19235ae04a936a6492daf316d + http://autobuild.buildroot.net/results/bbd68f52781da735e983b1260de5b804787374b1 + +Signed-off-by: Carlos Santos +--- + tcti/tcti_socket.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tcti/tcti_socket.cpp b/tcti/tcti_socket.cpp +index e8982f1..b6e5874 100644 +--- a/tcti/tcti_socket.cpp ++++ b/tcti/tcti_socket.cpp +@@ -28,6 +28,8 @@ + #include + #include // Needed for _wtoi + ++#include // for fd_set ++ + #include "sapi/tpm20.h" + #include "tcti/tcti_socket.h" + #include "sysapi_util.h" +-- +2.14.3 + From 4f634160b2a106f7e34b4bb018b34e77c8dda2a9 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 23 Mar 2018 20:59:39 +0200 Subject: [PATCH 0317/2640] brotli: new package Add the brotli package to Buildroot. This is needed by woff2, which in turn is needed by webkitgtk from version 2.20.0 onwards. WebKitGTK+ used to bundle a copy of the library, but it stopped doing so now that the upstream has started making releases. [Peter: fix license hash] Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/brotli/Config.in | 12 ++++++++++++ package/brotli/brotli.hash | 5 +++++ package/brotli/brotli.mk | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/brotli/Config.in create mode 100644 package/brotli/brotli.hash create mode 100644 package/brotli/brotli.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1faefc45fc..2d5f2108a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -62,6 +62,7 @@ F: package/setools/ F: package/sngrep/ N: Adrian Perez de Castro +F: package/brotli/ F: package/libepoxy/ F: package/webkitgtk/ diff --git a/package/Config.in b/package/Config.in index 58dfd6306d..26ded5ebb2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -63,6 +63,7 @@ menu "Audio and video applications" endmenu menu "Compressors and decompressors" + source "package/brotli/Config.in" source "package/bzip2/Config.in" source "package/gzip/Config.in" source "package/lz4/Config.in" diff --git a/package/brotli/Config.in b/package/brotli/Config.in new file mode 100644 index 0000000000..e40f5b6b9f --- /dev/null +++ b/package/brotli/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_BROTLI + bool "brotli" + help + Generic-purpose lossless compression library. The algorithm + compresses data using a combination of a modern variant of + the LZ77 algorithm, Huffman coding and 2nd order context + modeling, with a compression ratio comparable to the best + currently available general-purpose compression methods. It + is similar in speed with deflate but offers more dense + compression. + + https://github.com/google/brotli diff --git a/package/brotli/brotli.hash b/package/brotli/brotli.hash new file mode 100644 index 0000000000..954d44eb70 --- /dev/null +++ b/package/brotli/brotli.hash @@ -0,0 +1,5 @@ +# Locally generated: +sha512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c v1.0.3.tar.gz + +# Hash for license files: +sha512 bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8 LICENSE diff --git a/package/brotli/brotli.mk b/package/brotli/brotli.mk new file mode 100644 index 0000000000..cf1e811543 --- /dev/null +++ b/package/brotli/brotli.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# brotli +# +################################################################################ + +BROTLI_VERSION = 1.0.3 +BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz +BROTLI_SITE = https://github.com/google/brotli/archive +BROTLI_LICENSE = MIT +BROTLI_LICENSE_FILES = LICENSE +BROTLI_INSTALL_STAGING = YES +BROTLI_CONF_OPTS = \ + -DBROTLI_DISABLE_TESTS=ON \ + -DBROTLI_BUNDLED_MODE=OFF + +$(eval $(cmake-package)) From 70afd4afa765183032fd0c335b6855fd02e30745 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 23 Mar 2018 20:59:40 +0200 Subject: [PATCH 0318/2640] woff2: new package Add the woff2 package to Builroot. This is needed by webkitgtk from version 2.20.0 onwards. WebKitGTK+ used to bundle a copy of the library, but it stopped doing so now that the upstream is has been making releases. [Peter: fix license hash] Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/woff2/Config.in | 9 +++++++++ package/woff2/woff2.hash | 5 +++++ package/woff2/woff2.mk | 17 +++++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/woff2/Config.in create mode 100644 package/woff2/woff2.hash create mode 100644 package/woff2/woff2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2d5f2108a8..031af3cdd0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -65,6 +65,7 @@ N: Adrian Perez de Castro F: package/brotli/ F: package/libepoxy/ F: package/webkitgtk/ +F: package/woff2/ N: Adrien Gallouët F: package/glorytun/ diff --git a/package/Config.in b/package/Config.in index 26ded5ebb2..ae5a09bd5b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1186,6 +1186,7 @@ menu "Graphics" source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" + source "package/woff2/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu diff --git a/package/woff2/Config.in b/package/woff2/Config.in new file mode 100644 index 0000000000..48672570dd --- /dev/null +++ b/package/woff2/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_WOFF2 + bool "woff2" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_BROTLI + help + Reference implementation for the WOFF2 font file format, + typically used for Web fonts + + https://github.com/google/woff2 diff --git a/package/woff2/woff2.hash b/package/woff2/woff2.hash new file mode 100644 index 0000000000..469071e3c2 --- /dev/null +++ b/package/woff2/woff2.hash @@ -0,0 +1,5 @@ +# Locally generated: +sha512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d v1.0.2.tar.gz + +# Hash for license files: +sha512 8ee924da3fb5d16135adcf6a8fbe9e2e8f3d2d80468617e72ca4fa059a60f8455c9a5f68a8dc381b1297c8bf39c887a912d0f69246d2604ada74d3da9e8e490b LICENSE diff --git a/package/woff2/woff2.mk b/package/woff2/woff2.mk new file mode 100644 index 0000000000..23b88a5e9a --- /dev/null +++ b/package/woff2/woff2.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# woff2 +# +################################################################################ + +WOFF2_VERSION = 1.0.2 +WOFF2_SOURCE = v$(WOFF2_VERSION).tar.gz +WOFF2_SITE = https://github.com/google/woff2/archive +WOFF2_LICENSE = MIT +WOFF2_LICENSE_FILES = LICENSE +WOFF2_INSTALL_STAGING = YES +WOFF2_DEPENDENCIES = brotli +WOFF2_CONF_OPTS = \ + -DNOISY_LOGGING=OFF + +$(eval $(cmake-package)) From 31086ea1de511b57e8377d9fa6b0fe7350b1e753 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 08:57:39 +0100 Subject: [PATCH 0319/2640] package/imagemagick: security bump version to 7.0.7-27 Fixes CVE-2018-6405 (upstream Github PR 964) and many others: http://www.imagemagick.org/script/changelog.php Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 3 ++- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 2468bdbc23..170231c4b7 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 924d1161ed2399bcb72f98419072b3130a466e07d9a6fce43d27458ffa907ffa 7.0.7-10.tar.gz +sha256 723a28f9cbc5c6130f496065fc01c839083e97bf3e4930f940a03c0155046170 7.0.7-27.tar.gz +sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index c2171a7564..116543888b 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-10 +IMAGEMAGICK_VERSION = 7.0.7-27 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From 65193bf3c93ec6922979907ce87fc82a73b25268 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 09:37:16 +0100 Subject: [PATCH 0320/2640] package/apache: security bump to version 2.4.33 Changelog: http://www.apache.org/dist/httpd/CHANGES_2.4.33 Fixes CVE-2017-15710, CVE-2018-1283, CVE-2018-1303, CVE-2018-1301, CVE-2017-15715, CVE-2018-1312, CVE-2018-1302. Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 5 +++-- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 6471c38b62..76c7c766cb 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,2 +1,3 @@ -# From http://www.apache.org/dist/httpd/httpd-2.4.29.tar.bz2.sha256 -sha256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 httpd-2.4.29.tar.bz2 +# From http://archive.apache.org/dist/httpd/httpd-2.4.33.tar.bz2.sha256 +sha256 de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 httpd-2.4.33.tar.bz2 +sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index e1b1a209cb..eaf7b9c5bf 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.29 +APACHE_VERSION = 2.4.33 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From f43a26453b02ee158d64ea4db3b9ce546d020a2c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 09:02:44 +0100 Subject: [PATCH 0321/2640] package/icu: bump version to 60.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/icu/icu.hash | 4 ++-- package/icu/icu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 8b54e22443..66a0a8dc80 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ -# From http://download.icu-project.org/files/icu4c/60.1/SHASUM512.txt -sha512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233 icu4c-60_1-src.tgz +# From http://download.icu-project.org/files/icu4c/60.2/SHASUM512.txt +sha512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694 icu4c-60_2-src.tgz sha256 24c771ce37201a3ab604852e47d10d21595d0493269dd6c8a5e567e998e18c00 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 6ac4a25378..a9466c8322 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ICU_VERSION = 60.1 +ICU_VERSION = 60.2 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) ICU_LICENSE = ICU License From 0c4bccf9e882ffead426051cfe76764dd2ecaf83 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 10 Mar 2018 19:45:37 -0300 Subject: [PATCH 0322/2640] configs/imxsabre: Fix U-Boot parallel build issue Sometimes imximage throws the following error: MKIMAGE u-boot-dtb.imx Error: No BOOT_FROM tag in board/freescale/mx6sxsabresd/imximage.cfg.cfgtmp arch/arm/imx-common/Makefile:91: recipe for target 'u-boot-dtb.imx' failed Later on, when running mkimage for the u-boot.imx it will succeed in finding the IVT offset. Looks like some race condition happening during parallel build when processing mkimage for u-boot-dtb.imx and u-boot.imx. A proper fix still needs to be implemented, but as a workaround let's remove the error when the IVT offset is not found. It is useful to have such message, especially during bring-up phase, but the build error that it causes is severe, so better avoid the build error for now. The error checking can be re-implemented later when we have a proper fix. This workaround has already been applied in mainline U-Boot: http://git.denx.de/?p=u-boot.git;a=commit;h=b5b0e4e351e20a606de22db6a56ad6bc1e2aa8fd Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/59015347 Reported-by: Thomas Petazzoni Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- ...-failure-when-no-IVT-offset-is-found.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch diff --git a/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch b/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch new file mode 100644 index 0000000000..92eff7574d --- /dev/null +++ b/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch @@ -0,0 +1,55 @@ +From 24ba28680abe868e8db3442a9bf523ad3af1febd Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Fri, 9 Mar 2018 08:25:00 -0300 +Subject: [PATCH] imximage: Remove failure when no IVT offset is found + +Sometimes imximage throws the following error: + + CFGS board/freescale/vf610twr/imximage.cfg.cfgtmp + CFGS board/freescale/vf610twr/imximage.cfg.cfgtmp + MKIMAGE u-boot-dtb.imx +Error: No BOOT_FROM tag in board/freescale/vf610twr/imximage.cfg.cfgtmp +arch/arm/mach-imx/Makefile:100: recipe for target 'u-boot-dtb.imx' failed + +Later on, when running mkimage for the u-boot.imx it will succeed in +finding the IVT offset. + +Looks like some race condition happening during parallel build when +processing mkimage for u-boot-dtb.imx and u-boot.imx. + +A proper fix still needs to be implemented, but as a workaround let's +remove the error when the IVT offset is not found. + +It is useful to have such message, especially during bring-up phase, +but the build error that it causes is severe, so better avoid the +build error for now. + +The error checking can be re-implemented later when we have a proper +fix. + +Reported-by: Breno Lima +Reported-by: Thomas Petazzoni +Signed-off-by: Fabio Estevam +--- + tools/imximage.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/tools/imximage.c b/tools/imximage.c +index 0c43196..bef56f8 100644 +--- a/tools/imximage.c ++++ b/tools/imximage.c +@@ -765,11 +765,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) + (*set_dcd_rst)(imxhdr, dcd_len, name, lineno); + fclose(fd); + +- /* Exit if there is no BOOT_FROM field specifying the flash_offset */ +- if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) { +- fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name); +- exit(EXIT_FAILURE); +- } + return dcd_len; + } + +-- +2.7.4 + From 0d87537ccc6d5b5daf6e7afac80117ad316dc371 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 24 Mar 2018 17:24:25 +0100 Subject: [PATCH 0323/2640] package/enlightenment: bump to 0.22.3 https://www.enlightenment.org/news/e0.22.3_release Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 686d0ef3be..7a6d3ff8f0 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,3 +1,3 @@ -# From https://www.enlightenment.org/news/e0.22.2_release -sha256 4d581ef85246f0cba003427bb9b3758e3de137babea1cdd2affd70a2cbe1632c enlightenment-0.22.2.tar.xz +# From https://www.enlightenment.org/news/e0.22.3_release +sha256 4d81e583073d74474b7a960b01cb596716a43cca2fadca7d1e5c91f4cf6efe9b enlightenment-0.22.3.tar.xz sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index ba6b54143e..480e9e9da8 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.22.2 +ENLIGHTENMENT_VERSION = 0.22.3 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause From 45d7087414bba3058c9905ec84d2aec2dfdfe228 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:24:35 +0100 Subject: [PATCH 0324/2640] configs/qemu_aarch64_virt: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/59015465 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/qemu_aarch64_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 3bafd90e5a..076773302d 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -19,3 +19,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.15.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 3f3bb11f33de2d508900da6bffa99b50a5cf9de1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:26:02 +0100 Subject: [PATCH 0325/2640] configs/freescale_p1025twr: needs host-openssl for the Linux kernel build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/59015355 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- configs/freescale_p1025twr_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_p1025twr_defconfig b/configs/freescale_p1025twr_defconfig index f7cc50f093..13ec517fbd 100644 --- a/configs/freescale_p1025twr_defconfig +++ b/configs/freescale_p1025twr_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/p1025twr" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_CPIO=y From f4e8dcc1d51c448a5932e576882ff4901e29463b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 12:35:52 +0100 Subject: [PATCH 0326/2640] package/samba4: bump version to 4.8.0 Changelog: https://www.samba.org/samba/history/samba-4.8.0.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...01-libreplace-disable-libbsd-support.patch | 6 ++- .../0004-libgpo-fix-build-without-ads.patch | 49 +++++++++++++++++++ package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 2 +- 4 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 package/samba4/0004-libgpo-fix-build-without-ads.patch diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index ed6accfca1..4794cb02fd 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -9,7 +9,7 @@ This causes redefinition conflicts for link(2) when both standard unistd.h and bsd/unistd.h get included. Signed-off-by: Gustavo Zacarias -(rebased for version 4.7.3) +(rebased for versions 4.7.3 & 4.8.0) Signed-off-by: Bernd Kuhls --- lib/replace/wscript | 12 ------------ @@ -19,7 +19,7 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 1dfd902..456be9b 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -253,19 +253,6 @@ +@@ -296,21 +296,6 @@ strlcpy_in_bsd = False @@ -32,6 +32,8 @@ index 1dfd902..456be9b 100644 - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') diff --git a/package/samba4/0004-libgpo-fix-build-without-ads.patch b/package/samba4/0004-libgpo-fix-build-without-ads.patch new file mode 100644 index 0000000000..5e3af3c322 --- /dev/null +++ b/package/samba4/0004-libgpo-fix-build-without-ads.patch @@ -0,0 +1,49 @@ +From a222b7506b53e689708834237f18877231dca589 Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Sat, 3 Feb 2018 07:07:55 +0100 +Subject: [PATCH] libgpo: Fix the build --without-ads + +Signed-off-by: Volker Lendecke +Reviewed-by: David Disseldorp + +Autobuild-User(master): David Disseldorp +Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 + +Downloaded from upstream commit: +https://git.samba.org/samba.git/?p=samba.git;a=commit;h=a222b7506b53e689708834237f18877231dca589 + +Fixes https://bugzilla.samba.org/show_bug.cgi?id=13331 + +Signed-off-by: Bernd Kuhls +--- + libgpo/pygpo.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c +index 7a02a0dc2aa..b6b53b76212 100644 +--- a/libgpo/pygpo.c ++++ b/libgpo/pygpo.c +@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, + return result; + } + ++#ifdef HAVE_ADS + static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, + const char *samaccountname, + uint32_t *uac_ret, const char **dn_ret) +@@ -468,11 +469,15 @@ static PyObject *py_ads_get_gpo_list(ADS *self, PyObject *args, PyObject *kwds) + return ret; + } + ++#endif ++ + static PyMethodDef ADS_methods[] = { + { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, + "Connect to the LDAP server" }, ++#ifdef HAVE_ADS + { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, + NULL }, ++#endif + { NULL } + }; + diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index dddd132d24..36e2ff79be 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.7.6.tar.asc -sha256 1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e samba-4.7.6.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.8.0.tar.asc +sha256 87d9b585dbd8628e79aabb6e621a94bd20a072a00762e78e0899fad22fc18fb7 samba-4.8.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index ada03c024f..a5ebe59ef3 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.7.6 +SAMBA4_VERSION = 4.8.0 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 1d10e9dc8c96f37cf79e54bc250df88559789c63 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 17:56:57 +0200 Subject: [PATCH 0327/2640] qemu: fix build with glibc 2.27 glibc version 2.27 added a wrapper for the memfd_create system call. The wrapper prototype collides with a static declaration of memfd_create. Add upstream patch to correctly detect the glibc provided memfd_create definition. Fixes: http://autobuild.buildroot.net/results/b82/b825c0cd397424b1fc7fa87c580e1757dc25c588/ http://autobuild.buildroot.net/results/9aa/9aa3853d23c0dc72bf3632b4d66ae39f597f5250/ http://autobuild.buildroot.net/results/b13/b13039ba602b9d500b939d259816a39ba24e1ba2/ Cc: Francois Perrad Signed-off-by: Baruch Siach Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../qemu/0002-memfd-fix-configure-test.patch | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/qemu/0002-memfd-fix-configure-test.patch diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch new file mode 100644 index 0000000000..3e06c0e932 --- /dev/null +++ b/package/qemu/0002-memfd-fix-configure-test.patch @@ -0,0 +1,58 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau +Signed-off-by: Paolo Bonzini +Signed-off-by: Baruch Siach +--- +Upstream status: commit 75e5b70e6b5 + + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a98bd4..99ccc1725ace 100755 +--- a/configure ++++ b/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba866..412e94a405fc 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.16.2 + From ff5aab9dfe3b057607269904164ee842d69fd4e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:58:09 +0100 Subject: [PATCH 0328/2640] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.27.0 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-libinput.hash | 12 +++++++----- .../xdriver_xf86-input-libinput.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 43b8f78f96..0c24f82880 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-September/002807.html -md5 da47ef62eab1d0e922a8fa929ff81758 xf86-input-libinput-0.26.0.tar.bz2 -sha1 3f55b8a5d4ff51d4f0cfe3fe9ace66227193abd4 xf86-input-libinput-0.26.0.tar.bz2 -sha256 abca558fc2226f295691f1cf3412d4c0edeaa439f677ca25b5c9fab310d2387b xf86-input-libinput-0.26.0.tar.bz2 -sha512 b52a27e916f7e86576500ef2bc3ce640676f5a710543755865a723628c0e01a575989460853bac184ed696961e3f8fca72ecba8ad4625be8cd9e31f9a55f5e97 xf86-input-libinput-0.26.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002885.html +md5 efc5ea72070411ef077a9dd096cfd41b xf86-input-libinput-0.27.0.tar.bz2 +sha1 127dba35576296d1800b7a29344c13da90141d4c xf86-input-libinput-0.27.0.tar.bz2 +sha256 77b0516cb0bff616f491faed7f7794fef9dc496edc2dc7d6197324727cc668a3 xf86-input-libinput-0.27.0.tar.bz2 +sha512 716a9b43438acd6b7c6a834a08ecec244fecdc31e77241998414bf1748781026cd6c6e85947155c44400e0192769a714dfbfa0ed42ba3677347cd89ac1081743 xf86-input-libinput-0.27.0.tar.bz2 +# Locally computed +sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index dab24b1235..cf195ffa10 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.26.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.27.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT From 76101f71efa689034217559b40ebb036251154e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:38:14 +0100 Subject: [PATCH 0329/2640] package/dovecot: bump version to 2.2.35 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index fef0746089..438c3cccef 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 5e92a4325409e66b343f6aaa67174b8921ce83d0df792c6eeb0b7b7e2c808353 dovecot-2.2.34.tar.gz +sha256 cce15db2fc5233386b63a3cf21c465c09e6e55014ed66c4f184b7d221a47180c dovecot-2.2.35.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index e1b4bb21b8..783ca06a0e 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).34 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).35 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 9d1eaf01d424a77245494a9f7572fc7af0c93a38 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:38:15 +0100 Subject: [PATCH 0330/2640] package/dovecot-pigeonhole: bump version to 0.4.23 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index a2b7eba9de..797530f526 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a dovecot-2.2-pigeonhole-0.4.21.tar.gz +sha256 2860d12b95e316bddfae00d887edcd9834272834406970aa1c096425569c035f dovecot-2.2-pigeonhole-0.4.23.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index ea8b0077f0..919c58e3e8 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.4.21 +DOVECOT_PIGEONHOLE_VERSION = 0.4.23 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From ebbf8746243ee4fa6b51a5a6afa8b14459b4178f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 20:46:35 +0200 Subject: [PATCH 0331/2640] libssh2: fix pkg-config info for mbedtls backend The libssh2.pc file did not contain the needed info for static link with libssh2. Add a patch fixing that. Fixes (qemu): http://autobuild.buildroot.net/results/634/6346b25be2844f9ef722e52040ac1b43d9c38899/ Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...002-acinclude.m4-add-mbedtls-to-LIBS.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch diff --git a/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch new file mode 100644 index 0000000000..76e08c51a9 --- /dev/null +++ b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch @@ -0,0 +1,31 @@ +From f4846473f0f0ec313f8ed7ff4cd9f59c1741465d Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 20 Mar 2018 20:21:53 +0200 +Subject: [PATCH] acinclude.m4: add mbedtls to LIBS + +This is useful for static builds so that the Libs.private field in +libssh2.pc contains correct info for the benefit of pkg-config users. +Static link with libssh2 requires this information. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/libssh2/libssh2/pull/242 + + acinclude.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index c0e89a1a0c98..02c70845d27c 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -441,6 +441,7 @@ m4_case([$1], + [mbedtls], [ + LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include ], [ + AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1]) ++ LIBS="$LIBS $LIBMBEDCRYPTO" + found_crypto="$1" + support_clear_memory=yes + ]) +-- +2.16.2 + From d769377a41e172e1963351c168c97a1212561133 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 20:46:36 +0200 Subject: [PATCH 0332/2640] qemu: add libssh2 optional dependency Make sure that qemu uses libssh2 when libssh2 is enabled, for build consistency. Cc: Francois Perrad Signed-off-by: Baruch Siach Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 345ef52668..c3a7e7738e 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -212,6 +212,13 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +QEMU_OPTS += --enable-libssh2 +QEMU_DEPENDENCIES += libssh2 +else +QEMU_OPTS += --disable-libssh2 +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS From 425c8a9a63b7875ba8ad2f6e241358311d8dbe54 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:39 +0100 Subject: [PATCH 0333/2640] package/x11r7/xapp_ico: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_ico/xapp_ico.hash | 9 +++++++-- package/x11r7/xapp_ico/xapp_ico.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_ico/xapp_ico.hash b/package/x11r7/xapp_ico/xapp_ico.hash index 055e85ea67..693aff65f7 100644 --- a/package/x11r7/xapp_ico/xapp_ico.hash +++ b/package/x11r7/xapp_ico/xapp_ico.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002135.html -sha256 2932767098f95ca129a0c7f0fecb0a18c789a79c1747f7423fdfe9f4e0c53590 ico-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002880.html +md5 7895f2d109f4206b6d2db37257e07d12 ico-1.0.5.tar.bz2 +sha1 8759ec954375f3a1b37dc920a12790bfbfb0cad3 ico-1.0.5.tar.bz2 +sha256 d73b62f29eb98d850f16b76d759395180b860b613fbe1686b18eee99a6e3773f ico-1.0.5.tar.bz2 +sha512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2 +# Locally computed +sha256 97ef3a622f2f385cabfc8ab7aff13dc46468c10a5520670b5edfa33f2c3999eb COPYING diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk index 621d1e489e..8b0d4f90f3 100644 --- a/package/x11r7/xapp_ico/xapp_ico.mk +++ b/package/x11r7/xapp_ico/xapp_ico.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_ICO_VERSION = 1.0.4 +XAPP_ICO_VERSION = 1.0.5 XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2 XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_ICO_LICENSE = MIT From ca54ec200a1fd549043311ad5cf013e1c39bd772 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:40 +0100 Subject: [PATCH 0334/2640] package/x11r7/xapp_xbacklight: bump version to 1.2.2 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xbacklight/xapp_xbacklight.hash | 9 +++++++-- package/x11r7/xapp_xbacklight/xapp_xbacklight.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash b/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash index 058c53fca2..b2aa760600 100644 --- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash +++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-October/002331.html -sha256 17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b xbacklight-1.2.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002862.html +md5 d50cf135af04436b9456a5ab7dcf7971 xbacklight-1.2.2.tar.bz2 +sha1 8cc84c4b2e23e99bfa72239847af4b42ae89669e xbacklight-1.2.2.tar.bz2 +sha256 615a1d13e429ed5a0300b2f4508bc199d7cf21b6b9f088a9d8188d3bc957bf5e xbacklight-1.2.2.tar.bz2 +sha512 4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec xbacklight-1.2.2.tar.bz2 +# Locally computed +sha256 c9fbf1f272215babef31808c1235de8e4f7641ca5edfc4fc615b6556054b2b04 COPYING diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk index 88c4bc5dbe..a2907bb288 100644 --- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk +++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XBACKLIGHT_VERSION = 1.2.1 +XAPP_XBACKLIGHT_VERSION = 1.2.2 XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2 XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XBACKLIGHT_LICENSE = MIT From 8d3b965253aa7ff3fc4d17e868003f9c886defed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:41 +0100 Subject: [PATCH 0335/2640] package/x11r7/xapp_xeyes: bump version to 1.1.2 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xeyes/xapp_xeyes.hash | 9 +++++++-- package/x11r7/xapp_xeyes/xapp_xeyes.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.hash b/package/x11r7/xapp_xeyes/xapp_xeyes.hash index 02eb26b7b9..bbb6a9b08b 100644 --- a/package/x11r7/xapp_xeyes/xapp_xeyes.hash +++ b/package/x11r7/xapp_xeyes/xapp_xeyes.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2010-November/001552.html -sha1 efe6116d31a7f69e4fb6038613e52b0960b9b61c xeyes-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002860.html +md5 6f0543ec84283df5743eeafc173bea4a xeyes-1.1.2.tar.bz2 +sha1 458987f8accdbd8abf993ee51030391cf584d2e8 xeyes-1.1.2.tar.bz2 +sha256 57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553 xeyes-1.1.2.tar.bz2 +sha512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0 xeyes-1.1.2.tar.bz2 +# Locally computed +sha256 d8de1de40e16227d1eb4b19e95117ce3f990f71f71df096a2259b0bc9931e042 COPYING diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk index 07c12002be..6c7f859d35 100644 --- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk +++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XEYES_VERSION = 1.1.1 +XAPP_XEYES_VERSION = 1.1.2 XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2 XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEYES_LICENSE = MIT From d852a10ddd00370034c8b5c6477de266eaf4b7d9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:42 +0100 Subject: [PATCH 0336/2640] package/x11r7/xapp_xfontsel: bump version to 1.0.6 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xfontsel/xapp_xfontsel.hash | 9 +++++++-- package/x11r7/xapp_xfontsel/xapp_xfontsel.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash b/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash index 40f55236f0..a09df5585b 100644 --- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash +++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002213.html -sha256 170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf xfontsel-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002861.html +md5 13150ff98846bf6d9a14bee00697fa47 xfontsel-1.0.6.tar.bz2 +sha1 3fd8d78cc270030b41298170c3e5222065dd1cfd xfontsel-1.0.6.tar.bz2 +sha256 25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c xfontsel-1.0.6.tar.bz2 +sha512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099 xfontsel-1.0.6.tar.bz2 +# Locally computed +sha256 a27097bcc5cdf4fa5d761dd4e5cea1f41911c51b0a7d9da6e3a48f69d9fd0c09 COPYING diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk index 781b4d3542..9dea4299b3 100644 --- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk +++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XFONTSEL_VERSION = 1.0.5 +XAPP_XFONTSEL_VERSION = 1.0.6 XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFONTSEL_LICENSE = MIT From 449ed99137f9e4529b684a3e8dfff3d7535e5aaa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:43 +0100 Subject: [PATCH 0337/2640] package/x11r7/xapp_xinit: bump version to 1.4.0 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinit/xapp_xinit.hash | 9 +++++++-- package/x11r7/xapp_xinit/xapp_xinit.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xinit/xapp_xinit.hash b/package/x11r7/xapp_xinit/xapp_xinit.hash index f8bab9114c..58ee1ecb1d 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2014-September/002477.html -sha256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 xinit-1.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002863.html +md5 2da154b2f80ca9637b1a17b13af0880c xinit-1.4.0.tar.bz2 +sha1 fcdca692b09a45f546016fff78718d1cf7e7852f xinit-1.4.0.tar.bz2 +sha256 230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef xinit-1.4.0.tar.bz2 +sha512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e xinit-1.4.0.tar.bz2 +# Locally computed +sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk index a796884f6b..d911a45953 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.3.4 +XAPP_XINIT_VERSION = 1.4.0 XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 From 1a253a49651d114b7372612020db02724e22e94e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:44 +0100 Subject: [PATCH 0338/2640] package/x11r7/xapp_xkill: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xkill/xapp_xkill.hash | 9 +++++++-- package/x11r7/xapp_xkill/xapp_xkill.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xkill/xapp_xkill.hash b/package/x11r7/xapp_xkill/xapp_xkill.hash index 22c256d49d..0602971705 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.hash +++ b/package/x11r7/xapp_xkill/xapp_xkill.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002313.html -sha256 88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e xkill-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002864.html +md5 938177e4472c346cf031c1aefd8934fc xkill-1.0.5.tar.bz2 +sha1 c5ee06b33adb252a41e4f737be6bd47651ff582a xkill-1.0.5.tar.bz2 +sha256 c5f0bb6a95e1ac7c4def8a657496d5d2f21ccd41eb47ef2c9ccb03fb6d6aff6b xkill-1.0.5.tar.bz2 +sha512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2 +# Locally computed +sha256 13306c3890e4c8710bc468dee0eba7f9677cd94c7a67d2d81fa932d4f635b21f COPYING diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk index 76af1b95cb..64ddbca694 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.mk +++ b/package/x11r7/xapp_xkill/xapp_xkill.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKILL_VERSION = 1.0.4 +XAPP_XKILL_VERSION = 1.0.5 XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKILL_LICENSE = MIT From 465d49aa3d2ad9b4ce1604e900885906361162d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:45 +0100 Subject: [PATCH 0339/2640] package/x11r7/xapp_xload: bump version to 1.1.3 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xload/xapp_xload.hash | 9 +++++++-- package/x11r7/xapp_xload/xapp_xload.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xload/xapp_xload.hash b/package/x11r7/xapp_xload/xapp_xload.hash index 418ce55634..99d9cabb0e 100644 --- a/package/x11r7/xapp_xload/xapp_xload.hash +++ b/package/x11r7/xapp_xload/xapp_xload.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002285.html -sha256 83f8e6260435f1df2e2e5036bb3325688b79f0b33069ef445eff5058d127e078 xload-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002865.html +md5 29afafdffe97f809d43a41db9dd63f25 xload-1.1.3.tar.bz2 +sha1 fd5053d38551883309863c2a43de2ceffa908a50 xload-1.1.3.tar.bz2 +sha256 f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907 xload-1.1.3.tar.bz2 +sha512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 xload-1.1.3.tar.bz2 +# Locally computed +sha256 a09b31d26e4d2781eef1e71f39789f86cad6d81153e72064f45875910fa6258f COPYING diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk index 364d247a95..b44a51b5fd 100644 --- a/package/x11r7/xapp_xload/xapp_xload.mk +++ b/package/x11r7/xapp_xload/xapp_xload.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLOAD_VERSION = 1.1.2 +XAPP_XLOAD_VERSION = 1.1.3 XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLOAD_LICENSE = MIT From ff2edf04c37a65f0c94e9505d886fe34b2dd2e77 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:46 +0100 Subject: [PATCH 0340/2640] package/x11r7/xapp_xlsclients: bump version to 1.1.4 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xlsclients/xapp_xlsclients.hash | 9 +++++++-- package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash index e1cb80b7fa..a465c3cee3 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002314.html -sha256 5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d xlsclients-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002866.html +md5 4fa92377e0ddc137cd226a7a87b6b29a xlsclients-1.1.4.tar.bz2 +sha1 175af1c216a1db3de5023ecd6cce186e7693c6e4 xlsclients-1.1.4.tar.bz2 +sha256 773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1 xlsclients-1.1.4.tar.bz2 +sha512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2 +# Locally computed +sha256 716d6f1d18cb97cdd4a2ef7b101d944a250ca9de57578a490c038b9aaf950648 COPYING diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk index 798dce029c..167748b338 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLSCLIENTS_VERSION = 1.1.3 +XAPP_XLSCLIENTS_VERSION = 1.1.4 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLSCLIENTS_LICENSE = MIT From 095036df4ca23adbab3416fdf893a8e92dfb0774 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:47 +0100 Subject: [PATCH 0341/2640] package/x11r7/xapp_xlsfonts: bump version to 1.0.6 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash | 9 +++++++-- package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash index f3a2603171..f76369f97e 100644 --- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash +++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002580.html -sha256 40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa xlsfonts-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002867.html +md5 5774fd4f518b3f338f2b28f270e04bfc xlsfonts-1.0.6.tar.bz2 +sha1 bf95e46e0897dcb9d197ce20d4fa024b8ace5148 xlsfonts-1.0.6.tar.bz2 +sha256 89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368 xlsfonts-1.0.6.tar.bz2 +sha512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0 xlsfonts-1.0.6.tar.bz2 +# Locally computed +sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk index 1c42a61a97..0ccd4ea6b0 100644 --- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk +++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLSFONTS_VERSION = 1.0.5 +XAPP_XLSFONTS_VERSION = 1.0.6 XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2 XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLSFONTS_LICENSE = MIT From f7f02b554039294dd2425886c3a64771a594a917 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:48 +0100 Subject: [PATCH 0342/2640] package/x11r7/xapp_xmessage: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xmessage/xapp_xmessage.hash | 9 +++++++-- package/x11r7/xapp_xmessage/xapp_xmessage.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.hash b/package/x11r7/xapp_xmessage/xapp_xmessage.hash index 5e1f199bd1..b668edf6a1 100644 --- a/package/x11r7/xapp_xmessage/xapp_xmessage.hash +++ b/package/x11r7/xapp_xmessage/xapp_xmessage.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002128.html -sha256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 xmessage-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002868.html +md5 e50ffae17eeb3943079620cb78f5ce0b xmessage-1.0.5.tar.bz2 +sha1 d3eca72c7173d0d9547c676a16bcec51ca1213a2 xmessage-1.0.5.tar.bz2 +sha256 373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029 xmessage-1.0.5.tar.bz2 +sha512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe xmessage-1.0.5.tar.bz2 +# Locally computed +sha256 dfd5427188bd6d6647ad1a9a0644428403c6239f6aa7f9d1a17629d8cc0a4ecd COPYING diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk index 9c855638e1..bae5da670d 100644 --- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk +++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XMESSAGE_VERSION = 1.0.4 +XAPP_XMESSAGE_VERSION = 1.0.5 XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2 XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMESSAGE_LICENSE = MIT From c1aea5e8995f4e7d2e2d50ae9f779e9eaf94dde4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:49 +0100 Subject: [PATCH 0343/2640] package/x11r7/xapp_xpr: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xpr/xapp_xpr.hash | 9 +++++++-- package/x11r7/xapp_xpr/xapp_xpr.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xpr/xapp_xpr.hash b/package/x11r7/xapp_xpr/xapp_xpr.hash index eaab288ced..0a1b4f81b9 100644 --- a/package/x11r7/xapp_xpr/xapp_xpr.hash +++ b/package/x11r7/xapp_xpr/xapp_xpr.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001926.html -sha256 fed98df31eb93d3dca4688cb535aabad06be572e70ace3b1685679c18dd86cb5 xpr-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002869.html +md5 eaac255076ea351fd08d76025788d9f9 xpr-1.0.5.tar.bz2 +sha1 0632c7d8632ac9d23f285811aaea805a2956e155 xpr-1.0.5.tar.bz2 +sha256 b936e0f1f8d63f5ad097a0bbdce2e67c34f5d49b7263f32a832ff62d394d1e1f xpr-1.0.5.tar.bz2 +sha512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967 xpr-1.0.5.tar.bz2 +# Locally computed +sha256 5e8ff9b5d3fc86b5d0bc5957c9ee0aa1a6d0fb9a6b116aae70762b628a0d5069 COPYING diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk index b2c4e040c3..b77c5b4844 100644 --- a/package/x11r7/xapp_xpr/xapp_xpr.mk +++ b/package/x11r7/xapp_xpr/xapp_xpr.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPR_VERSION = 1.0.4 +XAPP_XPR_VERSION = 1.0.5 XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPR_LICENSE = MIT From d79a584dae78a62e9af3260589d461d8cb88ea00 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:50 +0100 Subject: [PATCH 0344/2640] package/x11r7/xapp_xprop: bump version to 1.2.3 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xprop/xapp_xprop.hash | 9 +++++++-- package/x11r7/xapp_xprop/xapp_xprop.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index 4758979c44..a57d375b84 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002290.html -sha256 9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6 xprop-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002870.html +md5 4becb3ddc4674d741487189e4ce3d0b6 xprop-1.2.3.tar.bz2 +sha1 77062c08a23cfca76824b7e8f9860678255d6b1a xprop-1.2.3.tar.bz2 +sha256 d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b xprop-1.2.3.tar.bz2 +sha512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a xprop-1.2.3.tar.bz2 +# Locally computed +sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index 40a8577304..d8063d94c8 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.2 +XAPP_XPROP_VERSION = 1.2.3 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPROP_LICENSE = MIT From 30c17bbbd4535d710ddec75d8d20f4234e33b5d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:51 +0100 Subject: [PATCH 0345/2640] package/x11r7/xapp_xrdb: bump version to 1.1.1 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xrdb/xapp_xrdb.hash | 9 +++++++-- package/x11r7/xapp_xrdb/xapp_xrdb.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/package/x11r7/xapp_xrdb/xapp_xrdb.hash index 4844a09b4a..c729861724 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.hash +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002316.html -sha256 73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b xrdb-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002871.html +md5 96f9423eab4d0641c70848d665737d2e xrdb-1.1.1.tar.bz2 +sha1 0d6b1cae357574d565d6e6bc10f6ccf073e1b9dd xrdb-1.1.1.tar.bz2 +sha256 2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7 xrdb-1.1.1.tar.bz2 +sha512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f xrdb-1.1.1.tar.bz2 +# Locally computed +sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk index f32afa45ab..4b84c64a92 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XRDB_VERSION = 1.1.0 +XAPP_XRDB_VERSION = 1.1.1 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRDB_LICENSE = MIT From b96225bd44dc74d426e6033cf01f6f815a30d9b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:52 +0100 Subject: [PATCH 0346/2640] package/x11r7/xapp_xrefresh: bump version to 1.0.6 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xrefresh/xapp_xrefresh.hash | 9 +++++++-- package/x11r7/xapp_xrefresh/xapp_xrefresh.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash b/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash index 6d5a53b009..8eae8ed1bb 100644 --- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash +++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002214.html -sha256 3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6 xrefresh-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002872.html +md5 c56fa4adbeed1ee5173f464a4c4a61a6 xrefresh-1.0.6.tar.bz2 +sha1 11eb5b3f905631281d2cedd86a0b666bab0d9bdc xrefresh-1.0.6.tar.bz2 +sha256 287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353 xrefresh-1.0.6.tar.bz2 +sha512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674 xrefresh-1.0.6.tar.bz2 +# Locally computed +sha256 4f51c9a91cd277697cbea6604bf4cb240c1ed14cdba82550cb9cac8f1286f663 COPYING diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk index 8403762c8e..36a4feaad1 100644 --- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk +++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XREFRESH_VERSION = 1.0.5 +XAPP_XREFRESH_VERSION = 1.0.6 XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XREFRESH_LICENSE = MIT From 2d6c7bbbe1e6404658675aef503bc02899d3ef90 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:53 +0100 Subject: [PATCH 0347/2640] package/x11r7/xapp_xset: bump version to 1.2.4 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xset/xapp_xset.hash | 9 +++++++-- package/x11r7/xapp_xset/xapp_xset.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xset/xapp_xset.hash b/package/x11r7/xapp_xset/xapp_xset.hash index f9ff3920c6..62f951ba70 100644 --- a/package/x11r7/xapp_xset/xapp_xset.hash +++ b/package/x11r7/xapp_xset/xapp_xset.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002291.html -sha256 4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063 xset-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002873.html +md5 70ea7bc7bacf1a124b1692605883f620 xset-1.2.4.tar.bz2 +sha1 41a857f30ff5bb0dfbda1549bb703984344ea228 xset-1.2.4.tar.bz2 +sha256 e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957 xset-1.2.4.tar.bz2 +sha512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d xset-1.2.4.tar.bz2 +# Locally computed +sha256 6bfc619b6d37dd0e6ca575edcb3a05194136e04d1d9989b8e14e6f7850587382 COPYING diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk index 157cd229a7..9ead55a20f 100644 --- a/package/x11r7/xapp_xset/xapp_xset.mk +++ b/package/x11r7/xapp_xset/xapp_xset.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSET_VERSION = 1.2.3 +XAPP_XSET_VERSION = 1.2.4 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSET_LICENSE = MIT From 6a11e84c79e15499dabd021649d4580087df8d41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:54 +0100 Subject: [PATCH 0348/2640] package/x11r7/xapp_xsetroot: bump version to 1.1.2 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xsetroot/xapp_xsetroot.hash | 9 +++++++-- package/x11r7/xapp_xsetroot/xapp_xsetroot.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash index 89a1abe454..7cbabb5cef 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002149.html -sha256 ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9 xsetroot-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002874.html +md5 5fe769c8777a6e873ed1305e4ce2c353 xsetroot-1.1.2.tar.bz2 +sha1 42ab81761823b44974feab86477007c49dbace50 xsetroot-1.1.2.tar.bz2 +sha256 10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c xsetroot-1.1.2.tar.bz2 +sha512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b xsetroot-1.1.2.tar.bz2 +# Locally computed +sha256 48e9c9572e0dc1c14b93b753542f780e7751dd7f035816374d8a8be0211a4520 COPYING diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk index 9000867c84..98ba344cfa 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSETROOT_VERSION = 1.1.1 +XAPP_XSETROOT_VERSION = 1.1.2 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSETROOT_LICENSE = MIT From cd6915df1f89ffecf7732081cce1ec449486d09e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:55 +0100 Subject: [PATCH 0349/2640] package/x11r7/xapp_xsm: bump version to 1.0.4 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xsm/xapp_xsm.hash | 9 +++++++-- package/x11r7/xapp_xsm/xapp_xsm.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xsm/xapp_xsm.hash b/package/x11r7/xapp_xsm/xapp_xsm.hash index aef9e558ba..eda231fe93 100644 --- a/package/x11r7/xapp_xsm/xapp_xsm.hash +++ b/package/x11r7/xapp_xsm/xapp_xsm.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002163.html -sha256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a xsm-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002875.html +md5 bd32c14f09d58f46084b6a8f20e6e8f1 xsm-1.0.4.tar.bz2 +sha1 dd41234e276fe8b2d0a853879568f73b6d98812a xsm-1.0.4.tar.bz2 +sha256 9934b6893a4e52cf7435368fc8d425c371b5e32d96e420ead30166eb82d64425 xsm-1.0.4.tar.bz2 +sha512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176 xsm-1.0.4.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk index d4d240774e..6d752b4d15 100644 --- a/package/x11r7/xapp_xsm/xapp_xsm.mk +++ b/package/x11r7/xapp_xsm/xapp_xsm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSM_VERSION = 1.0.3 +XAPP_XSM_VERSION = 1.0.4 XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSM_LICENSE = MIT From 7a0293fdb5e2bd5fc1917635c6c7d8b1aa81d695 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:56 +0100 Subject: [PATCH 0350/2640] package/x11r7/xapp_xwd: bump version to 1.0.7 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xwd/xapp_xwd.hash | 9 +++++++-- package/x11r7/xapp_xwd/xapp_xwd.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xwd/xapp_xwd.hash b/package/x11r7/xapp_xwd/xapp_xwd.hash index 1d9b4d5cff..606618bcc6 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.hash +++ b/package/x11r7/xapp_xwd/xapp_xwd.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002292.html -sha256 3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79 xwd-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002876.html +md5 11794a8eba6d295a192a8975287fd947 xwd-1.0.7.tar.bz2 +sha1 65ce0617be29687cf6082c3a0e85d15a0dcccda9 xwd-1.0.7.tar.bz2 +sha256 cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794 xwd-1.0.7.tar.bz2 +sha512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e xwd-1.0.7.tar.bz2 +# Locally computed +sha256 7cfda56afd92a1ecd2f23bd0064e01b5141053390d854785504adfe2c0fbd946 COPYING diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk index 0cda34ee26..4d7ed0f877 100644 --- a/package/x11r7/xapp_xwd/xapp_xwd.mk +++ b/package/x11r7/xapp_xwd/xapp_xwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XWD_VERSION = 1.0.6 +XAPP_XWD_VERSION = 1.0.7 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XWD_LICENSE = MIT From 1cc48c3bdfbebf36826b7a6e4e514f9a367a8f87 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:57 +0100 Subject: [PATCH 0351/2640] package/x11r7/xapp_xwininfo: bump version to 1.1.4 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xwininfo/xapp_xwininfo.hash | 9 +++++++-- package/x11r7/xapp_xwininfo/xapp_xwininfo.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index 4b891a2084..e3882584c3 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002215.html -sha256 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 xwininfo-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002877.html +md5 9a505b91ae7160bbdec360968d060c83 xwininfo-1.1.4.tar.bz2 +sha1 7364e79d1de7bb612dd98c336c649648c6c081ca xwininfo-1.1.4.tar.bz2 +sha256 839498aa46b496492a5c65cd42cd2e86e0da88149b0672e90cb91648f8cd5b01 xwininfo-1.1.4.tar.bz2 +sha512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b xwininfo-1.1.4.tar.bz2 +# Locally computed +sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 8ae5961ee4..7da881a9fc 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.3 +XAPP_XWININFO_VERSION = 1.1.4 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XWININFO_LICENSE = MIT From 8ce7fdb597ba402d199af280661262ed8d4e4c74 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:59 +0100 Subject: [PATCH 0352/2640] package/x11r7/xdata_xbitmaps: bump version to 1.1.2 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash | 9 +++++++-- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash index 3e5fb32896..05d37288ad 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2010-December/001563.html -sha1 578afff7e4912192b524c25254cf7f54c16e57d8 xbitmaps-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002881.html +md5 cedeef095918aca86da79a2934e03daf xbitmaps-1.1.2.tar.bz2 +sha1 1cb0e485a66280e9a64b48426140b8a0de9cf169 xbitmaps-1.1.2.tar.bz2 +sha256 b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee xbitmaps-1.1.2.tar.bz2 +sha512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2 +# Locally computed +sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk index 9767f2c143..e9545abaec 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDATA_XBITMAPS_VERSION = 1.1.1 +XDATA_XBITMAPS_VERSION = 1.1.2 XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data XDATA_XBITMAPS_LICENSE = MIT From b762f7d3e57397858051e7bb6d4b9cbd3f97b346 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:18:00 +0100 Subject: [PATCH 0353/2640] package/x11r7/xdata_xcursor-themes: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash | 9 +++++++-- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index e59c848641..6a8c99599f 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002271.html -sha256 e3fd2c05b9df0d88a3d1192c02143295744685f4f9a03db116e206698331bb86 xcursor-themes-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002882.html +md5 34a93df23e4aa9ee2832a4af33da3ceb xcursor-themes-1.0.5.tar.bz2 +sha1 6caae6cdb441003a42305f964c32bac21c34626f xcursor-themes-1.0.5.tar.bz2 +sha256 ae8381d39096598f7fe93fbd3ab079d93347a989f29e017f399ffcd20c8e1272 xcursor-themes-1.0.5.tar.bz2 +sha512 f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2 +# Locally computed +sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index a2987a0ff2..048291008b 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.4 +XDATA_XCURSOR_THEMES_VERSION = 1.0.5 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT From aa4c7cbefc2765d27ba95374b184795c7079acf0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Mar 2018 18:17:58 +0100 Subject: [PATCH 0354/2640] package/x11r7/xapp_xwud: bump version to 1.0.5 Added all upstream hashes, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xwud/xapp_xwud.hash | 9 +++++++-- package/x11r7/xapp_xwud/xapp_xwud.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xwud/xapp_xwud.hash b/package/x11r7/xapp_xwud/xapp_xwud.hash index 44e9c60753..e42057819d 100644 --- a/package/x11r7/xapp_xwud/xapp_xwud.hash +++ b/package/x11r7/xapp_xwud/xapp_xwud.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001927.html -sha256 d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd xwud-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-March/002878.html +md5 79972093bb0766fcd0223b2bd6d11932 xwud-1.0.5.tar.bz2 +sha1 a85d84a1b81f8e667ea6ac126d447590c93eb079 xwud-1.0.5.tar.bz2 +sha256 99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9 xwud-1.0.5.tar.bz2 +sha512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184 xwud-1.0.5.tar.bz2 +# Locally computed +sha256 be3db9aa060c462490a8c1ed44a4d059b32bba359f4688b1ecf3f794d363539e COPYING diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk index 60afd86287..2c2e1ad497 100644 --- a/package/x11r7/xapp_xwud/xapp_xwud.mk +++ b/package/x11r7/xapp_xwud/xapp_xwud.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XWUD_VERSION = 1.0.4 +XAPP_XWUD_VERSION = 1.0.5 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XWUD_LICENSE = MIT From add590943d8a3e26865b270392f6294c66cae7fc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 25 Mar 2018 00:43:23 +0300 Subject: [PATCH 0355/2640] xfsprogs: fix build with older kernel headers xfsprogs uses a local definition of struct fsxattr when the kernel provided one in linux/fs.h is too old. The preprocessor trickery that allows to include linux/fs.h without colliding with the local definitions breaks when source files include linux/fs.h on their own. Add a patch that removes these local includes. Fixes: http://autobuild.buildroot.net/results/3aa/3aad812582d94b76d204436d2879bfa732c34da6/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...-fix-build-with-older-kernel-headers.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch diff --git a/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch b/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch new file mode 100644 index 0000000000..9e1300d0cd --- /dev/null +++ b/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch @@ -0,0 +1,63 @@ +From 7ea1df02d0f2549b6249c8bee1f6ae02bf1251a9 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 25 Mar 2018 00:01:23 +0300 +Subject: [PATCH] xfs_scrub: fix build with older kernel headers + +The OVERRIDE_SYSTEM_FSXATTR macro in include/linux.h is meant to +override the linux/fs.h kernel header provided struct fsxattr for +kernels older than v4.7. A few source files include linux/fs.h before +the local linux.h, making this override ineffective. Remove these header +includes from the source files, and rely on the linux.h include alone. + +This fixes the following build failures: + +In file included from ../include/xfs.h:37:0, + from disk.c:40: +../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr' + struct fsxattr { + ^~~~~~~ + +In file included from ../include/xfs.h:37:0, + from ../include/project.h:22, + from ../include/input.h:24, + from phase1.c:38: +../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr' + struct fsxattr { + ^~~~~~~ + +Cc: Darrick J. Wong +Signed-off-by: Baruch Siach +--- +Upstream status: https://patchwork.kernel.org/patch/10306419/ + + scrub/disk.c | 1 - + scrub/phase1.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/scrub/disk.c b/scrub/disk.c +index e12175c8656c..54d7a2a77c45 100644 +--- a/scrub/disk.c ++++ b/scrub/disk.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #ifdef HAVE_SG_IO + # include + #endif +diff --git a/scrub/phase1.c b/scrub/phase1.c +index 6cd544233c94..d15689e1b544 100644 +--- a/scrub/phase1.c ++++ b/scrub/phase1.c +@@ -32,7 +32,6 @@ + #include + #include + #include +-#include + #include "libfrog.h" + #include "workqueue.h" + #include "input.h" +-- +2.16.2 + From 988e4c827c0f3d33a018c7309e675b139980a4e5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 25 Mar 2018 10:23:31 -0300 Subject: [PATCH 0356/2640] linux: bump default to version 4.15.13 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 4aa13cd442..9361adca55 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From d9534c816383ac45e75ae042b7c668406d9e8b1f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 25 Mar 2018 10:23:32 -0300 Subject: [PATCH 0357/2640] linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a8adfd6bf..f4c1427f29 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,12 +242,12 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.50" if BR2_KERNEL_HEADERS_4_1 - default "4.4.123" if BR2_KERNEL_HEADERS_4_4 - default "4.9.89" if BR2_KERNEL_HEADERS_4_9 + default "4.4.124" if BR2_KERNEL_HEADERS_4_4 + default "4.9.90" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.29" if BR2_KERNEL_HEADERS_4_14 - default "4.15.12" if BR2_KERNEL_HEADERS_4_15 + default "4.14.30" if BR2_KERNEL_HEADERS_4_14 + default "4.15.13" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From e4e714021043836ac803591fc3c39db957827725 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 25 Mar 2018 00:59:53 -0300 Subject: [PATCH 0358/2640] tpm2-tools: fix compilation error due to uninitialized variable Backport a patch alreary submitted upstream, at https://github.com/tpm2-software/tpm2-tools/pull/954 Fixes: http://autobuild.buildroot.net/results/ae1e151576b365380ab711a1b8ffcd92ad0050e2 http://autobuild.buildroot.net/results/ee80c2fe54c89589532efd47eb93bd27637c690f Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- ...-type-may-be-used-uninitialized-warn.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch diff --git a/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch b/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch new file mode 100644 index 0000000000..b472666f46 --- /dev/null +++ b/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch @@ -0,0 +1,36 @@ +From e15b01a1eb27e31964308892fcaa9c7d4f17f181 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sat, 24 Mar 2018 22:46:46 -0300 +Subject: [PATCH] tpm2_certify: fix "'type' may be used uninitialized" warning + +get_key_type does not assign a value to 'type' on error conditions, +which makes the compiler believe that it will be used uninitialized in +the LOG_ERR call, in set_scheme. In practice this will never happen +because set_scheme returns immediately if get_key_type retuns false but +the compiler does not understand that logic and fails because warnings +are treated as errors. + +Adapted for version 3.0.3 from the change submitted upstream: + + https://github.com/tpm2-software/tpm2-tools/pull/954 + +Signed-off-by: Carlos Santos +--- + tools/tpm2_certify.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/tpm2_certify.c b/tools/tpm2_certify.c +index eaac02f..cbc42a9 100644 +--- a/tools/tpm2_certify.c ++++ b/tools/tpm2_certify.c +@@ -107,6 +107,7 @@ static bool get_key_type(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT object_h + &out_public, &name, &qualified_name, &sessions_data_out)); + if (rval != TPM_RC_SUCCESS) { + LOG_ERR("TPM2_ReadPublic failed. Error Code: 0x%x", rval); ++ *type = TPM_ALG_ERROR; + return false; + } + +-- +2.14.3 + From 3ff90c8888dbc910665a8d76cc996cb3cb10c77d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:00 +0100 Subject: [PATCH 0359/2640] Makefile, skeleton: move the host skeleton logic to host-skeleton package As part of the per-package SDK work, we want to avoid having logic that installs files to the global HOST_DIR, and instead do it inside packages. One thing that gets installed to the global HOST_DIR is the minimal "skeleton" that we create in host: - the "usr" symbolic link for backward compatibility - the "lib" directory, and its lib64 or lib32 symbolic links This commit moves this logic to a new host-skeleton package, and makes all packages (except itself) depend on it. While at it, use $(Q) instead of @ in the HOST_SKELETON_INSTALL_CMDS. [Peter: drop host-patchelf reference in commit message] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 13 +------------ package/pkg-generic.mk | 4 ++++ package/skeleton/skeleton.mk | 12 ++++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 1b34818fc8..33c87b5ebb 100644 --- a/Makefile +++ b/Makefile @@ -560,7 +560,7 @@ endif .PHONY: dirs dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(HOST_DIR) $(HOST_DIR)/usr $(HOST_DIR)/lib $(BINARIES_DIR) + $(HOST_DIR) $(BINARIES_DIR) $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) $(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig @@ -579,17 +579,6 @@ sdk: world $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location -# Compatibility symlink in case a post-build script still uses $(HOST_DIR)/usr -$(HOST_DIR)/usr: $(HOST_DIR) - @ln -snf . $@ - -$(HOST_DIR)/lib: $(HOST_DIR) - @mkdir -p $@ - @case $(HOSTARCH) in \ - (*64) ln -snf lib $(@D)/lib64;; \ - (*) ln -snf lib $(@D)/lib32;; \ - esac - # Populating the staging with the base directories is handled by the skeleton package $(STAGING_DIR): @mkdir -p $(STAGING_DIR) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5edb4b0838..3cadb28595 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -551,6 +551,10 @@ $(2)_DEPENDENCIES += toolchain endif endif +ifneq ($(1),host-skeleton) +$(2)_DEPENDENCIES += host-skeleton +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES)) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index d380f41649..efcf420d72 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -11,4 +11,16 @@ SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_ADD_SKELETON_DEPENDENCY = NO +# We create a compatibility symlink in case a post-build script still +# uses $(HOST_DIR)/usr +define HOST_SKELETON_INSTALL_CMDS + $(Q)ln -snf . $(HOST_DIR)/usr + $(Q)mkdir -p $(HOST_DIR)/lib + $(Q)case $(HOSTARCH) in \ + (*64) ln -snf lib $(HOST_DIR)/lib64;; \ + (*) ln -snf lib $(HOST_DIR)/lib32;; \ + esac +endef + $(eval $(virtual-package)) +$(eval $(host-generic-package)) From 6729050f3a49dba42d2d881d31dbefd6b82b8dad Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:01 +0100 Subject: [PATCH 0360/2640] pkg-cmake: install CMake files as part of a package Currently, the toolchainfile.cmake and Buildroot.cmake files are installed outside of any package, just triggered by the toolchain target. As part of the per-package SDK effort, we are trying to avoid anything that installs to the global $(HOST_DIR), and this is one of the remaining files installed in $(HOST_DIR) outside of any package. We fix this by installing such files as part of the toolchain package post-install staging hooks. Yes, a post-install staging hook to install things to $(HOST_DIR) is a bit weird, but the toolchain infrastructure is made of target packages only, and they all install a lot of stuff to $(HOST_DIR) already. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 12 +++++++----- toolchain/toolchain/toolchain.mk | 3 --- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 9b07798a1e..34b49bdbe5 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -253,8 +253,8 @@ endif # based on the toolchainfile.cmake file's location: $(HOST_DIR)/share/buildroot # In all the other variables, HOST_DIR will be replaced by RELOCATED_HOST_DIR, # so we have to strip "$(HOST_DIR)/" from the paths that contain it. -$(HOST_DIR)/share/buildroot/toolchainfile.cmake: - @mkdir -p $(@D) +define TOOLCHAIN_CMAKE_INSTALL_FILES + @mkdir -p $(HOST_DIR)/share/buildroot sed \ -e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \ -e 's#@@TARGET_CFLAGS@@#$(call qstrip,$(TARGET_CFLAGS))#' \ @@ -268,7 +268,9 @@ $(HOST_DIR)/share/buildroot/toolchainfile.cmake: -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ - > $@ + > $(HOST_DIR)/share/buildroot/toolchainfile.cmake + $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake \ + $(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake +endef -$(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake: - $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake $(@) +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 179c09edf1..91c9ca2eff 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -38,6 +38,3 @@ TOOLCHAIN_INSTALL_STAGING = YES endif $(eval $(virtual-package)) - -toolchain: $(HOST_DIR)/share/buildroot/toolchainfile.cmake -toolchain: $(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake From e15ec4c56b811449047049cba89e178d8ee0fccd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:02 +0100 Subject: [PATCH 0361/2640] package/pkg-generic: add the concept of extract dependency Extract dependencies are dependencies that must be ready before the extract step of a package, i.e for tools that are needed to extract packages themselves. Current examples of such tools are host-tar, host-lzip and host-xz. They are currently handled through DEPENDENCIES_HOST_PREREQ. However, this mechanism has a number of drawbacks: - First and foremost, because host-tar/host-lzip/host-xz are not listed in the dependencies of packages, the package infrastructure does not know it should rsync them in the context of per-package SDK. - Second, there is no dependency handling *between* them. I.e, we have no mechanism that says host-tar should be built before host-lzip, while it is in fact the case: if you need to build host-lzip, you need to extract a tarball, so you may need host-tar if your system tarball is not capable enough. For those reasons, it makes sense to add explicit support for "extract dependencies" in the package infrastructure, through the _EXTRACT_DEPENDENCIES variable. It is unlikely this variable will ever be used by a package .mk file, but it will be used internally by the package infrastructure. [Peter: fix typo in manual] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: Matt Weber Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 7 +++++++ package/pkg-generic.mk | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 521d6d50c7..9d1428ad40 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -347,6 +347,13 @@ information is (assuming the package name is +libfoo+) : a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for the current host package. +* +LIBFOO_EXTRACT_DEPENDENCIES+ lists the dependencies (in terms of + package name) that are required for the current target package to be + extracted. These dependencies are guaranteed to be compiled and + installed before the extract step of the current package + starts. This is only used internally by the package infrastructure, + and should typically not be used directly by packages. + * +LIBFOO_PATCH_DEPENDENCIES+ lists the dependencies (in terms of package name) that are required for the current package to be patched. These dependencies are guaranteed to be extracted and diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 3cadb28595..0a404040b0 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -557,8 +557,13 @@ endif # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) +$(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) $(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES)) -$(2)_FINAL_ALL_DEPENDENCIES = $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES)) +$(2)_FINAL_ALL_DEPENDENCIES = \ + $$(sort \ + $$($(2)_FINAL_DEPENDENCIES) \ + $$($(2)_FINAL_EXTRACT_DEPENDENCIES) \ + $$($(2)_FINAL_PATCH_DEPENDENCIES)) $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO @@ -681,6 +686,7 @@ $$($(2)_TARGET_PATCH): | $$(patsubst %,%-patch,$$($(2)_FINAL_PATCH_DEPENDENCIES $(1)-extract: $$($(2)_TARGET_EXTRACT) $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) +$$($(2)_TARGET_EXTRACT): | $$($(2)_FINAL_EXTRACT_DEPENDENCIES) $(1)-depends: $$($(2)_FINAL_DEPENDENCIES) From e77013a3c4c2306e0c24da37db650d8eaf36ca4b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:03 +0100 Subject: [PATCH 0362/2640] package/pkg-generic: handle host-tar as an extract dependency This moves the host-tar dependency handling from DEPENDENCY_HOST_PREREQ to an extract dependency. To achieve that, check-host-tar.mk fills in the BR2_TAR_HOST_DEPENDENCY variable with host-tar if building a host-tar is needed. The name BR2_TAR_HOST_DEPENDENCY has been chosen because it matches the name BR2_CMAKE_HOST_DEPENDENCY already used in check-host-cmake.mk. The BR2_TAR_HOST_DEPENDENCY is added to all packages, except host-tar itself (obviously) and host-skeleton, because we depend on host-skeleton to install host-tar properly in HOST_DIR. In addition, we modify tar.mk to explicitly build host-tar without ccache: since ccache source code is available as a tarball, ccache will obviously depend on host-tar if the system tar is insufficient. Finally, to make things really clean, we also add $(BR2_TAR_HOST_DEPENDENCY) to the dependencies of the tar filesystem format, since it requires tar, so we'd better make sure we have a suitable tar. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: Matt Weber Signed-off-by: Peter Korsgaard --- fs/tar/tar.mk | 2 ++ package/pkg-generic.mk | 4 ++++ package/tar/tar.mk | 5 +++++ support/dependencies/check-host-tar.mk | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index e39c2fdbf1..68149e9eb7 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -6,6 +6,8 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) +ROOTFS_TAR_DEPENDENCIES = $(BR2_TAR_HOST_DEPENDENCY) + define ROOTFS_TAR_CMD (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0a404040b0..ae50c5f284 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -555,6 +555,10 @@ ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif +ifeq ($(filter host-tar host-skeleton,$(1)),) +$(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index a8a15d9518..92b6e9eaa5 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -47,4 +47,9 @@ endef HOST_TAR_CONF_OPTS = --without-selinux +# we are built before ccache +HOST_TAR_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + $(eval $(host-autotools-package)) diff --git a/support/dependencies/check-host-tar.mk b/support/dependencies/check-host-tar.mk index ad0b32e277..07d02fd1b1 100644 --- a/support/dependencies/check-host-tar.mk +++ b/support/dependencies/check-host-tar.mk @@ -1,6 +1,6 @@ TAR ?= tar ifeq (,$(call suitable-host-package,tar,$(TAR))) -DEPENDENCIES_HOST_PREREQ += host-tar TAR = $(HOST_DIR)/bin/tar +BR2_TAR_HOST_DEPENDENCY = host-tar endif From f13fdc45e84419fa9152746d7a9218216c93a045 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:04 +0100 Subject: [PATCH 0363/2640] package/pkg-generic: handle host-xz as an extract dependency This moves the host-xz dependency handling from DEPENDENCY_HOST_PREREQ to an extract dependency. To achieve that, check-host-xz.mk fills in the BR2_XZ_HOST_DEPENDENCY with host-xz if building a host-xz is needed. The name BR2_XZ_HOST_DEPENDENCY has been chosen because it matches the name BR2_CMAKE_HOST_DEPENDENCY already used in check-host-cmake.mk. The BR2_XZ_HOST_DEPENDENCY is added to all packages, except: - host-xz, because we would otherwise depend on ourself. - host-tar, because xz itself is delivered as a tarball, so we need to have host-xz depend on host-tar, and not host-tar depend on host-xz - host-skeleton, because we need to have host-xz depend on host-skeleton, and not the opposite. In addition, we modify xz.mk to explicitly build host-xz without ccache. We generally took the approach of building host-ccache *after* all the extractors have been built. [Peter: fix s/host-tar/host-xz/ typo] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 4 ++++ package/xz/xz.mk | 5 +++++ support/dependencies/check-host-xzcat.mk | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index ae50c5f284..b03d7263b1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -559,6 +559,10 @@ ifeq ($(filter host-tar host-skeleton,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif +ifeq ($(filter host-tar host-skeleton host-xz,$(1)),) +$(2)_EXTRACT_DEPENDENCIES += $(BR2_XZCAT_HOST_DEPENDENCY) +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/package/xz/xz.mk b/package/xz/xz.mk index e8116f24ae..bcdac13ee3 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -18,5 +18,10 @@ else XZ_CONF_OPTS = --disable-threads endif +# we are built before ccache +HOST_XZ_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/support/dependencies/check-host-xzcat.mk b/support/dependencies/check-host-xzcat.mk index 9be75c7311..e5d72f95dd 100644 --- a/support/dependencies/check-host-xzcat.mk +++ b/support/dependencies/check-host-xzcat.mk @@ -2,7 +2,7 @@ # If it is not present, build our own host-xzcat ifeq (,$(call suitable-host-package,xzcat,$(XZCAT))) -DEPENDENCIES_HOST_PREREQ += host-xz +BR2_XZCAT_HOST_DEPENDENCY = host-xz EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma XZCAT = $(HOST_DIR)/bin/xzcat endif From 15815e43ddbb137faca46084f3808f8063bfbffd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:05 +0100 Subject: [PATCH 0364/2640] package/pkg-generic: handle host-lzip as an extract dependency This moves the host-lzip dependency handling from DEPENDENCY_HOST_PREREQ to an extract dependency. To achieve that, check-host-lzip.mk fills in the BR2_LZIP_HOST_DEPENDENCY with host-lzip if building a host-lzip is needed. The name BR2_LZIP_HOST_DEPENDENCY has been chosen because it matches the name BR2_CMAKE_HOST_DEPENDENCY already used in check-host-cmake.mk. The BR2_LZIP_HOST_DEPENDENCY is added to all packages, except: - host-lzip, because we would otherwise depend on ourself. - host-tar, because lzip itself is delivered as a tarball, so we need to have host-lzip depend on host-tar, and not host-tar depend on host-lzip - host-skeleton, because we need to have host-lzip depend on host-skeleton, and not the opposite. We also mutually exclude host-lzip and host-xz from dependending on each other, to avoid a circular dependency. In addition, we modify lzip.mk to explicitly build host-lzip without ccache. We generally took the approach of building host-ccache *after* all the extractors have been built. [Peter: fix s/host-tar/host-lzip/ typo, fix s/xz/lzip/ typo] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/lzip/lzip.mk | 2 +- package/pkg-generic.mk | 6 +++++- support/dependencies/check-host-lzip.mk | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 4088662de2..72742240a5 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -16,7 +16,7 @@ endef define HOST_LZIP_CONFIGURE_CMDS (cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=$(HOST_DIR) \ - $(HOST_CONFIGURE_OPTS) ) + $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)") endef define LZIP_BUILD_CMDS diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b03d7263b1..f03f1d930f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -559,10 +559,14 @@ ifeq ($(filter host-tar host-skeleton,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz,$(1)),) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_XZCAT_HOST_DEPENDENCY) endif +ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) +$(2)_EXTRACT_DEPENDENCIES += $(BR2_LZIP_HOST_DEPENDENCY) +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk index 00cdd0a236..cdd784058c 100644 --- a/support/dependencies/check-host-lzip.mk +++ b/support/dependencies/check-host-lzip.mk @@ -1,5 +1,5 @@ ifeq (,$(call suitable-host-package,lzip,$(LZCAT))) -DEPENDENCIES_HOST_PREREQ += host-lzip +BR2_LZIP_HOST_DEPENDENCY = host-lzip EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz LZCAT = $(HOST_DIR)/bin/lzip -d -c endif From 0283d7ee3907d1345307c4ee4aab02fdf38780d4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:06 +0100 Subject: [PATCH 0365/2640] package/pkg-generic: handle host-ccache as a regular dependency This moves the host-ccache dependency handling from DEPENDENCIES_HOST_PREREQ to a proper package dependency. When BR2_CCACHE=y, we add host-ccache as a regular dependency of all packages except: - The extractor packages host-tar, host-xz and host-lzip - host-ccache itself - host-skeleton, because all packages depend on it Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: Matt Weber Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 5 +++++ package/pkg-generic.mk | 6 ++++++ support/dependencies/dependencies.mk | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 552a611f42..9a11d46d30 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -21,6 +21,11 @@ CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt # has zero dependency besides the C library. HOST_CCACHE_CONF_OPTS += --with-bundled-zlib +# We are ccache, so we can't use ccache +HOST_CCACHE_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR # is already used by autotargets for the ccache package. diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f03f1d930f..bc4882235f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -567,6 +567,12 @@ ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_LZIP_HOST_DEPENDENCY) endif +ifeq ($(BR2_CCACHE),y) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-ccache,$(1)),) +$(2)_DEPENDENCIES += host-ccache +endif +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk index 3fc235863c..bab064319f 100644 --- a/support/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -17,10 +17,6 @@ endef include support/dependencies/check-host-tar.mk -include $(sort $(filter-out %-tar.mk,$(wildcard support/dependencies/check-host-*.mk))) -ifeq ($(BR2_CCACHE),y) -DEPENDENCIES_HOST_PREREQ += host-ccache -endif - core-dependencies: @MAKE="$(MAKE)" DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ $(TOPDIR)/support/dependencies/dependencies.sh From 38d1c4aae36650816e464b5800f6aba86ebc1f9f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:07 +0100 Subject: [PATCH 0366/2640] package/pkg-generic: handle host-fakedate as a regular dependency This commit moves the host-fakedate dependency handling from DEPENDENCIES_HOST_PREREQ to a proper regular dependency handled by the package infrastructure. host-fakedate is added as dependency to all packages, except host-skeleton, because we depend on it. In addition, we make sure that host-fakedate does not grow a dependency on host-{tar,xz,lzip,ccache} to avoid circular dependencies. host-fakedate does not need any extraction tool and does not need to build C/C++ code (the source code is just a shell script available in Buildroot). Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 1 - package/pkg-generic.mk | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 33c87b5ebb..925d6e4aec 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,6 @@ export LC_ALL = C export GZIP = -n BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) -DEPENDENCIES_HOST_PREREQ += host-fakedate endif # To put more focus on warnings, be less verbose as default diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index bc4882235f..6d1f267328 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -555,24 +555,30 @@ ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif -ifeq ($(filter host-tar host-skeleton,$(1)),) +ifeq ($(filter host-tar host-skeleton host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_XZCAT_HOST_DEPENDENCY) endif -ifeq ($(filter host-tar host-skeleton host-xz host-lzip,$(1)),) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) $(2)_EXTRACT_DEPENDENCIES += $(BR2_LZIP_HOST_DEPENDENCY) endif ifeq ($(BR2_CCACHE),y) -ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-ccache,$(1)),) +ifeq ($(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif +ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($(filter host-skeleton host-fakedate,$(1)),) +$(2)_DEPENDENCIES += host-fakedate +endif +endif + # Eliminate duplicates in dependencies $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) $(2)_FINAL_EXTRACT_DEPENDENCIES = $$(sort $$($(2)_EXTRACT_DEPENDENCIES)) From ea9669fffae7d807ccb3810eb6c662cbb9e8f96f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 24 Mar 2018 15:20:08 +0100 Subject: [PATCH 0367/2640] core: kill DEPENDENCIES_HOST_PREREQ Now that DEPENDENCIES_HOST_PREREQ is no longer used anywhere, we can kill it. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 2 -- package/pkg-generic.mk | 2 -- support/dependencies/dependencies.mk | 10 ++-------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 925d6e4aec..a3a9d290d9 100644 --- a/Makefile +++ b/Makefile @@ -501,8 +501,6 @@ include package/Makefile.in -include $(sort $(wildcard arch/arch.mk.*)) include support/dependencies/dependencies.mk -PACKAGES += $(DEPENDENCIES_HOST_PREREQ) - include $(sort $(wildcard toolchain/*.mk)) include $(sort $(wildcard toolchain/*/*.mk)) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6d1f267328..6d82f7027e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -690,9 +690,7 @@ $(1)-configure: $$($(2)_TARGET_CONFIGURE) $$($(2)_TARGET_CONFIGURE): | $$($(2)_FINAL_DEPENDENCIES) $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare -ifeq ($$(filter $(1),$$(DEPENDENCIES_HOST_PREREQ)),) $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dependencies -endif ifeq ($$($(2)_OVERRIDE_SRCDIR),) # In the normal case (no package override), the sequence of steps is diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk index bab064319f..563574d6ad 100644 --- a/support/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -17,19 +17,13 @@ endef include support/dependencies/check-host-tar.mk -include $(sort $(filter-out %-tar.mk,$(wildcard support/dependencies/check-host-*.mk))) -core-dependencies: +dependencies: @MAKE="$(MAKE)" DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ $(TOPDIR)/support/dependencies/dependencies.sh -$(DEPENDENCIES_HOST_PREREQ): HOSTCC=$(HOSTCC_NOCCACHE) -$(DEPENDENCIES_HOST_PREREQ): HOSTCXX=$(HOSTCXX_NOCCACHE) -$(DEPENDENCIES_HOST_PREREQ): core-dependencies - -dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ) - ################################################################################ # # Toplevel Makefile options # ################################################################################ -.PHONY: dependencies core-dependencies +.PHONY: dependencies From 108837294191db0075aa0d05ce11f7c51a3dca14 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 25 Mar 2018 21:40:39 +0300 Subject: [PATCH 0368/2640] strace: bump to version 4.21 Download site moved to strace.io. No upstream provided hashes. Drop the musl specific autoconf seed values. These values are now detected correctly. Add --enable-mpers=check to fix configure on aarch64 that does not support binaries for the compat personality. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 7 ++----- package/strace/strace.mk | 13 +++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 404be39788..21da83058e 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,7 +1,4 @@ -# From https://sourceforge.net/projects/strace/files/strace/4.20/ -md5 f2271ab0fac49ebee9cbd7f3469227cb strace-4.20.tar.xz -sha1 9cebc754af3434e4027a07745770892f685c0316 strace-4.20.tar.xz # Locally calculated after checking signature -# https://sourceforge.net/projects/strace/files/strace/4.20/strace-4.20.tar.xz.asc -sha256 5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523 strace-4.20.tar.xz +# https://strace.io/files/4.21/strace-4.21.tar.xz.asc +sha256 5c7688db44073e94c59a5627744e5699454419824cc8166e8bcfd7ec58375c37 strace-4.21.tar.xz sha256 ea7ff222f36c9df0aa2924a8f7c7d2aec3ea11e752feba4b15ec79b695b6236a COPYING diff --git a/package/strace/strace.mk b/package/strace/strace.mk index ba57774e5d..f27dc4155b 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,19 +4,12 @@ # ################################################################################ -STRACE_VERSION = 4.20 +STRACE_VERSION = 4.21 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz -STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) +STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = BSD-3-Clause STRACE_LICENSE_FILES = COPYING - -# strace bundle some kernel headers to build libmpers, this mixes userspace -# headers and kernel headers which break the build with musl. -# The stddef.h from gcc is used instead of the one from musl. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -STRACE_CONF_OPTS += st_cv_m32_mpers=no \ - st_cv_mx32_mpers=no -endif +STRACE_CONF_OPTS = --enable-mpers=check define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph From cbe725d755006e41a71180b5786fa9f52104f518 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 22 Mar 2018 09:20:01 -0700 Subject: [PATCH 0369/2640] eudev: prevent udev init script nonexistent directory error The following error occures in the udev init script because the kernel config may optionally not include uevent_helper. /etc/init.d/S10udev: line 47: can't create /proc/sys/kernel/hotplug: nonexistent directory Work around this by not trying to access the destination if it's not available. Signed-off-by: Joshua Henderson Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/eudev/S10udev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/eudev/S10udev b/package/eudev/S10udev index 640fec625b..47c715c886 100755 --- a/package/eudev/S10udev +++ b/package/eudev/S10udev @@ -28,7 +28,7 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) printf "Populating %s using udev: " "${udev_root:-/dev}" - printf '\000\000\000\000' > /proc/sys/kernel/hotplug + [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug $UDEV_BIN -d || { echo "FAIL"; exit 1; } udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add From 76e6837cd670449740f21015a406d722e089a084 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Mar 2018 22:03:51 +0200 Subject: [PATCH 0370/2640] package/libss7: propagate dependency from dahdi-tools Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libss7/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index b99c578182..bdf5fbe3a8 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBSS7 bool "libss7" + depends on BR2_USE_MMU # dahdi-tools <- perl depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_DAHDI_LINUX From b3b5608b47525799b0601d45939d3bae545fd124 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 22 Mar 2018 09:24:26 -0700 Subject: [PATCH 0371/2640] sam-ba: fix sam-ba symbolic link Following the removal of $(HOST_DIR)/usr, the symbolic link from $(HOST_DIR)/bin/sam-ba/ to $(HOST_DIR)/opt/sam-ba/sam-ba was broken, so we fix this. In addition, sam-ba being prebuilt, it comes in two separates binaries, one for x86 and the other for x86_64, so we take this into account as well. Signed-off-by: Joshua Henderson [Thomas: - add spaces around = signs - rework commit log.] Signed-off-by: Thomas Petazzoni --- package/sam-ba/sam-ba.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index 244ede3ef1..a7941459c7 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -23,10 +23,16 @@ endef # then create a symbolic link from $(HOST_DIR)/bin to the # application binary, for easier usage. +ifeq ($(HOSTARCH),x86_64) +SAM_BA_BIN_NAME = sam-ba_64 +else +SAM_BA_BIN_NAME = sam-ba +endif + define HOST_SAM_BA_INSTALL_CMDS mkdir -p $(HOST_DIR)/opt/sam-ba/ cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ - ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba + ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba endef $(eval $(host-generic-package)) From 300e335a2dc40a45fc993deca020062824c08705 Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Tue, 20 Mar 2018 15:39:41 -0500 Subject: [PATCH 0372/2640] python-decorator: update to add host package Update to add host package for python decorator Signed-off-by: Jared Bents Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-decorator/python-decorator.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index c0c43f6096..3802f3dc16 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -11,3 +11,4 @@ PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) From 6f7838128376cceb5e6ca28533222bb9c7d7ac86 Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Tue, 20 Mar 2018 15:39:42 -0500 Subject: [PATCH 0373/2640] python-networkx: new package Update to add python-networkx package to buildroot. While 2.1 is the latest version, the current version of setools does not work with versions past 1.11. Signed-off-by: Jared Bents Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-networkx/Config.in | 9 +++++++++ package/python-networkx/python-networkx.hash | 4 ++++ package/python-networkx/python-networkx.mk | 17 +++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-networkx/Config.in create mode 100644 package/python-networkx/python-networkx.hash create mode 100644 package/python-networkx/python-networkx.mk diff --git a/package/Config.in b/package/Config.in index ae5a09bd5b..992d670bb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -838,6 +838,7 @@ menu "External python modules" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" + source "package/python-networkx/Config.in" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in new file mode 100644 index 0000000000..0f3e86f497 --- /dev/null +++ b/package/python-networkx/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_NETWORKX + bool "python-networkx" + select BR2_PACKAGE_PYTHON_DECORATOR # runtime + help + A Python package for the creation, manipulation, + and study of the structure, dynamics, and + functions of complex networks. + + https://pypi.python.org/pypi/networkx diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash new file mode 100644 index 0000000000..92383e75c4 --- /dev/null +++ b/package/python-networkx/python-networkx.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/networks/json, sha256 locally computed +md5 6ef584a879e9163013e9a762e1cf7cd1 networkx-1.11.tar.gz +sha256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 networkx-1.11.tar.gz +sha256 f4c13bf0e83bef45116ebda6c360066df6fd99610efaea9790b998c5441b0c0d LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk new file mode 100644 index 0000000000..4dfdbd5a1c --- /dev/null +++ b/package/python-networkx/python-networkx.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-networkx +# +################################################################################ + +# The current version of setools (v4.1.1) does not work with python-networkx past v1.11 +PYTHON_NETWORKX_VERSION = 1.11 +PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz +PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/c2/93/dbb41b03cf7c878a7409c8e92226531f840a423c9309ea534873a83c9192 +PYTHON_NETWORKX_LICENSE = BSD-3-Clause +PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt +PYTHON_NETWORKX_SETUP_TYPE = setuptools +HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator + +$(eval $(python-package)) +$(eval $(host-python-package)) From 05dc106db43478f295c29fd708fbfdf1df8b6a1a Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Tue, 20 Mar 2018 15:39:43 -0500 Subject: [PATCH 0374/2640] setools: update to add sedta and seinfoflow Update to add sedta and seinfoflow to setools Signed-off-by: Jared Bents Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/setools/Config.in | 2 ++ package/setools/setools.mk | 16 ++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/package/setools/Config.in b/package/setools/Config.in index ae0c45fe3f..0a7899b5eb 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_USE_MMU select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX help @@ -16,6 +17,7 @@ config BR2_PACKAGE_SETOOLS * apol - analyze a SELinux policy. (requires python-qt5) * sediff - semantic policy difference tool for SELinux. * sedta - Perform domain transition analyses + * seinfoflow - information flow analysis for SELinux * sesearch - Search rules (allow, type_transition, etc.) https://github.com/TresysTechnology/setools diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 6748c95c23..1ed7e976d6 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -11,7 +11,7 @@ SETOOLS_INSTALL_STAGING = YES SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol +HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx ifeq ($(BR2_PACKAGE_PYTHON3),y) SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) @@ -36,14 +36,6 @@ define HOST_SETOOLS_FIX_SETUP endef HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP -# sedta and seinfoflow depend on python-networkx. This package is not -# available in buildroot. -define SETOOLS_REMOVE_BROKEN_SCRIPTS - $(RM) $(TARGET_DIR)/usr/bin/sedta - $(RM) $(TARGET_DIR)/usr/bin/seinfoflow -endef -SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS - # apol requires pyqt5. However, the setools installation # process will install apol even if pyqt5 is missing. # Remove these scripts from the target it pyqt5 is not selected. @@ -55,12 +47,8 @@ endef SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS endif -# sedta and seinfoflow depend on python-networkx. This package is not -# available in buildroot. pyqt5 is not a host-package, remove apol -# from the host directory as well. +# pyqt5 is not a host-package, remove apol from the host directory. define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS - $(RM) $(HOST_DIR)/bin/sedta - $(RM) $(HOST_DIR)/bin/seinfoflow $(RM) $(HOST_DIR)/bin/apol endef HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS From c8680956819fae8776d7bd6d1f0e67a7b6436672 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 25 Mar 2018 00:59:52 -0300 Subject: [PATCH 0375/2640] toolchain: fix detection of SSP support GCC issues a warning message if -fstack-protector is passed but SSP is not available, so in order to force the compilation to fail we must also pass -Werror. All external toolchains were verified. The only one whose configuration incorrectly selected BR2_TOOLCHAIN_HAS_SSP was CodeSourcery NIOSII. Fixes: http://autobuild.buildroot.net/results/ce8fe8ac9cf0db01ae15d476ea714ff176965cfb http://autobuild.buildroot.net/results/09ce8f05e28c0219f499ce55130e896cae0c8b45 Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 2 +- .../toolchain-external-codesourcery-niosII/Config.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 63ef6fb4b0..1792286add 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -421,7 +421,7 @@ check_unusable_toolchain = \ # check_toolchain_ssp = \ __CROSS_CC=$(strip $1) ; \ - __HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ + __HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ if [ "$(BR2_TOOLCHAIN_HAS_SSP)" != "y" -a "$${__HAS_SSP}" = "y" ] ; then \ echo "SSP support available in this toolchain, please enable BR2_TOOLCHAIN_EXTERNAL_HAS_SSP" ; \ exit 1 ; \ diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in index 7563995eb6..4ac9c95c86 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -5,7 +5,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS From ff7c6f1c18a10c3822fafde943f7ba82393c15cf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Mar 2018 20:37:11 +0100 Subject: [PATCH 0376/2640] safeclib: fix build without wchar and host-doxygen Add a patch (sent upstream) to add a --disable-doc option Fixes: - http://autobuild.buildroot.net/results/e597843f2bb528da01d1e617929c818613b56cec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Add-disable-doc-option.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/safeclib/0001-Add-disable-doc-option.patch diff --git a/package/safeclib/0001-Add-disable-doc-option.patch b/package/safeclib/0001-Add-disable-doc-option.patch new file mode 100644 index 0000000000..5d71173f1e --- /dev/null +++ b/package/safeclib/0001-Add-disable-doc-option.patch @@ -0,0 +1,59 @@ +From 0d56b6327f6b652511c3e4c72382f4dc4d194e10 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Mar 2018 20:12:28 +0100 +Subject: [PATCH] Add --disable-doc option + +This option allows the user to disable man pages even if pod2man and +doxygen programs are found + +Signed-off-by: Fabrice Fontaine +Upstream-status: Accepted (https://github.com/rurban/safeclib/commit/86404f0e2a7f2a9cad9c916b643594d4d07721d1) +--- + Makefile.am | 2 ++ + configure.ac | 10 ++++++++++ + 2 files changed, 12 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0f65c5c1..ce1424bb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -104,6 +104,7 @@ LIBTOOL_DISTCLEAN_FILES = \ + build-tools/test-driver + DISTCLEANFILES = .version + ++if ENABLE_DOC + MAN1_SOURCES = doc/man/man1/check_for_unsafe_apis.1 + dist_man_MANS = + if HAVE_POD2MAN +@@ -560,6 +561,7 @@ clean-local: + rm -rf $(builddir)/doc/html + rm -rf $(builddir)/doc/man + endif ++endif + + if ENABLE_GCOV + gcov: check +diff --git a/configure.ac b/configure.ac +index 0e4e5eea..33ed7326 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -339,6 +339,16 @@ else + AC_MSG_RESULT([no (default)]) + fi + ++AC_ARG_ENABLE(doc, ++ AS_HELP_STRING([--disable-doc], ++ [disable documentation @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_doc=true ;; ++ no) enable_doc=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-doc]) ;; ++ esac], [enable_doc=true]) ++AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") ++ + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, + dnl but this is only enabled for the shared objs, and we need it in the config + dnl for our tests. +-- +2.14.1 + From 4b30ee93248f93012d427ebd0211039095a6a3fc Mon Sep 17 00:00:00 2001 From: Falco Hyfing Date: Wed, 14 Mar 2018 14:17:50 +0100 Subject: [PATCH 0377/2640] python-pymodbus: new package Signed-off-by: Falco Hyfing Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pymodbus/Config.in | 7 +++++++ package/python-pymodbus/python-pymodbus.hash | 3 +++ package/python-pymodbus/python-pymodbus.mk | 13 +++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-pymodbus/Config.in create mode 100644 package/python-pymodbus/python-pymodbus.hash create mode 100644 package/python-pymodbus/python-pymodbus.mk diff --git a/DEVELOPERS b/DEVELOPERS index 031af3cdd0..fcc057aac1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -668,6 +668,9 @@ F: package/safeclib/ F: package/tinycbor/ F: package/tinydtls/ +N: Falco Hyfing +F: package/python-pymodbus/ + N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ diff --git a/package/Config.in b/package/Config.in index 992d670bb8..2f9210a04e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -874,6 +874,7 @@ menu "External python modules" source "package/python-pyinotify/Config.in" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" + source "package/python-pymodbus/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" diff --git a/package/python-pymodbus/Config.in b/package/python-pymodbus/Config.in new file mode 100644 index 0000000000..49043c10b3 --- /dev/null +++ b/package/python-pymodbus/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYMODBUS + bool "python-pymodbus" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Pymodbus is a full Modbus protocol implementation. + + https://github.com/riptideio/pymodbus diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash new file mode 100644 index 0000000000..c930795eb1 --- /dev/null +++ b/package/python-pymodbus/python-pymodbus.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 e33bd0dfbd2cbd4dbc686ca87f809aebb7d72e940eb5846d5d38bb0f3371b26a python-pymodbus-v1.4.0.tar.gz +sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f doc/LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk new file mode 100644 index 0000000000..40470fe92e --- /dev/null +++ b/package/python-pymodbus/python-pymodbus.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-pymodbus +# +################################################################################ + +PYTHON_PYMODBUS_VERSION = v1.4.0 +PYTHON_PYMODBUS_SITE = $(call github,riptideio,pymodbus,$(PYTHON_PYMODBUS_VERSION)) +PYTHON_PYMODBUS_SETUP_TYPE = setuptools +PYTHON_PYMODBUS_LICENSE = BSD-3-Clause +PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE + +$(eval $(python-package)) From 6697f3bcdb4ecd6f311125670803933c8f5afb1b Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 26 Mar 2018 10:23:32 +0300 Subject: [PATCH 0378/2640] Makefile: fix build break in sdk target After commit 6729050f3a49dba42d2d881d31dbefd6b82b8dad nothing creates $(HOST_DIR)/share/buildroot anymore, causing sdk to fail with: /bin/bash: .../output/host/share/buildroot/sdk-location: No such file or directory Add creation of that directory to the "sdk" build steps itself. Signed-off-by: Stefan Becker Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a3a9d290d9..9e2402d7d9 100644 --- a/Makefile +++ b/Makefile @@ -574,6 +574,7 @@ sdk: world $(TOPDIR)/support/scripts/fix-rpath host $(TOPDIR)/support/scripts/fix-rpath staging $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh + mkdir -p $(HOST_DIR)/share/buildroot echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location # Populating the staging with the base directories is handled by the skeleton package From b13d9ab380704ba4faf1e0295885797cb3341336 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Mon, 26 Mar 2018 09:18:44 +0200 Subject: [PATCH 0379/2640] libfcgi: Use SPDX license identifier The fcgi license is covered by SPDX, the identifier however is not obvious. For details, see https://spdx.org/licenses/OML.html [Peter: add spdx.org link] Signed-off-by: Alexander Dahl Signed-off-by: Peter Korsgaard --- package/libfcgi/libfcgi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk index ced850c153..78da772916 100644 --- a/package/libfcgi/libfcgi.mk +++ b/package/libfcgi/libfcgi.mk @@ -7,7 +7,7 @@ LIBFCGI_VERSION = 2.4.0 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz LIBFCGI_SITE = http://www.fastcgi.com/dist -LIBFCGI_LICENSE = fcgi license +LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES From bfda8371d4f71f0e316497d40eb24f0e936adb58 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 26 Mar 2018 12:39:18 +0100 Subject: [PATCH 0380/2640] brotli: disable unneeded check for C++ compiler This adds a local patch, also submitted upstream, which modifies CMakeLists.txt to avoid the check for the unneeded C++ compiler. Fixes: - http://autobuild.buildroot.net/results/68e05c634e62ba4b6f6eb8dc95eeb16faa58fd60 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...-CMake-to-not-check-for-a-C-compiler.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch diff --git a/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch b/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch new file mode 100644 index 0000000000..410de2830e --- /dev/null +++ b/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch @@ -0,0 +1,31 @@ +From fea0b1e46c486225d57e730cc0f94fa06b5b93fc Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 26 Mar 2018 12:12:00 +0100 +Subject: [PATCH] Tell CMake to not check for a C++ compiler + +By default CMake checks both for C and C++ compilers, while the latter +is not needed. Setting the list of languages to just "C" in the call to +project() removes the unneeded check. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: Submitted [https://github.com/google/brotli/pull/653] + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2dc7232..3fbcbfb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ + # support 2.8.7. + cmake_minimum_required(VERSION 2.8.6) + +-project(brotli) ++project(brotli LANGUAGES C) + + # If Brotli is being bundled in another project, we don't want to + # install anything. However, we want to let people override this, so +-- +2.16.3 + From eaa63edbee8b8bfdac3fcbd84573220c607e0662 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Mar 2018 21:48:05 +0200 Subject: [PATCH 0381/2640] package/eudev: don't forcibly link with -lrt This was carried over from udev back when it were an separate package, but was not even needed by eudev 1.3 when we introduced it back in 2014 (937a95449ec: eudev: new package). Drop it now. Signed-off-by: "Yann E. MORIN" Cc: Bernd Kuhls Cc: Eric Le Bihan Signed-off-by: Peter Korsgaard --- package/eudev/eudev.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index d08b9bb0c9..11dc93762b 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -10,9 +10,6 @@ EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES -# mq_getattr is in librt -EUDEV_CONF_ENV += LIBS=-lrt - EUDEV_CONF_OPTS = \ --disable-manpages \ --sbindir=/sbin \ From 0876b023663377bc3a24c80399f447c1f2afe0c1 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 26 Mar 2018 14:00:06 +0200 Subject: [PATCH 0382/2640] busybox: disable PAM in the config if linux-pam is not selected Currently there is only logic to enable PAM when linux-pam is selected. However, busybox will fail to build with PAM enabled if the linux-pam package has not been built before. So we should forcibly disable PAM in busybox in that case. Normally this is not an issue since our default busybox config doesn't have PAM enabled. However, if you enable linux-pam, then save the busybox config to a custom configuration file, then disable linux-pam again, and then do a "make clean; make", the build will fail. A more practical situation where this can occur is when the same custom busybox config is used in a Buildroot config with and without linux-pam. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Matt Weber Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index bc0c661754..7009f6a675 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -248,6 +248,10 @@ define BUSYBOX_LINUX_PAM $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) endef BUSYBOX_DEPENDENCIES += linux-pam +else +define BUSYBOX_LINUX_PAM + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) +endef endif # Telnet support From e807ddec287a1cc2855de53e88a17f404e0a0a40 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 26 Mar 2018 15:00:43 +0300 Subject: [PATCH 0383/2640] pkg-cmake: enable toolchain install staging phase Really fix commit 6729050f3a49dba42d2d881d31dbefd6b82b8dad That commit added a script to "toolchain" post install staging hooks. This will only be executed if TOOLCHAIN_INSTALL_STAGING is set to YES. Signed-off-by: Stefan Becker Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 34b49bdbe5..51a1929ebb 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -274,3 +274,4 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES +TOOLCHAIN_INSTALL_STAGING = YES From 692d191c8b0b3c86022e6a6ba3bd2d8f53b39f03 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 26 Mar 2018 22:46:14 +0300 Subject: [PATCH 0384/2640] libgpg-error: bump to version 1.28 Add upstream patch fixing arm/arm64 targets build failure. Use the smaller bz2 compressed tarball. Switch _SITE to https for better security and corporate firewall compatibility. Add license files hash. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ion-on-arm64-due-to-invalid-use-of-v.patch | 59 +++++++++++++++++++ package/libgpg-error/libgpg-error.hash | 6 +- package/libgpg-error/libgpg-error.mk | 5 +- 3 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 package/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch diff --git a/package/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/package/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch new file mode 100644 index 0000000000..a37337a090 --- /dev/null +++ b/package/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch @@ -0,0 +1,59 @@ +From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Sun, 18 Mar 2018 17:39:43 +0100 +Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. + +* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of +NULL. +-- + +Fix +Suggested-by: Jakub Wilk + +Signed-off-by: Werner Koch +Signed-off-by: Baruch Siach +--- +Upstream status: commit 791177de023 + + src/logging.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/src/logging.c b/src/logging.c +index 1a4f6203d16d..d01f974e4545 100644 +--- a/src/logging.c ++++ b/src/logging.c +@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) + + + /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print +- * just the raw dump, with FMT being an empty string, print a trailing +- * linefeed, otherwise print an entire debug line with the expanded +- * FMT followed by a possible wrapped hexdump and a final LF. */ ++ * just the raw dump (in this case ARG_PTR is not used), with FMT ++ * being an empty string, print a trailing linefeed, otherwise print ++ * an entire debug line with the expanded FMT followed by a possible ++ * wrapped hexdump and a final LF. */ + void + _gpgrt_logv_printhex (const void *buffer, size_t length, + const char *fmt, va_list arg_ptr) +@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, + va_end (arg_ptr); + } + else +- _gpgrt_logv_printhex (buffer, length, NULL, NULL); ++ { ++ /* va_list is not necessary a pointer and thus we can't use NULL ++ * because that would conflict with platforms using a straight ++ * struct for it (e.g. arm64). We use a dummy variable instead; ++ * the static is a simple way zero it out so to not get ++ * complains about uninitialized use. */ ++ static va_list dummy_argptr; ++ ++ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); ++ } + } + + +-- +2.16.2 + diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 0541d2311a..fd08aa54d8 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 04bdc7fd12001c797cc689b007fe24909f55aa0ee1d6d6aef967d9eebf5b2461 libgpg-error-1.27.tar.gz +# https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.28.tar.bz2.sig +sha256 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49 libgpg-error-1.28.tar.bz2 +# Locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 2140258c6e..f704203556 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.27 -LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error +LIBGPG_ERROR_VERSION = 1.28 +LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error +LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES From efc67deef38c9c69279c35b8e2665d81e8344e96 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 18 Mar 2018 15:01:27 -0400 Subject: [PATCH 0385/2640] qemu: remove support for some PowerPC processors in host qemu The 620, 630, and 970 are not supported at this time by qemu. Signed-off-by: Adam Duskett Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 78fe54a85c..bbc2aa27c5 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -6,6 +6,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS BR2_mips64 || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ BR2_sparc || BR2_x86_64 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 config BR2_PACKAGE_HOST_QEMU bool "host qemu" From cc9c3a9942fecc56d241d6b07683af81ef1bd41c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 18 Mar 2018 13:28:06 +0100 Subject: [PATCH 0386/2640] prosody: bump to version 0.10.0 this version is not restricted to Lua 5.1 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/prosody/Config.in | 4 ++-- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 20 +++++++++----------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package/prosody/Config.in b/package/prosody/Config.in index 77eeb85ab1..1bc79b7f2a 100644 --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PROSODY bool "prosody" - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT + depends on BR2_PACKAGE_HAS_LUAINTERPRETER select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime @@ -15,4 +15,4 @@ config BR2_PACKAGE_PROSODY https://prosody.im comment "prosody needs the lua interpreter" - depends on !BR2_PACKAGE_LUA_5_1 && !BR2_PACKAGE_LUAJIT + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 38942ea7ff..d560994566 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,5 +1,5 @@ # Hashes from: https://prosody.im/downloads/source/{MD5,SHA1,SHA256,SHA512}SUMS -md5 d743adea6cfbaacc3a24cc0c3928bb1b prosody-0.9.12.tar.gz -sha1 1ee224263a5b3d67960e12edbbe6b2f16b95d147 prosody-0.9.12.tar.gz -sha256 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d prosody-0.9.12.tar.gz -sha512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 prosody-0.9.12.tar.gz +md5 0eebf7a18ce1fc7dd9954c94ebd85f54 prosody-0.10.0.tar.gz +sha1 57c1c5a665e6453bdde06727ef398cd69accd9d7 prosody-0.10.0.tar.gz +sha256 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498 prosody-0.10.0.tar.gz +sha512 ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 prosody-0.10.0.tar.gz diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index d19653503d..3ff891909c 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,29 +4,27 @@ # ################################################################################ -PROSODY_VERSION = 0.9.12 +PROSODY_VERSION = 0.10.0 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -PROSODY_DEPENDENCIES = openssl libidn - -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -PROSODY_DEPENDENCIES += lua -endif - -ifeq ($(BR2_PACKAGE_LUAJIT),y) -PROSODY_DEPENDENCIES += luajit -endif +PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl PROSODY_CONF_OPTS = \ + --with-lua-bin=$(HOST_DIR)/usr/bin \ --with-lua=$(STAGING_DIR)/usr \ + --lua-version=$(LUAINTERPRETER_ABIVER) \ --c-compiler=$(TARGET_CC) \ - --cflags="$(TARGET_CFLAGS) -fPIC" \ + --cflags="$(TARGET_CFLAGS) -fPIC -std=c99" \ --linker=$(TARGET_CC) \ --ldflags="$(TARGET_LDFLAGS) -shared" \ --sysconfdir=/etc/prosody \ --prefix=/usr +ifeq ($(BR2_PACKAGE_LUAJIT),y) +PROSODY_CONF_OPTS += --runwith=luajit +endif + define PROSODY_CONFIGURE_CMDS cd $(@D) && \ $(TARGET_CONFIGURE_OPTS) \ From 1df9a5b5b2ffd5de88b2a3b4f2aaa9d38a7acf95 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 18 Mar 2018 13:28:07 +0100 Subject: [PATCH 0387/2640] prosody: replace tweaked configuration by patches Upgrading a tweaked configuration is painful, so stay with the upstream configuration which is already installed, and just apply a few patches. Everybody could do its own configuration in its root filesystem overlay. Signed-off-by: Francois Perrad [Thomas: squash patches.] Signed-off-by: Thomas Petazzoni --- package/prosody/0001-enable-syslog.patch | 25 +++ package/prosody/0002-add-pidfile.patch | 26 ++++ package/prosody/prosody.cfg.lua | 184 ----------------------- package/prosody/prosody.mk | 11 -- 4 files changed, 51 insertions(+), 195 deletions(-) create mode 100644 package/prosody/0001-enable-syslog.patch create mode 100644 package/prosody/0002-add-pidfile.patch delete mode 100644 package/prosody/prosody.cfg.lua diff --git a/package/prosody/0001-enable-syslog.patch b/package/prosody/0001-enable-syslog.patch new file mode 100644 index 0000000000..4bd0a15aed --- /dev/null +++ b/package/prosody/0001-enable-syslog.patch @@ -0,0 +1,25 @@ +From 267b5d195be0f3a8f00ccf4ccb62e25a9c4e48eb Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Sun, 22 Oct 2017 08:44:01 +0200 +Subject: [PATCH] enable syslog + +note: the posix module is auto-loaded by default + +Signed-off-by: Francois Perrad + +diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist +index a0fc6c9e..af3cc0e4 100644 +--- a/prosody.cfg.lua.dist ++++ b/prosody.cfg.lua.dist +@@ -163,7 +163,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week + log = { + info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging + error = "prosody.err"; +- -- "*syslog"; -- Uncomment this for logging to syslog ++ "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging with daemonize=false + } + +-- +2.11.0 + diff --git a/package/prosody/0002-add-pidfile.patch b/package/prosody/0002-add-pidfile.patch new file mode 100644 index 0000000000..b6af8dd822 --- /dev/null +++ b/package/prosody/0002-add-pidfile.patch @@ -0,0 +1,26 @@ +From 124d479195ac8ec1747b5b89fe4860d0e92c2aae Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Sun, 22 Oct 2017 08:58:11 +0200 +Subject: [PATCH] add pidfile + +see https://prosody.im/doc/configure#posix-only_options + +Signed-off-by: Francois Perrad + +diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist +index af3cc0e4..675db12f 100644 +--- a/prosody.cfg.lua.dist ++++ b/prosody.cfg.lua.dist +@@ -181,6 +181,9 @@ log = { + -- Location of directory to find certificates in (relative to main config file): + certificates = "certs" + ++-- This must match the PIDFILE used in S50prosody ++pidfile = "/var/run/prosody/prosody.pid" ++ + ----------- Virtual hosts ----------- + -- You need to add a VirtualHost entry for each domain you wish Prosody to serve. + -- Settings under each VirtualHost entry apply *only* to that host. +-- +2.11.0 + diff --git a/package/prosody/prosody.cfg.lua b/package/prosody/prosody.cfg.lua deleted file mode 100644 index 8329c0ad4e..0000000000 --- a/package/prosody/prosody.cfg.lua +++ /dev/null @@ -1,184 +0,0 @@ --- Prosody Example Configuration File --- --- Information on configuring Prosody can be found on our --- website at http://prosody.im/doc/configure --- --- Tip: You can check that the syntax of this file is correct --- when you have finished by running: luac -p prosody.cfg.lua --- If there are any errors, it will let you know what and where --- they are, otherwise it will keep quiet. --- --- The only thing left to do is rename this file to remove the .dist ending, and fill in the --- blanks. Good luck, and happy Jabbering! - - ----------- Server-wide settings ---------- --- Settings in this section apply to the whole server and are the default settings --- for any virtual hosts - --- This is a (by default, empty) list of accounts that are admins --- for the server. Note that you must create the accounts separately --- (see http://prosody.im/doc/creating_accounts for info) --- Example: admins = { "user1@example.com", "user2@example.net" } -admins = { } - --- Enable use of libevent for better performance under high load --- For more information see: http://prosody.im/doc/libevent ---use_libevent = true; - --- This is the list of modules Prosody will load on startup. --- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. --- Documentation on modules can be found at: http://prosody.im/doc/modules -modules_enabled = { - - -- Generally required - "roster"; -- Allow users to have a roster. Recommended ;) - "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. - "tls"; -- Add support for secure TLS on c2s/s2s connections - "dialback"; -- s2s dialback support - "disco"; -- Service discovery - - -- Not essential, but recommended - "private"; -- Private XML storage (for room bookmarks, etc.) - "vcard"; -- Allow users to set vCards - - -- These are commented by default as they have a performance impact - --"privacy"; -- Support privacy lists - --"compression"; -- Stream compression - - -- Nice to have - "version"; -- Replies to server version requests - "uptime"; -- Report how long server has been running - "time"; -- Let others know the time here on this server - "ping"; -- Replies to XMPP pings with pongs - "pep"; -- Enables users to publish their mood, activity, playing music and more - "register"; -- Allow users to register on this server using a client and change passwords - - -- Admin interfaces - "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands - --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 - - -- HTTP modules - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"http_files"; -- Serve static files from a directory over HTTP - - -- Other specific functionality - "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"groups"; -- Shared roster support - --"announce"; -- Send announcement to all online users - --"welcome"; -- Welcome users who register accounts - --"watchregistrations"; -- Alert admins of registrations - --"motd"; -- Send a message to users when they log in - --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. -}; - --- These modules are auto-loaded, but should you want --- to disable them then uncomment them here: -modules_disabled = { - -- "offline"; -- Store offline messages - -- "c2s"; -- Handle client connections - -- "s2s"; -- Handle server-to-server connections -}; - --- Disable account creation by default, for security --- For more information see http://prosody.im/doc/creating_accounts -allow_registration = false; - --- These are the SSL/TLS-related settings. If you don't want --- to use SSL/TLS, you may comment or remove this -ssl = { - key = "certs/localhost.key"; - certificate = "certs/localhost.crt"; -} - --- Force clients to use encrypted connections? This option will --- prevent clients from authenticating unless they are using encryption. - -c2s_require_encryption = false - --- Force certificate authentication for server-to-server connections? --- This provides ideal security, but requires servers you communicate --- with to support encryption AND present valid, trusted certificates. --- NOTE: Your version of LuaSec must support certificate verification! --- For more information see http://prosody.im/doc/s2s#security - -s2s_secure_auth = false - --- Many servers don't support encryption or have invalid or self-signed --- certificates. You can list domains here that will not be required to --- authenticate using certificates. They will be authenticated using DNS. - ---s2s_insecure_domains = { "gmail.com" } - --- Even if you leave s2s_secure_auth disabled, you can still require valid --- certificates for some domains by specifying a list here. - ---s2s_secure_domains = { "jabber.org" } - --- Select the authentication backend to use. The 'internal' providers --- use Prosody's configured data storage to store the authentication data. --- To allow Prosody to offer secure authentication mechanisms to clients, the --- default provider stores passwords in plaintext. If you do not trust your --- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed --- for information about using the hashed backend. - -authentication = "internal_plain" - --- Select the storage backend to use. By default Prosody uses flat files --- in its configured data directory, but it also supports more backends --- through modules. An "sql" backend is included by default, but requires --- additional dependencies. See http://prosody.im/doc/storage for more info. - ---storage = "sql" -- Default is "internal" - --- For the "sql" backend, you can uncomment *one* of the below to configure: ---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. ---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } ---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } - --- Logging configuration --- For advanced logging see http://prosody.im/doc/logging -log = { - -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - -- error = "prosody.err"; - "*syslog"; -- Logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false -} - -pidfile = "/var/run/prosody/prosody.pid" - ------------ Virtual hosts ----------- --- You need to add a VirtualHost entry for each domain you wish Prosody to serve. --- Settings under each VirtualHost entry apply *only* to that host. - -VirtualHost "localhost" - -VirtualHost "example.com" - -- Assign this host a certificate for TLS, otherwise it would use the one - -- set in the global section (if any). - -- Note that old-style SSL on port 5223 only supports one certificate, and will always - -- use the global one. - ssl = { - key = "certs/example.com.key"; - certificate = "certs/example.com.crt"; - } - ------- Components ------ --- You can specify components to add hosts that provide special services, --- like multi-user conferences, and transports. --- For more information on components, see http://prosody.im/doc/components - ----Set up a MUC (multi-user chat) room server on conference.example.com: ---Component "conference.example.com" "muc" - --- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: ---Component "proxy.example.com" "proxy65" - ----Set up an external component (default component port is 5347) --- --- External components allow adding various services, such as gateways/ --- transports to other networks like ICQ, MSN and Yahoo. For more info --- see: http://prosody.im/doc/components#adding_an_external_component --- ---Component "gateway.example.com" --- component_secret = "password" diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 3ff891909c..c5a83081dc 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -56,15 +56,4 @@ endef PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_REMOVE_CERT_GENERATOR -# 1. Enable posix functionality -# 2. Log to syslog -# 3. Specify pid file write location -# 4. Enable virtual host example.com -define PROSODY_TWEAK_DEFAULT_CONF - $(INSTALL) -D package/prosody/prosody.cfg.lua \ - $(TARGET_DIR)/etc/prosody/prosody.cfg.lua -endef - -PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_TWEAK_DEFAULT_CONF - $(eval $(generic-package)) From ef3304dabc1aef5c1035359211b1c3ca5d07eb3b Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 26 Mar 2018 20:19:33 +0300 Subject: [PATCH 0388/2640] package/systemd: add upstream build fix Fixes: http://autobuild.buildroot.org/results/4c439ee000354f90b4e59ee4006530f77263db47/ Signed-off-by: Stefan Becker Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...-include-libmount-h-in-a-header-file.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch diff --git a/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch b/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch new file mode 100644 index 0000000000..b91d09722b --- /dev/null +++ b/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch @@ -0,0 +1,75 @@ +From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Mon, 26 Mar 2018 17:34:53 +0200 +Subject: [PATCH] core: don't include libmount.h in a header file (#8580) + +linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* +definitions. + +To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h +should be included. And missing.h must be included last. + +Without this, building systemd may fail with: + +In file included from [...]/libmount/libmount.h:31:0, + from ../systemd-238/src/core/manager.h:23, + from ../systemd-238/src/core/emergency-action.h:37, + from ../systemd-238/src/core/unit.h:34, + from ../systemd-238/src/core/dbus-timer.h:25, + from ../systemd-238/src/core/timer.c:26: +[...]/sys/mount.h:57:2: error: expected identifier before numeric constant + +Upstream: https://github.com/systemd/systemd/pull/8580 +Signed-off-by: Stefan Becker +--- + src/core/dbus-execute.c | 1 + + src/core/manager.h | 3 ++- + src/core/mount.c | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 7344623ebf6..c342093bca4 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -18,6 +18,7 @@ + along with systemd; If not, see . + ***/ + ++#include + #include + #include + +diff --git a/src/core/manager.h b/src/core/manager.h +index 28c5da225b1..e09e0cdf5e9 100644 +--- a/src/core/manager.h ++++ b/src/core/manager.h +@@ -20,7 +20,6 @@ + along with systemd; If not, see . + ***/ + +-#include + #include + #include + +@@ -34,6 +33,8 @@ + #include "list.h" + #include "ratelimit.h" + ++struct libmnt_monitor; ++ + /* Enforce upper limit how many names we allow */ + #define MANAGER_MAX_NAMES 131072 /* 128K */ + +diff --git a/src/core/mount.c b/src/core/mount.c +index 0e755da5c02..0154ebda5d6 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include ++ + #include "sd-messages.h" + + #include "alloc-util.h" From ed6a7e18af8f4dfddee6e6b144f20dfaf6926315 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Mon, 26 Mar 2018 12:34:05 -0700 Subject: [PATCH 0389/2640] Config.in: add -Ofast option -Ofast (introduced in GCC 4.6) It combines the existing optimization level -O3 with options that can affect standards compliance but result in better optimized code. For example, -Ofast enables -ffast-math. Signed-off-by: Joshua Henderson Signed-off-by: Thomas Petazzoni --- Config.in | 11 +++++++++++ package/Makefile.in | 3 +++ 2 files changed, 14 insertions(+) diff --git a/Config.in b/Config.in index 0002df5176..037ea2265b 100644 --- a/Config.in +++ b/Config.in @@ -527,6 +527,17 @@ config BR2_OPTIMIZE_S -ftree-vect-loop-version This is the default. +config BR2_OPTIMIZE_FAST + bool "optimize for fast" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + help + Optimize for fast. Disregard strict standards + compliance. -Ofast enables all -O3 optimizations. It also + enables optimizations that are not valid for all + standard-compliant programs. It turns on -ffast-math and the + Fortran-specific -fstack-arrays, unless -fmax-stack-var-size + is specified, and -fno-protect-parens. + endchoice config BR2_GOOGLE_BREAKPAD_ENABLE diff --git a/package/Makefile.in b/package/Makefile.in index e387ce67fe..828e12e7d7 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -128,6 +128,9 @@ endif ifeq ($(BR2_OPTIMIZE_S),y) TARGET_OPTIMIZATION = -Os endif +ifeq ($(BR2_OPTIMIZE_FAST),y) +TARGET_OPTIMIZATION = -Ofast +endif ifeq ($(BR2_DEBUG_1),y) TARGET_DEBUGGING = -g1 endif From 355b87a1ac4626d1df79e5cb7fd4f8d10ac3294d Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Sat, 17 Mar 2018 09:11:17 -0700 Subject: [PATCH 0390/2640] rpi-bt-firmware: remove compatibility symlink Commit 361d1b969ecdba1a8a62613626f90fc025b94660 defines FIRMWARE_DIR for bluez5_utils. The compatibility symlink for the firmware is no longer needed. Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/rpi-bt-firmware/rpi-bt-firmware.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 255da19262..644fdc6d5f 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -10,10 +10,7 @@ RPI_BT_FIRMWARE_SITE_METHOD = git RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx -# The BlueZ hciattach utility looks for firmware in /etc/firmware. Add a -# compatibility symlink. define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - ln -sf ../lib/firmware $(TARGET_DIR)/etc/firmware $(INSTALL) -D -m 0644 $(@D)/BCM43430A1.hcd \ $(TARGET_DIR)/lib/firmware/BCM43430A1.hcd endef From ad980ccc3639baa2e517c4d36e836b71ab9f5b8f Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 15 Mar 2018 14:47:33 -0700 Subject: [PATCH 0391/2640] Config.in: Document BR2_CCACHE_DIR override This variable, like BR2_DL_DIR, is designed to be overridable from the environment. Unlike BR2_DL_DIR, it is not documented as such in the Config.in help text. Do so now. Signed-off-by: Trent Piepho Signed-off-by: Thomas Petazzoni --- Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Config.in b/Config.in index 037ea2265b..a74b24ae45 100644 --- a/Config.in +++ b/Config.in @@ -332,6 +332,9 @@ config BR2_CCACHE_DIR default "$(HOME)/.buildroot-ccache" help Where ccache should store cached files. + If the Linux shell environment has defined the BR2_CCACHE_DIR + environment variable, then this overrides this configuration + item. config BR2_CCACHE_INITIAL_SETUP string "Compiler cache initial setup" From 363505241f081314383af413b62a91bda53ef9c8 Mon Sep 17 00:00:00 2001 From: Oleksandr Zhadan Date: Thu, 15 Mar 2018 17:07:49 -0400 Subject: [PATCH 0392/2640] configs/arcturus_ucls1012a: new defconfig The uCLS1012A-SOM product family (ucls1012a) is an Arcturus Networks Inc. 64bit ARM Cortex-A53 class System on Module powered by a NXP QorIQ LS1012A Low Power Communication Processor. This 314 pin MXM3.0/SMARC module card contains DDR3, QSPI NOR Flash, eMMC NAND Flash, optional Audio CODEC and is available with 1 or 2 Gig-Ethernet PHYs. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Changes v1 -> v2: - updated kernel and u-boot source repositories to github Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 10 +++ .../arcturus/aarch64-ucls1012a/post-image.sh | 6 ++ board/arcturus/aarch64-ucls1012a/readme.txt | 74 +++++++++++++++++++ .../rootfs_overlay/etc/init.d/S09modload | 14 ++++ configs/arcturus_ucls1012a_defconfig | 37 ++++++++++ 6 files changed, 142 insertions(+) create mode 100755 board/arcturus/aarch64-ucls1012a/post-image.sh create mode 100644 board/arcturus/aarch64-ucls1012a/readme.txt create mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload create mode 100644 configs/arcturus_ucls1012a_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f44c3a9bf9..952fffaf88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,7 @@ acmesystems_aria_g25_256mb_defconfig: *defconfig acmesystems_arietta_g25_128mb_defconfig: *defconfig acmesystems_arietta_g25_256mb_defconfig: *defconfig amarula_vyasa_rk3288_defconfig: *defconfig +arcturus_ucls1012a_defconfig: *defconfig arcturus_ucp1020_defconfig: *defconfig arm_foundationv8_defconfig: *defconfig arm_juno_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fcc057aac1..40fda40bda 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1292,6 +1292,11 @@ F: package/tinyxml/ N: Maxime Ripard F: package/kmsxx/ +N: Michael Durrant +F: board/arcturus/ +F: configs/arcturus_ucp1020_defconfig +F: configs/arcturus_ucls1012a_defconfig + N: Michael Rommel F: package/knock/ F: package/python-crc16/ @@ -1350,6 +1355,11 @@ F: package/tcf-agent/ N: Olaf Rempel F: package/ctorrent/ +N: Oleksandr Zhadan +F: board/arcturus/ +F: configs/arcturus_ucp1020_defconfig +F: configs/arcturus_ucls1012a_defconfig + N: Oli Vogt F: package/python-django/ F: package/python-flup/ diff --git a/board/arcturus/aarch64-ucls1012a/post-image.sh b/board/arcturus/aarch64-ucls1012a/post-image.sh new file mode 100755 index 0000000000..ccfacd3858 --- /dev/null +++ b/board/arcturus/aarch64-ucls1012a/post-image.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +MKIMAGE=${HOST_DIR}/usr/bin/mkimage +MKIMAGE_IN=${BINARIES_DIR}/br2-ucls1012a.its +MKIMAGE_OUT=${BINARIES_DIR}/part0-000000.itb +${MKIMAGE} -f ${MKIMAGE_IN} ${MKIMAGE_OUT} diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt new file mode 100644 index 0000000000..483d5e9aef --- /dev/null +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -0,0 +1,74 @@ +Arcturus uCLS1012A SoM +====================== + +This tutorial describes how to use the predefined Buildroot +configuration for the Arcturus uCLS101A SoM platform. + +Additional information about the uCLS1012A System on Module can be found at +https://www.arcturusnetworks.com/products/ucls1012a +and product support for registered users at +https://www.arcturusnetworks.com/support + +Building +-------- + +Return to the top directory and execute the following commands. + + make arcturus_ucls1012a_defconfig + make + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- arc-ucls1012a.dtb + +-- Image + +-- part0-000000.itb + +-- rootfs.cpio + +-- rootfs.cpio.gz + +-- rootfs.tar + +-- u-boot.bin + +-- ucls1012a.its + +Flashing +-------- + +You'll need to program the image created by buildroot into the SPI NOR flash. + +1. Reboot your module and via the serial console press to enter the B$ +u-boot shell. + From the shell you will need to update four environment variables replacing the + IPv4 IP Address with ones that will work with your network and tftp server. + + B$ setenv ipaddr 192.168.1.81 + B$ setenv serverip 192.168.1.80 + B$ setenv gatewayip 192.168.1.1 + B$ setenv netmask 255.255.255.0 + B$ saveenv + +2. Enable tftp server to serve the /output/images/ folder. + +3. Program the new U-Boot binary (optional) + If you don't feel confident upgrading your bootloader then don't do it, + it's unnecessary most of the time. + + B$ tftp u-boot.bin + B$ run program_uboot + +4. Program the ITB image (includes Kernel, DTB and Ramdisk) + + B$ tftp part0-000000.itb + B$ run iprogram + +5. Booting your new system + + Reboot your system by reset command + B$ reset + + or + + B$ run bootcmd + +Good Luck ! diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload new file mode 100755 index 0000000000..c87ffda14f --- /dev/null +++ b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload @@ -0,0 +1,14 @@ +#!/bin/sh +# +case "$1" in + start) + modprobe pfe + ;; + stop) + ;; + restart|reload) + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig new file mode 100644 index 0000000000..0ce7d1341c --- /dev/null +++ b/configs/arcturus_ucls1012a_defconfig @@ -0,0 +1,37 @@ +# Architecture +BR2_aarch64=y + +# Linux headers same as kernel, a 4.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y + +# System settings +BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" +BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ArcturusNetworks/uCLS1012A-kernel.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v0.2.1811" +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y + +# U-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ArcturusNetworks/uCLS1012A-uboot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v0.2.1811" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" + +# Tools +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 0ccf773659a25a16d83f5e1e08f7cdcb61ce9c83 Mon Sep 17 00:00:00 2001 From: Chris Lesiak Date: Tue, 23 Jan 2018 17:17:23 -0600 Subject: [PATCH 0393/2640] package/avahi: Set the path to D-Bus system.d directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since D-Bus 1.9.18, the recommended location for the system and session busses configuration files is /usr/share instead of /etc. From the D-Bus NEWS file: D-Bus 1.9.18 (2015-07-21) == The “Pirate Elite” release. Configuration changes: • The basic setup for the well-known system and session buses is now done in read-only files in ${datadir}, moving a step closer to systems that can operate with an empty /etc directory. In increasing order of precedence: · ${datadir}/dbus-1/s*.conf now perform the basic setup such as setting the default message policies. · ${sysconfdir}/dbus-1/s*.conf are now optional. By default dbus still installs a trivial version of each, for documentation purposes; putting configuration directives in these files is deprecated. · ${datadir}/dbus-1/s*.d/ are now available for third-party software to install "drop-in" configuration snippets (any packages using those directories should explicitly depend on at least this version of dbus). · ${sysconfdir}/dbus-1/s*.d/ are also still available for sysadmins or third-party software to install "drop-in" configuration snippets · ${sysconfdir}/dbus-1/s*-local.conf are still available for sysadmins' overrides ${datadir} is normally /usr/share, ${sysconfdir} is normally /etc, and "s*" refers to either system or session as appropriate. Therefore, this commit adjusts the Avahi package to install the D-Bus related files to /usr/share/dbus-1/system.d. Signed-off-by: Chris Lesiak Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index c8f1af9a9d..ef621620f0 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -125,6 +125,7 @@ endif ifeq ($(BR2_PACKAGE_DBUS),y) AVAHI_DEPENDENCIES += dbus +AVAHI_CONF_OPTS += --with-dbus-sys=/usr/share/dbus-1/system.d else AVAHI_CONF_OPTS += --disable-dbus endif From 7cbfcb322c42caa8b3c3651df8a0b7696f04a99c Mon Sep 17 00:00:00 2001 From: Chris Lesiak Date: Tue, 23 Jan 2018 17:20:05 -0600 Subject: [PATCH 0394/2640] package/avahi: Add sysusers.d snippet Signed-off-by: Chris Lesiak Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.mk | 9 +++++++++ package/avahi/avahi_sysusers.conf | 5 +++++ 2 files changed, 14 insertions(+) create mode 100644 package/avahi/avahi_sysusers.conf diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index ef621620f0..baffe3cb69 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -190,6 +190,13 @@ endif ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) +define AVAHI_INSTALL_SYSTEMD_SYSUSERS + $(INSTALL) -D -m 644 package/avahi/avahi_sysusers.conf \ + $(TARGET_DIR)/usr/lib/sysusers.d/avahi.conf +endef +endif + define AVAHI_INSTALL_INIT_SYSTEMD mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants @@ -201,6 +208,8 @@ define AVAHI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf + + $(AVAHI_INSTALL_SYSTEMD_SYSUSERS) endef define AVAHI_INSTALL_DAEMON_INIT_SYSV diff --git a/package/avahi/avahi_sysusers.conf b/package/avahi/avahi_sysusers.conf new file mode 100644 index 0000000000..463ce97cea --- /dev/null +++ b/package/avahi/avahi_sysusers.conf @@ -0,0 +1,5 @@ +# sysusers.d snippet for creating the avahi system user automatically +# at boot on systemd-based systems that ship with an unpopulated +# /etc. See sysusers.d(5) for details. + +u avahi - "Avahi mDNS/DNS-SD Stack" From 29bccabdebff7b43189b0eed2090dc4858e1afca Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 28 Jan 2018 02:43:58 -0200 Subject: [PATCH 0395/2640] lshw: use data files provided by hwdata lshw is seldomly released, so its data files become easily outdated. Instead, this commit makes use of the data files provided by hwdata. This is easily possible because lshw looks for the files in several directories, including /usr/share/hwdata, where the hwdata collection is installed. We remove the entire /usr/share/lshw directory, where the not very up-to-date data files where installed. Four files were installed there: pci.ids, usb.ids (which are now provided by hwdata), manuf.txt and oui.txt (which are not used at run time). Signed-off-by: Carlos Santos [Thomas: - rework commit log - replace patch by a simple removal of the /usr/share/lshw directory - add "runtime" comment in Config.in for the BR2_PACKAGE_LSHW dependency] Signed-off-by: Thomas Petazzoni --- package/lshw/Config.in | 3 +++ package/lshw/lshw.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/package/lshw/Config.in b/package/lshw/Config.in index 3caac66c72..5e0e47b6e2 100644 --- a/package/lshw/Config.in +++ b/package/lshw/Config.in @@ -2,6 +2,9 @@ config BR2_PACKAGE_LSHW bool "lshw" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + select BR2_PACKAGE_HWDATA # runtime + select BR2_PACKAGE_HWDATA_PCI_IDS + select BR2_PACKAGE_HWDATA_USB_IDS help lshw (Hardware Lister) is a small tool to provide detailed information on the hardware configuration of the diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 9b52b09167..4195c073e2 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -23,6 +23,7 @@ endef define LSHW_INSTALL_TARGET_CMDS $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \ $(LSHW_MAKE_OPTS) install + $(RM) -rf $(TARGET_DIR)/usr/share/lshw endef $(eval $(generic-package)) From 84835f94713ce4e5a6e06c08576276ae0c0ff21f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 9 Mar 2018 19:05:51 +0100 Subject: [PATCH 0396/2640] libcdio: bump to version 2.0.0 Add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcdio/libcdio.hash | 5 ++++- package/libcdio/libcdio.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libcdio/libcdio.hash b/package/libcdio/libcdio.hash index 35c632a906..2b6f832cbe 100644 --- a/package/libcdio/libcdio.hash +++ b/package/libcdio/libcdio.hash @@ -1,2 +1,5 @@ # Locally calculated after checking signature -sha256 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a libcdio-0.94.tar.gz +sha256 1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958 libcdio-2.0.0.tar.gz + +# Hash for license file: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk index f0fc33527a..f4a5591722 100644 --- a/package/libcdio/libcdio.mk +++ b/package/libcdio/libcdio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCDIO_VERSION = 0.94 +LIBCDIO_VERSION = 2.0.0 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_INSTALL_STAGING = YES LIBCDIO_LICENSE = GPL-3.0+ From 46680c9dc13fdff28f07c3e86fbc1b778d457a31 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Mar 2018 10:09:33 +0100 Subject: [PATCH 0397/2640] ympd: add optional openssl dependency Fixes: - http://autobuild.buildroot.net/results/d9b1375f5f8ecde8fef027344a5d5b288f7cee7c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ympd/ympd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ympd/ympd.mk b/package/ympd/ympd.mk index e3f21e9eb0..6c0f3224cc 100644 --- a/package/ympd/ympd.mk +++ b/package/ympd/ympd.mk @@ -10,4 +10,11 @@ YMPD_LICENSE = GPL-2.0 YMPD_LICENSE_FILES = LICENSE YMPD_DEPENDENCIES = libmpdclient +ifeq ($(BR2_PACKAGE_OPENSSL),y) +YMPD_DEPENDENCIES += openssl +YMPD_CONF_OPTS += -DWITH_SSL=ON +else +YMPD_CONF_OPTS += -DWITH_SSL=OFF +endif + $(eval $(cmake-package)) From 142c8cc8d525f687ce199cc0163d48892e8a81f7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 26 Mar 2018 23:23:02 +0300 Subject: [PATCH 0398/2640] xerces: add upstream security fix CVE-2017-12627: dereference of a NULL pointer while processing the path to the DTD. xerces 3.2.1 includes this patch. But this version also added AC_RUN_IFELSE to its configure script, making cross compilation harder. Switching to cmake is also problematic since the minimum required cmake version is 3.2.0. The host dependencies check currently allows minimum cmake version 3.1. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/xerces/0001-fix-CVE-2017-12627.patch | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/xerces/0001-fix-CVE-2017-12627.patch diff --git a/package/xerces/0001-fix-CVE-2017-12627.patch b/package/xerces/0001-fix-CVE-2017-12627.patch new file mode 100644 index 0000000000..010be7e3d5 --- /dev/null +++ b/package/xerces/0001-fix-CVE-2017-12627.patch @@ -0,0 +1,22 @@ +XMLString: Don't call catString if relativePath is null + +https://xerces.apache.org/xerces-c/secadv/CVE-2017-12627.txt + +Upstream status: svn revision 1819998 + +Signed-off-by: Baruch Siach + +--- trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:58:30 1819997 ++++ trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:59:30 1819998 +@@ -920,7 +920,10 @@ + + XMLString::subString(tmpBuf, basePath, 0, (basePtr - basePath + 1), manager); + tmpBuf[basePtr - basePath + 1] = 0; +- XMLString::catString(tmpBuf, relativePath); ++ if (relativePath) ++ { ++ XMLString::catString(tmpBuf, relativePath); ++ } + + removeDotSlash(tmpBuf, manager); + From 4edbebed58db9ea88c2876d35f4c122e4c54ce0b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 21 Mar 2018 21:23:12 +0100 Subject: [PATCH 0399/2640] modem-manager: remove wrong gnutls dependency comment Signed-off-by: Peter Seiderer Acked-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/modem-manager/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8e995b4175..215449a50e 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MODEM_MANAGER bool "modemmanager" depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # libglib2 and gnutls + depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS # runtime dependency From 02c40b31813e07d4e48c7a9c7dbce259d2c95a58 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Mar 2018 08:30:59 -0300 Subject: [PATCH 0400/2640] linux: bump default to version 4.15.14 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 9361adca55..040a2341f9 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 9ef8f6b061b552012b767b83c7b21e5e3fb9fff7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Mar 2018 08:31:00 -0300 Subject: [PATCH 0401/2640] linux-headers: bump 4.{1, 4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f4c1427f29..ec3de2b215 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -241,13 +241,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 - default "4.1.50" if BR2_KERNEL_HEADERS_4_1 - default "4.4.124" if BR2_KERNEL_HEADERS_4_4 - default "4.9.90" if BR2_KERNEL_HEADERS_4_9 + default "4.1.51" if BR2_KERNEL_HEADERS_4_1 + default "4.4.125" if BR2_KERNEL_HEADERS_4_4 + default "4.9.91" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.30" if BR2_KERNEL_HEADERS_4_14 - default "4.15.13" if BR2_KERNEL_HEADERS_4_15 + default "4.14.31" if BR2_KERNEL_HEADERS_4_14 + default "4.15.14" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7776dd066713c2c23e4c847f53fc39682096a805 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Mar 2018 20:16:43 +0200 Subject: [PATCH 0402/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.0.0 Rebased 0002-Fix-endianess-detection-with-musl-based-toolchains.patch Signed-off-by: Bernd Kuhls Tested-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...dianess-detection-with-musl-based-toolchains.patch | 11 +++++++---- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 50dcb67278..b48d965d8a 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 17.3.7 +MESA3D_HEADERS_VERSION = 18.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch b/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch index 4846b34c9d..9ab0bca93a 100644 --- a/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch +++ b/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch @@ -16,6 +16,7 @@ http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fc Patch sent upstream: https://patchwork.freedesktop.org/patch/119961/ +[Bernd: rebase on mesa 18.0.0] Signed-off-by: Bernd Kuhls [Romain: rebase on mesa 17.3.1] Signed-off-by: Romain Naour @@ -41,14 +42,16 @@ diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am index 46689637f9..508edfd0d5 100644 --- a/src/amd/Makefile.addrlib.am +++ b/src/amd/Makefile.addrlib.am -@@ -30,6 +30,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \ +@@ -29,7 +29,8 @@ + -I$(srcdir)/addrlib/inc/chip/gfx9 \ -I$(srcdir)/addrlib/inc/chip/r800 \ -I$(srcdir)/addrlib/gfx9/chip \ - -I$(srcdir)/addrlib/r800/chip \ -+ $(DEFINES) \ - -DBRAHMA_BUILD=1 +- -I$(srcdir)/addrlib/r800/chip ++ -I$(srcdir)/addrlib/r800/chip \ ++ $(DEFINES) addrlib_libamdgpu_addrlib_la_CXXFLAGS = \ + $(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS) diff --git a/src/util/u_endian.h b/src/util/u_endian.h index 9e09f80181..038a28fac9 100644 --- a/src/util/u_endian.h diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 4bc4e820b8..ed88910bab 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-March/000410.html -md5 769137f2538562c300c4b76bcb097377 mesa-17.3.7.tar.xz -sha1 c66108a562cc94a9559357ca2b424f99c7f995e8 mesa-17.3.7.tar.xz -sha256 0595904a8fba65a8fe853a84ad3c940205503b94af41e8ceed245fada777ac1e mesa-17.3.7.tar.xz -sha512 ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e mesa-17.3.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-March/000412.html +md5 c2a59fc5b56de3e197fa3a6023409e23 mesa-18.0.0.tar.xz +sha1 361ed565bb7d243c251bfccd4fe2776f54c6d968 mesa-18.0.0.tar.xz +sha256 694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea mesa-18.0.0.tar.xz +sha512 1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396 mesa-18.0.0.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8e4aa7d5ac..1d88fd8480 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 17.3.7 +MESA3D_VERSION = 18.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 8625eca9408256a58418e2145d4cff3cfd3fe10f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Mar 2018 23:37:50 +0200 Subject: [PATCH 0403/2640] cjson: bump to version 1.7.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 2e615ad447..b4a6d00cca 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c3fc800cf9106db4ef5a5ef1fba7d144b21d73b68ad78234e182ebab12079277 cjson-v1.7.4.tar.gz +sha256 a8252abef9c4e0e672fe247cb46318f00a0aa975e455c8d943ae91492249dc3a cjson-v1.7.5.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 7c302abbf5..60bb73945a 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.7.4 +CJSON_VERSION = v1.7.5 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From ec848f899dce5aae2197089d49131f84831eea94 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 29 Mar 2018 00:14:01 +0300 Subject: [PATCH 0404/2640] time: bump to version 1.9 Fix seed variable name for the wait3 system call AC_TRY_RUN test. Remove manual installation; not needed anymore. Cc: Will Newton Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/time/time.hash | 2 +- package/time/time.mk | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/time/time.hash b/package/time/time.hash index 7d395bfb6c..b843534a58 100644 --- a/package/time/time.hash +++ b/package/time/time.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a2f540155961a35ba9b84aec5e77e3ae36c74cecb4484db455960601b7a2e1b time-1.8.tar.gz +sha256 fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e time-1.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/time/time.mk b/package/time/time.mk index c238ee6e27..400eca0dc7 100644 --- a/package/time/time.mk +++ b/package/time/time.mk @@ -4,16 +4,10 @@ # ################################################################################ -TIME_VERSION = 1.8 +TIME_VERSION = 1.9 TIME_SITE = $(BR2_GNU_MIRROR)/time -TIME_CONF_ENV = ac_cv_func_wait3=yes +TIME_CONF_ENV = ac_cv_func_wait3_rusage=yes TIME_LICENSE = GPL-3.0+ TIME_LICENSE_FILES = COPYING -# time uses an old version of automake that does not support -# installing in DESTDIR. -define TIME_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/time $(TARGET_DIR)/usr/bin/time -endef - $(eval $(autotools-package)) From 19e983a9540aa948d64423e63167aba2aff9fe41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Mar 2018 17:27:05 +0200 Subject: [PATCH 0405/2640] package/php: security bump to version 7.2.4 Fixes https://bugs.php.net/bug.php?id=75605, no CVE-ID yet. Removed patch 0008, applied upstream. Re-numbered patch 0009. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...t-sockets-make-AI_IDN-usage-optional.patch | 55 ------------------- ...ild-empty-php_load_zend_extension_c.patch} | 0 package/php/php.hash | 2 +- package/php/php.mk | 2 +- 4 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch rename package/php/{0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch => 0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch} (100%) diff --git a/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch b/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch deleted file mode 100644 index 7ab086865e..0000000000 --- a/package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 923cab3a5ee112d3de44b5571e73402f1fa3d619 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 26 Feb 2018 19:06:40 +0100 -Subject: [PATCH] ext/sockets: make AI_IDN usage optional - -AI_IDN is not supported by all C libraries (uClibc, musl), so make it -optional, like AI_ALL. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/php/php-src/pull/3160 ---- - ext/sockets/config.m4 | 13 +++++++++++++ - ext/sockets/sockets.c | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 -index fe7d22a10a..2bf6a2bd11 100644 ---- a/ext/sockets/config.m4 -+++ b/ext/sockets/config.m4 -@@ -69,6 +69,19 @@ if test "$PHP_SOCKETS" != "no"; then - AC_DEFINE(HAVE_AI_ALL,1,[Whether you have AI_ALL]) - fi - -+ dnl Check for AI_IDN flag -+ AC_CACHE_CHECK([if getaddrinfo supports AI_IDN],[ac_cv_gai_ai_idn], -+ [ -+ AC_TRY_COMPILE([ -+#include -+ ], [int flag = AI_IDN;], -+ ac_cv_gai_ai_idn=yes, ac_cv_gai_ai_idn=no) -+ ]) -+ -+ if test "$ac_cv_gai_ai_idn" = yes; then -+ AC_DEFINE(HAVE_AI_IDN,1,[Whether you have AI_IDN]) -+ fi -+ - PHP_NEW_EXTENSION([sockets], [sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c], [$ext_shared],, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) - fi -diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c -index 6db56c2816..ee9651ce09 100644 ---- a/ext/sockets/sockets.c -+++ b/ext/sockets/sockets.c -@@ -796,7 +796,7 @@ static PHP_MINIT_FUNCTION(sockets) - REGISTER_LONG_CONSTANT("AI_ALL", AI_ALL, CONST_CS | CONST_PERSISTENT); - #endif - REGISTER_LONG_CONSTANT("AI_ADDRCONFIG", AI_ADDRCONFIG, CONST_CS | CONST_PERSISTENT); --#ifdef __USE_GNU -+#if defined(HAVE_AI_IDN) && defined(__USE_GNU) - REGISTER_LONG_CONSTANT("AI_IDN", AI_IDN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("AI_CANONIDN", AI_CANONIDN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("AI_IDN_ALLOW_UNASSIGNED", AI_IDN_ALLOW_UNASSIGNED, CONST_CS | CONST_PERSISTENT); --- -2.14.3 - diff --git a/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch similarity index 100% rename from package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch rename to package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch diff --git a/package/php/php.hash b/package/php/php.hash index 34230df874..4cd5acaef9 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 b3a94f1b562f413c0b96f54bc309706d83b29ac65d9b172bc7ed9fb40a5e651f php-7.2.3.tar.xz +sha256 7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88 php-7.2.4.tar.xz # License file sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index dcb89b03d3..bfd25de875 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.2.3 +PHP_VERSION = 7.2.4 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 22e27da26590adb203ad2cb14e986ff5c2592727 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 29 Mar 2018 01:12:01 +0300 Subject: [PATCH 0406/2640] gawk: bump to version 4.2.1 Enable static build. gawk builds statically just fine. The shared library check has been removed in 4.1.1. Remove the symlink force hunk from the no-versioned patch. The only user of LN is in the part that this patch disables. Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gawk/0001-no-versioned.patch | 10 ---------- package/gawk/Config.in | 5 ++--- package/gawk/gawk.hash | 5 ++++- package/gawk/gawk.mk | 10 +--------- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/package/gawk/0001-no-versioned.patch b/package/gawk/0001-no-versioned.patch index 0c35088e86..c5bbdddeb5 100644 --- a/package/gawk/0001-no-versioned.patch +++ b/package/gawk/0001-no-versioned.patch @@ -1,5 +1,4 @@ Disabled versioned installation of binaries to save space. -Also use symlinks where it's appropiate. Signed-off-by: Gustavo Zacarias [Gustavo: update for 4.1.2] @@ -7,15 +6,6 @@ Signed-off-by: Gustavo Zacarias diff -Nura gawk-4.1.2.orig/Makefile.in gawk-4.1.2/Makefile.in --- gawk-4.1.2.orig/Makefile.in 2015-04-29 16:11:09.367925925 -0300 +++ gawk-4.1.2/Makefile.in 2015-04-29 16:11:25.308466495 -0300 -@@ -554,7 +554,7 @@ - CLEANFILES = core core.* - - # We want hard links for install-exec-hook, below --LN = ln -+LN = $(LN_S) - - # For some make's, e.g. OpenBSD, that don't define this - RM = rm -f @@ -1173,6 +1173,7 @@ # (This is done universally, which may not always be right, but # there's no easy way to distinguish GNU from non-GNU systems.) diff --git a/package/gawk/Config.in b/package/gawk/Config.in index a065243b7d..e9cf4c5ff7 100644 --- a/package/gawk/Config.in +++ b/package/gawk/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_GAWK bool "gawk" depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help A special-purpose programming language which is data driven @@ -11,7 +10,7 @@ config BR2_PACKAGE_GAWK http://www.gnu.org/software/gawk/ -comment "gawk needs a toolchain w/ wchar, dynamic library" +comment "gawk needs a toolchain w/ wchar" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index e2c7806cc5..d8dd27c17c 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 gawk-4.1.4.tar.xz +# https://ftp.gnu.org/gnu/gawk/gawk-4.2.1.tar.xz.sig +sha256 d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc175551 gawk-4.2.1.tar.xz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index a3a2927373..0779736882 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 4.1.4 +GAWK_VERSION = 4.2.1 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk @@ -44,13 +44,5 @@ endef GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK -# Assume we support shared libs -# The check isn't cross-compile friendly and it's mandatory anyway -define GAWK_DISABLE_SHARED_CHECK - $(SED) 's/ check-for-shared-lib-support//' $(@D)/extension/Makefile.in -endef - -GAWK_POST_PATCH_HOOKS += GAWK_DISABLE_SHARED_CHECK - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ae7d59eaae1c55d707b2a70437a84c280f598572 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 15:58:14 +0200 Subject: [PATCH 0407/2640] sngrep: fix libgcrypt handling Fixes: http://autobuild.buildroot.net/results/f1c6494133806b9fc26ae3ce9e9c6a22fa2eda6f/ Commit 6205b75873c (sngrep: gnutls support also needs libgcrypt) ensured that --with-gnutls is only used when both gnutls and libgcrypt are enabled, but it didn't ensure libgcrypt gets built before sngrep or told the configure script where to find libgcrypt-config, breaking the build. Fix both issues. Signed-off-by: Peter Korsgaard --- package/sngrep/sngrep.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 4c9958d497..3f1fe989cf 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -22,7 +22,8 @@ SNGREP_DEPENDENCIES += openssl SNGREP_CONF_OPTS += --with-openssl --without-gnutls # gnutls support also requires libgcrypt else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -SNGREP_DEPENDENCIES += gnutls +SNGREP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config +SNGREP_DEPENDENCIES += gnutls libgcrypt SNGREP_CONF_OPTS += --with-gnutls --without-openssl else SNGREP_CONF_OPTS += --without-gnutls --without-openssl From 28dd2f2896bff7b861a4272fa343e3f7fa80725c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 16:15:15 +0200 Subject: [PATCH 0408/2640] e2fsprogs: bump to version 1.44.1 From the release notes (https://lwn.net/Articles/750103/): E2fsprogs 1.44.0 introduced a regression introduced which caused e2fsck to fail to support HTree directories on big-endian systems. Fix how we read block numbers for internal htree nodes. Removed a potential memory leak from fsck. E2image now correctly creates e2image files for bigalloc file systems. Dumpe2fs and debugfs now correctly support e2image files for file systems that have the meta_bg option enabled. E2fsck and debugfs now correctly handle delete inodes (including processing the orphaned inode list in the case of e2fsck) for bigalloc file systems. (Addresses Google Bug: #73795618) Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 812dfbe320..60498db8e4 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.0/sha256sums.asc -sha256 a3567042f03fcee0e01db8f923b24cec92e2ba5b11f8e39e245672ad5392723d e2fsprogs-1.44.0.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.1/sha256sums.asc +sha256 0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef e2fsprogs-1.44.1.tar.xz # Locally calculated sha256 680f852df303874fe9c722283a7da571ae9a0477768df8af1e363298e2adc51e NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index e9dff32abc..ce7736c1cd 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.44.0 +E2FSPROGS_VERSION = 1.44.1 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From 6938c219d80e2267f8e25f3fc37f955ab723cc55 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 16:52:09 +0200 Subject: [PATCH 0409/2640] libopenssl: security bump to version 1.0.2o Fixes the following security issues: Constructed ASN.1 types with a recursive definition could exceed the stack (CVE-2018-0739) Constructed ASN.1 types with a recursive definition (such as can be found in PKCS7) could eventually exceed the stack given malicious input with excessive recursion. This could result in a Denial Of Service attack. There are no such structures used within SSL/TLS that come from untrusted sources so this is considered safe. Incorrect CRYPTO_memcmp on HP-UX PA-RISC (CVE-2018-0733) Because of an implementation bug the PA-RISC CRYPTO_memcmp function is effectively reduced to only comparing the least significant bit of each byte. This allows an attacker to forge messages that would be considered as authenticated in an amount of tries lower than that guaranteed by the security claims of the scheme. The module can only be compiled by the HP-UX assembler, so that only HP-UX PA-RISC targets are affected. rsaz_1024_mul_avx2 overflow bug on x86_64 (CVE-2017-3738) This issue has been reported in a previous OpenSSL security advisory and a fix was provided for OpenSSL 1.0.2. Due to the low severity no fix was released at that time for OpenSSL 1.1.0. The fix is now available in OpenSSL 1.1.0h. There is an overflow bug in the AVX2 Montgomery multiplication procedure used in exponentiation with 1024-bit moduli. No EC algorithms are affected. Analysis suggests that attacks against RSA and DSA as a result of this defect would be very difficult to perform and are not believed likely. Attacks against DH1024 are considered just feasible, because most of the work necessary to deduce information about a private key may be performed offline. The amount of resources required for such an attack would be significant. However, for an attack on TLS to be meaningful, the server would have to share the DH1024 private key among multiple clients, which is no longer an option since CVE-2016-0701. This only affects processors that support the AVX2 but not ADX extensions like Intel Haswell (4th generation). For more details, see https://www.openssl.org/news/secadv/20180327.txt The copyright year changed in LICENSE, so adjust the hash to match. Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 6 +++--- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index e3d3da757d..48b7471c20 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,8 +1,8 @@ -# From https://www.openssl.org/source/openssl-1.0.2n.tar.gz.sha256 -sha256 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe openssl-1.0.2n.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2o.tar.gz.sha256 +sha256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d openssl-1.0.2o.tar.gz # Locally computed sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956 openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d -sha256 9ee37d72966bb4a841343f0606ce44d41b3eae4df4285200c5a8ddc2b935992a LICENSE +sha256 c8f60f4842bbad0353f5d81620e72b168b5638ca3a0a999f5da113b22491612e LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 5a78676c64..16a9c2e9d2 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.0.2n +LIBOPENSSL_VERSION = 1.0.2o LIBOPENSSL_SITE = http://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From 9427b63e10ef416ccd8094d0762728e560276759 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 29 Mar 2018 11:15:06 -0700 Subject: [PATCH 0410/2640] configs/atmel: bump to linux4sam_5.8 Bump at91sam9x5ek, atmel_sama5d27_som1_ek, atmel_sama5d2_xplained, atmel_sama5d3_xplained, and atmel_sama5d4_xplained all variants to linux4sam_5.8. The 3 foundation components have their tags changed (AT91Bootstrap, U-Boot, Linux kernel). at91bootstrap 3.8.10 is required to support gcc7. Signed-off-by: Joshua Henderson Cc: Nicolas Ferre Signed-off-by: Peter Korsgaard --- configs/at91sam9x5ek_defconfig | 6 +++--- configs/at91sam9x5ek_dev_defconfig | 6 +++--- configs/at91sam9x5ek_mmc_defconfig | 6 +++--- configs/at91sam9x5ek_mmc_dev_defconfig | 6 +++--- configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 6 +++--- configs/atmel_sama5d2_xplained_mmc_defconfig | 6 +++--- configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 6 +++--- configs/atmel_sama5d3_xplained_defconfig | 6 +++--- configs/atmel_sama5d3_xplained_dev_defconfig | 6 +++--- configs/atmel_sama5d3_xplained_mmc_defconfig | 6 +++--- configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 6 +++--- configs/atmel_sama5d4_xplained_defconfig | 6 +++--- configs/atmel_sama5d4_xplained_dev_defconfig | 6 +++--- configs/atmel_sama5d4_xplained_mmc_defconfig | 6 +++--- configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index a536230345..cac305436e 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -5,7 +5,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" @@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 3af4ba74e8..ba97212dca 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" @@ -86,13 +86,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 6964d5814e..dc15bbcacb 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" @@ -26,13 +26,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_ENVIMAGE=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 931cf7dec8..5c8658c356 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" @@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_ENVIMAGE=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 3752129202..4cea358b29 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek at91-sama5d27_som1_ek_pda4 at91-sama5d27_som1_ek_pda7 at91-sama5d27_som1_ek_pda7b" @@ -72,13 +72,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 8889978deb..5be2fe9dcc 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" @@ -18,13 +18,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 23a2582086..bff9cdf8fa 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -25,7 +25,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" @@ -90,13 +90,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index b65c389acc..5b356ed724 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -6,7 +6,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index f403e2308d..976a77f7a6 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 4ddb17149a..0a40b054d6 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a3351482cf..d3a30bc5b1 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -89,13 +89,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index feedf1f5a6..e5a76411ee 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -7,7 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index 7ebfde173c..d45175bf28 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -92,13 +92,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index b8b21e777c..6fbaf3c748 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -18,13 +18,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index c31f15a1ee..1907a7590a 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -25,7 +25,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -90,13 +90,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y From 6aa2bfd87fed698fa1d14cde21360cf2a187fff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 29 Mar 2018 21:15:50 +0200 Subject: [PATCH 0411/2640] bash: bump to version 4.4.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 4e2e48f363..951bcf5850 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://ftp.gnu.org/gnu/bash/bash-4.4.12.tar.gz.sig -sha256 57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331 bash-4.4.12.tar.gz +# http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz.sig +sha256 604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23 bash-4.4.18.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index e9384911a0..b162d93188 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 4.4.12 +BASH_VERSION = 4.4.18 BASH_SITE = $(BR2_GNU_MIRROR)/bash # Build after since bash is better than busybox shells BASH_DEPENDENCIES = ncurses readline host-bison \ From be824409c4bc83cf0b61816bdf2c4edf8cd15da3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 30 Mar 2018 08:44:42 +0300 Subject: [PATCH 0412/2640] libsigsegv: bump to version 2.12 Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libsigsegv/libsigsegv.hash | 5 ++++- package/libsigsegv/libsigsegv.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libsigsegv/libsigsegv.hash b/package/libsigsegv/libsigsegv.hash index e937259ece..47ba356821 100644 --- a/package/libsigsegv/libsigsegv.hash +++ b/package/libsigsegv/libsigsegv.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dd7c2eb2ef6c47189406d562c1dc0f96f2fc808036834d596075d58377e37a18 libsigsegv-2.11.tar.gz +# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.12.tar.gz.sig +sha256 3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6 libsigsegv-2.12.tar.gz +# Locally calculated +sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index d2524977a4..6fa0929bba 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGSEGV_VERSION = 2.11 +LIBSIGSEGV_VERSION = 2.12 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes From 94e906cecef40991536b5484b4058308da079415 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 18:22:51 +0200 Subject: [PATCH 0413/2640] busybox: bump version to 1.28.2 Drop 0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch now upstream. >From the release notes: Bug fix release. 1.28.2 has fixes for tcpsvd (fixed fallout from opt_complementary removal), udhcpd (do not ignore SIGTERM), tar and unzip (reverted to previous, more permissive symlink handling), ssl_client (fixed option parsing). Signed-off-by: Peter Korsgaard --- ...ne-creation-of-symlinks-with-suspici.patch | 358 ------------------ package/busybox/busybox.hash | 8 +- package/busybox/busybox.mk | 2 +- 3 files changed, 5 insertions(+), 363 deletions(-) delete mode 100644 package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch diff --git a/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch b/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch deleted file mode 100644 index f6f1359654..0000000000 --- a/package/busybox/0003-tar-unzip-postpone-creation-of-symlinks-with-suspici.patch +++ /dev/null @@ -1,358 +0,0 @@ -From a84db18fc71d09e801df0ebca048d82e90b32c6a Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Tue, 20 Feb 2018 15:57:45 +0100 -Subject: [PATCH] tar,unzip: postpone creation of symlinks with "suspicious" - targets - -This mostly reverts commit bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7 -"libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1" - -Users report that it is somewhat too restrictive. See -https://bugs.busybox.net/show_bug.cgi?id=8411 - -In particular, this interferes with unpacking of busybox-based -filesystems with links like "sbin/applet" -> "../bin/busybox". - -The change is made smaller by deleting ARCHIVE_EXTRACT_QUIET flag - -it is unused since 2010, and removing conditionals on it -allows commonalizing some error message codes. - -function old new delta -create_or_remember_symlink - 94 +94 -create_symlinks_from_list - 64 +64 -tar_main 1002 1006 +4 -unzip_main 2732 2724 -8 -data_extract_all 984 891 -93 -unsafe_symlink_target 147 - -147 ------------------------------------------------------------------------------- -(add/remove: 2/1 grow/shrink: 1/2 up/down: 162/-248) Total: -86 bytes - -Signed-off-by: Denys Vlasenko ---- - archival/libarchive/data_extract_all.c | 28 ++++---------- - archival/libarchive/unsafe_symlink_target.c | 59 +++++++++++++---------------- - archival/tar.c | 2 + - archival/unzip.c | 25 ++++++------ - include/bb_archive.h | 23 ++++++----- - testsuite/tar.tests | 10 ++--- - 6 files changed, 68 insertions(+), 79 deletions(-) - -diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c -index d3a6df5e8..8fa69ffaf 100644 ---- a/archival/libarchive/data_extract_all.c -+++ b/archival/libarchive/data_extract_all.c -@@ -107,9 +107,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) - } - } - else if (existing_sb.st_mtime >= file_header->mtime) { -- if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) -- && !S_ISDIR(file_header->mode) -- ) { -+ if (!S_ISDIR(file_header->mode)) { - bb_error_msg("%s not created: newer or " - "same age file exists", dst_name); - } -@@ -125,7 +123,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) - /* Handle hard links separately */ - if (hard_link) { - res = link(hard_link, dst_name); -- if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { -+ if (res != 0) { - /* shared message */ - bb_perror_msg("can't create %slink '%s' to '%s'", - "hard", dst_name, hard_link -@@ -165,10 +163,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) - } - case S_IFDIR: - res = mkdir(dst_name, file_header->mode); -- if ((res == -1) -+ if ((res != 0) - && (errno != EISDIR) /* btw, Linux doesn't return this */ - && (errno != EEXIST) -- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) - ) { - bb_perror_msg("can't make dir %s", dst_name); - } -@@ -198,27 +195,16 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) - * - * Untarring bug.tar would otherwise place evil.py in '/tmp'. - */ -- if (!unsafe_symlink_target(file_header->link_target)) { -- res = symlink(file_header->link_target, dst_name); -- if (res != 0 -- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) -- ) { -- /* shared message */ -- bb_perror_msg("can't create %slink '%s' to '%s'", -- "sym", -- dst_name, file_header->link_target -- ); -- } -- } -+ create_or_remember_symlink(&archive_handle->symlink_placeholders, -+ file_header->link_target, -+ dst_name); - break; - case S_IFSOCK: - case S_IFBLK: - case S_IFCHR: - case S_IFIFO: - res = mknod(dst_name, file_header->mode, file_header->device); -- if ((res == -1) -- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) -- ) { -+ if (res != 0) { - bb_perror_msg("can't create node %s", dst_name); - } - break; -diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c -index 441ba8b24..8dcafeaa1 100644 ---- a/archival/libarchive/unsafe_symlink_target.c -+++ b/archival/libarchive/unsafe_symlink_target.c -@@ -5,44 +5,37 @@ - #include "libbb.h" - #include "bb_archive.h" - --int FAST_FUNC unsafe_symlink_target(const char *target) -+void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, -+ const char *target, -+ const char *linkname) - { -- const char *dot; -- -- if (target[0] == '/') { -- const char *var; -- unsafe: -- var = getenv("EXTRACT_UNSAFE_SYMLINKS"); -- if (var) { -- if (LONE_CHAR(var, '1')) -- return 0; /* pretend it's safe */ -- return 1; /* "UNSAFE!" */ -- } -- bb_error_msg("skipping unsafe symlink to '%s' in archive," -- " set %s=1 to extract", -- target, -- "EXTRACT_UNSAFE_SYMLINKS" -+ if (target[0] == '/' || strstr(target, "..")) { -+ llist_add_to(symlink_placeholders, -+ xasprintf("%s%c%s", linkname, '\0', target) -+ ); -+ return; -+ } -+ if (symlink(target, linkname) != 0) { -+ /* shared message */ -+ bb_perror_msg_and_die("can't create %slink '%s' to '%s'", -+ "sym", linkname, target - ); -- /* Prevent further messages */ -- setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0); -- return 1; /* "UNSAFE!" */ - } -+} - -- dot = target; -- for (;;) { -- dot = strchr(dot, '.'); -- if (!dot) -- return 0; /* safe target */ -+void FAST_FUNC create_symlinks_from_list(llist_t *list) -+{ -+ while (list) { -+ char *target; - -- /* Is it a path component starting with ".."? */ -- if ((dot[1] == '.') -- && (dot == target || dot[-1] == '/') -- /* Is it exactly ".."? */ -- && (dot[2] == '/' || dot[2] == '\0') -- ) { -- goto unsafe; -+ target = list->data + strlen(list->data) + 1; -+ if (symlink(target, list->data)) { -+ /* shared message */ -+ bb_error_msg_and_die("can't create %slink '%s' to '%s'", -+ "sym", -+ list->data, target -+ ); - } -- /* NB: it can even be trailing ".", should only add 1 */ -- dot += 1; -+ list = list->link; - } - } -diff --git a/archival/tar.c b/archival/tar.c -index 9ed3821d5..415ebde0d 100644 ---- a/archival/tar.c -+++ b/archival/tar.c -@@ -1244,6 +1244,8 @@ int tar_main(int argc UNUSED_PARAM, char **argv) - while (get_header_tar(tar_handle) == EXIT_SUCCESS) - bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */ - -+ create_symlinks_from_list(tar_handle->symlink_placeholders); -+ - /* Check that every file that should have been extracted was */ - while (tar_handle->accept) { - if (!find_list_entry(tar_handle->reject, tar_handle->accept->data) -diff --git a/archival/unzip.c b/archival/unzip.c -index da4b2a544..0d00d8dc9 100644 ---- a/archival/unzip.c -+++ b/archival/unzip.c -@@ -345,7 +345,9 @@ static void unzip_create_leading_dirs(const char *fn) - } - - #if ENABLE_FEATURE_UNZIP_CDF --static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) -+static void unzip_extract_symlink(llist_t **symlink_placeholders, -+ zip_header_t *zip, -+ const char *dst_fn) - { - char *target; - -@@ -370,15 +372,9 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) - target[xstate.mem_output_size] = '\0'; - #endif - } -- if (!unsafe_symlink_target(target)) { --//TODO: libbb candidate -- if (symlink(target, dst_fn)) { -- /* shared message */ -- bb_perror_msg_and_die("can't create %slink '%s' to '%s'", -- "sym", dst_fn, target -- ); -- } -- } -+ create_or_remember_symlink(symlink_placeholders, -+ target, -+ dst_fn); - free(target); - } - #endif -@@ -490,6 +486,9 @@ int unzip_main(int argc, char **argv) - llist_t *zaccept = NULL; - llist_t *zreject = NULL; - char *base_dir = NULL; -+#if ENABLE_FEATURE_UNZIP_CDF -+ llist_t *symlink_placeholders = NULL; -+#endif - int i; - char key_buf[80]; /* must match size used by my_fgets80 */ - -@@ -954,7 +953,7 @@ int unzip_main(int argc, char **argv) - #if ENABLE_FEATURE_UNZIP_CDF - if (S_ISLNK(file_mode)) { - if (dst_fd != STDOUT_FILENO) /* not -p? */ -- unzip_extract_symlink(&zip, dst_fn); -+ unzip_extract_symlink(&symlink_placeholders, &zip, dst_fn); - } else - #endif - { -@@ -990,6 +989,10 @@ int unzip_main(int argc, char **argv) - total_entries++; - } - -+#if ENABLE_FEATURE_UNZIP_CDF -+ create_symlinks_from_list(symlink_placeholders); -+#endif -+ - if ((opts & OPT_l) && quiet <= 1) { - if (!verbose) { - // " Length Date Time Name\n" -diff --git a/include/bb_archive.h b/include/bb_archive.h -index 8ed20d70e..a5c61e95b 100644 ---- a/include/bb_archive.h -+++ b/include/bb_archive.h -@@ -64,6 +64,9 @@ typedef struct archive_handle_t { - /* Currently processed file's header */ - file_header_t *file_header; - -+ /* List of symlink placeholders */ -+ llist_t *symlink_placeholders; -+ - /* Process the header component, e.g. tar -t */ - void FAST_FUNC (*action_header)(const file_header_t *); - -@@ -119,15 +122,14 @@ typedef struct archive_handle_t { - #define ARCHIVE_RESTORE_DATE (1 << 0) - #define ARCHIVE_CREATE_LEADING_DIRS (1 << 1) - #define ARCHIVE_UNLINK_OLD (1 << 2) --#define ARCHIVE_EXTRACT_QUIET (1 << 3) --#define ARCHIVE_EXTRACT_NEWER (1 << 4) --#define ARCHIVE_DONT_RESTORE_OWNER (1 << 5) --#define ARCHIVE_DONT_RESTORE_PERM (1 << 6) --#define ARCHIVE_NUMERIC_OWNER (1 << 7) --#define ARCHIVE_O_TRUNC (1 << 8) --#define ARCHIVE_REMEMBER_NAMES (1 << 9) -+#define ARCHIVE_EXTRACT_NEWER (1 << 3) -+#define ARCHIVE_DONT_RESTORE_OWNER (1 << 4) -+#define ARCHIVE_DONT_RESTORE_PERM (1 << 5) -+#define ARCHIVE_NUMERIC_OWNER (1 << 6) -+#define ARCHIVE_O_TRUNC (1 << 7) -+#define ARCHIVE_REMEMBER_NAMES (1 << 8) - #if ENABLE_RPM --#define ARCHIVE_REPLACE_VIA_RENAME (1 << 10) -+#define ARCHIVE_REPLACE_VIA_RENAME (1 << 9) - #endif - - -@@ -197,7 +199,10 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC; - void seek_by_read(int fd, off_t amount) FAST_FUNC; - - const char *strip_unsafe_prefix(const char *str) FAST_FUNC; --int unsafe_symlink_target(const char *target) FAST_FUNC; -+void create_or_remember_symlink(llist_t **symlink_placeholders, -+ const char *target, -+ const char *linkname) FAST_FUNC; -+void create_symlinks_from_list(llist_t *list) FAST_FUNC; - - void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; - const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; -diff --git a/testsuite/tar.tests b/testsuite/tar.tests -index b7cd74ca5..1675b07b1 100755 ---- a/testsuite/tar.tests -+++ b/testsuite/tar.tests -@@ -279,7 +279,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 - testing "tar does not extract into symlinks" "\ - >>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$? - " "\ --tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract -+tar: can't create symlink 'passwd' to '/tmp/passwd' - 0 - " \ - "" "\ -@@ -299,7 +299,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 - testing "tar -k does not extract into symlinks" "\ - >>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$? - " "\ --tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract -+tar: can't create symlink 'passwd' to '/tmp/passwd' - 0 - " \ - "" "\ -@@ -324,11 +324,11 @@ rm -rf etc usr - ' "\ - etc/ssl/certs/3b2716e5.0 - etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem --tar: skipping unsafe symlink to '/usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract - etc/ssl/certs/f80cc7f6.0 - usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt - 0 - etc/ssl/certs/3b2716e5.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem -+etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem -> /usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt - etc/ssl/certs/f80cc7f6.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem - " \ - "" "" -@@ -346,9 +346,9 @@ ls symlink/bb_test_evilfile - ' "\ - anything.txt - symlink --tar: skipping unsafe symlink to '/tmp' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract - symlink/bb_test_evilfile --0 -+tar: can't create symlink 'symlink' to '/tmp' -+1 - ls: /tmp/bb_test_evilfile: No such file or directory - ls: bb_test_evilfile: No such file or directory - symlink/bb_test_evilfile --- -2.16.2 - diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index b7067b6633..538aa04b9b 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,6 +1,6 @@ -# From https://busybox.net/downloads/busybox-1.28.1.tar.bz2.sign -md5 928919a21e34d5c5507d872a4fb7b9f4 busybox-1.28.1.tar.bz2 -sha1 932e2a77c3ddaa7f0915ed6fe9232041d261f86b busybox-1.28.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.28.2.tar.bz2.sign +md5 5db059384469827ab19dac69d3fcd092 busybox-1.28.2.tar.bz2 +sha1 5ddba42aa14b875688727f0a3a9973e42fc51c23 busybox-1.28.2.tar.bz2 # Locally calculated -sha256 98fe1d3c311156c597cd5cfa7673bb377dc552b6fa20b5d3834579da3b13652e busybox-1.28.1.tar.bz2 +sha256 b64a94a60877c96838ee60e75765576ecc8756bf3636485117637604acb84b0d busybox-1.28.2.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7009f6a675..d2d2e86636 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.28.1 +BUSYBOX_VERSION = 1.28.2 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 5af41088a49e1a5c438d9d6d2e39e2a15d4b3c8a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 30 Mar 2018 10:57:14 +0300 Subject: [PATCH 0414/2640] libunistring: bump to version 0.9.9 Drop --{enable,disable}-threads; threading support is detected automatically. Add GPLv3 license file. Add license files hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libunistring/libunistring.hash | 6 +++++- package/libunistring/libunistring.mk | 10 ++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 15e35cb81c..8a5da7782d 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 2e3764512aaf2ce598af5a38818c0ea23dedf1ff5460070d1b6cee5c3336e797 libunistring-0.9.7.tar.xz +# https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.9.tar.xz.sig +sha256 a4d993ecfce16cf503ff7579f5da64619cee66226fb3b998dafb706190d9a833 libunistring-0.9.9.tar.xz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 9340e79937..929b52ebd5 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,18 +4,12 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.7 +LIBUNISTRING_VERSION = 0.9.9 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0 -LIBUNISTRING_LICENSE_FILES = COPYING.LIB - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBUNISTRING_CONF_OPTS += --enable-threads=posix -else -LIBUNISTRING_CONF_OPTS += --disable-threads -endif +LIBUNISTRING_LICENSE_FILES = COPYING COPYING.LIB $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 0a4d16698db58a67e260cc34fdddacb3f0804112 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 30 Mar 2018 11:17:38 +0200 Subject: [PATCH 0415/2640] package/dovecot: bump version to 2.3.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 438c3cccef..cd2a0809fe 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 cce15db2fc5233386b63a3cf21c465c09e6e55014ed66c4f184b7d221a47180c dovecot-2.2.35.tar.gz +sha256 0883821b97fd02a084a84b9469a681f7e6edc56541d854b5419d98891c51fb93 dovecot-2.3.1.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 783ca06a0e..8e775be5f7 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).35 +DOVECOT_VERSION_MAJOR = 2.3 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).1 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 599e83992564f5ff248ee21c735ca2db0ac8e182 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 30 Mar 2018 11:17:39 +0200 Subject: [PATCH 0416/2640] package/dovecot-pigeonhole: bump version to 0.5.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 797530f526..2950476102 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 2860d12b95e316bddfae00d887edcd9834272834406970aa1c096425569c035f dovecot-2.2-pigeonhole-0.4.23.tar.gz +sha256 e3b0aa59261881bcb0d33a6c398f3cb5f9f75e077e67bae175cf33c362577547 dovecot-2.3-pigeonhole-0.5.1.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 919c58e3e8..f70ae5c02d 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,9 +4,9 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.4.23 -DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz -DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2 +DOVECOT_PIGEONHOLE_VERSION = 0.5.1 +DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz +DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot From 4cd1ab15886a408b897104709ff87f15cc88ba16 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 27 Mar 2018 13:00:22 +0200 Subject: [PATCH 0417/2640] core: alternate solution to disable C++ Some packages that use libtool really need some love to be able to disable C++ support. This is because libtool will want to call AC_PROG_CXXCPP as soon as CXX is set non-empty to something different from 'no'. Then, AC_PROG_CXXCPP will want a C++ preprocessor that works on valid input *and* fail on invalid input. So, providing 'false' as the C++ compiler will then require that we do have a working C++ preprocessor. Which is totally counter-productive since we do not have a C++ compiler to start with... bd39d11d2e (core/infra: fix build on toolchain without C++) was a previous attempt at fixing this, by using the host's C++ preprocessor. However, that is very incorrect (that's my code, I can say so!) because the set of defines will most probably be different for the host and the target, thus causing all sorts of trouble. For example, on ARM we'd have to include different headers for soft-float vs hard-float, which is decided based on a macro, which is not defined for x86, and thus may redirect to the wrong (and missing) header. Instead, we notice that libtool uses the magic value 'no' to decide that a C++ compiler is not available, in which case it skips the call to AC_PROG_CXXCPP. Given that 'no' is not provided by any package in Debian and derivatives, as well as in Fedora, we can assume that no system will have an executable called 'no'. Hence, we use that as a magic value to disable C++ detection altogether. Fixes: #10846 (again) Reported-by: Damien Riegel Signed-off-by: "Yann E. MORIN" Cc: Damien Riegel Cc: Peter Seiderer Cc: Vivien Didelot Cc: Peter Korsgaard Cc: Thomas Petazzoni Tested-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 828e12e7d7..0af79dfb63 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -412,8 +412,16 @@ else NLS_OPTS = --disable-nls endif +# We need anything that is invalid. Traditionally, we'd have used 'false' (and +# we did so in the past). However, that breaks libtool for packages that have +# optional C++ support (e.g. gnutls), because libtool will *require* a *valid* +# C++ preprocessor as long as CXX is not 'no'. +# Now, whether we use 'no' or 'false' for CXX as the same side effect: it is an +# invalid C++ compiler, and thus will cause detection of C++ to fail (which is +# expected and what we want), while at the same time taming libtool into +# silence. ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -TARGET_CONFIGURE_OPTS += CXX=false CXXCPP=cpp +TARGET_CONFIGURE_OPTS += CXX=no endif ifeq ($(BR2_STATIC_LIBS),y) From fb521b5d45dc74463a5fb30657642d328e3d51cd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Mar 2018 10:47:08 +0200 Subject: [PATCH 0418/2640] libnspr: bump version to 4.19 Signed-off-by: Peter Korsgaard --- package/libnspr/libnspr.hash | 4 ++-- package/libnspr/libnspr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 46c091e0da..3067afd720 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.17/src/SHA256SUMS -sha256 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095 nspr-4.17.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.19/src/SHA256SUMS +sha256 2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729 nspr-4.19.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 0c782ae309..14381bb5e8 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.17 +LIBNSPR_VERSION = 4.19 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr From 0ccab9b0edaf6455b909f2f381790e9620f17354 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Mar 2018 10:47:09 +0200 Subject: [PATCH 0419/2640] libnss: bump version to 3.35 Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 6c8ce83784..775ef4868c 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_33_RTM/src/SHA256SUMS -sha256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 nss-3.33.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_35_RTM/src/SHA256SUMS +sha256 f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa nss-3.35.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 27d305cc34..2bef2bcc66 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.33 +LIBNSS_VERSION = 3.35 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 6911750391b07a5fdda0fdaf43409941858318d5 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 00:29:12 +0530 Subject: [PATCH 0420/2640] opus: add hash for license file Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/opus/opus.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 32fe2e245b..c1a92d6b94 100644 --- a/package/opus/opus.hash +++ b/package/opus/opus.hash @@ -1,2 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt sha256 cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732 opus-1.2.1.tar.gz + +# Hash for license file +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 COPYING From 4308f0c85062ae398b1ecad181560552f8d79673 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 00:29:13 +0530 Subject: [PATCH 0421/2640] opusfile: add hash for license file Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/opusfile/opusfile.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/opusfile/opusfile.hash b/package/opusfile/opusfile.hash index 528ded2079..59e08192f5 100644 --- a/package/opusfile/opusfile.hash +++ b/package/opusfile/opusfile.hash @@ -1,2 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt sha256 f75fb500e40b122775ac1a71ad80c4477698842a8fe9da4a1b4a1a9f16e4e979 opusfile-0.9.tar.gz + +# Hash for license file +sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING From 5ccd6958d54d194a623f23debeefce15c6aaccc7 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 00:29:14 +0530 Subject: [PATCH 0422/2640] opus-tools: add hash for license file Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/opus-tools/opus-tools.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/opus-tools/opus-tools.hash b/package/opus-tools/opus-tools.hash index 185c94ce75..c7759e559f 100644 --- a/package/opus-tools/opus-tools.hash +++ b/package/opus-tools/opus-tools.hash @@ -1,2 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt sha256 a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c opus-tools-0.1.10.tar.gz + +# Hash for license file +sha256 88021117568c64038175d7fb3b8286056f7cdb54f09dc806578f6bd9342c62cc COPYING From 543261cd5303578a96ca154c4ece9d5e0d81eb1d Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 00:29:15 +0530 Subject: [PATCH 0423/2640] opus-tools: update license As per COPYING file, opusinfo is licensed under GPL version 2. Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/opus-tools/opus-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk index a81e75eb0e..ab00ced705 100644 --- a/package/opus-tools/opus-tools.mk +++ b/package/opus-tools/opus-tools.mk @@ -6,7 +6,7 @@ OPUS_TOOLS_VERSION = 0.1.10 OPUS_TOOLS_SITE = https://downloads.xiph.org/releases/opus -OPUS_TOOLS_LICENSE = BSD-2-Clause +OPUS_TOOLS_LICENSE = BSD-2-Clause, GPL-2.0 (opusinfo) OPUS_TOOLS_LICENSE_FILES = COPYING OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf From a86b2523a0e0b723d580329c238e35e7e1af5fe3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 30 Mar 2018 21:28:03 +0200 Subject: [PATCH 0424/2640] utils/genrandconfig: adjust to core-dependencies removal In commit ea9669fffae7d807ccb3810eb6c662cbb9e8f96f ("core: kill DEPENDENCIES_HOST_PREREQ"), the core-dependencies make target was removed, and is now named just "dependencies". This broke the utils/genrandconfig script, and this commit intends to fix that. Since this script is part of the Buildroot tree, it is provided together with Buildroot, so we don't need to support the legacy core-dependencies target. Someone checking out an older Buildroot will have a working setup, with support/dependencies exposing core-dependencies and utils/genrandconfig using core-dependencies. The only broken situation will be between ea9669fffae7d807ccb3810eb6c662cbb9e8f96f and this commit, but that's not a sufficient reason to add some backward compatibility code. Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index d958664572..07882200e0 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -404,7 +404,7 @@ def gen_config(args): "savedefconfig"]) return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "core-dependencies"]) + "dependencies"]) if __name__ == '__main__': From 9b2f6548f8d2cad52fd3a5f81febf4818ee66304 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 01:02:08 +0530 Subject: [PATCH 0425/2640] zstd: fix legal info zstd is dual licensed under BSD-3-Clause or GPL-2.0 as per README.md and source files license header. Cc: Andrey Smirnov Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/zstd/zstd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index d5459f99dd..c0fa88026c 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -6,7 +6,7 @@ ZSTD_VERSION = v1.3.3 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) -ZSTD_LICENSE = BSD-3-Clause, GPL-2.0 +ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) From d8151145f29e80e686d87675e7da7cae696196c5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Mar 2018 14:03:43 +0200 Subject: [PATCH 0426/2640] python-docker: bump version to 3.1.4 Signed-off-by: Peter Korsgaard --- package/python-docker/python-docker.hash | 4 ++-- package/python-docker/python-docker.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash index c09ccc3859..e811d3a8ac 100644 --- a/package/python-docker/python-docker.hash +++ b/package/python-docker/python-docker.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docker/json, sha256 locally computed -md5 71e97726a8bdc56effa7df8321c47af1 docker-3.1.1.tar.gz -sha256 462165ca6367f802280684ab44e581cd2efba8995d78d07ea994e42194927c3b docker-3.1.1.tar.gz +md5 981b23b41fd2346efcae977244b7188e docker-3.1.4.tar.gz +sha256 753251b142d56f243fba53ba321a37740a6b6583c528437f45df4d28ba3d4d5d docker-3.1.4.tar.gz sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index fb9b32a603..6a818ebaed 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 3.1.1 +PYTHON_DOCKER_VERSION = 3.1.4 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://pypi.python.org/packages/0d/17/ad98e025e5528337c4dc5835a5874898eb226da17e4ffed732c894cb1938 +PYTHON_DOCKER_SITE = https://pypi.python.org/packages/7f/22/fd6e97c99a512f74d46dab2b450fe370eb2f83404ef790298e3fd012cd5c PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE From 205b786376f1631a877144effb4899818ef7fbe2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Mar 2018 14:03:44 +0200 Subject: [PATCH 0427/2640] docker-compose: bump version to 1.20.1 Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 4 ++-- package/docker-compose/docker-compose.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index abcb424d09..5a5e86abe8 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docker-compose/json, sha256 locally computed -md5 0c62ffccfbf22195dc8f168d7ce104b0 docker-compose-1.20.0rc2.tar.gz -sha256 8f4c7d1d8bef2f137f28332f13187af159ea55ceb58338dfc70cda3800f65d11 docker-compose-1.20.0rc2.tar.gz +md5 8f9f6d59cc8e65dbfad6fda26b96fde7 docker-compose-1.20.1.tar.gz +sha256 34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66 docker-compose-1.20.1.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index d5f71c05a0..52c16dbc79 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 1.20.0rc2 -DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/b9/fe/44a2d249d86ef04ccf792c841fc73ffcf96e6138ca3a926de8ba032cf912 +DOCKER_COMPOSE_VERSION = 1.20.1 +DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/25/4f/4e2b8ff942c9b3d96a81082590617c5c5fa006b066a4181b8d985ea3ac79 DOCKER_COMPOSE_SETUP_TYPE = setuptools DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 9b224e6c209c2eb6188731ebad65fa97515580e0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 8 Mar 2018 17:42:52 +0100 Subject: [PATCH 0428/2640] ncmpc: bump to version 0.29 Since version 0.28 ncmpc only supports the meson build. Therefore, adapt to package infrastructure according to the user manual. Add a hash for the license file. Add a nmpc entry for myself in DEVELOPERS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/ncmpc/ncmpc.hash | 5 ++++- package/ncmpc/ncmpc.mk | 28 +++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 40fda40bda..ef6589e37d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -663,6 +663,7 @@ F: package/libupnp/ F: package/libupnp18/ F: package/minissdpd/ F: package/motion/ +F: package/ncmpc/ F: package/rygel/ F: package/safeclib/ F: package/tinycbor/ diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index 82fae1d78c..0e9a4a903c 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9 ncmpc-0.27.tar.xz +sha256 ef68a9b67172383ea80ee46579015109433fa058728812d2b0ebede660d85f12 ncmpc-0.29.tar.xz + +# Hash for license file: +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 31b4f08d14..0c9dfd4658 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,11 +5,33 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).27 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).29 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) -NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses +NCMPC_DEPENDENCIES = host-meson host-pkgconf libglib2 libmpdclient ncurses NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +NCMPC_CONF_OPTS += \ + --prefix=/usr \ + --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ + --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf + +NCMPC_NINJA_OPTS = $(if $(VERBOSE),-v) + +define NCMPC_CONFIGURE_CMDS + rm -rf $(@D)/build + mkdir -p $(@D)/build + $(TARGET_MAKE_ENV) meson $(NCMPC_CONF_OPTS) $(@D) $(@D)/build +endef + +define NCMPC_BUILD_CMDS + $(TARGET_MAKE_ENV) ninja $(NCMPC_NINJA_OPTS) -C $(@D)/build +endef + +define NCMPC_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ + ninja $(NCMPC_NINJA_OPTS) -C $(@D)/build install +endef + +$(eval $(generic-package)) From 0e4de0f2db5f7a252d4b8a4cac752fac9ca2deb3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 08:47:09 +0200 Subject: [PATCH 0429/2640] support/config-fragments/autobuild: fix SSP in br-nios2-glibc Commit c8680956819fae8776d7bd6d1f0e67a7b6436672 ("toolchain: fix detection of SSP support") fixed the SSP check so that it does the correct thing for nios2 toolchains. While this commit fixed the description of the Sourcery NIOSII toolchain, it didn't fix the description for the autobuilders of the br-nios2-glibc toolchain, causing some build failures. This commit adjusts br-nios2-glibc.config to indicate that the toolchain doesn't have SSP support. Fixes: http://autobuild.buildroot.net/results/6c44e328b7bffd8474d29d5bdf1ea109ec15f4ad/ Signed-off-by: Thomas Petazzoni --- support/config-fragments/autobuild/br-nios2-glibc.config | 1 + 1 file changed, 1 insertion(+) diff --git a/support/config-fragments/autobuild/br-nios2-glibc.config b/support/config-fragments/autobuild/br-nios2-glibc.config index 62f2665e44..52b9f7f9f5 100644 --- a/support/config-fragments/autobuild/br-nios2-glibc.config +++ b/support/config-fragments/autobuild/br-nios2-glibc.config @@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y From 557cd845b216de8bfe7bb8d2ebf61bf020026f90 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 27 Mar 2018 23:05:54 +0300 Subject: [PATCH 0430/2640] brotli: fix building of static libraries Include a patch to make CMake honor the BUILD_SHARED_LIBS which Buildroot sets to choose the kind of libraries to build. Fixes: - http://autobuild.buildroot.net/results/f1c4b5aeb12af7b7a3e8ae01c219004ecd9befd6/ - http://autobuild.buildroot.net/results/74d20ff38766466623cc4a9eb18afcda831bc20b/ Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...g-BUILD_SHARED_LIBS-to-choose-static.patch | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch diff --git a/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch b/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch new file mode 100644 index 0000000000..33b9bb70ce --- /dev/null +++ b/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch @@ -0,0 +1,144 @@ +From b60b613e7c2c9bf7a142c3c486ac6e77ad93f5d1 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 26 Mar 2018 19:08:31 +0100 +Subject: [PATCH] CMake: Allow using BUILD_SHARED_LIBS to choose static/shared + libs + +By convention projects using CMake which can build either static or +shared libraries use a BUILD_SHARED_LIBS flag to allow selecting between +both: the add_library() command automatically switches between both using +this variable when the library kind is not passed to add_library(). It +is also usual to expose the BUILD_SHARED_LIBS as an user-facing setting +with the option() command. + +This way, the following will both work as expected: + + % cmake -DBUILD_SHARED_LIBS=OFF ... + % cmake -DBUILS_SHARED_LIBS=ON ... + +This is helpful for distributions which need (or want) to build only +static libraries. +--- + CMakeLists.txt | 42 ++++++++++++++---------------------------- + c/fuzz/test_fuzzer.sh | 6 +++--- + 2 files changed, 17 insertions(+), 31 deletions(-) + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: Submitted [https://github.com/google/brotli/pull/655] + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 99b9258..3867931 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.8.6) + + project(brotli C) + ++option(BUILD_SHARED_LIBS "Build shared libraries" ON) ++ + # If Brotli is being bundled in another project, we don't want to + # install anything. However, we want to let people override this, so + # we'll use the BROTLI_BUNDLED_MODE variable to let them do that; just +@@ -114,10 +116,6 @@ set(BROTLI_LIBRARIES_CORE brotlienc brotlidec brotlicommon) + set(BROTLI_LIBRARIES ${BROTLI_LIBRARIES_CORE} ${LIBM_LIBRARY}) + mark_as_advanced(BROTLI_LIBRARIES) + +-set(BROTLI_LIBRARIES_CORE_STATIC brotlienc-static brotlidec-static brotlicommon-static) +-set(BROTLI_LIBRARIES_STATIC ${BROTLI_LIBRARIES_CORE_STATIC} ${LIBM_LIBRARY}) +-mark_as_advanced(BROTLI_LIBRARIES_STATIC) +- + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + add_definitions(-DOS_LINUX) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +@@ -137,24 +135,22 @@ endfunction() + transform_sources_list("scripts/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake") + include("${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake") + +-add_library(brotlicommon SHARED ${BROTLI_COMMON_C}) +-add_library(brotlidec SHARED ${BROTLI_DEC_C}) +-add_library(brotlienc SHARED ${BROTLI_ENC_C}) +- +-add_library(brotlicommon-static STATIC ${BROTLI_COMMON_C}) +-add_library(brotlidec-static STATIC ${BROTLI_DEC_C}) +-add_library(brotlienc-static STATIC ${BROTLI_ENC_C}) ++add_library(brotlicommon ${BROTLI_COMMON_C}) ++add_library(brotlidec ${BROTLI_DEC_C}) ++add_library(brotlienc ${BROTLI_ENC_C}) + + # Older CMake versions does not understand INCLUDE_DIRECTORIES property. + include_directories(${BROTLI_INCLUDE_DIRS}) + ++if(BUILD_SHARED_LIBS) ++ foreach(lib brotlicommon brotlidec brotlienc) ++ target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) ++ string(TOUPPER "${lib}" LIB) ++ set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" ) ++ endforeach() ++endif() ++ + foreach(lib brotlicommon brotlidec brotlienc) +- target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" ) +- string(TOUPPER "${lib}" LIB) +- set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" ) +-endforeach() +- +-foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static) + target_link_libraries(${lib} ${LIBM_LIBRARY}) + set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) + set_target_properties(${lib} PROPERTIES +@@ -167,9 +163,6 @@ endforeach() + target_link_libraries(brotlidec brotlicommon) + target_link_libraries(brotlienc brotlicommon) + +-target_link_libraries(brotlidec-static brotlicommon-static) +-target_link_libraries(brotlienc-static brotlicommon-static) +- + # For projects stuck on older versions of CMake, this will set the + # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still + # have a relatively easy way to use Brotli: +@@ -183,7 +176,7 @@ endif() + + # Build the brotli executable + add_executable(brotli ${BROTLI_CLI_C}) +-target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC}) ++target_link_libraries(brotli ${BROTLI_LIBRARIES}) + + # Installation + if(NOT BROTLI_BUNDLED_MODE) +@@ -199,13 +192,6 @@ if(NOT BROTLI_BUNDLED_MODE) + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) + +- install( +- TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +- ) +- + install( + DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +diff --git a/c/fuzz/test_fuzzer.sh b/c/fuzz/test_fuzzer.sh +index 5c754e1..e85e12f 100755 +--- a/c/fuzz/test_fuzzer.sh ++++ b/c/fuzz/test_fuzzer.sh +@@ -14,12 +14,12 @@ mkdir bin + cd bin + + cmake $BROTLI -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \ +- -DBUILD_TESTING=OFF -DENABLE_SANITIZER=address +-make -j$(nproc) brotlidec-static ++ -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_SANITIZER=address ++make -j$(nproc) brotlidec + + ${CXX} -o run_decode_fuzzer -std=c++11 -fsanitize=address -I$SRC/include \ + $SRC/fuzz/decode_fuzzer.cc $SRC/fuzz/run_decode_fuzzer.cc \ +- ./libbrotlidec-static.a ./libbrotlicommon-static.a ++ ./libbrotlidec.a ./libbrotlicommon.a + + mkdir decode_corpora + unzip $BROTLI/java/org/brotli/integration/fuzz_data.zip -d decode_corpora +-- +2.16.3 + From 0ceb847af5955eac911935a1f1f2f444523eece6 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 27 Mar 2018 23:05:55 +0300 Subject: [PATCH 0431/2640] woff2: fix static builds Include a patch to make CMake correctly find the Brotli libraries when they have been built as static libraries. Fixes: - http://autobuild.buildroot.net/results/f1c4b5aeb12af7b7a3e8ae01c219004ecd9befd6/ - http://autobuild.buildroot.net/results/74d20ff38766466623cc4a9eb18afcda831bc20b/ Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...tiple-libraries-being-returned-for-B.patch | 80 +++++++++++++++++++ package/woff2/woff2.mk | 7 ++ 2 files changed, 87 insertions(+) create mode 100644 package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch diff --git a/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch b/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch new file mode 100644 index 0000000000..142eab2718 --- /dev/null +++ b/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch @@ -0,0 +1,80 @@ +From 9a6d50b3f355c1e4d72a235aa0bac4856dff1785 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Tue, 27 Mar 2018 19:59:23 +0100 +Subject: [PATCH] CMake: Handle multiple libraries being returned for Brotli + +Brotli is built as three libraries: libbrotlienc, libbrotlidec, and +libbrotlicommon. When requesting the linker flags using pkg-config for +e.g. libbrotlidec, it will return both libbrotlidec and libbrotlicommon. +The FindBrotli*.cmake files ignore the names of the libraries returned +by pkg-config, and hardcode only the libbrotli{enc,dec} names. While +this is fine when using shared libraries (they contain an entry for +libbrotlicommon as required library in their headers), it will cause +linker errors when Brotli has been built as static libraries, due to +the missing symbols from libbrotlicommon being unknown to the linker. + +This fixes FindBrotli*.cmake files by using the library names reported +by pkg-config (instead of hardcoding them), and applying find_library() +to each of the libraries to find their absolute paths. If any of the +libraries is missing, the corresponding BROTLI{ENC,DEC}_LIBRARIES is +unset to let find_package_handle_standard_args() report an error. +--- + cmake/FindBrotliDec.cmake | 13 +++++++++---- + cmake/FindBrotliEnc.cmake | 14 ++++++++++---- + 2 files changed, 19 insertions(+), 8 deletions(-) + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: Submitted [https://github.com/google/woff2/pull/112] + +diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake +index abb06f4..9cbb415 100644 +--- a/cmake/FindBrotliDec.cmake ++++ b/cmake/FindBrotliDec.cmake +@@ -18,10 +18,15 @@ find_path(BROTLIDEC_INCLUDE_DIRS + HINTS ${PC_BROTLIDEC_INCLUDEDIR} + ) + +-find_library(BROTLIDEC_LIBRARIES +- NAMES brotlidec +- HINTS ${PC_BROTLIDEC_LIBDIR} +-) ++set(BROTLIDEC_LIBRARIES "") ++foreach(_lib ${PC_BROTLIDEC_LIBRARIES}) ++ find_library(PC_BROTLIDEC_PATH_${_lib} ${_lib} HINTS ${PC_BROTLIDEC_LIBRARY_DIRS}) ++ if(NOT PC_BROTLIDEC_PATH_${_lib}) ++ unset(BROTLIDEC_LIBRARIES) ++ break() ++ endif() ++ list(APPEND BROTLIDEC_LIBRARIES "${PC_BROTLIDEC_PATH_${_lib}}") ++endforeach() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BrotliDec +diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake +index 4be347d..55f3932 100644 +--- a/cmake/FindBrotliEnc.cmake ++++ b/cmake/FindBrotliEnc.cmake +@@ -18,10 +18,16 @@ find_path(BROTLIENC_INCLUDE_DIRS + HINTS ${PC_BROTLIENC_INCLUDEDIR} + ) + +-find_library(BROTLIENC_LIBRARIES +- NAMES brotlienc +- HINTS ${PC_BROTLIENC_LIBDIR} +-) ++set(BROTLIENC_LIBRARIES "") ++foreach(_lib ${PC_BROTLIENC_LIBRARIES}) ++ find_library(PC_BROTLIENC_PATH_${_lib} ${_lib} ++ HINTS ${PC_BROTLIENC_LIBRARY_DIRS}) ++ if(NOT PC_BROTLIENC_PATH_${_lib}) ++ unset(BROTLIENC_LIBRARIES) ++ break() ++ endif() ++ list(APPEND BROTLIENC_LIBRARIES "${PC_BROTLIENC_PATH_${_lib}}") ++endforeach() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BrotliEnc +-- +2.16.3 + diff --git a/package/woff2/woff2.mk b/package/woff2/woff2.mk index 23b88a5e9a..b2ff33fe98 100644 --- a/package/woff2/woff2.mk +++ b/package/woff2/woff2.mk @@ -14,4 +14,11 @@ WOFF2_DEPENDENCIES = brotli WOFF2_CONF_OPTS = \ -DNOISY_LOGGING=OFF +# The CMake build files for woff2 manually set some RPATH handling options +# which make the installation steps fail with static builds, so pass this +# to prevent any attempt of mangling RPATH that CMake would do. +ifneq ($(BR2_SHARED_LIBS),y) +WOFF2_CONF_OPTS += -DCMAKE_SKIP_RPATH=ON +endif + $(eval $(cmake-package)) From badff5f483cdf7409e181b233b28f7966d3ff439 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 27 Mar 2018 20:50:13 +0300 Subject: [PATCH 0432/2640] picocom: bump to version 3.1 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/picocom/picocom.hash | 2 +- package/picocom/picocom.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/picocom/picocom.hash b/package/picocom/picocom.hash index f155830493..28f2d9cdc5 100644 --- a/package/picocom/picocom.hash +++ b/package/picocom/picocom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a539db95bde3a5ebd52ae58a21f40d00cc2c97bf14b1f50caffc07257989112e picocom-3.0.tar.gz +sha256 e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb picocom-3.1.tar.gz sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6 LICENSE.txt diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index 0fa60f99c3..d27c734376 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -4,7 +4,7 @@ # ################################################################################ -PICOCOM_VERSION = 3.0 +PICOCOM_VERSION = 3.1 PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt From 9feb6d982d7a5e3b61cc19ad9733dd3e737bf6a0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 09:20:19 +0200 Subject: [PATCH 0433/2640] package/jimtcl: fix fallout after no-C++ fixups Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain. However, some packages, like jimtcl, really want to find the binary that $CXX contains. Revert jimtcl to use 'false' instead of 'no'. Fixes: http://autobuild.buildroot.org/results/54f/54f3df03551fbdf293d33dc1e3f08005faa15321/ Signed-off-by: "Yann E. MORIN" Cc: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- package/jimtcl/jimtcl.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 68c8a914db..389a72ab83 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -44,9 +44,13 @@ endif # pkg-autotools.mk JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK +# jimtcl really wants to find a existing $CXX, so feed it false +# when we do not have one. define JIMTCL_CONFIGURE_CMDS (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) CCACHE=none \ + $(TARGET_CONFIGURE_OPTS) \ + CCACHE=none \ + $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ ./configure --prefix=/usr \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ From 5966e2dc54dfb19c5fde3a09d72f3abc6125c202 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 09:20:20 +0200 Subject: [PATCH 0434/2640] package/openocd: fix fallout after no-C++ fixups Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain. However, some packages, like jimtcl as bundled in opeocd, really want to find the binary that $CXX contains. Revert openocd to use 'false' instead of 'no'. Fixes: http://autobuild.buildroot.org/results/cbd/cbd5ab97fb0659968ff628461130627cf1745955/ Signed-off-by: "Yann E. MORIN" Cc: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- package/openocd/openocd.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9d2576ceeb..548d8b81a0 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -11,7 +11,12 @@ OPENOCD_LICENSE = GPL-2.0+ OPENOCD_LICENSE_FILES = COPYING # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES -OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + +# The bundled jimtcl really wants to find a existing $CXX, so feed it +# false when we do not have one. +OPENOCD_CONF_ENV = \ + $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" OPENOCD_CONF_OPTS = \ --oldincludedir=$(STAGING_DIR)/usr/include \ From 650818fb3a6fb7b9bd9fcefabbc187c1bbe95e0a Mon Sep 17 00:00:00 2001 From: Yves Deweerdt Date: Wed, 21 Jun 2017 22:39:44 +0200 Subject: [PATCH 0435/2640] configs/raspberrypi0w_defconfig: new defconfig for Raspberry Pi Zero W Up to now, Raspberry Pi Zero W (rpi0w) could be built with the normal raspberrypi0_defconfig. However, then you don't have support for the Bluetooth out-of-the-box, which makes using a W a bit pointless. Therefore, create a separate defconfig for the W. It is a copy of raspberrypi0_defconfig with the following changes: - Add DT overlays (from rpi-firmware) to support Bluetooth. - Pass --add-pi3-miniuart-bt-overlay to post-image.sh. Since there is now a separate raspberrypi0w_defconfig, the W support can be removed from raspberrypi0_defconfig. Signed-off-by: Yves Deweerdt [Arnout: - Bump to same kernel version as raspberrypi0. - Remove redundant comment. - Remove redundant default BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y. - Improve commit log. - Refresh .gitlab-ci.yml. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 1 + board/raspberrypi/genimage-raspberrypi0.cfg | 1 - board/raspberrypi/genimage-raspberrypi0w.cfg | 31 ++++++++++++++++++++ board/raspberrypi0w | 1 + configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 31 ++++++++++++++++++++ 6 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 board/raspberrypi/genimage-raspberrypi0w.cfg create mode 120000 board/raspberrypi0w create mode 100644 configs/raspberrypi0w_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 952fffaf88..20a5a6521a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,6 +212,7 @@ qemu_x86_defconfig: *defconfig qemu_xtensa_lx60_defconfig: *defconfig qemu_xtensa_lx60_nommu_defconfig: *defconfig raspberrypi0_defconfig: *defconfig +raspberrypi0w_defconfig: *defconfig raspberrypi2_defconfig: *defconfig raspberrypi3_64_defconfig: *defconfig raspberrypi3_defconfig: *defconfig diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 212c30607e..a9d4c4501f 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -2,7 +2,6 @@ image boot.vfat { vfat { files = { "bcm2708-rpi-b-plus.dtb", - "bcm2708-rpi-0-w.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", diff --git a/board/raspberrypi/genimage-raspberrypi0w.cfg b/board/raspberrypi/genimage-raspberrypi0w.cfg new file mode 100644 index 0000000000..3aafd9b6fc --- /dev/null +++ b/board/raspberrypi/genimage-raspberrypi0w.cfg @@ -0,0 +1,31 @@ +image boot.vfat { + vfat { + files = { + "bcm2708-rpi-0-w.dtb", + "rpi-firmware/bootcode.bin", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", + "rpi-firmware/overlays", + "zImage" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/raspberrypi0w b/board/raspberrypi0w new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi0w @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 0fb8a99465..8a213fc4b1 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -16,7 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same # as the A+ model, just in a different form-factor BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus bcm2708-rpi-0-w" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus" BR2_PACKAGE_RPI_FIRMWARE=y # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig new file mode 100644 index 0000000000..973412380d --- /dev/null +++ b/configs/raspberrypi0w_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_arm1176jzf_s=y +BR2_ARM_EABIHF=y + +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" + +BR2_PACKAGE_RPI_FIRMWARE=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" From 5563a1c6a48716debe2983869ddb757318094dce Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 14:52:50 +0200 Subject: [PATCH 0436/2640] support/check-uniq-files: support weird locales and filenames Currently, when a filename contains characters not representable in the user's locale, we fail hard, especially when the host python is python3. This is because python2 and python3 handle encoding/decoding strings differently, with python3 presumable doing the right thing, but it breaks on some systems, while python2 presumable does the wrong thing, but it works everywhere. (Just joking, obviously...) Part of the issue being that the csv reader in python2 is broken with UTF8. We fix the issue by ditching the csv reader, and simply read the file in binary mode, manually partitioning the lines on the first comma. Then, we use the binary-encoded (really, un-encoded) package names and filenames as values and keys, respectively. Finally, for each filename or package we need to print, we try to decode them with the defaults for the user settings, but catch any decoding exception and fall back to dumping the raw, binary values. Which codec is used by default differs between Python version, but in all cases something sane is printed at least. Thanks a lot to Arnout for the live help doing this patch. :-) Reported-by: Jaap Crezee Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Jaap Crezee [Arnout: commit log improvement] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/check-uniq-files | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files index be808cce03..f110176274 100755 --- a/support/scripts/check-uniq-files +++ b/support/scripts/check-uniq-files @@ -26,16 +26,23 @@ def main(): return False file_to_pkg = defaultdict(list) - with open(args.packages_file_list[0], 'r') as pkg_file_list: - r = csv.reader(pkg_file_list, delimiter=',') - for row in r: - pkg = row[0] - file = row[1] + with open(args.packages_file_list[0], 'rb') as pkg_file_list: + for line in pkg_file_list.readlines(): + pkg, _, file = line.rstrip(b'\n').partition(b',') file_to_pkg[file].append(pkg) for file in file_to_pkg: if len(file_to_pkg[file]) > 1: - sys.stderr.write(warn.format(args.type, file, file_to_pkg[file])) + # If possible, try to decode the binary strings with + # the default user's locale + try: + sys.stderr.write(warn.format(args.type, file.decode(), + [p.decode() for p in file_to_pkg[file]])) + except UnicodeDecodeError: + # ... but fallback to just dumping them raw if they + # contain non-representable chars + sys.stderr.write(warn.format(args.type, file, + file_to_pkg[file])) if __name__ == "__main__": From d83eacaaa8f17b5d573d540ca6338390fcfa0ba1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Apr 2017 22:56:43 +0200 Subject: [PATCH 0437/2640] package/x11r7/xserver_xorg-server: add sysv init script We need ":0.0 vt01" to make sure Xorg finds the correct terminal. Quoting https://www.x.org/archive/X11R6.8.0/doc/Xorg.1.html -allowMouseOpenFail Allow the server to start up even if the mouse device can't be opened or initialised. We need this option in case BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE was not enabled. -noreset prevents a server reset when the last client connection is closed. We need this option to prevent auto-close of Xorg. Tested with a qemu image and Kodi. Signed-off-by: Bernd Kuhls [Arnout: copy an abbreviate version of the explanation above to the script.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xserver_xorg-server/S40xorg | 46 +++++++++++++++++++ .../xserver_xorg-server.mk | 5 ++ 2 files changed, 51 insertions(+) create mode 100755 package/x11r7/xserver_xorg-server/S40xorg diff --git a/package/x11r7/xserver_xorg-server/S40xorg b/package/x11r7/xserver_xorg-server/S40xorg new file mode 100755 index 0000000000..215c0b7acf --- /dev/null +++ b/package/x11r7/xserver_xorg-server/S40xorg @@ -0,0 +1,46 @@ +#!/bin/sh +# +# Starts Xorg +# + +BIN=/usr/bin/Xorg +PIDFILE=/var/run/xorg.pid + +# ":0.0 vt01" makes sure Xorg finds the correct terminal. +# -allowMouseOpenFail allows the server to start up even if the mouse device +# can't be opened or initialised. +# -noreset prevents a server reset when the last client connection is closed. +XORG_ARGS=":0.0 vt01 -s 0 -noreset -allowMouseOpenFail" + +start() { + printf "Starting Xorg: " + start-stop-daemon -S -q -b -m -p $PIDFILE --exec $BIN -- $XORG_ARGS + [ $? = 0 ] && sleep 3 && echo "OK" || echo "FAIL" +} + +stop() { + printf "Stopping Xorg: " + start-stop-daemon -K -q -p $PIDFILE + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + sleep 2 + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 45a2c81f2b..d605a2c742 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -258,4 +258,9 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ + $(TARGET_DIR)/etc/init.d/S40xorg +endef + $(eval $(autotools-package)) From 7f430a4e87970d275af087d4fefcf15fa92778f9 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Tue, 19 Dec 2017 17:55:54 +0300 Subject: [PATCH 0438/2640] board: add support for ARC HS Development Kit (HSDK) Synopsys DesignWare HSDK (which stands for ARC HS Development Kit) is the latest and greatest development platform that sports quad-core ARC HS38 in real silicon. Most noticeable features of the board are: * Quad-core ARC HS38 CPU running at 1GHz * 4Gb of DDR * Built-in Vivante GPU (well supported via open source Etnaviv drivers) * Built-in Wi-Fi/Bluetooth module (RedPine RS-9113) And as usual we have: * [micro] SD-card slot * 2 USB 2.0 ports * 1Gbit Ethernet port * Built-in Digilent JTAG probe * Serial port accessible via micro-USB port Writing sdcard.img on SDcard creates two partitions: * FAT32 with uImage and uboot.env * EXT4 with root filesystem We modify kernel config because in default hsdk kernel config CONFIG_INITRAMFS_SOURCE parameter is set and when we build rootfs separately (BR2_TARGET_ROOTFS_INITRAMFS is not set) error appears. Also we set up CONFIG_ARC_UBOOT_SUPPORT which enables usage of uboot variables in the boot process. [Peter: Fix comments and rename defconfig to snps_archs38_hsdk_defconfig, Add defconfig to DEVELOPERS and fixup board/synopsys entry, Drop postimage script, rename env file in genimage.cfg and drop size setting for rootfs partition, Add "" for CONFIG_INITRAMFS_SOURCE in linux fragment] Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: Alexey Brodkin Cc: arc-buildroot@synopsys.com Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/synopsys/hsdk/genimage.cfg | 27 +++++++++++++++++++ board/synopsys/hsdk/linux.fragment | 2 ++ board/synopsys/hsdk/uboot.env.txt | 9 +++++++ configs/snps_archs38_hsdk_defconfig | 40 +++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+) create mode 100644 board/synopsys/hsdk/genimage.cfg create mode 100644 board/synopsys/hsdk/linux.fragment create mode 100644 board/synopsys/hsdk/uboot.env.txt create mode 100644 configs/snps_archs38_hsdk_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20a5a6521a..ab0feac292 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -225,6 +225,7 @@ snps_aarch64_vdk_defconfig: *defconfig snps_arc700_axs101_defconfig: *defconfig snps_archs38_axs103_defconfig: *defconfig snps_archs38_haps_defconfig: *defconfig +snps_archs38_hsdk_defconfig: *defconfig snps_archs38_vdk_defconfig: *defconfig socrates_cyclone5_defconfig: *defconfig solidrun_macchiatobin_mainline_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ef6589e37d..10e6220694 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -161,6 +161,8 @@ F: package/wf111/ N: ARC Maintainers F: arch/Config.in.arc +F: board/synopsys/ +F: configs/snps_archs38_hsdk_defconfig N: Ariel D'Alessandro F: package/axfsutils/ diff --git a/board/synopsys/hsdk/genimage.cfg b/board/synopsys/hsdk/genimage.cfg new file mode 100644 index 0000000000..87282fcb79 --- /dev/null +++ b/board/synopsys/hsdk/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "uImage" + } + file uboot.env { + image = "uboot-env.bin" + } + } + size = 100M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/synopsys/hsdk/linux.fragment b/board/synopsys/hsdk/linux.fragment new file mode 100644 index 0000000000..45d6c69af5 --- /dev/null +++ b/board/synopsys/hsdk/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_INITRAMFS_SOURCE="" +CONFIG_ARC_UBOOT_SUPPORT=y diff --git a/board/synopsys/hsdk/uboot.env.txt b/board/synopsys/hsdk/uboot.env.txt new file mode 100644 index 0000000000..6bcfb56a77 --- /dev/null +++ b/board/synopsys/hsdk/uboot.env.txt @@ -0,0 +1,9 @@ +baudrate=115200 +bootargs=console=ttyS3,115200n8 root=/dev/mmcblk0p2 rootwait +bootcmd=fatload mmc 0:1; bootm +bootdelay=2 +bootfile=uImage +loadaddr=0x82000000 +stderr=serial0@f0005000 +stdin=serial0@f0005000 +stdout=serial0@f0005000 diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig new file mode 100644 index 0000000000..125063b444 --- /dev/null +++ b/configs/snps_archs38_hsdk_defconfig @@ -0,0 +1,40 @@ +# Architecture +BR2_arcle=y +BR2_archs38=y + +# Linux headers +BR2_KERNEL_HEADERS_4_14=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="hsdk" +BR2_TARGET_GENERIC_ISSUE="Welcome to the HSDK Platform" +BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4" +BR2_LINUX_KERNEL_DEFCONFIG="hsdk" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_ELF=y +BR2_TARGET_UBOOT_ENVIMAGE=y +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" From 7ae94b51ed5d51fb9fa3f5a931bb8435bcbfaa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Wed, 7 Mar 2018 21:15:57 +0100 Subject: [PATCH 0439/2640] libkrb5: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel [Thomas: - remove LIBKRB5_VERSION_MAJOR - minor tweaks to commit title and Config.in help text] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libkrb5/Config.in | 13 +++++++++ package/libkrb5/libkrb5.hash | 2 ++ package/libkrb5/libkrb5.mk | 55 ++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 package/libkrb5/Config.in create mode 100644 package/libkrb5/libkrb5.hash create mode 100644 package/libkrb5/libkrb5.mk diff --git a/DEVELOPERS b/DEVELOPERS index 10e6220694..ac7a47fc7a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -117,6 +117,7 @@ F: package/ktap/ N: André Hentschel F: package/azure-iot-sdk-c/ +F: package/libkrb5/ F: package/openal/ F: package/p7zip/ F: package/wine/ diff --git a/package/Config.in b/package/Config.in index 2f9210a04e..3bff349905 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1395,6 +1395,7 @@ menu "Networking" source "package/libhttpparser/Config.in" source "package/libidn/Config.in" source "package/libiscsi/Config.in" + source "package/libkrb5/Config.in" source "package/libldns/Config.in" source "package/libmaxminddb/Config.in" source "package/libmbus/Config.in" diff --git a/package/libkrb5/Config.in b/package/libkrb5/Config.in new file mode 100644 index 0000000000..9147c90489 --- /dev/null +++ b/package/libkrb5/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBKRB5 + bool "libkrb5" + # needs fork() + depends on BR2_USE_MMU + help + Kerberos is a system for authenticating users and services + on a network. Kerberos is a trusted third-party service. + That means that there is a third party (the Kerberos server) + that is trusted by all the entities on the network (users + and services, usually called "principals"). This is the MIT + reference implementation of Kerberos V5. + + https://web.mit.edu/kerberos/ diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash new file mode 100644 index 0000000000..59552d7fd4 --- /dev/null +++ b/package/libkrb5/libkrb5.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 faeb125f83b0fb4cdb2f99f088140631bb47d975982de0956d18c85842969e08 krb5-1.16.tar.gz diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk new file mode 100644 index 0000000000..88cfc61a19 --- /dev/null +++ b/package/libkrb5/libkrb5.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# libkrb5 +# +################################################################################ + +LIBKRB5_VERSION = 1.16 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION) +LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz +LIBKRB5_SUBDIR = src +LIBKRB5_LICENSE = MIT +LIBKRB5_LICENSE_FILES = NOTICE +LIBKRB5_INSTALL_STAGING = YES + +# The configure script uses AC_TRY_RUN tests to check for those values, +# which doesn't work in a cross-compilation scenario. Therefore, +# we feed the configure script with the correct answer for those tests +LIBKRB5_CONF_ENV = \ + ac_cv_printf_positional=yes \ + ac_cv_func_regcomp=yes \ + krb5_cv_attr_constructor_destructor=yes,yes + +# Never use the host packages +LIBKRB5_CONF_OPTS = \ + --without-system-db \ + --without-system-et \ + --without-system-ss \ + --without-system-verto + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +LIBKRB5_CONF_OPTS += --with-ldap +LIBKRB5_DEPENDENCIES += openldap +else +LIBKRB5_CONF_OPTS += --without-ldap +endif + +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +LIBKRB5_CONF_OPTS += --with-libedit +LIBKRB5_DEPENDENCIES += libedit +else +LIBKRB5_CONF_OPTS += --without-libedit +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +LIBKRB5_CONF_OPTS += --with-readline +LIBKRB5_DEPENDENCIES += readline +else +LIBKRB5_CONF_OPTS += --without-readline +endif + +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBKRB5_CONF_OPTS += --disable-thread-support +endif + +$(eval $(autotools-package)) From 39d5d9ad65c0cb5f116287a7f0bd3cfc5d451de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Wed, 7 Mar 2018 21:15:58 +0100 Subject: [PATCH 0440/2640] squid: add optional dependency on libkrb5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/squid/squid.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 8ade55ee37..2d21ad8858 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ --enable-removal-policies="lru,heap" \ --with-filedescriptors=1024 \ --disable-ident-lookups \ - --without-mit-krb5 \ --enable-auth-basic="fake getpwnam" \ --enable-auth-digest="file" \ --enable-auth-negotiate="wrapper" \ @@ -50,6 +49,13 @@ else SQUID_CONF_ENV += squid_cv_gnu_atomics=no endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +SQUID_CONF_OPTS += --with-mit-krb5 +SQUID_DEPENDENCIES += libkrb5 +else +SQUID_CONF_OPTS += --without-mit-krb5 +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPTS += --with-openssl SQUID_DEPENDENCIES += openssl From c03d5395a12dc3d1d3b7619491e8108d7b5f7c49 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 31 Mar 2018 12:55:30 +0200 Subject: [PATCH 0441/2640] package/zsh: remove busybox show others dependency Back in 2013, zsh was added to Buildroot [1] with the dependency on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS. This dependency was keept with the refactoring [2]. But Busybox doesn't provide a zsh shell in the firt place. This dependency can be removed. [1] 3d19b7ef598f3534b46cf0746a81bc437579127c [2] 1dbd7b991025a8bf39ab5d25c2fd97f47f084bac Signed-off-by: Romain Naour Cc: Phil Eichinger Signed-off-by: Peter Korsgaard --- package/zsh/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/zsh/Config.in b/package/zsh/Config.in index 2e9daac6ef..2319477979 100644 --- a/package/zsh/Config.in +++ b/package/zsh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_ZSH bool "zsh" depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_NCURSES help zsh is a shell designed for interactive use, although it is From 7f02604553bc3c8449d6a112818f038e99abbdaf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 08:11:55 +0200 Subject: [PATCH 0442/2640] nodejs: security bump to version 8.11.1 Fixes the following security issues: - Fix for inspector DNS rebinding vulnerability (CVE-2018-7160): A malicious website could use a DNS rebinding attack to trick a web browser to bypass same-origin-policy checks and allow HTTP connections to localhost or to hosts on the local network, potentially to an open inspector port as a debugger, therefore gaining full code execution access. The inspector now only allows connections that have a browser Host value of localhost or localhost6. - Fix for 'path' module regular expression denial of service (CVE-2018-7158): A regular expression used for parsing POSIX paths could be used to cause a denial of service if an attacker were able to have a specially crafted path string passed through one of the impacted 'path' module functions. - Reject spaces in HTTP Content-Length header values (CVE-2018-7159): The Node.js HTTP parser allowed for spaces inside Content-Length header values. Such values now lead to rejected connections in the same way as non-numeric values. While we are at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 7 +++++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 4adef79dca..b3900f6a7d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,2 +1,5 @@ -# From http://nodejs.org/dist/v8.10.0/SHASUMS256.txt -sha256 b72d4e71618d6bcbd039b487b51fa7543631a4ac3331d7caf69bdf55b5b2901a node-v8.10.0.tar.xz +# From http://nodejs.org/dist/v8.11.1/SHASUMS256.txt +sha256 40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a node-v8.11.1.tar.xz + +# Hash for license file +sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index e1dd11cef5..2642525c47 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.10.0 +NODEJS_VERSION = 8.11.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 0866a280e40a7a2c7d7d50cc7e87c3f4652aff0a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2017 23:29:38 +0200 Subject: [PATCH 0443/2640] utils/genrandconfig: use --no-check-certificate in wget by default A number of autobuilder failures are due to the fact that autobuilder instances use old distributions, with old SSL certificates, and therefore wget aborts with an error "The certificate of `xyz.org' is not trusted.". In order to avoid such failures that are not very interesting in the context of the autobuilders, we pass --no-check-certificate to wget. The integrity of the downloaded files is anyway verified by the hashes, and this is only meant to be used in the context of testing/CI, not in production. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 07882200e0..06701ce565 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -349,6 +349,9 @@ def gen_config(args): with open(minimalconfigfile) as minimalf: configlines += minimalf.readlines() + # Allow hosts with old certificates to download over https + configlines.append("BR2_WGET=\"wget --passive-ftp -nd -t 3 --no-check-certificate\"") + # Amend the configuration with a few things. if randint(0, 20) == 0: configlines.append("BR2_ENABLE_DEBUG=y\n") From 34b62af1e05a9510f707eceb63e9b8c285035dc1 Mon Sep 17 00:00:00 2001 From: Jaap Crezee Date: Mon, 4 Sep 2017 17:19:54 +0200 Subject: [PATCH 0444/2640] python-libusb1: new package License info from PyPI is wrong: it is LGPL-2.1+, not GPL-2.0. The package includes a COPYING file with GPL-2.0, but since it is really LGPL-2.1+ only the COPYING.LESSER file is relevant. Signed-off-by: Jaap Crezee [Arnout: regenerate with scanpypi, fix legal info] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/python-libusb1/Config.in | 11 +++++++++++ package/python-libusb1/python-libusb1.hash | 4 ++++ package/python-libusb1/python-libusb1.mk | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-libusb1/Config.in create mode 100644 package/python-libusb1/python-libusb1.hash create mode 100644 package/python-libusb1/python-libusb1.mk diff --git a/package/Config.in b/package/Config.in index 3bff349905..de10dd0613 100644 --- a/package/Config.in +++ b/package/Config.in @@ -817,6 +817,7 @@ menu "External python modules" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" source "package/python-libconfig/Config.in" + source "package/python-libusb1/Config.in" source "package/python-lmdb/Config.in" source "package/python-logbook/Config.in" source "package/python-lxml/Config.in" diff --git a/package/python-libusb1/Config.in b/package/python-libusb1/Config.in new file mode 100644 index 0000000000..1c4a72edae --- /dev/null +++ b/package/python-libusb1/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_LIBUSB1 + bool "python-libusb1" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + help + Pure-python wrapper for libusb-1.0. + + http://github.com/vpelletier/python-libusb1 + +comment "python-libusb1 needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/python-libusb1/python-libusb1.hash b/package/python-libusb1/python-libusb1.hash new file mode 100644 index 0000000000..3649872eca --- /dev/null +++ b/package/python-libusb1/python-libusb1.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/libusb1/json, sha256 locally computed +md5 9c2eb6032deda59f287a443091d38cb4 libusb1-1.6.4.tar.gz +sha256 8c930d9c1d037d9c83924c82608aa6a1adcaa01ca0e4a23ee0e8e18d7eee670d libusb1-1.6.4.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/python-libusb1/python-libusb1.mk b/package/python-libusb1/python-libusb1.mk new file mode 100644 index 0000000000..3329764fef --- /dev/null +++ b/package/python-libusb1/python-libusb1.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-libusb1 +# +################################################################################ + +PYTHON_LIBUSB1_VERSION = 1.6.4 +PYTHON_LIBUSB1_SOURCE = libusb1-$(PYTHON_LIBUSB1_VERSION).tar.gz +PYTHON_LIBUSB1_SITE = https://pypi.python.org/packages/ec/5d/4fdac6c53525786fe35cff035c3345452e24e2bee5627893be65d12555cb +PYTHON_LIBUSB1_SETUP_TYPE = setuptools +PYTHON_LIBUSB1_LICENSE = LGPL-2.1+ +PYTHON_LIBUSB1_LICENSE_FILES = COPYING.LESSER +PYTHON_LIBUSB1_DEPENDENCIES = libusb + +$(eval $(python-package)) From ca9a0b2515bc07691fb774a62d9c226988283369 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Fri, 4 Aug 2017 18:31:29 +0200 Subject: [PATCH 0445/2640] Makefile: move mkdir rule to after HOST_DIR is defined HOST_DIR is defined twice: once to its default value before .config is included, and once more to BR2_HOST_DIR after .config is included. However, the rule that defines the mkdir for HOST_DIR comes between these two, so it will always use the default definition. Therefore, if a non-default BR2_HOST_DIR is used, there will be no rule to create that directory, while the dirs target depends on it. This happens to work at the moment, because in the dirs target, $(STAGING_DIR) comes before $(HOST_DIR), so $(HOST_DIR) will be created implicitly. However, this will fail in top-level parallel builds where both will be created in parallel. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9e2402d7d9..377737fb28 100644 --- a/Makefile +++ b/Makefile @@ -231,15 +231,6 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README -################################################################################ -# -# staging and target directories do NOT list these as -# dependencies anywhere else -# -################################################################################ -$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): - @mkdir -p $@ - BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -939,6 +930,11 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig # ################################################################################ +# staging and target directories do NOT list these as +# dependencies anywhere else +$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): + @mkdir -p $@ + # outputmakefile generates a Makefile in the output directory, if using a # separate output directory. This allows convenient use of make in the # output directory. From 91b4a4525bf30a03c1f2542b3c4d340e5e4ca42a Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Fri, 4 Aug 2017 18:31:30 +0200 Subject: [PATCH 0446/2640] Makefile: create symlink to non-default HOST_DIR If BR2_HOST_DIR is not the default, it can be difficult to find the host directory (i.e., HOST_DIR always has to be passed explicitly in addition to the output directory). For example, the Eclipse plugin assumes that HOST_DIR=BASE_DIR/host. Create a symlink from $(BASE_DIR)/host to $(HOST_DIR) if it is not the default. Also remove it in the clean target. When BR2_HOST_DIR is the default, HOST_DIR_SYMLINK will be empty so there will be no additional dependency to dirs and nothing to remove in clean. Fixes https://bugs.busybox.net/show_bug.cgi?id=10151 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 377737fb28..d7826b67d9 100644 --- a/Makefile +++ b/Makefile @@ -445,6 +445,12 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf # packages compiled for the host go here HOST_DIR := $(call qstrip,$(BR2_HOST_DIR)) +ifneq ($(HOST_DIR),$(BASE_DIR)/host) +HOST_DIR_SYMLINK = $(BASE_DIR)/host +$(HOST_DIR_SYMLINK): $(BASE_DIR) + ln -snf $(HOST_DIR) $(BASE_DIR)/host +endif + # Quotes are needed for spaces and all in the original PATH content. BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" @@ -548,7 +554,7 @@ endif .PHONY: dirs dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(HOST_DIR) $(BINARIES_DIR) + $(HOST_DIR) $(HOST_DIR_SYMLINK) $(BINARIES_DIR) $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) $(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig @@ -968,7 +974,7 @@ printvars: .PHONY: clean clean: - rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \ + rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ $(LEGAL_INFO_DIR) $(GRAPHS_DIR) From e8257a8f09fcc1aea7f759362a955a1dff1db7bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 15:27:29 +0200 Subject: [PATCH 0447/2640] docker-containerd: remove symlink to $(RUNC_SRCDIR) The DOCKER_CONTAINERD_CONFIGURE_CMDS creates a symlink to runc's source directory, but it does not build depend on runc, which means that the runc package may not have been extracted/built before docker-containerd. Therefore, when doing a build with "make docker-containerd", this symbolic link is broken, but it doesn't prevent docker-containerd from building. Therefore, this symlink is not necessary and can be dropped. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/docker-containerd/docker-containerd.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index ffbadb0c3f..8f0822b77f 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -27,8 +27,6 @@ endif define DOCKER_CONTAINERD_CONFIGURE_CMDS mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers - ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc endef define DOCKER_CONTAINERD_BUILD_CMDS From 048b06ed3e59d5d2268bea1de95560b80e4d3f8c Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 31 Mar 2018 15:27:30 +0200 Subject: [PATCH 0448/2640] package/pkg-golang: new package infrastructure This patch adds a new infrastructure for golang based packages. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" [Arnout: - Rewrap comments to 80 columns. - Create a global definition of GO_TARGET_ENV. - _GO_ENV is appended to the default env instead of replacing it. - Add a note to inner-golang-package that only target is supported. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Makefile.in | 1 + package/pkg-golang.mk | 130 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 package/pkg-golang.mk diff --git a/package/Makefile.in b/package/Makefile.in index 0af79dfb63..be7a48f647 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -452,3 +452,4 @@ include package/pkg-kconfig.mk include package/pkg-rebar.mk include package/pkg-kernel-module.mk include package/pkg-waf.mk +include package/pkg-golang.mk diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk new file mode 100644 index 0000000000..f51b2ee2e0 --- /dev/null +++ b/package/pkg-golang.mk @@ -0,0 +1,130 @@ +################################################################################ +# Golang package infrastructure +# +# This file implements an infrastructure that eases development of package .mk +# files for Go packages. It should be used for all packages that are written in +# go. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# +# In terms of implementation, this golang infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps are +# doing, if needed. For example, if _BUILD_CMDS is already defined, it is +# used as the list of commands to perform to build the package, instead of the +# default golang behavior. The package can also define some post operation +# hooks. +# +################################################################################ + +GO_BIN = $(HOST_DIR)/bin/go + +# We pass an empty GOBIN, otherwise "go install: cannot install +# cross-compiled binaries when GOBIN is set" +GO_TARGET_ENV = \ + $(HOST_GO_TARGET_ENV) \ + GOBIN= \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) + +################################################################################ +# inner-golang-package -- defines how the configuration, compilation and +# installation of a Go package should be done, implements a few hooks to tune +# the build process for Go specificities and calls the generic package +# infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix for host +# packages +# argument 3 is the uppercase package name, without the HOST_ prefix for host +# packages +# argument 4 is the type (target or host) +# +# NOTE Only type target is supported at the moment +################################################################################ + +define inner-golang-package + +$(2)_WORKSPACE ?= _gopath + +ifeq ($(BR2_STATIC_LIBS),y) +$(2)_LDFLAGS += -extldflags '-static' +endif + +$(2)_BUILD_OPTS += -ldflags "$$($(2)_LDFLAGS)" +$(2)_BUILD_OPTS += -tags "$$($(2)_TAGS)" + +# Target packages need the Go compiler on the host. +$(2)_DEPENDENCIES += host-go + +$(2)_BUILD_TARGETS ?= . + +$(2)_INSTALL_BINS ?= $(1) + +# The go build/install command installs the binaries inside +# gopath/bin/linux_GOARCH/ when cross compilation is enabled. We set this +# variable here to be used by packages if needed. +$(2)_BINDIR = $$($(2)_WORKSPACE)/bin/linux_$$(GO_GOARCH) + +# Source files in Go should be extracted in a precise folder in the hierarchy +# of GOPATH. It usually resolves around domain/vendor/software. By default, we +# derive domain/vendor/software from the upstream URL of the project, but we +# allow $(2)_SRC_SUBDIR to be overridden if needed. +$(2)_SRC_DOMAIN = $$(call domain,$($(2)_SITE)) +$(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$($(2)_SITE)))) +$(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$($(2)_SITE)))) + +$(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) +$(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) + +# Configure step. Only define it if not already defined by the package .mk +# file. +ifndef $(2)_CONFIGURE_CMDS +define $(2)_CONFIGURE_CMDS + mkdir -p $$(@D)/$$($(2)_WORKSPACE)/bin + mkdir -p $$(dir $$($(2)_SRC_PATH)) + ln -sf $$(@D) $$($(2)_SRC_PATH) +endef +endif + +# Build step. Only define it if not already defined by the package .mk file. We +# use the install command instead of build command here because the install +# command just moves the package binaries into /bin/linux_GOARCH/. +# This leverages the go build infrastructure for building and installing +# multiple binaries. +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + $$(foreach d,$$($(2)_BUILD_TARGETS),\ + cd $$($(2)_SRC_PATH); \ + $$(GO_TARGET_ENV) \ + GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + $$($(2)_GO_ENV) \ + $$(GO_BIN) install -v $$($(2)_BUILD_OPTS) ./$$(d) + ) +endef +endif + +# Target installation step. Only define it if not already defined by the +# package .mk file. +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + $$(foreach d,$$($(2)_INSTALL_BINS),\ + $(INSTALL) -D -m 0755 $$(@D)/$$($(2)_BINDIR)/$$(d) $(TARGET_DIR)/usr/bin/$$(d) + ) +endef +endif + +# Call the generic package infrastructure to generate the necessary make +# targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef # inner-golang-package + +################################################################################ +# golang-package -- the target generator macro for Go packages +################################################################################ + +golang-package = $(call inner-golang-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) From 12ae882bf66ed19bed0e9e127f4d6833aed453e2 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 31 Mar 2018 15:27:31 +0200 Subject: [PATCH 0449/2640] docs/manual: add documentation for the golang infrastructure This patch adds the documentation for the golang infrastructure. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-golang.txt | 108 +++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + 2 files changed, 110 insertions(+) create mode 100644 docs/manual/adding-packages-golang.txt diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt new file mode 100644 index 0000000000..b6d1f5e6b4 --- /dev/null +++ b/docs/manual/adding-packages-golang.txt @@ -0,0 +1,108 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +=== Infrastructure for Go packages + +This infrastructure applies to Go packages that use the standard +build system and use bundled dependencies. + +[[golang-package-tutorial]] + +==== +golang-package+ tutorial + +First, let's see how to write a +.mk+ file for a go package, +with an example : + +------------------------ +01: ################################################################################ +02: # +03: # foo +04: # +05: ################################################################################ +06: +07: FOO_VERSION = 1.0 +08: FOO_SITE = $(call github,bar,foo,$(FOO_VERSION)) +09: FOO_LICENSE = BSD-3-Clause +10: FOO_LICENSE_FILES = LICENSE +11: +12: $(eval $(golang-package)) +------------------------ + +On line 7, we declare the version of the package. + +On line 8, we declare the upstream location of the package, here +fetched from Github, since a large number of Go packages are hosted on +Github. + +On line 9 and 10, we give licensing details about the package. + +Finally, on line 12, we invoke the +golang-package+ macro that +generates all the Makefile rules that actually allow the package to be +built. + +[[golang-package-reference]] + +==== +golang-package+ reference + +In their +Config.in+ file, packages using the +golang-package+ +infrastructure should depend on +BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS+ +and +BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS+ because Buildroot will +automatically add a dependency on +host-go+ to such packages. + +The main macro of the Go package infrastructure is ++golang-package+. It is similar to the +generic-package+ macro. Only +target packages are supported with +golang-package+. + +Just like the generic infrastructure, the Go infrastructure works +by defining a number of variables before calling the +golang-package+. + +All the package metadata information variables that exist in the +xref:generic-package-reference[generic package infrastructure] also +exist in the Go infrastructure: +FOO_VERSION+, +FOO_SOURCE+, ++FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, ++FOO_LICENSE+, +FOO_LICENSE_FILES+, +FOO_INSTALL_STAGING+, etc. + +Note that it is not necessary to add +host-go+ in the ++FOO_DEPENDENCIES+ variable of a package, since this basic dependency +is automatically added as needed by the Go package infrastructure. + +A few additional variables, specific to the Go infrastructure, can +optionally be defined, depending on the package's needs. Many of them +are only useful in very specific cases, typical packages will +therefore only use a few of them, or none. + +* If your package need a custom +GOPATH+ to be compiled in, you can + use the +FOO_WORKSPACE+ variable. The +GOPATH+ being used will be + +/+. If +FOO_WORKSPACE+ is not + specified, it defaults to +_gopath+. + +* +FOO_SRC_SUBDIR+ is the sub-directory where your source will be + compiled relatively to the +GOPATH+. An example value is + +github.com/bar/foo+. If +FOO_SRC_SUBDIR+ is not specified, it + defaults to a value infered from the +FOO_SITE+ variable. + +* +FOO_LDFLAGS+ and +FOO_TAGS+ can be used to pass respectively the + +LDFLAGS+ or the +TAGS+ to the +go+ build command. + +* +FOO_BUILD_TARGETS+ can be used to pass the list of targets that + should be built. If +FOO_BUILD_TARGETS+ is not specified, it + defaults to +.+. + +* +FOO_INSTALL_BINS+ can be used to pass the list of binaries that + should be installed in +/usr/bin+ on the target. If + +FOO_INSTALL_BINS+ is not specified, it defaults to the lower-case + name of package. + +With the Go infrastructure, all the steps required to build and +install the packages are already defined, and they generally work well +for most Go-based packages. However, when required, it is still +possible to customize what is done in any particular step: + +* By adding a post-operation hook (after extract, patch, configure, + build or install). See xref:hooks[] for details. + +* By overriding one of the steps. For example, even if the Go + infrastructure is used, if the package +.mk+ file defines its own + +FOO_BUILD_CMDS+ variable, it will be used instead of the default Go + one. However, using this method should be restricted to very + specific cases. Do not use it in the general case. diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index e8d40daee4..c642146287 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -38,6 +38,8 @@ include::adding-packages-meson.txt[] include::adding-packages-cargo.txt[] +include::adding-packages-golang.txt[] + include::adding-packages-kernel-module.txt[] include::adding-packages-asciidoc.txt[] From 96dafedce8d074e068672b8384193ea3b68bf393 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 31 Mar 2018 15:27:32 +0200 Subject: [PATCH 0450/2640] package/flannel: convert to golang infrastructure Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/flannel/flannel.mk | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index bbb2c72a72..07d5d0dfd6 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -11,36 +11,12 @@ FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -FLANNEL_DEPENDENCIES = host-go - -FLANNEL_MAKE_ENV = \ - $(HOST_GO_TARGET_ENV) \ - GOBIN="$(@D)/bin" \ - GOPATH="$(@D)/gopath" \ - CGO_ENABLED=1 - -FLANNEL_GLDFLAGS = \ - -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -FLANNEL_GLDFLAGS += -extldflags '-static' -endif - -define FLANNEL_CONFIGURE_CMDS - # Put sources at prescribed GOPATH location. - mkdir -p $(@D)/gopath/src/github.com/coreos - ln -s $(@D) $(@D)/gopath/src/github.com/coreos/flannel -endef - -define FLANNEL_BUILD_CMDS - cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/bin/go \ - build -v -o $(@D)/bin/flanneld -ldflags "$(FLANNEL_GLDFLAGS)" . -endef +FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) +# Install flannel to its well known location. define FLANNEL_INSTALL_TARGET_CMDS - # Install flannel to its well known location. - $(INSTALL) -D -m 0755 $(@D)/bin/flanneld $(TARGET_DIR)/opt/bin/flanneld + $(INSTALL) -D -m 0755 $(@D)/$(FLANNEL_BINDIR)/flannel $(TARGET_DIR)/opt/bin/flanneld $(INSTALL) -D -m 0755 $(@D)/dist/mk-docker-opts.sh $(TARGET_DIR)/opt/bin/mk-docker-opts.sh endef -$(eval $(generic-package)) +$(eval $(golang-package)) From 30063d57d35c61cddff3047e7f55c221cf1d2709 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 31 Mar 2018 15:27:33 +0200 Subject: [PATCH 0451/2640] package/runc: convert to golang infrastructure Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/runc/runc.mk | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index fb3fec20f5..f1586f32b2 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,42 +9,15 @@ RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_DEPENDENCIES = host-go +RUNC_WORKSPACE = Godeps/_workspace -RUNC_GOPATH = "$(@D)/Godeps/_workspace" -RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(RUNC_GOPATH)" \ - PATH=$(BR_PATH) +RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) -RUNC_GLDFLAGS = \ - -X main.gitCommit=$(RUNC_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -RUNC_GLDFLAGS += -extldflags '-static' -endif - -RUNC_GOTAGS = cgo static_build +RUNC_TAGS = cgo static_build ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_GOTAGS += seccomp +RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif -define RUNC_CONFIGURE_CMDS - mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_BUILD_CMDS - cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ - build -v -o $(@D)/bin/runc \ - -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . -endef - -define RUNC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) +$(eval $(golang-package)) From 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 31 Mar 2018 15:27:34 +0200 Subject: [PATCH 0452/2640] package/docker-containerd: convert to golang infrastructure Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../docker-containerd/docker-containerd.mk | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 8f0822b77f..88e27b5ed4 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -9,37 +9,20 @@ DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VER DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code -DOCKER_CONTAINERD_DEPENDENCIES = host-go +DOCKER_CONTAINERD_WORKSPACE = vendor -DOCKER_CONTAINERD_GOPATH = "$(@D)/vendor" -DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_CONTAINERD_GOPATH)" - -DOCKER_CONTAINERD_GLDFLAGS = \ +DOCKER_CONTAINERD_LDFLAGS = \ -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' -endif +DOCKER_CONTAINERD_BUILD_TARGETS = ctr containerd containerd-shim -define DOCKER_CONTAINERD_CONFIGURE_CMDS - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker - ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd -endef +DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim -define DOCKER_CONTAINERD_BUILD_CMDS - $(foreach d,ctr containerd containerd-shim,\ - cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \ - -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep)) -endef - -define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS +define DOCKER_CONTAINERD_INSTALL_SYMLINKS ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc - $(INSTALL) -D -m 0755 $(@D)/bin/containerd $(TARGET_DIR)/usr/bin/docker-containerd - $(INSTALL) -D -m 0755 $(@D)/bin/containerd-shim $(TARGET_DIR)/usr/bin/containerd-shim ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim endef -$(eval $(generic-package)) +DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS + +$(eval $(golang-package)) From 53e1b222533fd110ab9472480ded126a4762db5e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 15:27:36 +0200 Subject: [PATCH 0453/2640] package/docker-proxy: convert to golang infrastructure Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" [Arnout: remove automatically added host-go dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/docker-proxy/docker-proxy.mk | 33 +++++----------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index 3bf6546d26..a90271fc35 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -10,37 +10,14 @@ DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf +DOCKER_PROXY_DEPENDENCIES = host-pkgconf -DOCKER_PROXY_GOPATH = "$(@D)/gopath" -DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - CGO_NO_EMULATION=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_PROXY_GOPATH)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - $(TARGET_MAKE_ENV) +DOCKER_PROXY_WORKSPACE = gopath -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_PROXY_GLDFLAGS += -extldflags '-static' -endif - -define DOCKER_PROXY_CONFIGURE_CMDS - mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker - ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork -endef - -define DOCKER_PROXY_BUILD_CMDS - cd $(@D)/gopath/src/github.com/docker/libnetwork; \ - $(DOCKER_PROXY_MAKE_ENV) \ - $(HOST_DIR)/usr/bin/go build -v \ - -o $(@D)/bin/docker-proxy \ - -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \ - github.com/docker/libnetwork/cmd/proxy -endef +DOCKER_PROXY_BUILD_TARGETS = cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy + $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_PROXY_BINDIR)/proxy $(TARGET_DIR)/usr/bin/docker-proxy endef -$(eval $(generic-package)) +$(eval $(golang-package)) From be796657cb921d33a7ef8debbd042e5f9fed5b8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 30 Mar 2018 18:50:36 +0200 Subject: [PATCH 0454/2640] package/apache: add optional support for lua Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apache/apache.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index eaf7b9c5bf..3b39be4a40 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -40,7 +40,6 @@ APACHE_CONF_OPTS = \ --without-suexec-bin \ --enable-mods-shared=all \ --with-mpm=$(APACHE_MPM) \ - --disable-lua \ --disable-luajit ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -57,6 +56,15 @@ APACHE_CONF_OPTS += \ --disable-proxy-html endif +ifeq ($(BR2_PACKAGE_LUA),y) +APACHE_CONF_OPTS += \ + --enable-lua \ + --with-lua=$(STAGING_DIR)/usr +APACHE_DEPENDENCIES += lua +else +APACHE_CONF_OPTS += --disable-lua +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) APACHE_DEPENDENCIES += openssl APACHE_CONF_OPTS += \ From 390b8cdba7112bc5dc06955136c9ddb1215d3c53 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 7 Mar 2018 23:19:38 +0100 Subject: [PATCH 0455/2640] package/docker-engine: convert to golang infrastructure Signed-off-by: Angelo Compagnucci [Thomas: - adapt to the changes in the golang-package infrastructure - keep the logic to support BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT] Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.mk | 65 +++++++------------------- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8928f072e7..ba84b4cf0a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -13,70 +13,57 @@ DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf -DOCKER_ENGINE_GOPATH = "$(@D)/gopath" -DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - CGO_NO_EMULATION=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_ENGINE_GOPATH)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - $(TARGET_MAKE_ENV) - -DOCKER_ENGINE_GLDFLAGS = \ +DOCKER_ENGINE_LDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ -X main.Version=$(DOCKER_ENGINE_VERSION) -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_ENGINE_GLDFLAGS += -extldflags '-static' -else ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y) -DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static' -endif +DOCKER_ENGINE_LDFLAGS += -extldflags '-static' endif -DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen -DOCKER_ENGINE_BUILD_TARGETS = docker +DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_BUILD_TARGETS = cmd/docker ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_BUILD_TAGS += seccomp +DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp endif ifeq ($(BR2_INIT_SYSTEMD),y) -DOCKER_ENGINE_BUILD_TAGS += journald +DOCKER_ENGINE_TAGS += journald DOCKER_ENGINE_DEPENDENCIES += systemd endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) -DOCKER_ENGINE_BUILD_TAGS += daemon -DOCKER_ENGINE_BUILD_TARGETS += dockerd +DOCKER_ENGINE_TAGS += daemon +DOCKER_ENGINE_BUILD_TARGETS += cmd/dockerd endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) -DOCKER_ENGINE_BUILD_TAGS += experimental +DOCKER_ENGINE_TAGS += experimental endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_DEPENDENCIES += btrfs-progs else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_btrfs +DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) DOCKER_ENGINE_DEPENDENCIES += lvm2 else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_devicemapper +DOCKER_ENGINE_TAGS += exclude_graphdriver_devicemapper endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS),y) DOCKER_ENGINE_DEPENDENCIES += gvfs else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs +DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif -define DOCKER_ENGINE_CONFIGURE_CMDS - mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker - ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker +DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) + +define DOCKER_ENGINE_RUN_AUTOGEN cd $(@D) && \ GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ BUILDTIME="$$(date)" \ @@ -85,6 +72,8 @@ define DOCKER_ENGINE_CONFIGURE_CMDS bash ./hack/make/.go-autogen endef +DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN + ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD @@ -103,22 +92,4 @@ endef endif -define DOCKER_ENGINE_BUILD_CMDS - $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - cd $(@D)/gopath/src/github.com/docker/docker; \ - $(DOCKER_ENGINE_MAKE_ENV) \ - $(HOST_DIR)/bin/go build -v \ - -o $(@D)/bin/$(target) \ - -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ - -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \ - github.com/docker/docker/cmd/$(target) - ) -endef - -define DOCKER_ENGINE_INSTALL_TARGET_CMDS - $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target) - ) -endef - -$(eval $(generic-package)) +$(eval $(golang-package)) From 03cdfea134bb74e32795b3cbc9689e70a78d61a8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 31 Mar 2018 15:34:57 -0300 Subject: [PATCH 0456/2640] linux: bump default to version 4.15.15 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 040a2341f9..934142c535 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.15" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 6e17a16dc728845bcfad48230b8db9c375acd31e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 31 Mar 2018 15:34:58 -0300 Subject: [PATCH 0457/2640] linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ec3de2b215..2a59e2902a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,12 +242,12 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 - default "4.4.125" if BR2_KERNEL_HEADERS_4_4 - default "4.9.91" if BR2_KERNEL_HEADERS_4_9 + default "4.4.126" if BR2_KERNEL_HEADERS_4_4 + default "4.9.92" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.31" if BR2_KERNEL_HEADERS_4_14 - default "4.15.14" if BR2_KERNEL_HEADERS_4_15 + default "4.14.32" if BR2_KERNEL_HEADERS_4_14 + default "4.15.15" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 14d43aea0a6a18878416bb4c5aa4d870d8377f5f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 31 Mar 2018 18:34:58 +0200 Subject: [PATCH 0458/2640] package/dovecot: add optional support for libsodium Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot/dovecot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 8e775be5f7..1a10b30e16 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -57,6 +57,13 @@ else DOVECOT_CONF_OPTS += --without-libcap endif +ifeq ($(BR2_PACKAGE_LIBSODIUM),y) +DOVECOT_CONF_OPTS += --with-sodium +DOVECOT_DEPENDENCIES += libsodium +else +DOVECOT_CONF_OPTS += --without-sodium +endif + ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y) DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" DOVECOT_CONF_OPTS += --with-mysql From 405f91200488dc8f4648acbdff5114d0af20b6b0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:47 +0200 Subject: [PATCH 0459/2640] fs: run filesystem hooks under fakeroot Currently, the pre-gen hooks of the various filesystems are run before we enter the fakeroot. However, this precludes those hooks from doing actions that require root, like creating a pseudo-device or the likes. So, move those pre-gen hooks under fakeroot. This has currently no side-effect, as they are still called before everything else in the fakeroot script, even the system-wide chown call. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 6d579db810..274a3e9c7b 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -76,9 +76,10 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) mkdir -p $(FS_DIR) - $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) + $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ + $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) ifneq ($$(ROOTFS_USERS_TABLES),) cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) From dec061adce133111460ecf29dbb8a0da36dad772 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:48 +0200 Subject: [PATCH 0460/2640] fs/cpio: don't extend packages' permissions table Currently, when we build a cpio filesystem without static devices, we shoehorn the /dev/console node as if it were specified by a package. This means that this device is added for all filesystems as well, not just the cpio. But if we disable cpio, that device is not created for other filesystems. This is not very clean, and may break expectations. Instead, use an explicit mknod as part of the _CMD, as we know it's going to run under fakeroot. This is still visible to all filesystems built after cpio, and not to those built before it, though. [Peter: ensure /dev exists, simplify comment] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/cpio/cpio.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index aa4d947fa5..1f0cafe62f 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -15,14 +15,16 @@ endef else # devtmpfs does not get automounted when initramfs is used. # Add a pre-init script to mount it before running init +# We must have /dev/console very early, even before /init runs, +# for stdin/stdout/stderr define ROOTFS_CPIO_ADD_INIT if [ ! -e $(TARGET_DIR)/init ]; then \ $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \ fi + mkdir -p $(TARGET_DIR)/dev + mknod -m 0622 $(TARGET_DIR)/dev/console c 5 1 endef -PACKAGES_PERMISSIONS_TABLE += /dev/console c 622 0 0 5 1 - - -$(sep) - endif # BR2_ROOTFS_DEVICE_CREATION_STATIC ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT From 8bfbf04f0cd4709d29e9ba391b9fda06a71aec17 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:49 +0200 Subject: [PATCH 0461/2640] fs/iso9660: rename internal variable We're soon to introduce a generic variable with that name, i.e. $(FS_NAME)_TARGET_DIR, so our internal, temporary variable would clash with it. Just rename it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/iso9660/iso9660.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 207c6aa39f..b33cf4cd8a 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -35,47 +35,47 @@ ROOTFS_ISO9660_USE_INITRD = YES endif ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES) -ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp +ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp define ROOTFS_ISO9660_CREATE_TEMPDIR - $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) - mkdir -p $(ROOTFS_ISO9660_TARGET_DIR) + $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR) + mkdir -p $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y) ROOTFS_ISO9660_DEPENDENCIES += host-zisofs-tools -ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp +ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp # This must be early, before we copy the bootloader files. define ROOTFS_ISO9660_MKZFTREE - $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) + $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR) $(HOST_DIR)/bin/mkzftree -X -z 9 -p $(PARALLEL_JOBS) \ $(TARGET_DIR) \ - $(ROOTFS_ISO9660_TARGET_DIR) + $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z else -ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR) +ROOTFS_ISO9660_TMP_TARGET_DIR = $(TARGET_DIR) endif ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y) ROOTFS_ISO9660_DEPENDENCIES += grub2 ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub.cfg ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/grub-eltorito.img define ROOTFS_ISO9660_INSTALL_BOOTLOADER $(INSTALL) -D -m 0644 $(BINARIES_DIR)/grub-eltorito.img \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub-eltorito.img + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub-eltorito.img endef else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y) ROOTFS_ISO9660_DEPENDENCIES += syslinux ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.cfg + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/isolinux.cfg ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin define ROOTFS_ISO9660_INSTALL_BOOTLOADER $(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/ $(INSTALL) -D -m 0644 $(HOST_DIR)/share/syslinux/ldlinux.c32 \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32 + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/ldlinux.c32 endef endif @@ -96,7 +96,7 @@ endef # Copy the kernel to temporary filesystem define ROOTFS_ISO9660_COPY_KERNEL $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) endef ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES) @@ -111,7 +111,7 @@ else ROOTFS_ISO9660_DEPENDENCIES += rootfs-cpio define ROOTFS_ISO9660_COPY_INITRD $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/initrd $(SED) "s%__INITRD_PATH__%/boot/initrd%" \ $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH) endef @@ -133,7 +133,7 @@ define ROOTFS_ISO9660_CMD $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ -no-emul-boot -boot-load-size 4 -boot-info-table \ $(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \ - -o $@ $(ROOTFS_ISO9660_TARGET_DIR) + -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y) From 7e9870ce32d6329d9e3d602247fbe1709a2275a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:50 +0200 Subject: [PATCH 0462/2640] core: introduce intermediate BASE_TARGET_DIR variable This new BASE_TARGET_DIR variable is set in stone to point to the real location where packages will be installed. Its name is modelled after its definition: it is located in $(BASE_DIR), and it is named 'target/', hence BASE_TARGET_DIR. The already-existing TARGET_DIR variable now simply points to the same location, except that it is recursively expanded, so that we can later change it depending on the context. All locations that really need to reference the existing target/ directory, are changed to use BASE_TARGET_DIR; surprinsigly enough, they all seem to be located in the main Makefile. :-) The rest is left with using good-old TARGET_DIR. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d7826b67d9..6eca3c9ec6 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,8 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images -TARGET_DIR := $(BASE_DIR)/target +BASE_TARGET_DIR := $(BASE_DIR)/target +TARGET_DIR = $(BASE_TARGET_DIR) # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host @@ -456,7 +457,7 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" # Location of a file giving a big fat warning that output/target # should not be used as the root filesystem. -TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM +TARGET_DIR_WARNING_FILE = $(BASE_TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM ifeq ($(BR2_CCACHE),y) CCACHE := $(HOST_DIR)/bin/ccache @@ -553,7 +554,7 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ endif .PHONY: dirs -dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ +dirs: $(BUILD_DIR) $(STAGING_DIR) $(BASE_TARGET_DIR) \ $(HOST_DIR) $(HOST_DIR_SYMLINK) $(BINARIES_DIR) $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) @@ -974,7 +975,7 @@ printvars: .PHONY: clean clean: - rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ + rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ $(LEGAL_INFO_DIR) $(GRAPHS_DIR) From 2765973e01b386131d9f2ebb8a89a403a381d5e7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:51 +0200 Subject: [PATCH 0463/2640] fs: set per-rootfs variable name Like we do for packages with the PKG variable, set ROOTFS to contain the upper-case name of the rootfs currently being generated. This will be useful in later patches, when we need more per-rootfs variables, like a per-rootfs TARGET_DIR for example. In Makefiles, per-rule variables trickle down the dependency chain, to all dependencies of that rule, so we have to stop ROOTFS as soon as we're not in a rootfs. This means we have to stop it at target-finalize (which is a dependency of all filesystems), and for each package individually, since some packages (host or target) can be direct dependencies of filesystems as well. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- Makefile | 3 +++ fs/common.mk | 1 + package/pkg-generic.mk | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 6eca3c9ec6..6cfe83072e 100644 --- a/Makefile +++ b/Makefile @@ -677,6 +677,9 @@ endif $(TARGETS_ROOTFS): target-finalize +# Avoid the rootfs name leaking down the dependency chain +target-finalize: ROOTFS= + .PHONY: target-finalize target-finalize: $(PACKAGES) @$(call MESSAGE,"Finalizing target directory") diff --git a/fs/common.mk b/fs/common.mk index 274a3e9c7b..19a975aa47 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -72,6 +72,7 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c endif +$$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6d82f7027e..152e1d0c67 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -384,6 +384,10 @@ endef define inner-generic-package +# When doing a package, we're definitely not doing a rootfs, but we +# may inherit it via the dependency chain, so we reset it. +$(1): ROOTFS= + # Ensure the package is only declared once, i.e. do not accept that a # package be re-defined by a br2-external tree ifneq ($(call strip,$(filter $(1),$(PACKAGES_ALL))),) From 0c7adf75d2220a1a762cf3b031e9efa7e5b431cc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:52 +0200 Subject: [PATCH 0464/2640] fs: define per-rootfs directory This will serve in future commits to store pre-rootfs files, like fakeroot script... Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/common.mk b/fs/common.mk index 19a975aa47..1915fbbe9b 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -39,6 +39,8 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) # all variable references except the arguments must be $$-quoted. define inner-rootfs +ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) + # extra deps ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) From 48152408306a0dd06153f1816568036738c628d5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:53 +0200 Subject: [PATCH 0465/2640] fs: use a per-rootfs fakeroot script ... and locate that script in a per-rootfs directory. Just like for ROOTFS, this variable will leak down the dependency tree to target-finalize and packages - But it doesn't matter as it isn't used outside fs/. [Peter: extend commit message] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 1915fbbe9b..b208c6f479 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -28,7 +28,6 @@ # macro will automatically generate a compressed filesystem image. FS_DIR = $(BUILD_DIR)/buildroot-fs -FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ $(BR2_ROOTFS_STATIC_DEVICE_TABLE)) @@ -75,10 +74,11 @@ ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) +$$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") - rm -rf $(FS_DIR) - mkdir -p $(FS_DIR) + rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) + mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ From 2a6c55de4993065cc8170c0bb13ef17ef39b9078 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:54 +0200 Subject: [PATCH 0466/2640] fs: split per-rootfs dependency line Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index b208c6f479..ab42beb7be 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -75,7 +75,8 @@ endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot -$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) +$$(BINARIES_DIR)/rootfs.$(1): target-finalize +$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) From c6e425729e5db04676df4e81cf4d48bafefb0942 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:55 +0200 Subject: [PATCH 0467/2640] fs: introduce per-rootfs TARGET_DIR variable ... which for now still points to the base target directory, but this is a step forward. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- Makefile | 4 +++- fs/common.mk | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6cfe83072e..b34dd78c73 100644 --- a/Makefile +++ b/Makefile @@ -215,8 +215,10 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images +# The target directory is common to all packages, +# but there is one that is specific to each filesystem. BASE_TARGET_DIR := $(BASE_DIR)/target -TARGET_DIR = $(BASE_TARGET_DIR) +TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR)) # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host diff --git a/fs/common.mk b/fs/common.mk index ab42beb7be..22e18d1eff 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -39,6 +39,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) define inner-rootfs ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) +ROOTFS_$(2)_TARGET_DIR = $$(BASE_TARGET_DIR) # extra deps ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ From 98d1e7f9287405cd8848300932555c176eae6423 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:56 +0200 Subject: [PATCH 0468/2640] fs: new intermediate rootfs-common to gather common dependencies Before we can create an intermediate tarball for all filesystems, we nedd to move the common dependencies needed to generate that intermediate tarball, rather than leave those dependencies to each filesystem. So, we introduce rootfs-common, which gathers all those common dependencies. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 22e18d1eff..a6ab6c6795 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -34,6 +34,24 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ USERS_TABLE = $(FS_DIR)/users_table.txt ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) +ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar + +.PHONY: rootfs-common +rootfs-common: $(ROOTFS_COMMON_TAR) + +ROOTFS_COMMON_DEPENDENCIES = \ + host-fakeroot host-makedevs \ + $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) + +.PHONY: $(ROOTFS_COMMON_TAR) +# When doing the common tarball, we're not really doing a rootfs. +$(ROOTFS_COMMON_TAR): ROOTFS= +$(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize + @: + +rootfs-common-show-depends: + @echo $(ROOTFS_COMMON_DEPENDENCIES) + # Since this function will be called from within an $(eval ...) # all variable references except the arguments must be $$-quoted. define inner-rootfs @@ -41,9 +59,7 @@ define inner-rootfs ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) ROOTFS_$(2)_TARGET_DIR = $$(BASE_TARGET_DIR) -# extra deps -ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ - $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) +ROOTFS_$(2)_DEPENDENCIES += rootfs-common ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz @@ -76,7 +92,6 @@ endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot -$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) From 31fd0b1cac219ec058b02281c5b5363513f585de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:57 +0200 Subject: [PATCH 0469/2640] fs: introduce a macro for reproducible command Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index a6ab6c6795..20e8446131 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -34,6 +34,12 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ USERS_TABLE = $(FS_DIR)/users_table.txt ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) +ifeq ($(BR2_REPRODUCIBLE),y) +define ROOTFS_REPRODUCIBLE + find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) +endef +endif + ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar .PHONY: rootfs-common @@ -119,9 +125,7 @@ endif echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) -ifeq ($$(BR2_REPRODUCIBLE),y) - echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT) -endif + $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) From 118534fe54b48532024b7883a46988b4e08671bc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:58 +0200 Subject: [PATCH 0470/2640] fs: use a common tarball as base for the other filesystems Currently, some filesystems may want to tweak the content of the target directory, create special device nodes etc... This all means that: - the content of the target directory for a specific filesystems may depend on whether another filesystem is enabled or not; for example, cpio will create a /init script or symlink and a /dev/console node; - the filesystems can not be built in parallel, because they may change the content of the target directory while another is being assembled. Furthermore, the same fakeroot script is executed over-and-over-again for each filesystem, to create the device nodes, the users and their homes and files, and setting permissions... We introduce an intermediate tarball, for which we do the full fakeroot shebang. That tarball then serves as the base for the other filesystems, with a very simple fakeroot script that untars the common tarball, and calls the actual filesystem image generator on that. Note that we use a very simple tar command to generate the intermediate tarball, because we are not concerned with reproducibility of the archive itself (only of the archived files). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 75 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 20e8446131..224ea5ab69 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -42,6 +42,19 @@ endif ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar +# Command to create the common tarball from the base target directory. +define ROOTFS_COMMON_TAR_CMD + tar cf $(ROOTFS_COMMON_TAR) --numeric-owner \ + --exclude=$(notdir $(TARGET_DIR_WARNING_FILE)) \ + -C $(TARGET_DIR) . +endef + +# Command to extract the common tarball into the per-rootfs target directory +define ROOTFS_COMMON_UNTAR_CMD + mkdir -p $(TARGET_DIR) + tar xf $(ROOTFS_COMMON_TAR) -C $(TARGET_DIR) +endef + .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_TAR) @@ -49,11 +62,39 @@ ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) -.PHONY: $(ROOTFS_COMMON_TAR) # When doing the common tarball, we're not really doing a rootfs. $(ROOTFS_COMMON_TAR): ROOTFS= +$(ROOTFS_COMMON_TAR): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize - @: + @$(call MESSAGE,"Generating common rootfs tarball") + rm -rf $(FS_DIR) + mkdir -p $(FS_DIR) + echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) + echo "set -e" >> $(FAKEROOT_SCRIPT) + echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) +ifneq ($(ROOTFS_USERS_TABLES),) + cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE) +endif + $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) + PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT) +ifneq ($(ROOTFS_DEVICE_TABLES),) + cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE) +ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) + $(call PRINTF,$(PACKAGES_DEVICES_TABLE)) >> $(FULL_DEVICE_TABLE) +endif +endif + $(call PRINTF,$(PACKAGES_PERMISSIONS_TABLE)) >> $(FULL_DEVICE_TABLE) + echo "$(HOST_DIR)/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) + $(foreach s,$(call qstrip,$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ + echo "echo '$(TERM_BOLD)>>> Executing fakeroot script $(s)$(TERM_RESET)'" >> $(FAKEROOT_SCRIPT); \ + echo $(EXTRA_ENV) $(s) $(TARGET_DIR) $(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $(FAKEROOT_SCRIPT)$(sep)) + $(foreach hook,$(ROOTFS_PRE_CMD_HOOKS),\ + $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) + $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) + $(foreach hook,$(ROOTFS_POST_CMD_HOOKS),\ + $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) + chmod a+x $(FAKEROOT_SCRIPT) + PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) @@ -63,7 +104,7 @@ rootfs-common-show-depends: define inner-rootfs ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) -ROOTFS_$(2)_TARGET_DIR = $$(BASE_TARGET_DIR) +ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target ROOTFS_$(2)_DEPENDENCIES += rootfs-common @@ -100,39 +141,17 @@ $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") - rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) - mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) + rm -rf $$(ROOTFS_$(2)_DIR) + mkdir -p $$(ROOTFS_$(2)_DIR) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_COMMON_UNTAR_CMD)) >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) -ifneq ($$(ROOTFS_USERS_TABLES),) - cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) -endif - $$(call PRINTF,$$(PACKAGES_USERS)) >> $$(USERS_TABLE) - PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT) -ifneq ($$(ROOTFS_DEVICE_TABLES),) - cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE) -ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) - $$(call PRINTF,$$(PACKAGES_DEVICES_TABLE)) >> $$(FULL_DEVICE_TABLE) -endif -endif - $$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE) - echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) - $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ - echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ - echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) - $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) - $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) chmod a+x $$(FAKEROOT_SCRIPT) - rm -f $$(TARGET_DIR_WARNING_FILE) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) - $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT) endif From bb2a57a17a71a53f823e2609ba08fa8c6bebe24a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:05:59 +0200 Subject: [PATCH 0471/2640] fs: run packages' filesystem hooks in a copy of target/ Currently, some packages may register hooks to be run just before and just after the generic tarball image is generated, because they need to prepare the filesystem for read-only or read-write operation. However, this means that, if any of the hooks or the image generation fails, the target directory is left in a dangling, inconsistent state. We fix that by doing a copy of target/, run the hooks on that copy, generate the generic tarball image out of that, and get rid of the copy. This way, we can guarantee consistency of the target directory, and we can even ditch support for post-fs hooks (those that restore target/). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 7 ++++-- .../testing/tests/core/test_post_scripts.py | 23 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 224ea5ab69..1d7c78dd45 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -58,17 +58,20 @@ endef .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_TAR) +# Emulate being in a filesystem, so that we can have our own TARGET_DIR. +ROOTFS_COMMON_TARGET_DIR = $(FS_DIR)/target + ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) -# When doing the common tarball, we're not really doing a rootfs. -$(ROOTFS_COMMON_TAR): ROOTFS= +$(ROOTFS_COMMON_TAR): ROOTFS=COMMON $(ROOTFS_COMMON_TAR): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating common rootfs tarball") rm -rf $(FS_DIR) mkdir -p $(FS_DIR) + rsync -au $(BASE_TARGET_DIR)/ $(TARGET_DIR) echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) echo "set -e" >> $(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) diff --git a/support/testing/tests/core/test_post_scripts.py b/support/testing/tests/core/test_post_scripts.py index edb339d8c4..a0e5b6b454 100644 --- a/support/testing/tests/core/test_post_scripts.py +++ b/support/testing/tests/core/test_post_scripts.py @@ -18,17 +18,17 @@ class TestPostScripts(infra.basetest.BRTest): infra.filepath("tests/core/post-fakeroot.sh"), infra.filepath("tests/core/post-image.sh")) - def check_post_log_file(self, path, what): + def check_post_log_file(self, f, what, target_dir): lines = {} - with open(path, 'rb') as csvfile: + with open(os.path.join(self.builddir, "build", f), 'rb') as csvfile: r = csv.reader(csvfile, delimiter=',') for row in r: lines[row[0]] = row[1] - self.assertEqual(lines["arg1"], os.path.join(self.builddir, what)) + self.assertEqual(lines["arg1"], what) self.assertEqual(lines["arg2"], "foobar") self.assertEqual(lines["arg3"], "baz") - self.assertEqual(lines["TARGET_DIR"], os.path.join(self.builddir, "target")) + self.assertEqual(lines["TARGET_DIR"], target_dir) self.assertEqual(lines["BUILD_DIR"], os.path.join(self.builddir, "build")) self.assertEqual(lines["HOST_DIR"], os.path.join(self.builddir, "host")) staging = os.readlink(os.path.join(self.builddir, "staging")) @@ -37,9 +37,12 @@ class TestPostScripts(infra.basetest.BRTest): self.assertEqual(lines["BR2_CONFIG"], os.path.join(self.builddir, ".config")) def test_run(self): - f = os.path.join(self.builddir, "build", "post-build.log") - self.check_post_log_file(f, "target") - f = os.path.join(self.builddir, "build", "post-fakeroot.log") - self.check_post_log_file(f, "target") - f = os.path.join(self.builddir, "build", "post-image.log") - self.check_post_log_file(f, "images") + self.check_post_log_file("post-build.log", + os.path.join(self.builddir, "target"), + os.path.join(self.builddir, "target")) + self.check_post_log_file("post-fakeroot.log", + os.path.join(self.builddir, "build/buildroot-fs/target"), + os.path.join(self.builddir, "build/buildroot-fs/target")) + self.check_post_log_file("post-image.log", + os.path.join(self.builddir, "images"), + os.path.join(self.builddir, "target")) From fcdf58cad101528345b88529763f430af5ee94dd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:06:00 +0200 Subject: [PATCH 0472/2640] fs: get rid of package-provided post-fs hooks Now that the pre-fs ones are run on a transient copy of target/, the post-fs hooks are no longer needed because we no longer need to restore the target/ directory as it is only a internal copy. Remove support for the post-fs hooks, and update the sole package using them. We do not add a legacy check because this was mostly a purely-internal detail that was never really exposed nor documented. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 -- package/pkg-generic.mk | 2 -- package/skeleton-init-systemd/skeleton-init-systemd.mk | 6 ------ 3 files changed, 10 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 1d7c78dd45..ba2faa7759 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -94,8 +94,6 @@ endif $(foreach hook,$(ROOTFS_PRE_CMD_HOOKS),\ $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) - $(foreach hook,$(ROOTFS_POST_CMD_HOOKS),\ - $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) chmod a+x $(FAKEROOT_SCRIPT) PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 152e1d0c67..88375916fd 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -644,7 +644,6 @@ $(2)_PRE_LEGAL_INFO_HOOKS ?= $(2)_POST_LEGAL_INFO_HOOKS ?= $(2)_TARGET_FINALIZE_HOOKS ?= $(2)_ROOTFS_PRE_CMD_HOOKS ?= -$(2)_ROOTFS_POST_CMD_HOOKS ?= # human-friendly targets and target sequencing $(1): $(1)-install @@ -954,7 +953,6 @@ PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) -ROOTFS_POST_CMD_HOOKS += $$($(2)_ROOTFS_POST_CMD_HOOKS) ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ff64205cbe..5d6b716f7a 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -55,12 +55,6 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR -define SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR - rm -rf $(TARGET_DIR)/var - mv $(TARGET_DIR)/usr/share/factory/var $(TARGET_DIR)/var -endef -SKELETON_INIT_SYSTEMD_ROOTFS_POST_CMD_HOOKS += SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR - endif define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS From 543107d390d18cd109c1a6ddc05d292cf31750d2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 11:06:01 +0200 Subject: [PATCH 0473/2640] fs: remove intermediate artefacts Each of the intermediate, per-rootfs target directories, as well as the intermediate tarball, can take quite some place, and is mostly a duplication of what's already in target/. The only delta, if any, would be the tweaks made by the filesystem image generations, but those tweaks are most probably only meaningful when seen as root. We normally do not remove intermediate files, but those can be quite large, and are not directly usable by, nor accessible to the user. So, get rid of them once the filesystem has been generated. This does not need to be done in fakeroot. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Tested-by: Matt Weber Signed-off-by: Peter Korsgaard --- Makefile | 1 + fs/common.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index b34dd78c73..6a3d038e66 100644 --- a/Makefile +++ b/Makefile @@ -753,6 +753,7 @@ endif .PHONY: target-post-image target-post-image: $(TARGETS_ROOTFS) target-finalize + @rm -f $(ROOTFS_COMMON_TAR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) diff --git a/fs/common.mk b/fs/common.mk index ba2faa7759..9baf367729 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -96,6 +96,7 @@ endif $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) chmod a+x $(FAKEROOT_SCRIPT) PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) + $(Q)rm -rf $(TARGET_DIR) rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) @@ -153,6 +154,7 @@ $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) + $(Q)rm -rf $$(TARGET_DIR) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT) endif From bf6b55268fdd78a441f99b9b0ca45b81939f8334 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 09:22:51 +0200 Subject: [PATCH 0474/2640] DEVELOPERS: add myself for a number of unmaintained boards These boards I own and currently have no entries in DEVELOPERS, so add them. Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac7a47fc7a..ee66cdd6c1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1399,8 +1399,20 @@ N: Pedro Aguilar F: package/libunistring/ N: Peter Korsgaard +F: board/minnowboard/ +F: board/nexbox/a95x/ +F: board/openblocks/a6/ F: board/orangepi/ +F: board/pandaboard/ +F: board/roseapplepi/ +F: configs/minnowboard_max-graphical_defconfig +F: configs/minnowboard_max_defconfig +F: configs/nexbox_a95x_defconfig +F: configs/openblocks_a6_defconfig F: configs/orangepi_pc_defconfig +F: configs/pandaboard_defconfig +F: configs/roseapplepi_defconfig +F: configs/sheevaplug_defconfig F: package/docker-compose/ F: package/dump1090/ F: package/flickcurl/ From 8a612c9ed9d7fde40a4e5bfe851e9a8ee7228bf2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 12:27:11 +0200 Subject: [PATCH 0475/2640] ktap: bump version for linux-4.8 support Fixes #10776 The upstream git repo contains a number of fixes for building against newer kernel versions, so bump the version. git shortlog eb66d40310c93dc82bc8eac889744c1ed1f01f7b.. Alain Kalker (2): uprobe: Print the symbol, not the matching pattern uprobe: Blacklist uretprobes on _start Aleksa Sarai (2): runtime: update GFP_WAIT to GFP_RECLAIM userspace: fix up argument parsing NULL dereference Alexey Makhalov (1): Fix building for v4.8 kernel Azat Khuzhin (12): Use get_unused_fd_flags(0) instead of get_unused_fd() Support trace_seq::seq Ignore separate debug files (*.dwo) Use trace_seq_has_overflowed() makefile: split vim plugins installing into separate target makefile: use DESTDIR for install (allow to change install dir) makefile: install: create dirs makefile: use ldflags for linking ktap makefile: add CPPFLAGS to KTAPC_CFLAGS, to allow change default flags ignore: exclude /debian Support compilation for 4.2 (ftrace_events cleanup) runtime: fix building on 4.3 Jovi Zhangwei (11): Merge pull request #84 from azat/linux-3.19-fixes-v3 Merge pull request #85 from azat/debian-preparations-v2 Merge pull request #88 from NanXiao/master Merge pull request #89 from NanXiao/patch-1 Merge pull request #91 from NanXiao/patch-1 Merge pull request #90 from azat/linux-4.2-compilation-fixes Merge pull request #99 from cyphar/fix-null-deref Merge pull request #98 from cyphar/fix-gfp-reclaim Merge pull request #97 from azat/fix-building-4.3-__GFP_RECLAIM Merge pull request #103 from ackalker/blacklist Merge pull request #104 from YustasSwamp/master Nan Xiao (3): Update tutorial.md Update Makefile Fix memory leak issue in main function. WEI ZHANG (1): ktap: Change the copyright to Huawei Technologies While we are at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard --- package/ktap/ktap.hash | 3 ++- package/ktap/ktap.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/ktap/ktap.hash b/package/ktap/ktap.hash index d58bd85b43..1eff712501 100644 --- a/package/ktap/ktap.hash +++ b/package/ktap/ktap.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 bc8b03a53c430ae4fcf594ffdf31e2b2ed47a8fee25dd8fea60aa34f75441707 ktap-eb66d40310c93dc82bc8eac889744c1ed1f01f7b.tar.gz +sha256 44a0808d57175cf9d15466f720e1e10d5ed1abc3497aedf9ddd6469545552345 ktap-23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE-GPL diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk index b9b3dbcc53..3b9134da65 100644 --- a/package/ktap/ktap.mk +++ b/package/ktap/ktap.mk @@ -4,7 +4,7 @@ # ################################################################################ -KTAP_VERSION = eb66d40310c93dc82bc8eac889744c1ed1f01f7b +KTAP_VERSION = 23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION)) KTAP_LICENSE = GPL-2.0 KTAP_LICENSE_FILES = LICENSE-GPL From 0bd23f0603954c6a1d3d6c6e6d25bd2511fd472b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 21 Oct 2017 22:54:57 +0200 Subject: [PATCH 0476/2640] lua: always use host-lua for host-luainterpreter Similar to how we do for openssl. host-luainterpreter is only used by the luarocks infrastructure, and there is afaik no specific reason why the host lua variant must match the target one. Luajit only supports a limited number of architectures, so building it for the host limits the architectures Buildroot can be used on (E.G. powerpc64 autobuilders). To fix this, always use host-lua. Slightly rework lua.mk to ensure host-lua-5.1 is used when luajit is selected, and drop the logic for using host-luajit. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/lua/lua.mk | 6 +++--- package/luainterpreter/Config.in | 4 ++++ package/luainterpreter/luainterpreter.mk | 2 +- package/luarocks/luarocks.mk | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 0ac2e0e25d..851dc8f734 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -16,10 +16,10 @@ endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -LUA_LICENSE_FILES = COPYRIGHT -else +ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y) LUA_LICENSE_FILES = doc/readme.html +else +LUA_LICENSE_FILES = COPYRIGHT endif LUA_PROVIDES = luainterpreter diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in index e89a9b84d2..7bc54d862f 100644 --- a/package/luainterpreter/Config.in +++ b/package/luainterpreter/Config.in @@ -7,3 +7,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string + +config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER + string + default "host-lua" diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk index cb1d5dde18..58d421b183 100644 --- a/package/luainterpreter/luainterpreter.mk +++ b/package/luainterpreter/luainterpreter.mk @@ -20,4 +20,4 @@ endif $(eval $(virtual-package)) $(eval $(host-virtual-package)) -LUA_RUN = $(HOST_DIR)/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) +LUA_RUN = $(HOST_DIR)/bin/lua diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 389d521832..63d908a416 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -23,10 +23,6 @@ HOST_LUAROCKS_CONF_OPTS = \ --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ --with-lua=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_LUAJIT),y) -HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit -endif - define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef From 3d02062787041877b56c51b20cbc13af24264aa1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 21:03:57 +0200 Subject: [PATCH 0477/2640] Makefile: Ensure BASE_TARGET_DIR exists, not TARGET_DIR This was present in Yann's original patch, but got dropped when I rebased commit 7e9870ce32 (core: introduce intermediate BASE_TARGET_DIR variable) to fix the Makefile conflicts. Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6a3d038e66..71c77f474d 100644 --- a/Makefile +++ b/Makefile @@ -945,7 +945,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): +$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From f542085a61ee0e1d85e32a1f6f71ccea9101ea31 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Dec 2017 16:09:44 +0100 Subject: [PATCH 0478/2640] infra/pkg-kconfig: commonalise update-(def)config code Except for the nice human-friendly reminder of the command that the user was just running, and the name of the file to copy from, those two rules are exactly the same. Make that a common macro that is shared, so that it's easier to add more checks, and to simplify maintenance. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 0402f81ffe..4bd7161b1a 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -11,6 +11,17 @@ # ################################################################################ +# Macro to update back the custom (def)config file +# $(1): file to copy from +define kconfig-package-update-config + @$(if $($(PKG)_KCONFIG_FRAGMENT_FILES), \ + echo "Unable to perform $(@) when fragment files are set"; exit 1) + @$(if $($(PKG)_KCONFIG_DEFCONFIG), \ + echo "Unable to perform $(@) when using a defconfig rule"; exit 1) + cp -f $($(PKG)_DIR)/$(1) $($(PKG)_KCONFIG_FILE) + touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE) +endef + ################################################################################ # inner-kconfig-package -- generates the make targets needed to support a # kconfig package @@ -204,25 +215,17 @@ $(1)-savedefconfig: $(1)-check-configuration-done # Target to copy back the configuration to the source configuration file # Even though we could use 'cp --preserve-timestamps' here, the separate # cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig. +$(1)-update-config: PKG=$(2) $(1)-update-config: $(1)-check-configuration-done - @$$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \ - echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1) - @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - echo "Unable to perform $(1)-update-config when using a defconfig rule"; exit 1) - cp -f $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) + $$(call kconfig-package-update-config,$$($(2)_KCONFIG_DOTCONFIG)) # Note: make sure the timestamp of the stored configuration is not newer than # the .config to avoid a useless rebuild. Note that, contrary to # $(1)-update-config, the reference for 'touch' is _not_ the file from which # we copy. +$(1)-update-defconfig: PKG=$(2) $(1)-update-defconfig: $(1)-savedefconfig - @$$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \ - echo "Unable to perform $(1)-update-defconfig when fragment files are set"; exit 1) - @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - echo "Unable to perform $(1)-update-defconfig when using a defconfig rule"; exit 1) - cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) + $$(call kconfig-package-update-config,defconfig) endif # package enabled From 152f58e2092158cfd243934f577430badd619637 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Dec 2017 16:09:45 +0100 Subject: [PATCH 0479/2640] infra/pkg-config: hide away non-critical commands When updating back the (def)config file, the touch command is not very useful by default, so hide it away. We do not hide away the cp command, as that could confuse the user under some circunmstances. For example, when the toolchain does not yet exist, the uClibc buildsystem will complain multiple times about gcc not being found, like so: make[2]: /home/ymorin/dev/buildroot/O/host/bin/i686-buildroot-linux-uclibc-gcc: Command not found (Note that we can not suppress those warnings, as they are on stderr, and we still want to see stderr in case of real errors). So, if we were to hide the cp command, the user could be left confused, even though we were sucessful in updating back the (def)config file. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 4bd7161b1a..0da6d0ab4e 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -19,7 +19,7 @@ define kconfig-package-update-config @$(if $($(PKG)_KCONFIG_DEFCONFIG), \ echo "Unable to perform $(@) when using a defconfig rule"; exit 1) cp -f $($(PKG)_DIR)/$(1) $($(PKG)_KCONFIG_FILE) - touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE) + $(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE) endef ################################################################################ From 725ea68913cf6369a40180a70d94fadb06ca6491 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Dec 2017 16:09:46 +0100 Subject: [PATCH 0480/2640] infra/pkg-kconfig: do not update-(def)config to a directory Currently, if the user specifies the path to an existing directory as the path to the custom (def)config file (FOO_KCONFIG_FILE), then we happily create a file in there, either 'defconfig' or '.config' (or whatever the .config is named for that package), depending on whether we're saving a defconfig or a full config. So, we could save the file, but then the Buildroot defconfig file that contains that path would no longer be reusable as-is, because we interpret that path as a path to a file. Furthermore, if the directory-portion of FOO_KCONFIG_FILE does not exist yet, the update would fail, because cp does not create missing directory components. So we fix that by adding an explicit test for the directory-ness of the target file, and then an explicit mkdir to create missing directory components. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 0da6d0ab4e..81bba5220c 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -18,6 +18,11 @@ define kconfig-package-update-config echo "Unable to perform $(@) when fragment files are set"; exit 1) @$(if $($(PKG)_KCONFIG_DEFCONFIG), \ echo "Unable to perform $(@) when using a defconfig rule"; exit 1) + $(Q)if [ -d $($(PKG)_KCONFIG_FILE) ]; then \ + echo "Unable to perform $(@) when $($(PKG)_KCONFIG_FILE) is a directory"; \ + exit 1; \ + fi + $(Q)mkdir -p $(dir $($(PKG)_KCONFIG_FILE)) cp -f $($(PKG)_DIR)/$(1) $($(PKG)_KCONFIG_FILE) $(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE) endef From 89bdacb14ed458ee62a997a06255e5e19c480f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Thu, 15 Mar 2018 20:45:54 +0100 Subject: [PATCH 0481/2640] wine: depend on shared libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even if --enable-static --disable-shared is passed, wine tries to build a shared library, causing a build failure in a BR2_STATIC_LIBS=y configuration: /home/test/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): In function `__uClibc_fini': __uClibc_main.c:(.text.__uClibc_fini+0x10): undefined reference to `__fini_array_start' /home/test/buildroot/output/host/lib/gcc/i686-buildroot-linux-uclibc/6.4.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/test/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): relocation R_386_GOTOFF again st undefined hidden symbol `__fini_array_start' can not be used when making a shared object /home/test/buildroot/output/host/lib/gcc/i686-buildroot-linux-uclibc/6.4.0/../../../../i686-buildroot-linux-uclibc/bin/ld: final link failed: Bad value collect2: error: ld returned 1 exit status make[2]: *** [libwine.so.1.0] Error 1 make[2]: Leaving directory `/home/test/buildroot/output/build/wine-3.0/libs/wine' make[1]: *** [libs/wine] Error 2 Since using wine in a static linking environment is fairly unlikely, we simply mark the wine package unavailable on static-only configurations. Since we need to add a Config.in comment, we also introduced a BR2_PACKAGE_WINE_ARCH_SUPPORTS hidden boolean, to share the architecture dependencies definition between the wine config option and the comment. Signed-off-by: André Hentschel [Thomas: - add a comment in the Config.in file about the dependency - add BR2_PACKAGE_WINE_ARCH_SUPPORTS - extend the commit log] Signed-off-by: Thomas Petazzoni --- package/wine/Config.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/wine/Config.in b/package/wine/Config.in index 627a9a71f4..9de8cf0f6d 100644 --- a/package/wine/Config.in +++ b/package/wine/Config.in @@ -1,11 +1,18 @@ -config BR2_PACKAGE_WINE - bool "wine" +config BR2_PACKAGE_WINE_ARCH_SUPPORTS + bool + default y # Wine only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" || \ BR2_HOSTARCH = "powerpc" || BR2_HOSTARCH = "arm" || \ BR2_HOSTARCH = "aarch64" # Wine has much CPU specific code and mostly makes sense on x86 depends on BR2_i386 + +config BR2_PACKAGE_WINE + bool "wine" + depends on BR2_PACKAGE_WINE_ARCH_SUPPORTS + # Wine unconditionally builds shared libraries + depends on !BR2_STATIC_LIBS help Wine is a compatibility layer capable of running Windows applications on Linux. Instead of simulating internal @@ -15,3 +22,7 @@ config BR2_PACKAGE_WINE methods. http://www.winehq.org + +comment "wine needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_WINE_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS From 12b08c2be639e26ba0983d7dbdb3bddd91355f4c Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Fri, 30 Mar 2018 20:10:55 -0300 Subject: [PATCH 0482/2640] .gitlab-ci.yml: use image with flake8 Bump the docker image to the latest tag to have flake8 pre-installed. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Yann E. MORIN Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 2 +- .gitlab-ci.yml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab0feac292..1f4d506196 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # It needs to be regenerated every time a defconfig is added, using # "make .gitlab-ci.yml". -image: buildroot/base:20180205.0730 +image: buildroot/base:20180318.1724 .defconfig_script: &defconfig_script - echo 'Configure Buildroot' diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in index cb3eb715f2..c0e9563f2f 100644 --- a/.gitlab-ci.yml.in +++ b/.gitlab-ci.yml.in @@ -4,7 +4,7 @@ # It needs to be regenerated every time a defconfig is added, using # "make .gitlab-ci.yml". -image: buildroot/base:20180205.0730 +image: buildroot/base:20180318.1724 .defconfig_script: &defconfig_script - echo 'Configure Buildroot' From 1960eda2f681c16c22ab613fbd54a2aaa2a5e7dd Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 13 Mar 2018 00:09:44 -0300 Subject: [PATCH 0483/2640] .gitlab-ci.yml: check flake8 Add a test to check Python code style in the whole buildroot tree. Search files by type in order to help flake8 to find the Python scripts without .py extension. But don't rely only in the output of 'file' as it uses heuristics and sometimes it is wrong (specially identifying Python files as C++ source for the 'file' version currently in the Docker image). Include in the output: - the list of Python files processed; - statistics for each kind of warning; - the total number of warnings; - the number of Python files processed. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Yann E. MORIN Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 11 +++++++++++ .gitlab-ci.yml.in | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f4d506196..fd1aeb3408 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,17 @@ check-DEVELOPERS: script: - "! utils/get-developers | grep -v 'No action specified'" +check-flake8: + before_script: + # Help flake8 to find the Python files without .py extension. + - find * -type f -name '*.py' > files.txt + - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt + - sort -u files.txt | tee files.processed + script: + - python -m flake8 --statistics --count $(cat files.processed) + after_script: + - wc -l files.processed + check-package: script: - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} + diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in index c0e9563f2f..bffcb02be1 100644 --- a/.gitlab-ci.yml.in +++ b/.gitlab-ci.yml.in @@ -30,6 +30,17 @@ check-DEVELOPERS: script: - "! utils/get-developers | grep -v 'No action specified'" +check-flake8: + before_script: + # Help flake8 to find the Python files without .py extension. + - find * -type f -name '*.py' > files.txt + - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt + - sort -u files.txt | tee files.processed + script: + - python -m flake8 --statistics --count $(cat files.processed) + after_script: + - wc -l files.processed + check-package: script: - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} + From d879be3049598f35d7b959784e1a6c2811ba2036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Mar 2018 20:43:56 +0100 Subject: [PATCH 0484/2640] package/libbsd: enable for non-glibc toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libbsd builds now almost fine with a musl or uClibc toolchain, except for one issue introduced in the latest version bump. Upstream commit 22fbd62368c39de8ac5e249d1502d5ac0ffdef30 [1] uses the glibc-only macro `__GLIBC_PREREQ`. The issue is fixed by the attached patch from upstream, which fixes the use of `__GLIBC_PREREQ` on non-glibc toolchains. Backported from: https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 netcat-openbsd is the only package selecting libbsd. However, building it still needs a glibc toolchain, as it uses `b64_ntop` which is not available in musl or uClibc. Build has been successfully tested with: * armv7-eabihf--glibc--bleeding-edge-2017.11-1 * armv7-eabihf--musl--bleeding-edge-2018.02-1 * armv7-eabihf--uclibc--bleeding-edge-2018.02-1 [1] https://cgit.freedesktop.org/libbsd/commit/?id=22fbd62368c39de8ac5e249d1502d5ac0ffdef30 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...laration-protection-for-glibc-alread.patch | 80 +++++++++++++++++++ package/libbsd/Config.in | 5 +- 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch diff --git a/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch b/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch new file mode 100644 index 0000000000..fdf45bdef6 --- /dev/null +++ b/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch @@ -0,0 +1,80 @@ +From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:39:45 +0100 +Subject: [PATCH] Fix function declaration protection for glibc already + providing them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On non-glibc based systems we cannot unconditionally use the +__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, +if it is undefined, define it to 0. + +We should also always declare these functions on non-glibc based +systems. And on systems with a new enough glibc, which provides these +functions, we should still provide the declarations if _GNU_SOURCE +is *not* defined. + +Backported from: +https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + +Reported-by: Jörg Krause +Signed-off-by: Guillem Jover +Signed-off-by: Jörg Krause +--- + include/bsd/stdlib.h | 3 ++- + include/bsd/string.h | 3 ++- + include/bsd/sys/cdefs.h | 8 ++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index 8d33d1f..a5b063c 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 29097f6..f987fee 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); + void strmode(mode_t mode, char *str); + +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) + void explicit_bzero(void *buf, size_t len); + #endif + __END_DECLS +diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h +index b4c8f30..d1cc419 100644 +--- a/include/bsd/sys/cdefs.h ++++ b/include/bsd/sys/cdefs.h +@@ -58,6 +58,14 @@ + #endif + #endif + ++/* ++ * On non-glibc based systems, we cannot unconditionally use the ++ * __GLIBC_PREREQ macro as it gets expanded before evaluation. ++ */ ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(maj, min) 0 ++#endif ++ + /* + * Some kFreeBSD headers expect those macros to be set for sanity checks. + */ +-- +2.16.2 + diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 11e4c4d974..f6c2e4be4b 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_LIBBSD bool "libbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_USES_GLIBC help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making @@ -19,6 +18,6 @@ config BR2_PACKAGE_LIBBSD http://libbsd.freedesktop.org/ -comment "libbsd needs a glibc toolchain w/ threads" +comment "libbsd needs a toolchain w/ threads" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_HAS_THREADS From 8cbb08d8e59d56e5d86a85fc8730c9c604d77d27 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 13 Mar 2018 22:18:25 +0100 Subject: [PATCH 0485/2640] meson: fix error when restorecon unavailable host-meson is used by some packages such as libmpdclient. If selinuxenabled is installed on host but restorecon is unavailable (for an "unknwown" reason), install will crash. Fixes: - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...undError-when-restorecon-unavailable.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch diff --git a/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch b/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch new file mode 100644 index 0000000000..3f1ca68dfc --- /dev/null +++ b/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch @@ -0,0 +1,31 @@ +From 8edc477b7d7b160004eb700a1b7523237333d9ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 13 Mar 2018 18:52:36 +0100 +Subject: [PATCH] Fix FileNotFoundError when restorecon unavailable + +Fixes: + - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d + +Signed-off-by: Fabrice Fontaine +--- + mesonbuild/scripts/meson_install.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py +index f895f17d..1414ace2 100644 +--- a/mesonbuild/scripts/meson_install.py ++++ b/mesonbuild/scripts/meson_install.py +@@ -97,6 +97,10 @@ def restore_selinux_contexts(): + # is ignored quietly. + return + ++ if not shutil.which('restorecon'): ++ # If we don't have restorecon, failure is ignored quietly. ++ return ++ + with subprocess.Popen(['restorecon', '-F', '-f-', '-0'], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc: + out, err = proc.communicate(input=b'\0'.join(os.fsencode(f) for f in selinux_updates) + b'\0') +-- +2.14.1 + From 6d0316dc7b14f6cd2d44e92c6ab581a6ab385234 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Tue, 27 Mar 2018 09:44:34 +0200 Subject: [PATCH 0486/2640] package/xterm: Avoid freetype2 path poisoning using imake When imake is installed on the host, it tries to include freetype headers from host, so we must override ac_cv_path_IMAKE to avoid this. Extract from config.log: configure:14803: checking if we should use imake to help configure:14820: result: yes configure:14829: checking for xmkmf configure:14846: found /usr/bin/xmkmf configure:14857: result: /usr/bin/xmkmf configure:14920: testing Using /usr/bin/xmkmf ... configure:15015: testing IMAKE_CFLAGS -I. -I/usr/include/freetype2 Signed-off-by: Valentin Korenblit [Thomas: pass ac_cv_path_IMAKE="" as suggested by Romain Naour.] Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/xterm/xterm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 645de92e22..201280fd46 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -14,6 +14,9 @@ XTERM_CONF_OPTS = --enable-256-color \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib +# Avoid freetype2 path poisoning by imake +XTERM_CONF_ENV = ac_cv_path_IMAKE="" + ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) XTERM_DEPENDENCIES += xlib_libXft XTERM_CONF_OPTS += --enable-freetype \ From 54157c6c2d9fba5ad230294ae1c7dfc0032b1ede Mon Sep 17 00:00:00 2001 From: Rafal Susz Date: Tue, 13 Mar 2018 19:00:05 +0100 Subject: [PATCH 0487/2640] package/linux: fix custom dts files handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Custom dts files are still conditionally copied based on non existing boolean. So it is currently not possible to use custom dts file(s) at all. List of dts files is now iterated and files are copied into dedicated kernel arch dir. Signed-off-by: Rafal Susz Tested-by: Jan Kundrát Signed-off-by: Peter Korsgaard --- linux/linux.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index e98b25cb72..cf1cae7cc0 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -370,8 +370,9 @@ endif # Compilation. We make sure the kernel gets rebuilt when the # configuration has changed. define LINUX_BUILD_CMDS - $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS), - cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/) + @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ + cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ + done $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ @@ -482,9 +483,9 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST endif endif -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y) +ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:) $(error No kernel device tree source specified, check your \ -BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings) +BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif endif # BR_BUILDING From 5899a8326f0fd46283732f07dea888907b763919 Mon Sep 17 00:00:00 2001 From: Rafal Susz Date: Tue, 13 Mar 2018 19:00:06 +0100 Subject: [PATCH 0488/2640] configs/s6lx9_microboard_defconfig: purge custom dts boolean Since custom dts files are unconditionally handled *KERNEL_USE_CUSTOM_DTS is no longer available/needed. Signed-off-by: Rafal Susz Signed-off-by: Peter Korsgaard --- configs/s6lx9_microboard_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig index f77c80ba87..97b2d3fe79 100644 --- a/configs/s6lx9_microboard_defconfig +++ b/configs/s6lx9_microboard_defconfig @@ -10,5 +10,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig" -BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts" From 42be6b6153ba0fdbd2152944e86f7cb180b55012 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 7 Mar 2018 10:48:12 +0100 Subject: [PATCH 0489/2640] check-package: Flag usage of '\t \\$'. check-package would flag tabs before a backslash ('\t\\'), two spaces before a backslash (' \\') but would not flag a tab before space before backslash ('\t \\'), allowing someone to bypass the check. Signed-off-by: Nicolas Cavallari Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 2df2e1a884..cfd4d05117 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -123,7 +123,7 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): class SpaceBeforeBackslash(_CheckFunction): - TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t)\\$") + TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") def check_line(self, lineno, text): if self.TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH.match(text.rstrip()): From e42a65bdcd76018dbe2d4fd4459a7ca216e99e32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 4 Mar 2018 16:06:05 +0100 Subject: [PATCH 0490/2640] package/freescale-imx: Remove imx6s from has_vpu list According to imx-vpu-5.4.37/Makefile, line 6: INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q imx6s is not supported by the imx-vpu package. Its install target, guarded by ifeq ($(PLATFORM), $(findstring $(PLATFORM), $(INCLUDE_LIST))) does nothing, causing a build error later on in the imx-vpuwrap package checking for vpu_lib.h... no configure: error: lib_vpu is required, consider installing imx-lib Signed-off-by: Bernd Kuhls Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index b5e5ab23dc..e33a90d912 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -60,8 +60,7 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU bool From 878716830bfbdf76b69f69a18b53ae56fdbf8365 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 4 Mar 2018 16:06:06 +0100 Subject: [PATCH 0491/2640] package/kodi: remove imx support https://git.buildroot.net/buildroot/commit/?id=266208972192f1e0869f89d7be941de6294a810a broke imx support in Kodi because previously the G2D libraries were part of the imx-gpu-viv package: CMake Error at /usr/share/cmake-3.7/Modules/FindPackageHandleStandardArgs.cmake:138 (message): Could NOT find IMX (missing: G2D_LIBRARY) Adjusting the Kodi package to use the imx-gpu-g2d as well still does not provide a working build: /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'void CIMX::Deinitialize()': /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:79:21: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0); ^~~~~~~~~~~~~~~~~~~ /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'bool CIMX::UpdateDCIC()': /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:109:19: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0); ^~~~~~~~~~~~~~~~~~~ /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:115:21: error: 'DCIC_IOC_START_VSYNC' was not declared in this scope ioctl(m_fddcic, DCIC_IOC_START_VSYNC, 0); ^~~~~~~~~~~~~~~~~~~~ /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'virtual void CIMX::Process()': /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:125:19: error: 'DCIC_IOC_START_VSYNC' was not declared in this scope ioctl(m_fddcic, DCIC_IOC_START_VSYNC, 0); ^~~~~~~~~~~~~~~~~~~~ /home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:131:19: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0); ^~~~~~~~~~~~~~~~~~~ Although it might be possible to fix these bugs with something like #define DCIC_IOC_CONFIG_DCIC _IO('D', 12) #define DCIC_IOC_START_VSYNC _IO('D', 15) #define DCIC_IOC_STOP_VSYNC _IO('D', 16) as done in https://raw.githubusercontent.com/LibreELEC/LibreELEC.tv/libreelec-7.0/projects/imx6/patches/kodi/imx6-jarvis.patch we would still try to ride a dead horse. The upcoming Kodi version 18.0-Leia will remove imx support completely, see upstream PR 12990. Signed-off-by: Bernd Kuhls Reviewed-by: Gary Bisson [Thomas: keep an explicit -DENABLE_IMX=OFF in CONF_OPTS.] Signed-off-by: Thomas Petazzoni --- package/kodi/kodi.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 93f4dd4b31..9d3b65ae91 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -71,7 +71,8 @@ KODI_CONF_OPTS += \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ - -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz + -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \ + -DENABLE_IMX=OFF ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv @@ -191,12 +192,6 @@ KODI_DEPENDENCIES += libamcodec else KODI_CONF_OPTS += -DENABLE_AML=OFF endif -ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y) -KODI_CONF_OPTS += -DENABLE_IMX=ON -KODI_DEPENDENCIES += imx-vpuwrap -else -KODI_CONF_OPTS += -DENABLE_IMX=OFF -endif endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) From 2da613a7d94a4bd34e9f70533cf0d8b2803be5bb Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 12 Oct 2017 12:14:18 -0300 Subject: [PATCH 0492/2640] netcat: add forced dependence on BusyBox It may be necessary if packages become built in parallel, leading to a race condition on the creation of the "nc" link. Of course this still leaves a race conditon if other netcat competitors but we must assume thet the user is a grown-up person who knows what is doing. Signed-off-by: Carlos Santos [Arnout: Don't force-remove the existing nc, not needed according to Romain.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/netcat/netcat.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index eb7ddcac27..6c7c4b8f29 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -9,4 +9,10 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING +# Ensure Busybox gets built/installed before, so that this package overrides +# Busybox nc. +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +NETCAT_DEPENDENCIES += busybox +endif + $(eval $(autotools-package)) From b28d77789a4ba327532674efd6250b8634a99feb Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 1 Apr 2018 00:28:21 +0200 Subject: [PATCH 0493/2640] netcat: force-remove nc link before install The nc -> netcat symlink is not created if nc exists already, e.g. from busybox. For netcat itself this is not needed, it is always installed. Cc: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/netcat/netcat.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 6c7c4b8f29..d8b3c930b9 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -9,10 +9,17 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -# Ensure Busybox gets built/installed before, so that this package overrides -# Busybox nc. +# Ensure Busybox gets built/installed before, so that this package +# overrides Busybox nc. ifeq ($(BR2_PACKAGE_BUSYBOX),y) NETCAT_DEPENDENCIES += busybox endif +# Netcat doesn't overwrite a pre-existing 'nc' (e.g. from busybox) so +# force-remove it. +define NETCAT_RMOVE_NC_LINK + rm -f $(TARGET_DIR)/usr/bin/nc +endef +NETCAT_PRE_INSTALL_TARGET_HOOKS += NETCAT_RMOVE_NC_LINK + $(eval $(autotools-package)) From 1490558b75f2d28fdf11745a1977872b33d82b98 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 30 Mar 2018 23:48:07 +0200 Subject: [PATCH 0494/2640] utils/scanpypi: don't hardcode python2 Commit 3a0c20c5309b (scanpypi: add support for Python3) adapted the script to work with python 3.x, but the shebang still said python2 making it unlikely to work on systems without python 2.x. Change it to just 'python' instead. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 505ba0a246..df8939b82e 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python """ Utility for building Buildroot packages for existing PyPI packages From c9f6e1a329a9ad5044bbeb0ee32c71a0adff2c65 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:16 -0300 Subject: [PATCH 0495/2640] boot/*/*.mk: fix code style Use only one space before backslash. Indent with tabs. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- boot/lpc32xxcdl/lpc32xxcdl.mk | 8 ++++---- boot/syslinux/syslinux.mk | 2 +- boot/uboot/uboot.mk | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk index 04c1c7f060..30afed050b 100644 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ b/boot/lpc32xxcdl/lpc32xxcdl.mk @@ -33,10 +33,10 @@ LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag endif LPC32XXCDL_BUILD_FLAGS = \ - CROSS_COMPILE=$(TARGET_CROSS) \ - NXPMCU_WINBASE=$(@D) \ - NXPMCU_SOFTWARE=$(@D) \ - BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + NXPMCU_WINBASE=$(@D) \ + NXPMCU_SOFTWARE=$(@D) \ + BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \ CSP=lpc32xx TOOL=gnu GEN=lpc LPC32XXCDL_BOARD_STARTUP_DIR = \ diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 13496414dd..67bc69254e 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -59,7 +59,7 @@ define SYSLINUX_BUILD_CMDS CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ - $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) + $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) endef # While the actual bootloader is compiled for the target, several diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b7032d5901..24d3e4ef54 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -202,8 +202,8 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_BOARD_NAME)_config endef else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) @@ -230,16 +230,16 @@ define UBOOT_BUILD_CMDS $(if $(UBOOT_CUSTOM_DTS_PATH), cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ ) - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_MAKE_TARGET) $(if $(BR2_TARGET_UBOOT_FORMAT_SD), $(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd) $(if $(BR2_TARGET_UBOOT_FORMAT_NAND), $(@D)/tools/mxsboot \ - -w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \ - -o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \ - -e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \ + -w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \ + -o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \ + -e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \ nand $(@D)/u-boot.sb $(@D)/u-boot.nand) endef From 0c90c109cbd629d664a965aa1690c3ef2b90ba02 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:18 -0300 Subject: [PATCH 0496/2640] fs/yaffs2: fix code style Rename the .mk to follow the convention. The variables inside it already use the correct name. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/yaffs2/{yaffs.mk => yaffs2.mk} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%) diff --git a/fs/yaffs2/yaffs.mk b/fs/yaffs2/yaffs2.mk similarity index 100% rename from fs/yaffs2/yaffs.mk rename to fs/yaffs2/yaffs2.mk From a7b4bbfc14b9dbea7906b4ddedb80119da8377c2 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:14 -0300 Subject: [PATCH 0497/2640] check-package: prepare to extend to other directories Currently the script only checks files inside the package/ directory. Upcoming patches will enable it for other directories. In order to reliably test for file names, i.e. the Config.in in the base directory, normalize the path of files to check to a relative path to the base directory. Rename the variable that holds the compiled regexp to better represent its content and rearrange how it is declared to make easy to later add new directories to check. As a consequence the files that declare package infra types would not be ignored anymore, so create a new variable to list the files intree to be ignored during the check. The same variable will be used by upcoming patches to ignore other files. Ignore pkg-*.mk and doc-asciidoc.mk since they are package infra files. In order to not produce weird results when used for files outside the tree (i.e. in a private br2-external) add an explicit command line option (-b) that bypasses any checks that would make a file be ignored by the path that contains it. When in this out-of-tree mode, the user is responsible for providing a list of files to check that do not contain files the script does not understand, e.g. package infra files. As a result of this patch, besides the known use: $ ./utils/check-package package/new-package/* someone with the utils/ directory in the path can now also run: $ cd package/new-package/ $ check-package * or $ check-package -b /path/to/br2-ext-tree/package/staging-package/* Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- utils/check-package | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/utils/check-package b/utils/check-package index a87a74decc..d2457c706c 100755 --- a/utils/check-package +++ b/utils/check-package @@ -4,6 +4,7 @@ from __future__ import print_function import argparse import inspect +import os import re import sys @@ -24,6 +25,9 @@ def parse_args(): parser.add_argument("files", metavar="F", type=str, nargs="*", help="list of files") + parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false", + help="do not apply the pathname filters used for intree files") + parser.add_argument("--manual-url", action="store", default="http://nightly.buildroot.org/", help="default: %(default)s") @@ -41,12 +45,21 @@ def parse_args(): CONFIG_IN_FILENAME = re.compile("/Config\.\S*$") -FILE_IS_FROM_A_PACKAGE = re.compile("package/[^/]*/") +DO_CHECK_INTREE = re.compile("|".join([ + "package/", + ])) +DO_NOT_CHECK_INTREE = re.compile("|".join([ + "package/doc-asciidoc\.mk$", + "package/pkg-\S*\.mk$", + ])) def get_lib_from_filename(fname): - if FILE_IS_FROM_A_PACKAGE.search(fname) is None: - return None + if flags.intree_only: + if DO_CHECK_INTREE.match(fname) is None: + return None + if DO_NOT_CHECK_INTREE.match(fname): + return None if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config if fname.endswith(".hash"): @@ -117,7 +130,16 @@ def __main__(): global flags flags = parse_args() - if len(flags.files) == 0: + if flags.intree_only: + # change all paths received to be relative to the base dir + base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in flags.files] + # move current dir so the script find the files + os.chdir(base_dir) + else: + files_to_check = flags.files + + if len(files_to_check) == 0: print("No files to check style") sys.exit(1) @@ -125,7 +147,7 @@ def __main__(): total_warnings = 0 total_lines = 0 - for fname in flags.files: + for fname in files_to_check: nwarnings, nlines = check_file_using_lib(fname) total_warnings += nwarnings total_lines += nlines From 7e26b8886bc3833db7d073497920519648b45b68 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:34 -0300 Subject: [PATCH 0498/2640] arch/Config.in*: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- arch/Config.in | 2 +- arch/Config.in.arc | 2 +- arch/Config.in.arm | 4 ++-- arch/Config.in.bfin | 2 +- arch/Config.in.m68k | 2 +- arch/Config.in.mips | 8 ++++---- arch/Config.in.powerpc | 4 ++-- arch/Config.in.sh | 2 +- arch/Config.in.sparc | 2 +- arch/Config.in.x86 | 30 +++++++++++++++--------------- arch/Config.in.xtensa | 8 ++++---- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index d3f63da34f..dd972bc0ee 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -376,8 +376,8 @@ endchoice # Set up flat binary type choice prompt "FLAT Binary type" - depends on BR2_BINFMT_FLAT default BR2_BINFMT_FLAT_ONE + depends on BR2_BINFMT_FLAT config BR2_BINFMT_FLAT_ONE bool "One memory region" diff --git a/arch/Config.in.arc b/arch/Config.in.arc index 92503a0140..156384b9a5 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -1,7 +1,7 @@ choice prompt "Target CPU" - depends on BR2_arc default BR2_arc770d + depends on BR2_arc help Specific CPU to use diff --git a/arch/Config.in.arm b/arch/Config.in.arm index b05e83e33c..c99a995db2 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -456,9 +456,9 @@ config BR2_ARM_ENABLE_VFP choice prompt "Target ABI" - depends on BR2_arm || BR2_armeb default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2 default BR2_ARM_EABI + depends on BR2_arm || BR2_armeb help Application Binary Interface to use. The Application Binary Interface describes the calling conventions (how arguments @@ -746,7 +746,6 @@ config BR2_GCC_TARGET_ABI default "lp64" if BR2_aarch64 || BR2_aarch64_be config BR2_GCC_TARGET_FPU - depends on BR2_arm || BR2_armeb default "vfp" if BR2_ARM_FPU_VFPV2 default "vfpv3" if BR2_ARM_FPU_VFPV3 default "vfpv3-d16" if BR2_ARM_FPU_VFPV3D16 @@ -756,6 +755,7 @@ config BR2_GCC_TARGET_FPU default "neon-vfpv4" if BR2_ARM_FPU_NEON_VFPV4 default "fp-armv8" if BR2_ARM_FPU_FP_ARMV8 default "neon-fp-armv8" if BR2_ARM_FPU_NEON_FP_ARMV8 + depends on BR2_arm || BR2_armeb config BR2_GCC_TARGET_FLOAT_ABI default "soft" if BR2_ARM_SOFT_FLOAT diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin index bd9589c71d..b570d388fd 100644 --- a/arch/Config.in.bfin +++ b/arch/Config.in.bfin @@ -1,7 +1,7 @@ choice prompt "Target CPU" - depends on BR2_bfin default BR2_bf532 + depends on BR2_bfin help Specify target CPU config BR2_bf512 diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index c56031cb78..c134df2f14 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -15,8 +15,8 @@ config BR2_m68k_cf # coldfire variants will be added later choice prompt "Target CPU" - depends on BR2_m68k default BR2_m68k_68040 + depends on BR2_m68k help Specific CPU variant to use diff --git a/arch/Config.in.mips b/arch/Config.in.mips index f8e57bab33..eaabb625cc 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -28,9 +28,9 @@ config BR2_MIPS_CPU_MIPS64R6 choice prompt "Target Architecture Variant" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default BR2_mips_32 if BR2_mips || BR2_mipsel default BR2_mips_64 if BR2_mips64 || BR2_mips64el + depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el help Specific CPU variant to use @@ -118,8 +118,8 @@ endchoice choice prompt "Target ABI" - depends on BR2_mips64 || BR2_mips64el default BR2_MIPS_NABI32 + depends on BR2_mips64 || BR2_mips64el help Application Binary Interface to use @@ -145,8 +145,8 @@ config BR2_MIPS_SOFT_FLOAT choice prompt "FP mode" - depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT default BR2_MIPS_FP32_MODE_XX + depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT help MIPS32 supports different FP modes (32,xx,64). Information about FP modes can be found here: @@ -180,8 +180,8 @@ config BR2_MIPS_NAN_2008 choice prompt "Target NaN" - depends on BR2_mips_32r5 || BR2_mips_64r5 default BR2_MIPS_ENABLE_NAN_2008 + depends on BR2_mips_32r5 || BR2_mips_64r5 help MIPS supports two different NaN encodings, legacy and 2008. Information about MIPS NaN encodings can be found here: diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 0968412647..7a452a630a 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -71,12 +71,12 @@ config BR2_powerpc_740 depends on !BR2_ARCH_IS_64 config BR2_powerpc_7400 bool "7400" - select BR2_POWERPC_CPU_HAS_ALTIVEC depends on !BR2_ARCH_IS_64 + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_7450 bool "7450" - select BR2_POWERPC_CPU_HAS_ALTIVEC depends on !BR2_ARCH_IS_64 + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_750 bool "750" depends on !BR2_ARCH_IS_64 diff --git a/arch/Config.in.sh b/arch/Config.in.sh index deb7244f29..1cb2db90ad 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -1,7 +1,7 @@ choice prompt "Target Architecture Variant" - depends on BR2_sh default BR2_sh4 + depends on BR2_sh help Specific CPU variant to use diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc index 9b6a6aa21a..b22b55142e 100644 --- a/arch/Config.in.sparc +++ b/arch/Config.in.sparc @@ -1,8 +1,8 @@ choice prompt "Target Architecture Variant" - depends on BR2_sparc || BR2_sparc64 default BR2_sparc_v8 if BR2_sparc default BR2_sparc_v9 if BR2_sparc64 + depends on BR2_sparc || BR2_sparc64 help Specific CPU variant to use diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 8e623b3c2b..f7c53a0fae 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -20,8 +20,8 @@ config BR2_X86_CPU_HAS_AVX2 choice prompt "Target Architecture Variant" - depends on BR2_i386 || BR2_x86_64 default BR2_x86_i586 if BR2_i386 + depends on BR2_i386 || BR2_x86_64 help Specific CPU variant to use @@ -50,35 +50,35 @@ config BR2_x86_pentiumpro depends on !BR2_x86_64 config BR2_x86_pentium_mmx bool "pentium MMX" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_pentium_m bool "pentium mobile" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE - depends on !BR2_x86_64 config BR2_x86_pentium2 bool "pentium2" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_pentium3 bool "pentium3" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE - depends on !BR2_x86_64 config BR2_x86_pentium4 bool "pentium4" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 - depends on !BR2_x86_64 config BR2_x86_prescott bool "prescott" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 - depends on !BR2_x86_64 config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -140,21 +140,21 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE42 config BR2_x86_k6 bool "k6" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_k6_2 bool "k6-2" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_athlon bool "athlon" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_athlon_4 bool "athlon-4" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE - depends on !BR2_x86_64 config BR2_x86_opteron bool "opteron" select BR2_X86_CPU_HAS_MMX @@ -198,21 +198,21 @@ config BR2_x86_geode depends on !BR2_x86_64 config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_c32 bool "Via C3-2 (Nehemiah cores)" + depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE - depends on !BR2_x86_64 config BR2_x86_winchip_c6 bool "IDT Winchip C6" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX config BR2_x86_winchip2 bool "IDT Winchip 2" - select BR2_X86_CPU_HAS_MMX depends on !BR2_x86_64 + select BR2_X86_CPU_HAS_MMX endchoice config BR2_ARCH diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index 5d5bcb48f9..49e93a4774 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -1,15 +1,15 @@ choice prompt "Target Architecture Variant" - depends on BR2_xtensa default BR2_xtensa_fsf + depends on BR2_xtensa config BR2_XTENSA_CUSTOM - select BR2_ARCH_HAS_MMU_OPTIONAL bool "Custom Xtensa processor configuration" + select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_xtensa_fsf - select BR2_ARCH_HAS_MMU_MANDATORY bool "fsf - Default configuration" + select BR2_ARCH_HAS_MMU_MANDATORY endchoice @@ -30,8 +30,8 @@ config BR2_XTENSA_OVERLAY_FILE choice prompt "Target Architecture Endianness" - depends on BR2_XTENSA_CUSTOM default BR2_XTENSA_LITTLE_ENDIAN + depends on BR2_XTENSA_CUSTOM config BR2_XTENSA_LITTLE_ENDIAN bool "Little endian" From b2b8a3c3e45adcac6ec0103fc115798a2c799cca Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:40 -0300 Subject: [PATCH 0499/2640] arch/Config.in*: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- arch/Config.in | 97 +++++++++++++++++++++++-------------------- arch/Config.in.mips | 4 +- arch/Config.in.xtensa | 12 +++--- 3 files changed, 61 insertions(+), 52 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index dd972bc0ee..65448e9339 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -28,24 +28,25 @@ config BR2_arcle bool "ARC (little endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs - that can be used from deeply embedded to high performance host - applications. Little endian. + Synopsys' DesignWare ARC Processor Cores are a family of + 32-bit CPUs that can be used from deeply embedded to high + performance host applications. Little endian. config BR2_arceb bool "ARC (big endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs - that can be used from deeply embedded to high performance host - applications. Big endian. + Synopsys' DesignWare ARC Processor Cores are a family of + 32-bit CPUs that can be used from deeply embedded to high + performance host applications. Big endian. config BR2_arm bool "ARM (little endian)" # MMU support is set by the subarchitecture file, arch/Config.in.arm help - ARM is a 32-bit reduced instruction set computer (RISC) instruction - set architecture (ISA) developed by ARM Holdings. Little endian. + ARM is a 32-bit reduced instruction set computer (RISC) + instruction set architecture (ISA) developed by ARM Holdings. + Little endian. http://www.arm.com/ http://en.wikipedia.org/wiki/ARM @@ -53,8 +54,9 @@ config BR2_armeb bool "ARM (big endian)" # MMU support is set by the subarchitecture file, arch/Config.in.arm help - ARM is a 32-bit reduced instruction set computer (RISC) instruction - set architecture (ISA) developed by ARM Holdings. Big endian. + ARM is a 32-bit reduced instruction set computer (RISC) + instruction set architecture (ISA) developed by ARM Holdings. + Big endian. http://www.arm.com/ http://en.wikipedia.org/wiki/ARM @@ -81,8 +83,8 @@ config BR2_bfin select BR2_ARCH_HAS_FDPIC_SUPPORT select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 help - The Blackfin is a family of 16 or 32-bit microprocessors developed, - manufactured and marketed by Analog Devices. + The Blackfin is a family of 16 or 32-bit microprocessors + developed, manufactured and marketed by Analog Devices. http://www.analog.com/ http://en.wikipedia.org/wiki/Blackfin @@ -113,8 +115,8 @@ config BR2_microblazeel bool "Microblaze AXI (little endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus - based architecture (little endian) + Soft processor core designed for Xilinx FPGAs from Xilinx. AXI + bus based architecture (little endian) http://www.xilinx.com http://en.wikipedia.org/wiki/Microblaze @@ -122,8 +124,8 @@ config BR2_microblazebe bool "Microblaze non-AXI (big endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus - based architecture (non-AXI, big endian) + Soft processor core designed for Xilinx FPGAs from Xilinx. PLB + bus based architecture (non-AXI, big endian) http://www.xilinx.com http://en.wikipedia.org/wiki/Microblaze @@ -131,7 +133,8 @@ config BR2_mips bool "MIPS (big endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - MIPS is a RISC microprocessor from MIPS Technologies. Big endian. + MIPS is a RISC microprocessor from MIPS Technologies. Big + endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies @@ -139,7 +142,8 @@ config BR2_mipsel bool "MIPS (little endian)" select BR2_ARCH_HAS_MMU_MANDATORY help - MIPS is a RISC microprocessor from MIPS Technologies. Little endian. + MIPS is a RISC microprocessor from MIPS Technologies. Little + endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies @@ -148,7 +152,8 @@ config BR2_mips64 select BR2_ARCH_IS_64 select BR2_ARCH_HAS_MMU_MANDATORY help - MIPS is a RISC microprocessor from MIPS Technologies. Big endian. + MIPS is a RISC microprocessor from MIPS Technologies. Big + endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies @@ -157,7 +162,8 @@ config BR2_mips64el select BR2_ARCH_IS_64 select BR2_ARCH_HAS_MMU_MANDATORY help - MIPS is a RISC microprocessor from MIPS Technologies. Little endian. + MIPS is a RISC microprocessor from MIPS Technologies. Little + endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies @@ -180,8 +186,8 @@ config BR2_powerpc bool "PowerPC" select BR2_ARCH_HAS_MMU_MANDATORY help - PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. - Big endian. + PowerPC is a RISC architecture created by Apple-IBM-Motorola + alliance. Big endian. http://www.power.org/ http://en.wikipedia.org/wiki/Powerpc @@ -190,8 +196,8 @@ config BR2_powerpc64 select BR2_ARCH_IS_64 select BR2_ARCH_HAS_MMU_MANDATORY help - PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. - Big endian. + PowerPC is a RISC architecture created by Apple-IBM-Motorola + alliance. Big endian. http://www.power.org/ http://en.wikipedia.org/wiki/Powerpc @@ -200,8 +206,8 @@ config BR2_powerpc64le select BR2_ARCH_IS_64 select BR2_ARCH_HAS_MMU_MANDATORY help - PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. - Little endian. + PowerPC is a RISC architecture created by Apple-IBM-Motorola + alliance. Little endian. http://www.power.org/ http://en.wikipedia.org/wiki/Powerpc @@ -209,8 +215,9 @@ config BR2_sh bool "SuperH" select BR2_ARCH_HAS_MMU_OPTIONAL help - SuperH (or SH) is a 32-bit reduced instruction set computer (RISC) - instruction set architecture (ISA) developed by Hitachi. + SuperH (or SH) is a 32-bit reduced instruction set computer + (RISC) instruction set architecture (ISA) developed by + Hitachi. http://www.hitachi.com/ http://en.wikipedia.org/wiki/SuperH @@ -218,8 +225,9 @@ config BR2_sparc bool "SPARC" select BR2_ARCH_HAS_MMU_MANDATORY help - SPARC (from Scalable Processor Architecture) is a RISC instruction - set architecture (ISA) developed by Sun Microsystems. + SPARC (from Scalable Processor Architecture) is a RISC + instruction set architecture (ISA) developed by Sun + Microsystems. http://www.oracle.com/sun http://en.wikipedia.org/wiki/Sparc @@ -228,8 +236,9 @@ config BR2_sparc64 select BR2_ARCH_IS_64 select BR2_ARCH_HAS_MMU_MANDATORY help - SPARC (from Scalable Processor Architecture) is a RISC instruction - set architecture (ISA) developed by Sun Microsystems. + SPARC (from Scalable Processor Architecture) is a RISC + instruction set architecture (ISA) developed by Sun + Microsystems. http://www.oracle.com/sun http://en.wikipedia.org/wiki/Sparc @@ -349,27 +358,27 @@ config BR2_BINFMT_ELF depends on BR2_USE_MMU select BR2_BINFMT_SUPPORTS_SHARED help - ELF (Executable and Linkable Format) is a format for libraries and - executables used across different architectures and operating - systems. + ELF (Executable and Linkable Format) is a format for libraries + and executables used across different architectures and + operating systems. config BR2_BINFMT_FDPIC bool "FDPIC" depends on BR2_ARCH_HAS_FDPIC_SUPPORT select BR2_BINFMT_SUPPORTS_SHARED help - ELF FDPIC binaries are based on ELF, but allow the individual load - segments of a binary to be located in memory independently of each - other. This makes this format ideal for use in environments where no - MMU is available. + ELF FDPIC binaries are based on ELF, but allow the individual + load segments of a binary to be located in memory + independently of each other. This makes this format ideal for + use in environments where no MMU is available. config BR2_BINFMT_FLAT bool "FLAT" depends on !BR2_USE_MMU help - FLAT binary is a relatively simple and lightweight executable format - based on the original a.out format. It is widely used in environment - where no MMU is available. + FLAT binary is a relatively simple and lightweight executable + format based on the original a.out format. It is widely used + in environment where no MMU is available. endchoice @@ -393,8 +402,8 @@ config BR2_BINFMT_FLAT_SEP_DATA # absolute jump" or "error: value -yyyyy out of range". depends on BR2_bfin help - Allow for the data and text segments to be separated and placed in - different regions of memory. + Allow for the data and text segments to be separated and + placed in different regions of memory. config BR2_BINFMT_FLAT_SHARED bool "Shared binary" diff --git a/arch/Config.in.mips b/arch/Config.in.mips index eaabb625cc..8bb8d126e6 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -148,8 +148,8 @@ choice default BR2_MIPS_FP32_MODE_XX depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT help - MIPS32 supports different FP modes (32,xx,64). Information about FP - modes can be found here: + MIPS32 supports different FP modes (32,xx,64). Information + about FP modes can be found here: https://sourceware.org/binutils/docs/as/MIPS-Options.html https://dmz-portal.imgtec.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking#5._Generating_modeless_code diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index 49e93a4774..14049480ec 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -20,13 +20,13 @@ config BR2_XTENSA_OVERLAY_FILE Enter the path to the overlay tarball for a custom processor configuration. - These overlay files are tar packages with updated configuration - files for various toolchain packages and Xtensa processor - configurations. They are provided by the processor vendor or - directly from Tensilica. + These overlay files are tar packages with updated + configuration files for various toolchain packages and Xtensa + processor configurations. They are provided by the processor + vendor or directly from Tensilica. - The path can be either absolute, or relative to the top directory - of buildroot. + The path can be either absolute, or relative to the top + directory of buildroot. choice prompt "Target Architecture Endianness" From d3de010481fdb0aa9719d4ae64e413ea7c59c400 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:44 -0300 Subject: [PATCH 0500/2640] system/Config.in: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- system/Config.in | 122 +++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/system/Config.in b/system/Config.in index 7b36516cc7..d14a864ca5 100644 --- a/system/Config.in +++ b/system/Config.in @@ -92,9 +92,9 @@ config BR2_TARGET_GENERIC_PASSWD_SHA512 help Use SHA512 to encode passwords. - Extremely strong, but not ubiquitous, although available in glibc - for some time now. Choose only if you are sure your C library - understands SHA512 passwords. + Extremely strong, but not ubiquitous, although available in + glibc for some time now. Choose only if you are sure your C + library understands SHA512 passwords. endchoice # Passwd encoding @@ -219,9 +219,9 @@ config BR2_ROOTFS_MERGED_USR is the historical UNIX way. In this case, /usr can be a filesystem on a partition separate from / . - If you say 'y' here, then /bin, /sbin and /lib will be symlinks - to their counterparts in /usr. In this case, /usr can not be a - separate filesystem. + If you say 'y' here, then /bin, /sbin and /lib will be + symlinks to their counterparts in /usr. In this case, /usr can + not be a separate filesystem. config BR2_TARGET_ENABLE_ROOT_LOGIN bool "Enable root login with password" @@ -230,10 +230,10 @@ config BR2_TARGET_ENABLE_ROOT_LOGIN help Allow root to log in with a password. - If not enabled, root will not be able to log in with a password. - However, if you have an ssh server and you add an ssh key, you - can still allow root to log in. Alternatively, you can use sudo - to become root. + If not enabled, root will not be able to log in with a + password. However, if you have an ssh server and you add an + ssh key, you can still allow root to log in. Alternatively, + you can use sudo to become root. config BR2_TARGET_GENERIC_ROOT_PASSWD string "Root password" @@ -242,25 +242,28 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD help Set the initial root password. - If set to empty (the default), then no root password will be set, - and root will need no password to log in. + If set to empty (the default), then no root password will be + set, and root will need no password to log in. - If the password starts with any of $1$, $5$ or $6$, it is considered - to be already crypt-encoded with respectively md5, sha256 or sha512. - Any other value is taken to be a clear-text value, and is crypt-encoded - as per the "Passwords encoding" scheme, above. + If the password starts with any of $1$, $5$ or $6$, it is + considered to be already crypt-encoded with respectively md5, + sha256 or sha512. Any other value is taken to be a clear-text + value, and is crypt-encoded as per the "Passwords encoding" + scheme, above. - Note: "$" signs in the hashed password must be doubled. For example, - if the hashed password is "$1$longsalt$v35DIIeMo4yUfI23yditq0", - then you must enter it as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0" - (this is necessary otherwise make would attempt to interpret the $ - as a variable expansion). + Note: "$" signs in the hashed password must be doubled. For + example, if the hashed password is + "$1$longsalt$v35DIIeMo4yUfI23yditq0", then you must enter it + as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0" (this is necessary + otherwise make would attempt to interpret the $ as a variable + expansion). WARNING! WARNING! The password appears as-is in the .config file, and may appear - in the build log! Avoid using a valuable password if either the - .config file or the build log may be distributed, or at the - very least use a strong cryptographic hash for your password! + in the build log! Avoid using a valuable password if either + the .config file or the build log may be distributed, or at + the very least use a strong cryptographic hash for your + password! choice bool "/bin/sh" @@ -375,10 +378,10 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW default y help The root filesystem is typically mounted read-only at boot. - By default, buildroot remounts it in read-write mode early during the - boot process. - Say no here if you would rather like your root filesystem to remain - read-only. + By default, buildroot remounts it in read-write mode early + during the boot process. + Say no here if you would rather like your root filesystem to + remain read-only. If unsure, say Y. config BR2_SYSTEM_DHCP @@ -391,8 +394,9 @@ config BR2_SYSTEM_DHCP If left empty, no automatic DHCP requests will take place. - For more complicated network setups use an overlay to overwrite - /etc/network/interfaces or add a networkd configuration file. + For more complicated network setups use an overlay to + overwrite /etc/network/interfaces or add a networkd + configuration file. comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd" depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD) @@ -468,18 +472,19 @@ config BR2_TARGET_TZ_ZONELIST help Space-separated list of time zones to compile. - The value "default" includes all commonly used time zones. Note - that this set consumes around 5.5M for glibc and 2.1M for uClibc. + The value "default" includes all commonly used time zones. + Note that this set consumes around 5.5M for glibc and 2.1M for + uClibc. - The full list is the list of files in the time zone database source, - not including the build and .tab files. + The full list is the list of files in the time zone database + source, not including the build and .tab files. config BR2_TARGET_LOCALTIME string "default local time" default "Etc/UTC" help - The time zone to install as the default local time, expressed as a - tzdata location, such as: + The time zone to install as the default local time, expressed + as a tzdata location, such as: Etc/UTC (the default) GMT Europe/Paris @@ -506,24 +511,24 @@ config BR2_ROOTFS_OVERLAY root filesystem after the build has finished and before it is packed into the selected filesystem images. - They are copied as-is into the rootfs, excluding files ending with - ~ and .git, .svn and .hg directories. + They are copied as-is into the rootfs, excluding files ending + with ~ and .git, .svn and .hg directories. config BR2_ROOTFS_POST_BUILD_SCRIPT string "Custom scripts to run before creating filesystem images" default "" help - Specify a space-separated list of scripts to be run after the build - has finished and before Buildroot starts packing the files into - selected filesystem images. + Specify a space-separated list of scripts to be run after the + build has finished and before Buildroot starts packing the + files into selected filesystem images. - This gives users the opportunity to do board-specific cleanups, - add-ons and the like, so the generated files can be used directly - without further processing. + This gives users the opportunity to do board-specific + cleanups, add-ons and the like, so the generated files can be + used directly without further processing. - These scripts are called with the target directory name as first - argument. Make sure the exit code of those scripts are 0, otherwise - make will stop after calling them. + These scripts are called with the target directory name as + first argument. Make sure the exit code of those scripts are + 0, otherwise make will stop after calling them. config BR2_ROOTFS_POST_FAKEROOT_SCRIPT string "Custom scripts to run inside the fakeroot environment" @@ -548,8 +553,9 @@ config BR2_ROOTFS_POST_FAKEROOT_SCRIPT to create arbitrary entries statically in /dev - BR2_ROOTFS_DEVICE_TABLE - to set arbitrary permissions as well as extended attributes - (such as capabilities) on files and directories, + to set arbitrary permissions as well as extended + attributes (such as capabilities) on files and + directories, - BR2_ROOTFS_USERS_TABLES: to create arbitrary users and their home directories @@ -581,16 +587,16 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS || BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \ || BR2_ROOTFS_POST_IMAGE_SCRIPT != "" help - Pass these additional arguments to each post-build or post-image - scripts. + Pass these additional arguments to each post-build or + post-image scripts. - Note that all the post-build and post-image scripts will be passed - the same set of arguments, you can not pass different arguments to - each script. + Note that all the post-build and post-image scripts will be + passed the same set of arguments, you can not pass different + arguments to each script. - Note also, as stated in their respective help text, that the first - argument to each post-build or post-image script is the target - directory / images directory. The arguments in this option will be - passed *after* those. + Note also, as stated in their respective help text, that the + first argument to each post-build or post-image script is the + target directory / images directory. The arguments in this + option will be passed *after* those. endmenu From 560ab2cb956e936ead76074c5e8e6f6c0287074a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:15 -0300 Subject: [PATCH 0501/2640] check-package: enable for arch/ and system/ These directories can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from these directories. Signed-off-by: Ricardo Martincoski Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/check-package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/check-package b/utils/check-package index d2457c706c..8d10affabd 100755 --- a/utils/check-package +++ b/utils/check-package @@ -46,7 +46,9 @@ def parse_args(): CONFIG_IN_FILENAME = re.compile("/Config\.\S*$") DO_CHECK_INTREE = re.compile("|".join([ + "arch/", "package/", + "system/", ])) DO_NOT_CHECK_INTREE = re.compile("|".join([ "package/doc-asciidoc\.mk$", From f96b4b9e5716a3ebbcaa239020aabc865603746b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:35 -0300 Subject: [PATCH 0502/2640] boot/*/Config.in: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap/Config.in | 2 +- boot/at91bootstrap3/Config.in | 2 +- boot/at91dataflashboot/Config.in | 2 +- boot/lpc32xxcdl/Config.in | 2 +- boot/mxs-bootlets/Config.in | 8 ++++---- boot/uboot/Config.in | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 57fdeda946..96cfdbc7e9 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_AT91BOOTSTRAP - depends on BR2_arm926t bool "AT91 Bootstrap" + depends on BR2_arm926t help AT91Bootstrap is a first level bootloader for the Atmel AT91 devices. It integrates algorithms for: diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 237deb929c..bdc1e775a8 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_AT91BOOTSTRAP3 - depends on BR2_arm926t || BR2_cortex_a5 bool "AT91 Bootstrap 3" + depends on BR2_arm926t || BR2_cortex_a5 help AT91Bootstrap is a first level bootloader for the Atmel AT91 devices. It integrates algorithms for: diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in index 80b57a4ad0..4055f96410 100644 --- a/boot/at91dataflashboot/Config.in +++ b/boot/at91dataflashboot/Config.in @@ -1,3 +1,3 @@ config BR2_TARGET_AT91DATAFLASHBOOT - depends on BR2_arm926t bool "AT91 DataFlashBoot" + depends on BR2_arm926t diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in index ce7589c35c..97137aa7d4 100644 --- a/boot/lpc32xxcdl/Config.in +++ b/boot/lpc32xxcdl/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_LPC32XXCDL - depends on BR2_arm926t bool "LPC32XX CDL (kickstart and S1L)" + depends on BR2_arm926t if BR2_TARGET_LPC32XXCDL diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index 4bb07a06f5..b3e392afa8 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -24,8 +24,8 @@ config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT endchoice config BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL - depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL string "URL of custom bootlets tarball" + depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL if BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT @@ -43,16 +43,16 @@ choice Select which bootstream to generate config BR2_TARGET_MXS_BOOTLETS_BAREBOX - depends on BR2_TARGET_BAREBOX bool "Barebox Bootloader" + depends on BR2_TARGET_BAREBOX config BR2_TARGET_MXS_BOOTLETS_LINUX - depends on BR2_LINUX_KERNEL bool "Linux Kernel" + depends on BR2_LINUX_KERNEL config BR2_TARGET_MXS_BOOTLETS_UBOOT - depends on BR2_TARGET_UBOOT bool "U-boot bootloader" + depends on BR2_TARGET_UBOOT endchoice diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 264f343767..d96e7f687f 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -199,23 +199,23 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" config BR2_TARGET_UBOOT_FORMAT_KWB - depends on BR2_arm bool "u-boot.kwb (Marvell)" + depends on BR2_arm config BR2_TARGET_UBOOT_FORMAT_LDR - depends on BR2_bfin bool "u-boot.ldr" + depends on BR2_bfin config BR2_TARGET_UBOOT_FORMAT_ELF bool "u-boot.elf" config BR2_TARGET_UBOOT_FORMAT_SB - depends on BR2_arm bool "u-boot.sb (Freescale i.MX28)" + depends on BR2_arm config BR2_TARGET_UBOOT_FORMAT_SD - depends on BR2_arm bool "u-boot.sd (Freescale i.MX28)" + depends on BR2_arm help This is Freescale i.MX28 SB format, with a header for booting from an SD card. @@ -226,8 +226,8 @@ config BR2_TARGET_UBOOT_FORMAT_SD See doc/README.mxs (or doc/README.mx28_common before 2013.07) config BR2_TARGET_UBOOT_FORMAT_NAND - depends on BR2_arm bool "u-boot.nand (Freescale i.MX28)" + depends on BR2_arm help This is Freescale i.MX28 BootStream format (.sb), with a header for booting from a NAND flash. @@ -303,10 +303,10 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME endmenu config BR2_TARGET_UBOOT_OMAP_IFT + bool "produce a .ift signed image (OMAP)" depends on BR2_TARGET_UBOOT_FORMAT_BIN depends on BR2_arm || BR2_armeb select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS - bool "produce a .ift signed image (OMAP)" help Use gpsign to produce an image of u-boot.bin signed with a Configuration Header for booting on OMAP processors. From f65a435e4595f1f6c9a1ff2715d2241d20f9213b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:41 -0300 Subject: [PATCH 0503/2640] boot/*/Config.in: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap/Config.in | 6 +++-- boot/at91bootstrap3/Config.in | 10 ++++---- boot/uboot/Config.in | 43 ++++++++++++++++++----------------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in index 96cfdbc7e9..0f6430fd8d 100644 --- a/boot/at91bootstrap/Config.in +++ b/boot/at91bootstrap/Config.in @@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP help AT91Bootstrap is a first level bootloader for the Atmel AT91 devices. It integrates algorithms for: - - Device initialization such as clock configuration, PIO settings... + - Device initialization such as clock configuration, PIO + settings... - Peripheral drivers such as PIO, PMC or SDRAMC... - - Physical media algorithm such as DataFlash, NandFlash, NOR Flash... + - Physical media algorithm such as DataFlash, NandFlash, NOR + Flash... if BR2_TARGET_AT91BOOTSTRAP diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index bdc1e775a8..614363c9a6 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP3 help AT91Bootstrap is a first level bootloader for the Atmel AT91 devices. It integrates algorithms for: - - Device initialization such as clock configuration, PIO settings... + - Device initialization such as clock configuration, PIO + settings... - Peripheral drivers such as PIO, PMC or SDRAMC... - - Physical media algorithm such as DataFlash, NandFlash, NOR Flash... + - Physical media algorithm such as DataFlash, NandFlash, NOR + Flash... if BR2_TARGET_AT91BOOTSTRAP3 @@ -20,8 +22,8 @@ config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" help - This option allows Buildroot to get the AT91 Bootstrap 3 source - code from a Git repository. + This option allows Buildroot to get the AT91 Bootstrap 3 + source code from a Git repository. endchoice diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d96e7f687f..19cf12a073 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -11,14 +11,14 @@ choice config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY bool "Legacy" help - Select this option if you use an old U-Boot (older than 2015.04), - so that we use the old build system. + Select this option if you use an old U-Boot (older than + 2015.04), so that we use the old build system. config BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG bool "Kconfig" help - Select this option if you use a recent U-Boot version (2015.04 or - newer), so that we use the Kconfig build system. + Select this option if you use a recent U-Boot version (2015.04 + or newer), so that we use the Kconfig build system. endchoice @@ -27,9 +27,9 @@ config BR2_TARGET_UBOOT_BOARDNAME string "U-Boot board name" help One of U-Boot supported boards to be built. - This will be suffixed with _config to meet U-Boot standard naming. - See boards.cfg in U-Boot source code for the list of available - configurations. + This will be suffixed with _config to meet U-Boot standard + naming. See boards.cfg in U-Boot source code for the list of + available configurations. endif choice @@ -79,8 +79,8 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy help - Revision to use in the typical format used by Git/Mercurial/Subversion - E.G. a sha id, a tag, branch, .. + Revision to use in the typical format used by + Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. endif @@ -229,25 +229,25 @@ config BR2_TARGET_UBOOT_FORMAT_NAND bool "u-boot.nand (Freescale i.MX28)" depends on BR2_arm help - This is Freescale i.MX28 BootStream format (.sb), with a header - for booting from a NAND flash. + This is Freescale i.MX28 BootStream format (.sb), with a + header for booting from a NAND flash. U-boot includes an mxsboot tool to generate this format, starting from 2011.12. - There are two possibilities when preparing an image writable to - NAND flash: - 1) The NAND was not written at all yet or the BCB (Boot Control - Blocks) is broken. In this case, the NAND image 'u-boot.nand' - needs to written. + There are two possibilities when preparing an image writable + to NAND flash: + 1) The NAND was not written at all yet or the BCB (Boot + Control Blocks) is broken. In this case, the NAND image + 'u-boot.nand' needs to written. 2) The NAND flash was already written with a good BCB. This applies after 'u-boot.nand' was correctly written. There is no - need to write the BCB again. In this case, the bootloader can be - upgraded by writing 'u-boot.sb'. + need to write the BCB again. In this case, the bootloader can + be upgraded by writing 'u-boot.sb'. To satisfy both cases, the 'u-boot.nand' image obtained from - mxsboot as well as the U-Boot make target 'u-boot.sb' are copied - to the binaries directory. + mxsboot as well as the U-Boot make target 'u-boot.sb' are + copied to the binaries directory. See doc/README.mxs (or doc/README.mx28_common before 2013.07) @@ -295,7 +295,8 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM help In case the U-Boot binary for the target platform is not among - the default names, one or more custom names can be listed here. + the default names, one or more custom names can be listed + here. Use space to separate multiple names. Example: u-boot_magic.bin From 8f2b06f455f23bc6e191a8aa2930756d668aca3e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:19 -0300 Subject: [PATCH 0504/2640] fs/ubi: use namespace for internal variable UBINIZE_CONFIG_FILE_PATH is only used inside this file, so rename it to start with UBI_, following the namespace convention already used by common packages. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/ubi/ubi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk index c78feda5a3..9874e73ff6 100644 --- a/fs/ubi/ubi.mk +++ b/fs/ubi/ubi.mk @@ -15,16 +15,16 @@ UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS)) ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs ifeq ($(BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG),y) -UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE)) +UBI_UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE)) else -UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg +UBI_UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg endif # don't use sed -i as it misbehaves on systems with SELinux enabled when this is # executed through fakeroot (see #9386) define ROOTFS_UBI_CMD sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \ - $(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg + $(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg $(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg endef From 65e37439450808f0a18c4f45dafe4b915c23aa63 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:20 -0300 Subject: [PATCH 0505/2640] fs/*/*.mk: fix code style The header of the initramfs.mk file fits in one line, so rearrange it. Remove consecutive empty line. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/initramfs/initramfs.mk | 3 +-- fs/iso9660/iso9660.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk index b8dee18ec5..c751093214 100644 --- a/fs/initramfs/initramfs.mk +++ b/fs/initramfs/initramfs.mk @@ -1,7 +1,6 @@ ################################################################################ # -# Build a kernel with an integrated initial ramdisk -# filesystem based on cpio. +# Build a kernel with an integrated initial ramdisk filesystem based on cpio. # ################################################################################ diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index b33cf4cd8a..a129655ce3 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -128,7 +128,6 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD endif # ROOTFS_ISO9660_USE_INITRD - define ROOTFS_ISO9660_CMD $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ -no-emul-boot -boot-load-size 4 -boot-info-table \ From 50e64863e17df73668bf265c4a6ee11626f1217d Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:22 -0300 Subject: [PATCH 0506/2640] linux/linux-ext-*.mk: fit file header into one line Make it follow the package coding style by removing redundant info. Signed-off-by: Ricardo Martincoski Cc: Christian Stewart Cc: David Lechner Signed-off-by: Thomas Petazzoni --- linux/linux-ext-aufs.mk | 2 +- linux/linux-ext-ev3dev-linux-drivers.mk | 2 +- linux/linux-ext-fbtft.mk | 2 +- linux/linux-ext-rtai.mk | 2 +- linux/linux-ext-xenomai.mk | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/linux-ext-aufs.mk b/linux/linux-ext-aufs.mk index fb2f3560a7..d4bbb07196 100644 --- a/linux/linux-ext-aufs.mk +++ b/linux/linux-ext-aufs.mk @@ -1,7 +1,7 @@ ################################################################################ -# Linux Aufs extensions # # Patch the linux kernel with aufs extension +# ################################################################################ LINUX_EXTENSIONS += aufs diff --git a/linux/linux-ext-ev3dev-linux-drivers.mk b/linux/linux-ext-ev3dev-linux-drivers.mk index c8afeeb1d5..3bb12db38d 100644 --- a/linux/linux-ext-ev3dev-linux-drivers.mk +++ b/linux/linux-ext-ev3dev-linux-drivers.mk @@ -1,7 +1,7 @@ ################################################################################ -# Linux ev3dev extensions # # Patch the linux kernel with ev3dev extension +# ################################################################################ LINUX_EXTENSIONS += ev3dev-linux-drivers diff --git a/linux/linux-ext-fbtft.mk b/linux/linux-ext-fbtft.mk index 5eb3d944e8..cbc9c58ed3 100644 --- a/linux/linux-ext-fbtft.mk +++ b/linux/linux-ext-fbtft.mk @@ -1,7 +1,7 @@ ################################################################################ -# Linux fbtft extensions # # Patch the linux kernel with fbtft extension +# ################################################################################ LINUX_EXTENSIONS += fbtft diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk index fb483aa80b..46e3dae3a7 100644 --- a/linux/linux-ext-rtai.mk +++ b/linux/linux-ext-rtai.mk @@ -1,7 +1,7 @@ ################################################################################ -# Linux RTAI extensions # # Patch the linux kernel with RTAI extension +# ################################################################################ LINUX_EXTENSIONS += rtai diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk index 76a9786e4d..d066bb32ac 100644 --- a/linux/linux-ext-xenomai.mk +++ b/linux/linux-ext-xenomai.mk @@ -1,7 +1,7 @@ ################################################################################ -# Linux Adeos/Xenomai extensions # -# Patch the linux kernel with xenomai extension +# Patch the linux kernel with Adeos/Xenomai extension +# ################################################################################ LINUX_EXTENSIONS += xenomai From 0b0d93fe7037654f26d760293d9b061e0648c43b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:23 -0300 Subject: [PATCH 0507/2640] linux/linux*.mk: fix code style Use only one space before backslash. Remove consecutive empty line. Indent with tabs. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- linux/linux-ext-rtai.mk | 4 ++-- linux/linux.mk | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk index 46e3dae3a7..50f79f8d50 100644 --- a/linux/linux-ext-rtai.mk +++ b/linux/linux-ext-rtai.mk @@ -20,8 +20,8 @@ endif define RTAI_PREPARE_KERNEL kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \ if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \ - $(APPLY_PATCHES) $(LINUX_DIR) \ - $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \ + $(APPLY_PATCHES) $(LINUX_DIR) \ + $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \ hal-linux-$${kver}-*patch ; \ else \ echo "No RTAI patch for your kernel version" ; \ diff --git a/linux/linux.mk b/linux/linux.mk index cf1cae7cc0..02796d8bb2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -371,11 +371,11 @@ endif # configuration has changed. define LINUX_BUILD_CMDS @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ - cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ + cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ done $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) - @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ + @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ fi $(LINUX_BUILD_DTB) $(LINUX_APPEND_DTB) @@ -405,15 +405,14 @@ endif define LINUX_INSTALL_HOST_TOOLS # Installing dtc (device tree compiler) as host tool, if selected - if grep -q "CONFIG_DTC=y" $(@D)/.config; then \ - $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ; \ - if [ ! -e $(HOST_DIR)/bin/dtc ]; then \ - ln -sf linux-dtc $(HOST_DIR)/bin/dtc ; \ - fi \ + if grep -q "CONFIG_DTC=y" $(@D)/.config; then \ + $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ; \ + if [ ! -e $(HOST_DIR)/bin/dtc ]; then \ + ln -sf linux-dtc $(HOST_DIR)/bin/dtc ; \ + fi \ fi endef - define LINUX_INSTALL_IMAGES_CMDS $(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR)) $(call LINUX_INSTALL_DTB,$(BINARIES_DIR)) @@ -427,10 +426,10 @@ define LINUX_INSTALL_TARGET_CMDS $(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET) # Install modules and remove symbolic links pointing to build # directories, not relevant on the target - @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ + @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \ - rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \ - rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \ + rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \ + rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \ fi $(LINUX_INSTALL_HOST_TOOLS) endef @@ -485,7 +484,7 @@ endif ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:) $(error No kernel device tree source specified, check your \ -BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) + BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif endif # BR_BUILDING From a338f59e16a90a5d82cb22a7008d158352a7a0bc Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:24 -0300 Subject: [PATCH 0508/2640] linux/linux.mk: use namespace for internal variables These three symbols: KERNEL_ARCH_PATH KERNEL_DTBS KERNEL_DTS_NAME are defined and used only inside this file, so use the LINUX_ namespace for them instead of KERNEL_. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 02796d8bb2..7609a15f23 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -125,15 +125,15 @@ endif # going to be installed in the target filesystem. LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` -KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) +LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) # We keep only the .dts files, so that the user can specify both .dts # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) -KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME)) +LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y) LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME)) @@ -155,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y) LINUX_IMAGE_NAME = zImage else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y) -LINUX_IMAGE_NAME = cuImage.$(KERNEL_DTS_NAME) +LINUX_IMAGE_NAME = cuImage.$(LINUX_DTS_NAME) else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y) -LINUX_IMAGE_NAME = simpleImage.$(KERNEL_DTS_NAME) +LINUX_IMAGE_NAME = simpleImage.$(LINUX_DTS_NAME) else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y) LINUX_IMAGE_NAME = Image else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y) @@ -187,11 +187,11 @@ endif # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the # defconfig file. ifeq ($(KERNEL_ARCH),i386) -KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86 +LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 else ifeq ($(KERNEL_ARCH),x86_64) -KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86 +LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 else -KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) +LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) endif ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y) @@ -201,7 +201,7 @@ LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME) else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ_BIN),y) LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME) else -LINUX_IMAGE_PATH = $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME) +LINUX_IMAGE_PATH = $(LINUX_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME) endif # BR2_LINUX_KERNEL_VMLINUX define LINUX_APPLY_LOCAL_PATCHES @@ -323,14 +323,14 @@ endef ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),) define LINUX_BUILD_DTB - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS) + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_DTBS) endef ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),) define LINUX_INSTALL_DTB # dtbs moved from arch//boot to arch//boot/dts since 3.8-rc1 cp $(addprefix \ - $(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \ - $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \ + $(LINUX_ARCH_PATH)/boot/$(if $(wildcard \ + $(addprefix $(LINUX_ARCH_PATH)/boot/dts/,$(LINUX_DTBS))),dts/),$(LINUX_DTBS)) \ $(1) endef endif # BR2_LINUX_KERNEL_APPENDED_DTB @@ -340,8 +340,8 @@ endif # BR2_LINUX_KERNEL_DTS_SUPPORT ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y) # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1 define LINUX_APPEND_DTB - (cd $(KERNEL_ARCH_PATH)/boot; \ - for dtb in $(KERNEL_DTS_NAME); do \ + (cd $(LINUX_ARCH_PATH)/boot; \ + for dtb in $(LINUX_DTS_NAME); do \ if test -e $${dtb}.dtb ; then \ dtbpath=$${dtb}.dtb ; \ else \ @@ -359,10 +359,10 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y) LINUX_APPEND_DTB += ; \ MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\ sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \ - for dtb in $(KERNEL_DTS_NAME); do \ + for dtb in $(LINUX_DTS_NAME); do \ $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \ -T kernel -C none $${MKIMAGE_ARGS} \ - -d $(KERNEL_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \ + -d $(LINUX_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \ done endif endif @@ -371,7 +371,7 @@ endif # configuration has changed. define LINUX_BUILD_CMDS @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ - cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ + cp -f $${dts} $(LINUX_ARCH_PATH)/boot/dts/ ; \ done $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ @@ -386,7 +386,7 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y) # appended DTBs. define LINUX_INSTALL_IMAGE mkdir -p $(1) - cp $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1) + cp $(LINUX_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1) endef else # Otherwise, just install the unique image generated by the kernel @@ -482,7 +482,7 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST endif endif -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:) +ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(LINUX_DTS_NAME)),y:) $(error No kernel device tree source specified, check your \ BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif From 6e3c9ad59e9d0bef54ee84c3255588f861828a98 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:26 -0300 Subject: [PATCH 0509/2640] toolchain: merge toolchain-common.in to Config.in toolchain-common.in is a Config.in file with an uncommon name. It is just included by toolchain/Config.in, and toolchain/Config.in is not that long, so instead of renaming the file, merge it to toolchain/Config.in. Move the raw contents from the file to the exact location it is currently included in order to not change the order in the menu. Update the references in the manual as well. Suggested-by: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.txt | 4 +- toolchain/Config.in | 471 +++++++++++++++++++++- toolchain/toolchain-common.in | 469 --------------------- 3 files changed, 472 insertions(+), 472 deletions(-) delete mode 100644 toolchain/toolchain-common.in diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index c9857a80d3..f5e1e313d5 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -292,13 +292,13 @@ use in the comment. * Kernel headers ** Dependency symbol: +BR2_TOOLCHAIN_HEADERS_AT_LEAST_X_Y+, (replace - +X_Y+ with the proper version, see +toolchain/toolchain-common.in+) + +X_Y+ with the proper version, see +toolchain/Config.in+) ** Comment string: +headers >= X.Y+ and/or `headers <= X.Y` (replace +X.Y+ with the proper version) * GCC version ** Dependency symbol: +BR2_TOOLCHAIN_GCC_AT_LEAST_X_Y+, (replace - +X_Y+ with the proper version, see +toolchain/toolchain-common.in+) + +X_Y+ with the proper version, see +toolchain/Config.in+) ** Comment string: +gcc >= X.Y+ and/or `gcc <= X.Y` (replace +X.Y+ with the proper version) diff --git a/toolchain/Config.in b/toolchain/Config.in index bf1166b601..91035c71d7 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -56,6 +56,475 @@ endchoice source "toolchain/toolchain-buildroot/Config.in" source "toolchain/toolchain-external/Config.in" -source "toolchain/toolchain-common.in" + +# Generic toolchain options + +# we want gdb config in the middle of both source and external +# toolchains, but mconf won't let us source the same file twice, +# so put it here instead +source "package/gdb/Config.in.host" + +comment "Toolchain Generic Options" + +# https://sourceware.org/bugzilla/show_bug.cgi?id=19615 +# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 + bool + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735 +# exception_ptr, nested_exception, and future from libstdc++ are not +# available for architectures not supporting always lock-free atomic +# ints before GCC 7 +config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + bool + default y if BR2_nios2 + default y if BR2_ARM_CPU_ARMV4 + default y if BR2_ARM_CPU_ARMV5 + default y if BR2_sparc_v8 + default y if BR2_m68k_cf5208 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +config BR2_TOOLCHAIN_HAS_NATIVE_RPC + bool + +config BR2_USE_WCHAR + bool + +config BR2_ENABLE_LOCALE + bool + +config BR2_INSTALL_LIBSTDCPP + bool + +config BR2_TOOLCHAIN_HAS_FORTRAN + bool + +config BR2_TOOLCHAIN_HAS_THREADS + bool + +config BR2_TOOLCHAIN_HAS_THREADS_DEBUG + bool + +config BR2_TOOLCHAIN_HAS_THREADS_NPTL + bool + +config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS + bool + +config BR2_TOOLCHAIN_HAS_SSP + bool + +config BR2_TOOLCHAIN_SUPPORTS_PIE + bool + +config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY + bool "Copy gconv libraries" + depends on BR2_TOOLCHAIN_USES_GLIBC + help + The gconv libraries are used to convert between different + character sets (charsets). + + Say 'y' if you need to store and/or display different charsets. + +config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST + string "Gconv libraries to copy" + depends on BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY + help + Set to the list of gconv libraries to copy. + Leave empty to copy all gconv libraries. + + Specify only the basename of the libraries, leave + out the .so extension. Eg.: + IBM850 ISO8859-15 UNICODE + + Note: the full set of gconv libs are ~8MiB (on ARM). + +# This boolean is true if the toolchain provides a built-in full +# featured gettext implementation (glibc), and false if only a stub +# gettext implementation is provided (uclibc, musl) +config BR2_TOOLCHAIN_HAS_FULL_GETTEXT + bool + +config BR2_USE_MMU + bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL + default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY + help + If your target has a MMU, you should say Y here. If you + are unsure, just say Y. + +config BR2_TARGET_OPTIMIZATION + string "Target Optimizations" + default "" + help + Optimizations to use when building for the target host. + NOTE: gcc optimization level is defined in build options. + +config BR2_TARGET_LDFLAGS + string "Target linker options" + help + Extra options to pass to the linker when building for the target. + + Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib') + are not supported. + +config BR2_ECLIPSE_REGISTER + bool "Register toolchain within Eclipse Buildroot plug-in" + help + This options tells Buildroot to generate the necessary + configuration files to make your toolchain appear within + Eclipse, through the Eclipse Buildroot plugin. + +# Options for packages to depend on, if they require at least a +# specific version of the kernel headers. +# Toolchains should choose the adequate option (ie. the highest +# version, not all of them). +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + bool + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + +# This order guarantees that the highest version is set, as kconfig +# stops affecting a value on the first matching default. +config BR2_TOOLCHAIN_HEADERS_AT_LEAST + string + default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 + default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 + default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + default "4.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + default "4.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + default "4.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + default "4.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + default "4.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + default "4.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + default "4.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + default "4.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 + default "4.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + default "4.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + default "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + default "3.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + default "3.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + default "3.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + default "3.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 + default "3.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + default "3.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 + default "3.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + default "3.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + default "3.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 + default "3.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + default "3.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + default "3.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + default "3.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + default "3.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 + default "3.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + default "2.6" + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 + bool + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_5 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_6 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + +config BR2_TOOLCHAIN_GCC_AT_LEAST_7 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + +# This order guarantees that the highest version is set, as kconfig +# stops affecting a value on the first matching default. +config BR2_TOOLCHAIN_GCC_AT_LEAST + string + default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 + default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 + default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5 + default "4.9" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + default "4.8" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + default "4.7" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + default "4.6" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + default "4.5" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + default "4.4" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + default "4.3" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 + +config BR2_TOOLCHAIN_HAS_MNAN_OPTION + bool + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_TOOLCHAIN_HAS_SYNC_1 + bool + default y + depends on !BR2_bfin + depends on !BR2_m68k_cf + depends on !BR2_microblaze + depends on !BR2_sparc + depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) + +config BR2_TOOLCHAIN_HAS_SYNC_2 + bool + default y if BR2_TOOLCHAIN_HAS_SYNC_1 + +config BR2_TOOLCHAIN_HAS_SYNC_4 + bool + default y + depends on !BR2_m68k_cf + depends on !BR2_sparc + depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) + +# The availability of __sync for 8-byte types on ARM is somewhat +# complicated: +# +# - It appeared in gcc starting with gcc 4.7. +# +# - On ARMv7, there is no problem, it can be directly implemented in +# userspace. +# +# - On < ARMv7, it requires help from the kernel. Unfortunately, the +# libgcc code implementing 8-byte __sync with the help from the +# kernel calls __write() when a failure occurs, which is a function +# internal to glibc, not available in uClibc and musl. This means +# that the 8-byte __sync operations are not available on < ARMv7 +# with uClibc and musl. This problem was fixed as part of gcc +# PR68059, which was backported to the gcc 5 branch, but isn't yet +# part of any gcc 5.x release. +# +config BR2_TOOLCHAIN_ARM_HAS_SYNC_8 + bool + default y + depends on BR2_arm || BR2_armeb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_ARM_CPU_ARMV7A + +# 8-byte intrinsics available on most x86 CPUs, except a few old ones +config BR2_TOOLCHAIN_X86_HAS_SYNC_8 + bool + default y + depends on BR2_i386 + depends on !BR2_x86_i486 + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 + +# 8-byte intrinsics available: +# - On all 64 bits architecture +# - On a certain combinations of ARM platforms +# - On certain x86 32 bits CPUs +config BR2_TOOLCHAIN_HAS_SYNC_8 + bool + default y if BR2_ARCH_IS_64 + default y if BR2_TOOLCHAIN_ARM_HAS_SYNC_8 + default y if BR2_TOOLCHAIN_X86_HAS_SYNC_8 + +# libatomic is available since gcc 4.8, when thread support is +# enabled. Also, libatomic doesn't recognize "uclinux" as a valid OS +# part of the tuple, and is therefore not build on uclinux targets, +# which is why BR2_BINFMT_FLAT configurations are excluded. +config BR2_TOOLCHAIN_HAS_LIBATOMIC + bool + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ + BR2_TOOLCHAIN_HAS_THREADS && \ + !BR2_BINFMT_FLAT + +# __atomic intrinsics are available: +# - with gcc 4.8, either through built-ins or libatomic, on all +# architectures. Since we don't want to separate the cases where +# libatomic is needed vs. not needed, we simplify thing and only +# support situations where libatomic is available, even if on some +# architectures libatomic is not strictly needed as all __atomic +# intrinsics might be built-in. The only case where libatomic is +# missing entirely is when the toolchain does not have support for +# threads. However, a package that does not need threads but still +# uses atomics is quite a corner case, which does not warrant the +# added complexity. +# - with gcc 4.7, libatomic did not exist, so only built-ins are +# available. This means that __atomic can only be used in a subset +# of the architectures +config BR2_TOOLCHAIN_HAS_ATOMIC + bool + default y if BR2_TOOLCHAIN_HAS_LIBATOMIC + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_arm + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_armeb + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_xtensa + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_ARCH_IS_64 + +# - libquadmath is not needed/available on all architectures (but gcc +# correctly handles this already). +# - At least, libquadmath is available on: +# - i*86 +# - x86_64 +# - When available, libquadmath requires wchar support. +config BR2_TOOLCHAIN_HAS_LIBQUADMATH + bool + default y if BR2_i386 || BR2_x86_64 endmenu diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in deleted file mode 100644 index 8941e0f3cd..0000000000 --- a/toolchain/toolchain-common.in +++ /dev/null @@ -1,469 +0,0 @@ -# Generic toolchain options - -# we want gdb config in the middle of both source and external -# toolchains, but mconf won't let us source the same file twice, -# so put it here instead -source "package/gdb/Config.in.host" - -comment "Toolchain Generic Options" - -# https://sourceware.org/bugzilla/show_bug.cgi?id=19615 -# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 - bool - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735 -# exception_ptr, nested_exception, and future from libstdc++ are not -# available for architectures not supporting always lock-free atomic -# ints before GCC 7 -config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - bool - default y if BR2_nios2 - default y if BR2_ARM_CPU_ARMV4 - default y if BR2_ARM_CPU_ARMV5 - default y if BR2_sparc_v8 - default y if BR2_m68k_cf5208 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 - -config BR2_TOOLCHAIN_HAS_NATIVE_RPC - bool - -config BR2_USE_WCHAR - bool - -config BR2_ENABLE_LOCALE - bool - -config BR2_INSTALL_LIBSTDCPP - bool - -config BR2_TOOLCHAIN_HAS_FORTRAN - bool - -config BR2_TOOLCHAIN_HAS_THREADS - bool - -config BR2_TOOLCHAIN_HAS_THREADS_DEBUG - bool - -config BR2_TOOLCHAIN_HAS_THREADS_NPTL - bool - -config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS - bool - -config BR2_TOOLCHAIN_HAS_SSP - bool - -config BR2_TOOLCHAIN_SUPPORTS_PIE - bool - -config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY - bool "Copy gconv libraries" - depends on BR2_TOOLCHAIN_USES_GLIBC - help - The gconv libraries are used to convert between different - character sets (charsets). - - Say 'y' if you need to store and/or display different charsets. - -config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST - string "Gconv libraries to copy" - depends on BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY - help - Set to the list of gconv libraries to copy. - Leave empty to copy all gconv libraries. - - Specify only the basename of the libraries, leave - out the .so extension. Eg.: - IBM850 ISO8859-15 UNICODE - - Note: the full set of gconv libs are ~8MiB (on ARM). - -# This boolean is true if the toolchain provides a built-in full -# featured gettext implementation (glibc), and false if only a stub -# gettext implementation is provided (uclibc, musl) -config BR2_TOOLCHAIN_HAS_FULL_GETTEXT - bool - -config BR2_USE_MMU - bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL - default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY - help - If your target has a MMU, you should say Y here. If you - are unsure, just say Y. - -config BR2_TARGET_OPTIMIZATION - string "Target Optimizations" - default "" - help - Optimizations to use when building for the target host. - NOTE: gcc optimization level is defined in build options. - -config BR2_TARGET_LDFLAGS - string "Target linker options" - help - Extra options to pass to the linker when building for the target. - - Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib') - are not supported. - -config BR2_ECLIPSE_REGISTER - bool "Register toolchain within Eclipse Buildroot plug-in" - help - This options tells Buildroot to generate the necessary - configuration files to make your toolchain appear within - Eclipse, through the Eclipse Buildroot plugin. - -# Options for packages to depend on, if they require at least a -# specific version of the kernel headers. -# Toolchains should choose the adequate option (ie. the highest -# version, not all of them). -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - bool - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 - -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 - -# This order guarantees that the highest version is set, as kconfig -# stops affecting a value on the first matching default. -config BR2_TOOLCHAIN_HEADERS_AT_LEAST - string - default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 - default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 - default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 - default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 - default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 - default "4.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - default "4.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 - default "4.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - default "4.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - default "4.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 - default "4.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - default "4.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 - default "4.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - default "4.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 - default "4.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 - default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - default "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - default "3.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - default "3.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - default "3.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - default "3.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 - default "3.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - default "3.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - default "3.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 - default "3.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - default "3.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 - default "3.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - default "3.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - default "3.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - default "3.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - default "3.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - default "3.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - default "2.6" - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - bool - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_5 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_6 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -config BR2_TOOLCHAIN_GCC_AT_LEAST_7 - bool - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -# This order guarantees that the highest version is set, as kconfig -# stops affecting a value on the first matching default. -config BR2_TOOLCHAIN_GCC_AT_LEAST - string - default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 - default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 - default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5 - default "4.9" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - default "4.8" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - default "4.7" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - default "4.6" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - default "4.5" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - default "4.4" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 - default "4.3" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - -config BR2_TOOLCHAIN_HAS_MNAN_OPTION - bool - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_TOOLCHAIN_HAS_SYNC_1 - bool - default y - depends on !BR2_bfin - depends on !BR2_m68k_cf - depends on !BR2_microblaze - depends on !BR2_sparc - depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) - -config BR2_TOOLCHAIN_HAS_SYNC_2 - bool - default y if BR2_TOOLCHAIN_HAS_SYNC_1 - -config BR2_TOOLCHAIN_HAS_SYNC_4 - bool - default y - depends on !BR2_m68k_cf - depends on !BR2_sparc - depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT) - -# The availability of __sync for 8-byte types on ARM is somewhat -# complicated: -# -# - It appeared in gcc starting with gcc 4.7. -# -# - On ARMv7, there is no problem, it can be directly implemented in -# userspace. -# -# - On < ARMv7, it requires help from the kernel. Unfortunately, the -# libgcc code implementing 8-byte __sync with the help from the -# kernel calls __write() when a failure occurs, which is a function -# internal to glibc, not available in uClibc and musl. This means -# that the 8-byte __sync operations are not available on < ARMv7 -# with uClibc and musl. This problem was fixed as part of gcc -# PR68059, which was backported to the gcc 5 branch, but isn't yet -# part of any gcc 5.x release. -# -config BR2_TOOLCHAIN_ARM_HAS_SYNC_8 - bool - default y - depends on BR2_arm || BR2_armeb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_ARM_CPU_ARMV7A - -# 8-byte intrinsics available on most x86 CPUs, except a few old ones -config BR2_TOOLCHAIN_X86_HAS_SYNC_8 - bool - default y - depends on BR2_i386 - depends on !BR2_x86_i486 - depends on !BR2_x86_c3 - depends on !BR2_x86_winchip_c6 - depends on !BR2_x86_winchip2 - -# 8-byte intrinsics available: -# - On all 64 bits architecture -# - On a certain combinations of ARM platforms -# - On certain x86 32 bits CPUs -config BR2_TOOLCHAIN_HAS_SYNC_8 - bool - default y if BR2_ARCH_IS_64 - default y if BR2_TOOLCHAIN_ARM_HAS_SYNC_8 - default y if BR2_TOOLCHAIN_X86_HAS_SYNC_8 - -# libatomic is available since gcc 4.8, when thread support is -# enabled. Also, libatomic doesn't recognize "uclinux" as a valid OS -# part of the tuple, and is therefore not build on uclinux targets, -# which is why BR2_BINFMT_FLAT configurations are excluded. -config BR2_TOOLCHAIN_HAS_LIBATOMIC - bool - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ - BR2_TOOLCHAIN_HAS_THREADS && \ - !BR2_BINFMT_FLAT - -# __atomic intrinsics are available: -# - with gcc 4.8, either through built-ins or libatomic, on all -# architectures. Since we don't want to separate the cases where -# libatomic is needed vs. not needed, we simplify thing and only -# support situations where libatomic is available, even if on some -# architectures libatomic is not strictly needed as all __atomic -# intrinsics might be built-in. The only case where libatomic is -# missing entirely is when the toolchain does not have support for -# threads. However, a package that does not need threads but still -# uses atomics is quite a corner case, which does not warrant the -# added complexity. -# - with gcc 4.7, libatomic did not exist, so only built-ins are -# available. This means that __atomic can only be used in a subset -# of the architectures -config BR2_TOOLCHAIN_HAS_ATOMIC - bool - default y if BR2_TOOLCHAIN_HAS_LIBATOMIC - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_arm - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_armeb - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_xtensa - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_ARCH_IS_64 - -# - libquadmath is not needed/available on all architectures (but gcc -# correctly handles this already). -# - At least, libquadmath is available on: -# - i*86 -# - x86_64 -# - When available, libquadmath requires wchar support. -config BR2_TOOLCHAIN_HAS_LIBQUADMATH - bool - default y if BR2_i386 || BR2_x86_64 From b17e5b2d580cb09d057e33bf612a24dfe9582f43 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:27 -0300 Subject: [PATCH 0510/2640] toolchain/wrapper: fix code style The header of the .mk file fits in one line, so rearrange it to be similar to a header from a package. Signed-off-by: Ricardo Martincoski Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 7f72a0cade..0b26037d48 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -1,4 +1,8 @@ -# This file contains the definition of the toolchain wrapper build commands +################################################################################ +# +# definition of the toolchain wrapper build commands +# +################################################################################ # We use --hash-style=both to increase the compatibility of the generated # binary with older platforms, except for MIPS, where the only acceptable From d0837c0a149c53aa49eca6d9efc29b0214457d74 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:28 -0300 Subject: [PATCH 0511/2640] toolchain/toolchain.mk: fix code style Rearrange the header of the .mk file so it becomes similar to a header from a package. It doesn't fit in one line, so split the details to a comment below the header. GCONV_LIBS is only used inside this file, so rename it to start with TOOLCHAIN_, following the namespace convention already used by packages. Rename the hook COPY_GCONV_LIBS to TOOLCHAIN_GLIBC_COPY_GCONV_LIBS following the convention used for hooks in packages. Signed-off-by: Ricardo Martincoski Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- toolchain/toolchain.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk index 59fc905caf..e7451e2643 100644 --- a/toolchain/toolchain.mk +++ b/toolchain/toolchain.mk @@ -1,7 +1,11 @@ -# This file contains toolchain-related customisation of the content -# of the target/ directory. Those customisations are added to the -# TARGET_FINALIZE_HOOKS, to be applied just after all packages -# have been built. +################################################################################ +# +# toolchain-related customisation of the content of the target/ directory +# +################################################################################ + +# Those customisations are added to the TARGET_FINALIZE_HOOKS, to be applied +# just after all packages have been built. # Install default nsswitch.conf file if the skeleton doesn't provide it ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) @@ -15,8 +19,8 @@ endif # Install the gconv modules ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y) -GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST)) -define COPY_GCONV_LIBS +TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST)) +define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS $(Q)found_gconv=no; \ for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \ [ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \ @@ -27,14 +31,14 @@ define COPY_GCONV_LIBS printf "Unable to find gconv modules\n" >&2; \ exit 1; \ fi; \ - if [ -z "$(GCONV_LIBS)" ]; then \ + if [ -z "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" ]; then \ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \ $(TARGET_DIR)/usr/lib/gconv/gconv-modules && \ $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \ $(TARGET_DIR)/usr/lib/gconv \ || exit 1; \ else \ - for l in $(GCONV_LIBS); do \ + for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \ $(TARGET_DIR)/usr/lib/gconv/$${l}.so \ || exit 1; \ @@ -47,10 +51,10 @@ define COPY_GCONV_LIBS || exit 1; \ done; \ done; \ - ./support/scripts/expunge-gconv-modules "$(GCONV_LIBS)" \ + ./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \ <$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \ >$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \ fi endef -TOOLCHAIN_TARGET_FINALIZE_HOOKS += COPY_GCONV_LIBS +TOOLCHAIN_TARGET_FINALIZE_HOOKS += TOOLCHAIN_GLIBC_COPY_GCONV_LIBS endif From 9b6b4e36b4d73d7ca0e5fff43b718250cb5a9993 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:32 -0300 Subject: [PATCH 0512/2640] */Config.in*: remove consecutive empty lines Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Config.in | 1 - Config.in.legacy | 1 - arch/Config.in.mips | 1 - boot/barebox/barebox/Config.in | 1 - boot/syslinux/Config.in | 1 - fs/jffs2/Config.in | 1 - 6 files changed, 6 deletions(-) diff --git a/Config.in b/Config.in index a74b24ae45..852c61ef3a 100644 --- a/Config.in +++ b/Config.in @@ -620,7 +620,6 @@ config BR2_SHARED_STATIC_LIBS endchoice - config BR2_PACKAGE_OVERRIDE_FILE string "location of a package override file" default "$(CONFIG_DIR)/local.mk" diff --git a/Config.in.legacy b/Config.in.legacy index 60f9148234..b1dca97e5e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1164,7 +1164,6 @@ config BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL version provided in buildroot. And both can't coexist. It now uses OpenSSL as the only option. - config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE bool "nginx http spdy module removed" select BR2_LEGACY diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 8bb8d126e6..e45299f818 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -115,7 +115,6 @@ config BR2_mips_p6600 select BR2_MIPS_CPU_MIPS64R6 endchoice - choice prompt "Target ABI" default BR2_MIPS_NABI32 diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 0be26adf93..958e294e40 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -17,7 +17,6 @@ config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG Name of the board for which Barebox should be built, without the _defconfig suffix. - config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE string "Configuration file path" depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in index da035498de..e969d53fd0 100644 --- a/boot/syslinux/Config.in +++ b/boot/syslinux/Config.in @@ -48,7 +48,6 @@ config BR2_TARGET_SYSLINUX_EFI help Install the 'efi' image, to boot from an EFI environment. - if BR2_TARGET_SYSLINUX_LEGACY_BIOS config BR2_TARGET_SYSLINUX_C32 diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in index 1010216bd1..f1703f4edd 100644 --- a/fs/jffs2/Config.in +++ b/fs/jffs2/Config.in @@ -98,7 +98,6 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE the flash memory page size. Using this option is only needed if Linux is configured to use a page size different than 4kB. - config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE hex "Virtual memory page size" depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE From 79936be11a4ad7f8939a5b8dbe7ef258da7afe1c Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:17 -0300 Subject: [PATCH 0513/2640] check-package: enable for boot/ This directory can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from the boot/ directory. Ignore boot/barebox/barebox.mk as it declares a package infra and not a package itself. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- utils/check-package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/check-package b/utils/check-package index 8d10affabd..48ce956443 100755 --- a/utils/check-package +++ b/utils/check-package @@ -47,10 +47,12 @@ def parse_args(): CONFIG_IN_FILENAME = re.compile("/Config\.\S*$") DO_CHECK_INTREE = re.compile("|".join([ "arch/", + "boot/", "package/", "system/", ])) DO_NOT_CHECK_INTREE = re.compile("|".join([ + "boot/barebox/barebox\.mk$", "package/doc-asciidoc\.mk$", "package/pkg-\S*\.mk$", ])) From b205420e6ad1f773d8444c4c279ab38fca0012e9 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:36 -0300 Subject: [PATCH 0514/2640] fs/*/Config.in: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/jffs2/Config.in | 6 +++--- fs/tar/Config.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in index f1703f4edd..208cabaa52 100644 --- a/fs/jffs2/Config.in +++ b/fs/jffs2/Config.in @@ -38,8 +38,8 @@ endchoice config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE hex "Erase block size" - depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM default 0x20000 + depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM help Set to erase size of memory @@ -68,8 +68,8 @@ config BR2_TARGET_ROOTFS_JFFS2_PAD config BR2_TARGET_ROOTFS_JFFS2_PADSIZE hex "Pad output size (0x0 = to end of EB)" - depends on BR2_TARGET_ROOTFS_JFFS2_PAD default 0x0 + depends on BR2_TARGET_ROOTFS_JFFS2_PAD help Set to 0x0 to pad to end of erase block. @@ -100,8 +100,8 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE hex "Virtual memory page size" - depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE default 0x1000 + depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE help Set to virtual memory page size of target system (in bytes). This value should match the virtual page size in Linux (i.e. this should have the diff --git a/fs/tar/Config.in b/fs/tar/Config.in index 2116edf143..a4e375c68b 100644 --- a/fs/tar/Config.in +++ b/fs/tar/Config.in @@ -50,8 +50,8 @@ endchoice config BR2_TARGET_ROOTFS_TAR_OPTIONS string "other random options to pass to tar" - depends on BR2_TARGET_ROOTFS_TAR default "" + depends on BR2_TARGET_ROOTFS_TAR help Any other flags you want to pass to tar Refer to tar --help for details From 4a417b75091ac3d6136bc942ab54003c5299671d Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:42 -0300 Subject: [PATCH 0515/2640] fs/*/Config.in: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/cpio/Config.in | 6 +++--- fs/ext2/Config.in | 22 ++++++++++++---------- fs/initramfs/Config.in | 3 ++- fs/jffs2/Config.in | 16 +++++++++------- fs/ubi/Config.in | 11 ++++++----- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index 679959d222..83a7fa5824 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -1,9 +1,9 @@ config BR2_TARGET_ROOTFS_CPIO bool "cpio the root filesystem (for use as an initial RAM filesystem)" help - Build a cpio archive of the root filesystem. This is typically - used for an initial RAM filesystem that is passed to the kernel - by the bootloader. + Build a cpio archive of the root filesystem. This is typically + used for an initial RAM filesystem that is passed to the + kernel by the bootloader. if BR2_TARGET_ROOTFS_CPIO diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 27ad69fde9..74bacc1141 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -49,11 +49,11 @@ config BR2_TARGET_ROOTFS_EXT2_SIZE default BR2_TARGET_ROOTFS_EXT2_BLOCKS if BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP # legacy 2017.08 default "60M" help - The size of the filesystem image. If it does not have a suffix, - it is interpreted as power-of-two kilobytes. If it is suffixed - by 'k', 'm', 'g', 't' (either upper-case or lower-case), then - it is interpreted in power-of-two kilobytes, megabytes, - gigabytes, terabytes, etc. + The size of the filesystem image. If it does not have a + suffix, it is interpreted as power-of-two kilobytes. If it is + suffixed by 'k', 'm', 'g', 't' (either upper-case or + lower-case), then it is interpreted in power-of-two kilobytes, + megabytes, gigabytes, terabytes, etc. config BR2_TARGET_ROOTFS_EXT2_INODES int "exact number of inodes (leave at 0 for auto calculation)" @@ -65,15 +65,16 @@ config BR2_TARGET_ROOTFS_EXT2_RESBLKS help The number of blocks on the filesystem (as a percentage of the total number of blocks), that are reserved for use by root. - Traditionally, this has been 5%, and all ext-related tools still - default to reserving 5% when creating a new ext filesystem. + Traditionally, this has been 5%, and all ext-related tools + still default to reserving 5% when creating a new ext + filesystem. config BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS string "additional mke2fs options" default "-O ^64bit" help - Specify a space-separated list of mke2fs options, including any - ext2/3/4 filesystem features. + Specify a space-separated list of mke2fs options, including + any ext2/3/4 filesystem features. For more information about the mke2fs options, see the manual page mke2fs(8). @@ -91,7 +92,8 @@ choice prompt "Compression method" default BR2_TARGET_ROOTFS_EXT2_NONE help - Select compressor for ext2/3/4 filesystem of the root filesystem + Select compressor for ext2/3/4 filesystem of the root + filesystem config BR2_TARGET_ROOTFS_EXT2_NONE bool "no compression" diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in index 8ed9f7ebb5..9d5a3f92e6 100644 --- a/fs/initramfs/Config.in +++ b/fs/initramfs/Config.in @@ -10,7 +10,8 @@ config BR2_TARGET_ROOTFS_INITRAMFS A rootfs.cpio file will be generated in the images/ directory. This is the archive that will be included in the kernel image. The default rootfs compression set in the kernel configuration - is used, regardless of how buildroot's cpio archive is configured. + is used, regardless of how buildroot's cpio archive is + configured. Note that enabling initramfs together with another filesystem formats doesn't make sense: you would end up having two diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in index 208cabaa52..44c0b10446 100644 --- a/fs/jffs2/Config.in +++ b/fs/jffs2/Config.in @@ -94,18 +94,20 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE bool "Select custom virtual memory page size" help - Use a custom virtual memory page size. Note that this is not related to - the flash memory page size. Using this option is only needed if Linux is - configured to use a page size different than 4kB. + Use a custom virtual memory page size. Note that this is not + related to the flash memory page size. Using this option is + only needed if Linux is configured to use a page size + different than 4kB. config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE hex "Virtual memory page size" default 0x1000 depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE help - Set to virtual memory page size of target system (in bytes). This value - should match the virtual page size in Linux (i.e. this should have the - same value as the value of the PAGE_SIZE macro in Linux). It is not - related to the flash memory page size. + Set to virtual memory page size of target system (in bytes). + This value should match the virtual page size in Linux (i.e. + this should have the same value as the value of the PAGE_SIZE + macro in Linux). It is not related to the flash memory page + size. endif diff --git a/fs/ubi/Config.in b/fs/ubi/Config.in index 5fa2f1f61d..85b1c56bb0 100644 --- a/fs/ubi/Config.in +++ b/fs/ubi/Config.in @@ -18,8 +18,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE int "sub-page size" default 512 help - Tells ubinize that the flash supports sub-pages and the sub-page - size. Use 0 if sub-pages are not supported on flash chip. + Tells ubinize that the flash supports sub-pages and the + sub-page size. Use 0 if sub-pages are not supported on flash + chip. The value provided here is passed to the -s/--sub-page-size option of ubinize. @@ -28,9 +29,9 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG help Select this option to use a custom ubinize configuration file, rather than the default configuration used by Buildroot (which - defines a single dynamic volume marked as auto-resize). Passing - a custom ubinize configuration file allows you to create several - volumes, specify volume types, etc. + defines a single dynamic volume marked as auto-resize). + Passing a custom ubinize configuration file allows you to + create several volumes, specify volume types, etc. As a convenience, buildroot replaces the string "BR2_ROOTFS_UBIFS_PATH" with the path to the built ubifs file. From 0c8367363821c2417443082f076198f02afcdb4e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:21 -0300 Subject: [PATCH 0516/2640] check-package: enable for fs/ The filesystem types can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from the fs/ directory. Ignore fs/common.mk as it declares a package infra and not a package itself. Register the ROOTFS_ as a valid prefix for variables. Ignore these symbols: - PACKAGES_PERMISSIONS_TABLE: defined either by packages through pkg-generic or by filesystem types, used by fs/common.mk; - SUMTOOL: defined by package mtd, used by filesystem jffs2; - TARGETS_ROOTFS: defined by filesystem types, used in the main Makefile. Keep using loose checks that warn about common mistakes while keep the code simple. As a consequence the check functions do not differentiate between packages and filesystems so the symbol PACKAGE_UBI would not generate a warning for the ubi filesystem neither the symbol ROOTFS_MTD would generate a warning for the mtd package. But those kind of mistakes are not common and are obvious in the code review, unlike typos i.e. ROOTFS_UBl or PACKAGE_MID that would be hard to see in the code review. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/check-package | 2 ++ utils/checkpackagelib/lib_mk.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 48ce956443..4c9eea0534 100755 --- a/utils/check-package +++ b/utils/check-package @@ -48,11 +48,13 @@ CONFIG_IN_FILENAME = re.compile("/Config\.\S*$") DO_CHECK_INTREE = re.compile("|".join([ "arch/", "boot/", + "fs/", "package/", "system/", ])) DO_NOT_CHECK_INTREE = re.compile("|".join([ "boot/barebox/barebox\.mk$", + "fs/common\.mk$", "package/doc-asciidoc\.mk$", "package/pkg-\S*\.mk$", ])) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index cfd4d05117..58de4fd3cb 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -165,8 +165,11 @@ class TypoInPackageVariable(_CheckFunction): "LUA_RUN", "MKFS_JFFS2", "MKIMAGE_ARCH", + "PACKAGES_PERMISSIONS_TABLE", "PKG_CONFIG_HOST_BINARY", + "SUMTOOL", "TARGET_FINALIZE_HOOKS", + "TARGETS_ROOTFS", "XTENSA_CORE_NAME"])) PACKAGE_NAME = re.compile("/([^/]+)\.mk") VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=") @@ -177,7 +180,7 @@ class TypoInPackageVariable(_CheckFunction): # linux tools do not use LINUX_TOOL_ prefix for variables package = package.replace("LINUX_TOOL_", "") self.package = package - self.REGEX = re.compile("^(HOST_)?({}_[A-Z0-9_]+)".format(package)) + self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) self.FIND_VIRTUAL = re.compile( "^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package)) self.virtual = [] From 4b95cf8dd413c6773b2aadc30157ad00e2fc7d94 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:43 -0300 Subject: [PATCH 0517/2640] linux/Config.*: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- linux/Config.ext.in | 15 +++++++++------ linux/Config.in | 43 +++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 011dffb0b1..acc8a04742 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -117,14 +117,17 @@ config BR2_LINUX_KERNEL_EXT_AUFS_VERSION string "aufs-standalone version" default "" help - The version you choose must match that of your kernel. Usually, - the sha1 of the cset you want to use; avoid using a branch name - as this yields non-reproducible builds. + The version you choose must match that of your kernel. + Usually, the sha1 of the cset you want to use; avoid using a + branch name as this yields non-reproducible builds. - See the following resources to see what versions are available: + See the following resources to see what versions are + available: - For aufs3.x: https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/ - For aufs4.x: https://github.com/sfjro/aufs4-standalone/branches/all + For aufs3.x: + https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/ + For aufs4.x: + https://github.com/sfjro/aufs4-standalone/branches/all endif # aufs diff --git a/linux/Config.in b/linux/Config.in index 934142c535..d9c5b62863 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -61,13 +61,13 @@ config BR2_LINUX_KERNEL_CUSTOM_VERSION config BR2_LINUX_KERNEL_CUSTOM_TARBALL bool "Custom tarball" help - This option allows to specify a URL pointing to a kernel source - tarball. This URL can use any protocol recognized by Buildroot, - like http://, ftp://, file:// or scp://. + This option allows to specify a URL pointing to a kernel + source tarball. This URL can use any protocol recognized by + Buildroot, like http://, ftp://, file:// or scp://. - When pointing to a local tarball using file://, you may want to - use a make variable like $(TOPDIR) to reference the root of the - Buildroot tree. + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. config BR2_LINUX_KERNEL_CUSTOM_GIT bool "Custom Git repository" @@ -109,8 +109,8 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \ if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != "" # legacy help - Revision to use in the typical format used by Git/Mercurial/Subversion - E.G. a sha id, a tag, branch, .. + Revision to use in the typical format used by + Git/Mercurial/Subversion E.G. a sha id, a tag, branch, .. endif @@ -175,7 +175,8 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE Path to the kernel configuration file Note: this can be a defconfig file or a complete .config file, - which can later be saved back with make linux-update-(def)config. + which can later be saved back with make + linux-update-(def)config. config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES string "Additional configuration fragment files" @@ -284,9 +285,9 @@ endchoice choice prompt "Kernel compression format" help - This selection will just ensure that the correct host tools are built. - The actual compression for the kernel should be selected in the - kernel configuration menu. + This selection will just ensure that the correct host tools + are built. The actual compression for the kernel should be + selected in the kernel configuration menu. config BR2_LINUX_KERNEL_GZIP bool "gzip compression" @@ -317,8 +318,9 @@ config BR2_LINUX_KERNEL_IMAGE_NAME depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM help The filename of the kernel image, if it is different from the - make target (above). Only Xtensa uses a filename different from - the make target. Defaults to BR2_LINUX_KERNEL_IMAGE_TARGET_NAME. + make target (above). Only Xtensa uses a filename different + from the make target. Defaults to + BR2_LINUX_KERNEL_IMAGE_TARGET_NAME. If unsure, leave it empty. @@ -327,18 +329,19 @@ config BR2_LINUX_KERNEL_UIMAGE_LOADADDR depends on BR2_arm || BR2_armeb depends on BR2_LINUX_KERNEL_UIMAGE || BR2_LINUX_KERNEL_APPENDED_UIMAGE help - If your ARM system's Linux kernel is configured with the new (3.7+) - multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y in your - kernel config), then it is necessary to specify a kernel load address - when building the uImage. This should be a hexadecimal string - beginning with 0x, for example: 0x00008000. + If your ARM system's Linux kernel is configured with the new + (3.7+) multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y + in your kernel config), then it is necessary to specify a + kernel load address when building the uImage. This should be a + hexadecimal string beginning with 0x, for example: 0x00008000. If unsure, let this option empty. config BR2_LINUX_KERNEL_DTS_SUPPORT bool "Build a Device Tree Blob (DTB)" help - Compile one or more device tree sources into device tree blobs. + Compile one or more device tree sources into device tree + blobs. Select the dts files to compile in the options below. if BR2_LINUX_KERNEL_DTS_SUPPORT From 4d39f5876deac7c8406db69585e0dd69e85222c3 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:25 -0300 Subject: [PATCH 0518/2640] check-package: enable for linux/ This directory can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from the linux/ directory. Ignore missing LINUX_EXT_ prefix as the variables for linux extensions do not use it. Ignore this symbol: - LINUX_EXTENSIONS: defined by each linux extension, used by linux/linux.mk. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- utils/check-package | 1 + utils/checkpackagelib/lib_mk.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/utils/check-package b/utils/check-package index 4c9eea0534..a5f5dc44c0 100755 --- a/utils/check-package +++ b/utils/check-package @@ -49,6 +49,7 @@ DO_CHECK_INTREE = re.compile("|".join([ "arch/", "boot/", "fs/", + "linux/", "package/", "system/", ])) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 58de4fd3cb..9989556e95 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -160,6 +160,7 @@ class TypoInPackageVariable(_CheckFunction): "ACLOCAL_HOST_DIR", "BR_CCACHE_INITIAL_SETUP", "BR_NO_CHECK_HASH_FOR", + "LINUX_EXTENSIONS", "LINUX_POST_PATCH_HOOKS", "LINUX_TOOLS", "LUA_RUN", @@ -179,6 +180,8 @@ class TypoInPackageVariable(_CheckFunction): package = package.replace("-", "_").upper() # linux tools do not use LINUX_TOOL_ prefix for variables package = package.replace("LINUX_TOOL_", "") + # linux extensions do not use LINUX_EXT_ prefix for variables + package = package.replace("LINUX_EXT_", "") self.package = package self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package)) self.FIND_VIRTUAL = re.compile( From 7a63dcb19bcf186a959ccfc1205040548fbcb0b5 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:38 -0300 Subject: [PATCH 0519/2640] toolchain/*/Config.in: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 2 +- toolchain/toolchain-buildroot/Config.in | 2 +- .../toolchain-external-custom/Config.in.options | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 91035c71d7..212fbbd300 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -42,8 +42,8 @@ choice config BR2_TOOLCHAIN_BUILDROOT bool "Buildroot toolchain" - select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS depends on BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT + select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS config BR2_TOOLCHAIN_EXTERNAL bool "External toolchain" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 9668f8d41a..0ab7e8db97 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -27,13 +27,13 @@ choice config BR2_TOOLCHAIN_BUILDROOT_UCLIBC bool "uClibc-ng" - select BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \ BR2_arm || BR2_armeb || \ BR2_bfin || BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_or1k || BR2_powerpc || BR2_sh2a || BR2_sh4 || \ BR2_sh4eb || BR2_sparc || BR2_xtensa || BR2_x86_64 + select BR2_TOOLCHAIN_USES_UCLIBC help This option selects uClibc-ng as the C library for the cross-compilation toolchain. diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 70c7d8e3c3..6c12b1619c 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -320,8 +320,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LOCALE config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS bool "Toolchain has threads support?" - select BR2_TOOLCHAIN_HAS_THREADS default y + select BR2_TOOLCHAIN_HAS_THREADS help Select this option if your external toolchain has thread support. If you don't know, leave the default value, @@ -331,8 +331,8 @@ if BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG bool "Toolchain has threads debugging support?" - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG default y + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG help Select this option if your external toolchain has thread debugging support. If you don't know, leave the default @@ -340,8 +340,8 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL bool "Toolchain has NPTL threads support?" - select BR2_TOOLCHAIN_HAS_THREADS_NPTL default y + select BR2_TOOLCHAIN_HAS_THREADS_NPTL help Select this option if your external toolchain uses the NPTL (Native Posix Thread Library) implementation of Posix @@ -354,9 +354,9 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP bool "Toolchain has SSP support?" - select BR2_TOOLCHAIN_HAS_SSP default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC default y if BR2_TOOLCHAIN_EXTERNAL_MUSL + select BR2_TOOLCHAIN_HAS_SSP help Selection this option if your external toolchain has Stack Smashing Protection support enabled. If you don't know, @@ -365,9 +365,9 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP config BR2_TOOLCHAIN_EXTERNAL_INET_RPC bool "Toolchain has RPC support?" - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC + depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL + select BR2_TOOLCHAIN_HAS_NATIVE_RPC help Select this option if your external toolchain supports RPC. If you don't know, leave the default value, Buildroot From 6d4f66f9b95b002310b60d0743c96fb66442e004 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:45 -0300 Subject: [PATCH 0520/2640] toolchain/*/Config.in: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 10 ++++++---- toolchain/toolchain-external/Config.in | 11 ++++++----- .../toolchain-external-codescape-img-mips/Config.in | 6 ++++-- .../toolchain-external-codescape-mti-mips/Config.in | 6 ++++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 212fbbd300..b33eaffd52 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -124,7 +124,8 @@ config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY The gconv libraries are used to convert between different character sets (charsets). - Say 'y' if you need to store and/or display different charsets. + Say 'y' if you need to store and/or display different + charsets. config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST string "Gconv libraries to copy" @@ -162,10 +163,11 @@ config BR2_TARGET_OPTIMIZATION config BR2_TARGET_LDFLAGS string "Target linker options" help - Extra options to pass to the linker when building for the target. + Extra options to pass to the linker when building for the + target. - Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib') - are not supported. + Note that options with a '$' sign (eg. + -Wl,-rpath='$ORIGIN/../lib') are not supported. config BR2_ECLIPSE_REGISTER bool "Register toolchain within Eclipse Buildroot plug-in" diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c4063b177b..6759e5cefa 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -53,15 +53,16 @@ choice config BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD bool "Toolchain to be downloaded and installed" help - Select this option if you want Buildroot to download and install the - toolchain. If you have selected a custom toolchain, specify the URL - in BR2_TOOLCHAIN_EXTERNAL_URL. + Select this option if you want Buildroot to download and + install the toolchain. If you have selected a custom + toolchain, specify the URL in BR2_TOOLCHAIN_EXTERNAL_URL. config BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED bool "Pre-installed toolchain" help - Select this option if you want to use a pre-installed toolchain. - Specify the path to this toolchain in BR2_TOOLCHAIN_EXTERNAL_PATH. + Select this option if you want to use a pre-installed + toolchain. Specify the path to this toolchain in + BR2_TOOLCHAIN_EXTERNAL_PATH. endchoice diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 8b2eab0ad2..2bfa567672 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -30,12 +30,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r6' Target Architecture Variant Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS + - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, + microMIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r6' Target Architecture Variant Disable 'Use soft-float' Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, microMIPS + - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, + microMIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r6' Target Architecture Variant Enable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index db191fd1be..5d466a58f4 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -41,12 +41,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r2' Target Architecture Variant Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS + - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, + microMIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r2' Target Architecture Variant Enable 'Use soft-float' Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, microMIPS + - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, + microMIPS Select 'MIPS (little endian)' Target Architecture Select 'mips 32r2' Target Architecture Variant Disable 'Use soft-float' From bfc8dce467bd12e43317d5dd0f180b1bb11c0cc0 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:29 -0300 Subject: [PATCH 0521/2640] check-package: enable for toolchain/ The toolchain directory can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from the toolchain/ directory. Ignore this symbol: - BR_LIBC: defined by the buildroot toolchain, used by gcc-final.mk. Ignore toolchain/toolchain-external/pkg-toolchain-external.mk as it declares a package infra and not a package itself. Ignore toolchain/helpers.mk as it contains only helper functions. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- utils/check-package | 3 +++ utils/checkpackagelib/lib_mk.py | 1 + 2 files changed, 4 insertions(+) diff --git a/utils/check-package b/utils/check-package index a5f5dc44c0..dd3a4bb7e8 100755 --- a/utils/check-package +++ b/utils/check-package @@ -52,12 +52,15 @@ DO_CHECK_INTREE = re.compile("|".join([ "linux/", "package/", "system/", + "toolchain/", ])) DO_NOT_CHECK_INTREE = re.compile("|".join([ "boot/barebox/barebox\.mk$", "fs/common\.mk$", "package/doc-asciidoc\.mk$", "package/pkg-\S*\.mk$", + "toolchain/helpers\.mk$", + "toolchain/toolchain-external/pkg-toolchain-external\.mk$", ])) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 9989556e95..86e9aa2d97 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -159,6 +159,7 @@ class TypoInPackageVariable(_CheckFunction): "ACLOCAL_DIR", "ACLOCAL_HOST_DIR", "BR_CCACHE_INITIAL_SETUP", + "BR_LIBC", "BR_NO_CHECK_HASH_FOR", "LINUX_EXTENSIONS", "LINUX_POST_PATCH_HOOKS", From f9b9ad206a3d3afaae90cf5dab9f909432645aff Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:46 -0300 Subject: [PATCH 0522/2640] qemu/Config.in.host: fix overindented depends on Do the same as used in all other Config.in files and use only one tab. Signed-off-by: Ricardo Martincoski Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index bbc2aa27c5..0ef4c700b0 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS BR2_mips64 || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ BR2_sparc || BR2_x86_64 - depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 config BR2_PACKAGE_HOST_QEMU bool "host qemu" From a1264445f8684dae9f9fc57627c79f9cbb11a328 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:33 -0300 Subject: [PATCH 0523/2640] Config.in*: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Config.in | 8 ++++---- Config.in.legacy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Config.in b/Config.in index 852c61ef3a..ca6010fd30 100644 --- a/Config.in +++ b/Config.in @@ -424,8 +424,8 @@ endif config BR2_STRIP_strip bool "strip target binaries" - depends on !BR2_PACKAGE_HOST_ELF2FLT default y + depends on !BR2_PACKAGE_HOST_ELF2FLT help Binaries and libraries in the target filesystem will be stripped using the normal 'strip' command. This allows to save @@ -435,16 +435,16 @@ config BR2_STRIP_strip config BR2_STRIP_EXCLUDE_FILES string "executables that should not be stripped" - depends on BR2_STRIP_strip default "" + depends on BR2_STRIP_strip help You may specify a space-separated list of binaries and libraries here that should not be stripped on the target. config BR2_STRIP_EXCLUDE_DIRS string "directories that should be skipped when stripping" - depends on BR2_STRIP_strip default "" + depends on BR2_STRIP_strip help You may specify a space-separated list of directories that should be skipped when stripping. Binaries and libraries in @@ -545,7 +545,6 @@ endchoice config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" - select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 @@ -554,6 +553,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + select BR2_PACKAGE_GOOGLE_BREAKPAD help This option will enable the use of google breakpad, a library and tool suite that allows you to distribute an application to diff --git a/Config.in.legacy b/Config.in.legacy index b1dca97e5e..08a129106c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1970,8 +1970,8 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q name. config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS - depends on BR2_PACKAGE_PYTHON bool "libsemanage python bindings removed" + depends on BR2_PACKAGE_PYTHON select BR2_LEGACY help This option has been removed, since the libsemanage Python From d6109172dff2b20105b41cf2ae88350328e35704 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:39 -0300 Subject: [PATCH 0524/2640] Config.in*: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Config.in | 27 ++--- Config.in.legacy | 289 ++++++++++++++++++++++++++--------------------- 2 files changed, 176 insertions(+), 140 deletions(-) diff --git a/Config.in b/Config.in index ca6010fd30..71b9f60e5b 100644 --- a/Config.in +++ b/Config.in @@ -175,8 +175,8 @@ config BR2_TAR_OPTIONS default "" help Options to pass to tar when extracting the sources. - E.g. " -v --exclude='*.svn*'" to exclude all .svn internal files - and to be verbose. + E.g. " -v --exclude='*.svn*'" to exclude all .svn internal + files and to be verbose. endmenu @@ -667,7 +667,8 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH Note that this mechanism is available for both the internal toolchain (through the toolchain wrapper and binutils patches) - and external toolchain backends (through the toolchain wrapper). + and external toolchain backends (through the toolchain + wrapper). config BR2_REPRODUCIBLE bool "Make the build reproducible (experimental)" @@ -751,9 +752,9 @@ choice bool "RELRO Protection" depends on BR2_SHARED_LIBS help - Enable a link-time protection know as RELRO (RELocation Read Only) - which helps to protect from certain type of exploitation techniques - altering the content of some ELF sections. + Enable a link-time protection know as RELRO (RELocation Read + Only) which helps to protect from certain type of exploitation + techniques altering the content of some ELF sections. config BR2_RELRO_NONE bool "None" @@ -769,9 +770,9 @@ config BR2_RELRO_PARTIAL config BR2_RELRO_FULL bool "Full" help - This option includes the partial configuration, but also - marks the GOT as read-only at the cost of initialization time - during program loading, i.e every time an executable is started. + This option includes the partial configuration, but also marks + the GOT as read-only at the cost of initialization time during + program loading, i.e every time an executable is started. endchoice @@ -784,10 +785,10 @@ choice depends on !BR2_OPTIMIZE_0 help Enable the _FORTIFY_SOURCE macro which introduces additional - checks to detect buffer-overflows in the following standard library - functions: memcpy, mempcpy, memmove, memset, strcpy, stpcpy, - strncpy, strcat, strncat, sprintf, vsprintf, snprintf, vsnprintf, - gets. + checks to detect buffer-overflows in the following standard + library functions: memcpy, mempcpy, memmove, memset, strcpy, + stpcpy, strncpy, strcat, strncat, sprintf, vsprintf, snprintf, + vsnprintf, gets. NOTE: This feature requires an optimization level of s/1/2/3/g diff --git a/Config.in.legacy b/Config.in.legacy index 08a129106c..fa083eaf79 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -99,11 +99,11 @@ if !BR2_SKIP_LEGACY config BR2_LEGACY bool help - This option is selected automatically when your old .config uses an - option that no longer exists in current buildroot. In that case, the - build will fail. Look for config options which are selected in the - menu below: they no longer exist and should be replaced by something - else. + This option is selected automatically when your old .config + uses an option that no longer exists in current buildroot. In + that case, the build will fail. Look for config options which + are selected in the menu below: they no longer exist and + should be replaced by something else. # This comment fits exactly in a 80-column display comment "Legacy detected: check the content of the menu below" @@ -566,18 +566,18 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH select BR2_LEGACY help The Sourcery CodeBench toolchain for the sh architecture has - been removed, since it uses glibc older than 2.17 that requires - -lrt to link executables using clock_* system calls. This makes - this toolchain difficult to maintain over time. + been removed, since it uses glibc older than 2.17 that + requires -lrt to link executables using clock_* system calls. + This makes this toolchain difficult to maintain over time. config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 bool "x86 Sourcery toolchain has been removed" select BR2_LEGACY help The Sourcery CodeBench toolchain for the x86 architecture has - been removed, since it uses glibc older than 2.17 that requires - -lrt to link executables using clock_* system calls. This makes - this toolchain difficult to maintain over time. + been removed, since it uses glibc older than 2.17 that + requires -lrt to link executables using clock_* system calls. + This makes this toolchain difficult to maintain over time. config BR2_GCC_VERSION_4_8_X bool "gcc 4.8.x support removed" @@ -672,10 +672,10 @@ config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS int "extra size in blocks has been removed" default 0 help - Since the support for auto calculation of the filesystem size has been - removed, this option is now useless and must be 0. - You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS matchs - your needs. + Since the support for auto calculation of the filesystem size + has been removed, this option is now useless and must be 0. + You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS + matchs your needs. config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS_WRAP bool @@ -703,14 +703,16 @@ config BR2_NBD_CLIENT select BR2_LEGACY select BR2_PACKAGE_NBD_CLIENT help - The nbd client option has been renamed to BR2_PACKAGE_NBD_CLIENT. + The nbd client option has been renamed to + BR2_PACKAGE_NBD_CLIENT. config BR2_NBD_SERVER bool "nbd server option was renamed" select BR2_LEGACY select BR2_PACKAGE_NBD_SERVER help - The nbd server option has been renamed to BR2_PACKAGE_NBD_SERVER. + The nbd server option has been renamed to + BR2_PACKAGE_NBD_SERVER. config BR2_PACKAGE_GMOCK bool "gmock merged into gtest package" @@ -805,8 +807,8 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS help The support for the prebuilt toolchain based on the Musl C library provided by the musl-cross project has been removed. - Upstream doesn't provide any prebuilt toolchain anymore, use the - Buildroot toolchain instead. + Upstream doesn't provide any prebuilt toolchain anymore, use + the Buildroot toolchain instead. config BR2_UCLIBC_INSTALL_TEST_SUITE bool "uClibc tests now in uclibc-ng-test" @@ -957,8 +959,8 @@ config BR2_PACKAGE_IPKG select BR2_LEGACY help ipkg dates back to the early 2000s when Compaq started the - handhelds.org project and it hasn't seen development since 2006. - Use opkg as a replacement. + handhelds.org project and it hasn't seen development since + 2006. Use opkg as a replacement. config BR2_GCC_VERSION_4_7_X bool "gcc 4.7.x support removed" @@ -1030,8 +1032,9 @@ config BR2_KERNEL_HEADERS_3_19 select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help - Version 3.19.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. + Version 3.19.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. @@ -1040,8 +1043,8 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS select BR2_LEGACY select BR2_PACKAGE_EFL help - With EFL 1.18, libevas-generic-loaders is now provided by the efl - package. + With EFL 1.18, libevas-generic-loaders is now provided by the + efl package. config BR2_PACKAGE_ELEMENTARY bool "elementary package removed" @@ -1053,8 +1056,9 @@ config BR2_PACKAGE_ELEMENTARY config BR2_LINUX_KERNEL_CUSTOM_LOCAL bool "Linux kernel local directory option removed" help - The option to select a local directory as the source of the Linux - kernel has been removed. It hurts reproducibility of builds. + The option to select a local directory as the source of the + Linux kernel has been removed. It hurts reproducibility of + builds. In case you were using this option during development of your Linux kernel, use the override mechanism instead. @@ -1092,14 +1096,16 @@ config BR2_PACKAGE_LIBFSLVPUWRAP select BR2_LEGACY select BR2_PACKAGE_IMX_VPUWRAP help - The libfslvpuwrap has been renamed to match the renamed package. + The libfslvpuwrap has been renamed to match the renamed + package. config BR2_PACKAGE_LIBFSLPARSER bool "libfslparser has been renamed to imx-parser" select BR2_LEGACY select BR2_PACKAGE_IMX_PARSER help - The libfslparser has been renamed to match the renamed package. + The libfslparser has been renamed to match the renamed + package. config BR2_PACKAGE_LIBFSLCODEC bool "libfslcodec has been renamed to imx-codec" @@ -1246,8 +1252,9 @@ config BR2_KERNEL_HEADERS_3_17 select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help - Version 3.17.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. + Version 3.17.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. @@ -1350,8 +1357,8 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL bool "openpowerlink debug option has been removed" select BR2_LEGACY help - This option depends on BR2_ENABLE_DEBUG which should not be used - by packages anymore. + This option depends on BR2_ENABLE_DEBUG which should not be + used by packages anymore. config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" @@ -1393,10 +1400,11 @@ config BR2_KERNEL_HEADERS_3_16 select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help - Version 3.16.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. - As an alternative, version 3.12.x of the headers have been - automatically selected in your configuration. + Version 3.16.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. + As an alternative, version 3.12.x of the headers have been + automatically selected in your configuration. config BR2_PACKAGE_PYTHON_PYXML bool "python-pyxml package has been removed" @@ -1409,9 +1417,9 @@ config BR2_PACKAGE_PYTHON_PYXML config BR2_ENABLE_SSP bool "Stack Smashing protection now has different levels" help - The protection offered by SSP can now be selected from different - protection levels. Be sure to review the SSP level in the build - options menu. + The protection offered by SSP can now be selected from + different protection levels. Be sure to review the SSP level + in the build options menu. config BR2_PACKAGE_DIRECTFB_CLE266 bool "cle266 driver for directfb removed" @@ -1434,8 +1442,8 @@ config BR2_PACKAGE_LIBELEMENTARY select BR2_LEGACY select BR2_PACKAGE_ELEMENTARY help - The libelementary package has been renamed to match the upstream - name. + The libelementary package has been renamed to match the + upstream name. config BR2_PACKAGE_LIBEINA bool "libeina package has been removed" @@ -1513,8 +1521,8 @@ config BR2_PACKAGE_INFOZIP select BR2_PACKAGE_ZIP help Info-Zip's Zip package has been renamed from infozip to zip, - to avoid ambiguities with Info-Zip's UnZip which has been added - in the unzip package. + to avoid ambiguities with Info-Zip's UnZip which has been + added in the unzip package. config BR2_BR2_PACKAGE_NODEJS_0_10_X bool "nodejs 0.10.x option removed" @@ -1522,9 +1530,10 @@ config BR2_BR2_PACKAGE_NODEJS_0_10_X select BR2_PACKAGE_NODEJS help nodejs 0.10.x option has been removed. 0.10.x is now - automatically chosen for ARMv5 architectures only and the latest - nodejs for all other supported architectures. The correct nodejs - version has been automatically selected in your configuration. + automatically chosen for ARMv5 architectures only and the + latest nodejs for all other supported architectures. The + correct nodejs version has been automatically selected in your + configuration. config BR2_BR2_PACKAGE_NODEJS_0_12_X bool "nodejs version 0.12.x has been removed" @@ -1560,24 +1569,24 @@ config BR2_PACKAGE_MEDIA_CTL select BR2_PACKAGE_LIBV4L select BR2_PACKAGE_LIBV4L_UTILS help - media-ctl source and developement have been moved to - v4l-utils since June 2014. For an up-to-date media-ctl - version select BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS. + media-ctl source and developement have been moved to v4l-utils + since June 2014. For an up-to-date media-ctl version select + BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS. config BR2_PACKAGE_SCHIFRA bool "schifra package has been removed" select BR2_LEGACY help - Schifra package has been maked broken since 2014.11 release and - haven't been fixed since then. + Schifra package has been maked broken since 2014.11 release + and haven't been fixed since then. config BR2_PACKAGE_ZXING bool "zxing option has been renamed" select BR2_LEGACY select BR2_PACKAGE_ZXING_CPP help - ZXing no longer provides the cpp bindings, it has been renamed to - BR2_PACKAGE_ZXING_CPP which uses a new upstream. + ZXing no longer provides the cpp bindings, it has been renamed + to BR2_PACKAGE_ZXING_CPP which uses a new upstream. # Since FreeRDP has new dependencies, protect this legacy to avoid the # infamous "unmet direct dependencies" kconfig error. @@ -1609,8 +1618,9 @@ config BR2_KERNEL_HEADERS_3_11 select BR2_KERNEL_HEADERS_3_10 select BR2_LEGACY help - Version 3.11.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. + Version 3.11.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. As an alternative, version 3.10.x of the headers have been automatically selected in your configuration. @@ -1619,8 +1629,9 @@ config BR2_KERNEL_HEADERS_3_13 select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help - Version 3.13.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. + Version 3.13.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. @@ -1629,8 +1640,9 @@ config BR2_KERNEL_HEADERS_3_15 select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help - Version 3.15.x of the Linux kernel headers have been deprecated - for more than four buildroot releases and are now removed. + Version 3.15.x of the Linux kernel headers have been + deprecated for more than four buildroot releases and are now + removed. As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. @@ -2058,8 +2070,9 @@ config BR2_TARGET_GENERIC_PASSWD_DES bool "Encoding passwords with DES has been removed" select BR2_LEGACY help - Paswords can now only be encoded with either of md5, sha256 or sha512. - The default is md5, which is stronger that DES (but still pretty weak). + Paswords can now only be encoded with either of md5, sha256 or + sha512. The default is md5, which is stronger that DES (but + still pretty weak). config BR2_PACKAGE_GTK2_THEME_HICOLOR bool "hicolor (default theme) is a duplicate" @@ -2083,16 +2096,17 @@ config BR2_PACKAGE_LIBGC select BR2_LEGACY select BR2_PACKAGE_BDWGC help - libgc has been removed because we have the same package under a - different name, bdwgc. + libgc has been removed because we have the same package under + a different name, bdwgc. config BR2_PACKAGE_WDCTL bool "util-linux' wdctl option has been renamed" select BR2_LEGACY select BR2_PACKAGE_UTIL_LINUX_WDCTL help - util-linux' wdctl option has been renamed to BR2_PACKAGE_UTIL_LINUX_WDCTL - to be aligned with how the other options are named. + util-linux' wdctl option has been renamed to + BR2_PACKAGE_UTIL_LINUX_WDCTL to be aligned with how the other + options are named. config BR2_PACKAGE_UTIL_LINUX_ARCH bool "util-linux' arch option has been removed" @@ -2112,16 +2126,17 @@ config BR2_PACKAGE_RPM_BZIP2_PAYLOADS select BR2_LEGACY select BR2_PACKAGE_BZIP2 help - The bzip2 payloads option rely entirely on the dependant package bzip2. - So, you need to select it to enable this feature. + The bzip2 payloads option rely entirely on the dependant + package bzip2. So, you need to select it to enable this + feature. config BR2_PACKAGE_RPM_XZ_PAYLOADS bool "rpm's xz payloads option has been removed" select BR2_LEGACY select BR2_PACKAGE_XZ help - The xz payloads option rely entirely on the dependant package xz. - So, you need to select it to enable this feature. + The xz payloads option rely entirely on the dependant package + xz. So, you need to select it to enable this feature. config BR2_PACKAGE_M4 bool "m4 target package removed" @@ -2176,9 +2191,9 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS select BR2_PACKAGE_STRONGSWAN_PKI select BR2_PACKAGE_STRONGSWAN_SCEP help - The tools option has been removed upstream and the different tools - have been split between the pki and scep options, with others - deprecated. + The tools option has been removed upstream and the different + tools have been split between the pki and scep options, with + others deprecated. config BR2_PACKAGE_XBMC_ADDON_XVDR bool "xbmc-addon-xvdr removed" @@ -2193,126 +2208,144 @@ config BR2_PACKAGE_XBMC_PVR_ADDONS select BR2_LEGACY select BR2_PACKAGE_KODI_PVR_ADDONS help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_ALSA_LIB bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_ALSA_LIB help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_AVAHI bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_AVAHI help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_DBUS bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_DBUS help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBBLURAY bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBBLURAY help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_GOOM bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_GOOM help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_RSXS bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_RSXS help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBCEC bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBCEC help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBMICROHTTPD bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBMICROHTTPD help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBNFS bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBNFS help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_RTMPDUMP bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_RTMPDUMP help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBSHAIRPLAY bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBSHAIRPLAY help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBSMBCLIENT bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBSMBCLIENT help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBTHEORA bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBTHEORA help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBUSB bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBUSB help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_LIBVA bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_LIBVA help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PACKAGE_XBMC_WAVPACK bool "xbmc options have been renamed" select BR2_LEGACY select BR2_PACKAGE_KODI_WAVPACK help - The XBMC media center project was renamed to Kodi entertainment center + The XBMC media center project was renamed to Kodi + entertainment center config BR2_PREFER_STATIC_LIB bool "static library option renamed" @@ -2390,8 +2423,8 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XC5000 select BR2_PACKAGE_LINUX_FIRMWARE_XCx000 help The Xceive xc5000 option now also handles older firmwares from - Xceive (the xc4000 series), as well as new firmwares (the xc5000c) - from Cresta, who bought Xceive. + Xceive (the xc4000 series), as well as new firmwares (the + xc5000c) from Cresta, who bought Xceive. config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 bool "Chelsio T4 option has been renamed" @@ -2432,9 +2465,9 @@ config BR2_PACKAGE_LIBELF select BR2_PACKAGE_ELFUTILS select BR2_LEGACY help - The libelf package provided an old version of the libelf library - and is deprecated. The libelf library is now provided by the - elfutils package. + The libelf package provided an old version of the libelf + library and is deprecated. The libelf library is now provided + by the elfutils package. config BR2_KERNEL_HEADERS_3_8 bool "kernel headers version 3.8.x are no longer supported" @@ -2461,7 +2494,8 @@ config BR2_PACKAGE_PROCPS select BR2_PACKAGE_PROCPS_NG select BR2_LEGACY help - The procps package has been replaced by the equivalent procps-ng. + The procps package has been replaced by the equivalent + procps-ng. config BR2_BINUTILS_VERSION_2_20_1 bool "binutils 2.20.1 has been removed" @@ -2548,40 +2582,40 @@ config BR2_PACKAGE_LIBV4L_DECODE_TM6000 select BR2_PACKAGE_LIBV4L_UTILS select BR2_LEGACY help - This libv4l option has been deprecated and replaced by a single - option to build all the libv4l utilities. + This libv4l option has been deprecated and replaced by a + single option to build all the libv4l utilities. config BR2_PACKAGE_LIBV4L_IR_KEYTABLE bool "ir-keytable" select BR2_PACKAGE_LIBV4L_UTILS select BR2_LEGACY help - This libv4l option has been deprecated and replaced by a single - option to build all the libv4l utilities. + This libv4l option has been deprecated and replaced by a + single option to build all the libv4l utilities. config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE bool "v4l2-compliance" select BR2_PACKAGE_LIBV4L_UTILS select BR2_LEGACY help - This libv4l option has been deprecated and replaced by a single - option to build all the libv4l utilities. + This libv4l option has been deprecated and replaced by a + single option to build all the libv4l utilities. config BR2_PACKAGE_LIBV4L_V4L2_CTL bool "v4l2-ctl" select BR2_PACKAGE_LIBV4L_UTILS select BR2_LEGACY help - This libv4l option has been deprecated and replaced by a single - option to build all the libv4l utilities. + This libv4l option has been deprecated and replaced by a + single option to build all the libv4l utilities. config BR2_PACKAGE_LIBV4L_V4L2_DBG bool "v4l2-dbg" select BR2_PACKAGE_LIBV4L_UTILS select BR2_LEGACY help - This libv4l option has been deprecated and replaced by a single - option to build all the libv4l utilities. + This libv4l option has been deprecated and replaced by a + single option to build all the libv4l utilities. ############################################################################### comment "Legacy options removed in 2014.05" @@ -2629,8 +2663,8 @@ config BR2_PACKAGE_TZDATA_ZONELIST string "tzdata: the timezone list option has been renamed" help The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to - BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration" - menu. You'll need to select BR2_TARGET_TZ_INFO. + BR2_TARGET_TZ_ZONELIST, and moved to the "System + configuration" menu. You'll need to select BR2_TARGET_TZ_INFO. config BR2_PACKAGE_TZDATA_ZONELIST_WRAP bool @@ -2642,8 +2676,8 @@ config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE select BR2_LEGACY help The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been - renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select - it in the corresponding choice. + renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to + select it in the corresponding choice. config BR2_PACKAGE_LUA_INTERPRETER_READLINE bool "Lua command-line editing using readline has been renamed" @@ -2707,8 +2741,8 @@ config BR2_PACKAGE_UDEV 'systemd' as init system, 'eudev' should be selected, which is the case if '/dev management' is set to 'Dynamic using eudev'. - If you are using 'systemd', its internal implementation of 'udev' - is used. + If you are using 'systemd', its internal implementation of + 'udev' is used. config BR2_PACKAGE_UDEV_RULES_GEN bool "udev rules generation handled by provider" @@ -2724,8 +2758,8 @@ config BR2_PACKAGE_UDEV_RULES_GEN '/dev management' is set to 'Dynamic using eudev' to get the same behaviour as in your old configuration. - If you are using 'systemd', it internal implementation of 'udev' - will generate the rules. + If you are using 'systemd', it internal implementation of + 'udev' will generate the rules. config BR2_PACKAGE_UDEV_ALL_EXTRAS bool "udev extras removed" @@ -2832,23 +2866,23 @@ config BR2_HAVE_DOCUMENTATION bool "support for documentation on target has been removed" select BR2_LEGACY help - Support for documentation on target has been removed since it has - been deprecated for more than four buildroot releases. + Support for documentation on target has been removed since it + has been deprecated for more than four buildroot releases. config BR2_PACKAGE_AUTOMAKE bool "automake target package has been removed" select BR2_LEGACY help - The 'automake' target package has been removed since it has been - deprecated for more than four buildroot releases. + The 'automake' target package has been removed since it has + been deprecated for more than four buildroot releases. Note: the host automake still exists. config BR2_PACKAGE_AUTOCONF bool "autoconf target package has been removed" select BR2_LEGACY help - The 'autoconf' target package has been removed since it has been - deprecated for more than four buildroot releases. + The 'autoconf' target package has been removed since it has + been deprecated for more than four buildroot releases. Note: the host autoconf still exists. config BR2_PACKAGE_XSTROKE @@ -2864,7 +2898,8 @@ config BR2_PACKAGE_LZMA help The 'lzma' target package has been removed since it has been deprecated for more than four buildroot releases. - Note: generating lzma-compressed rootfs images is still supported. + Note: generating lzma-compressed rootfs images is still + supported. config BR2_PACKAGE_TTCP bool "ttcp has been removed" @@ -2878,9 +2913,9 @@ config BR2_PACKAGE_LIBNFC_LLCP select BR2_LEGACY select BR2_PACKAGE_LIBLLCP help - The 'libnfc-llcp' package has been removed since upstream renamed - to 'libllcp'. We have added a new package for 'libllcp' and bumped - the version at the same time. + The 'libnfc-llcp' package has been removed since upstream + renamed to 'libllcp'. We have added a new package for + 'libllcp' and bumped the version at the same time. config BR2_PACKAGE_MYSQL_CLIENT bool "MySQL client renamed to MySQL" @@ -2946,8 +2981,8 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY help The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which led to problems with other packages that need the full lvm2 - suite. Therefore, the option has been replaced with the positive - BR2_PACKAGE_LVM2_STANDARD_INSTALL option. + suite. Therefore, the option has been replaced with the + positive BR2_PACKAGE_LVM2_STANDARD_INSTALL option. # Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in # in order to automatically propagate old configs From e2c4a687c78a5740dfed2fef624d553cf14ab47a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:30 -0300 Subject: [PATCH 0525/2640] check-package: enable for Config.in* in base dir These files can benefit from this script to prevent common mistakes when submitting patches. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- utils/check-package | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index dd3a4bb7e8..d9b719783d 100755 --- a/utils/check-package +++ b/utils/check-package @@ -44,8 +44,9 @@ def parse_args(): return parser.parse_args() -CONFIG_IN_FILENAME = re.compile("/Config\.\S*$") +CONFIG_IN_FILENAME = re.compile("Config\.\S*$") DO_CHECK_INTREE = re.compile("|".join([ + "Config.in", "arch/", "boot/", "fs/", From 15b1b632d51ece85d7f2b08966db2bb2edbdde5e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:37 -0300 Subject: [PATCH 0526/2640] package/*/Config.in: fix attributes order ... to follow the convention: type, default, depends on, select, help. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- package/mono/Config.in | 2 +- package/php/Config.in | 8 ++++---- package/systemd/Config.in | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mono/Config.in b/package/mono/Config.in index d162237086..63208fef49 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -5,9 +5,9 @@ config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO_ARCH_SUPPORTS bool - depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_powerpc || BR2_x86_64) + depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO bool "mono" diff --git a/package/php/Config.in b/package/php/Config.in index 11514e04b1..2469573541 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,15 +1,15 @@ config BR2_PACKAGE_PHP bool "php" + # PHP uses -export-dynamic, which breaks with elf2flt with a + # message like "ld.real: section .junk LMA [...,...] overlaps + # section .text LMA [...,...]" + depends on !BR2_BINFMT_FLAT select BR2_PACKAGE_PHP_SAPI_CGI if \ !BR2_PACKAGE_PHP_SAPI_APACHE && \ !BR2_PACKAGE_PHP_SAPI_CLI && \ !BR2_PACKAGE_PHP_SAPI_FPM && \ BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU - # PHP uses -export-dynamic, which breaks with elf2flt with a - # message like "ld.real: section .junk LMA [...,...] overlaps - # section .text LMA [...,...]" - depends on !BR2_BINFMT_FLAT help PHP is a widely-used general-purpose scripting language that is especially suited for Web development diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 420c78493d..c5a109675c 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -191,8 +191,8 @@ config BR2_PACKAGE_SYSTEMD_MACHINED config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h help nss-myhostname is a plug-in module for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc), @@ -247,8 +247,8 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED config BR2_PACKAGE_SYSTEMD_RESOLVED bool "enable resolve daemon" - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h help systemd-resolved is a system service that provides network name resolution to local applications. It implements a From 73f77570076db97ba2bdcf93fb84d348d278389a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:47 -0300 Subject: [PATCH 0527/2640] package/*/Config.in: re-wrap help text ... to follow the convention <2 spaces><62 chars>. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- package/python-functools32/Config.in | 4 ++-- package/python-jsonmodels/Config.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in index cc12557edc..606341d828 100644 --- a/package/python-functools32/Config.in +++ b/package/python-functools32/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_FUNCTOOLS32 bool "python-functools32" depends on BR2_PACKAGE_PYTHON help - Backport of the functools module from Python 3.2.3 for use on 2.7 - and PyPy. + Backport of the functools module from Python 3.2.3 for use on + 2.7 and PyPy. https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index d840e2acfe..f66982874a 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_JSONMODELS select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help - Models to make easier to deal with structures that are converted - to, or read from JSON. + Models to make easier to deal with structures that are + converted to, or read from JSON. https://github.com/beregond/jsonmodels From 3ff0728480f4b9b5e1ba36537960f107f274b4b7 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:48 -0300 Subject: [PATCH 0528/2640] scanpypi: generate help text compliant to check-package Each line must fit in <2 spaces><62 chars>. The default width for textwrap.wrap() is 70, so explicit set it to 62. Signed-off-by: Ricardo Martincoski Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index df8939b82e..f03ad0bb64 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -583,7 +583,7 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], + help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') From 73dcbc19e9eb5a0c829ed7ee488ca4eaba17e337 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 02:08:49 -0300 Subject: [PATCH 0529/2640] utils/checkpackagelib: exclude four files from Config.in indentation check package/Config.in, package/Config.in.host, package/x11r7/Config.in and package/kodi/Config.in do not comply with the normal Config.in indentation rules. However, this violation of the rule is legitimate, so let's skip them in check-package for this specific indentation check. This removes the last 2197 remaining warnings on Config.in files. Signed-off-by: Thomas Petazzoni [Ricardo: rebase patch to use relative paths passed by the main script, fix flake8 warnings, add package/Config.* to the list] Signed-off-by: Ricardo Martincoski Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/checkpackagelib/lib_config.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 11d885f8c7..1d273f1c5f 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -132,6 +132,12 @@ class Indent(_CheckFunction): text] elif entry in entries_that_should_not_be_indented: if not text.startswith(entry): + # four Config.in files have a special but legitimate indentation rule + if self.filename in ["package/Config.in", + "package/Config.in.host", + "package/kodi/Config.in", + "package/x11r7/Config.in"]: + return return ["{}:{}: should not be indented" .format(self.filename, lineno), text] From b757f9aca356824e47ce2de27deb91b1992c0313 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:50 -0300 Subject: [PATCH 0530/2640] .gitlab-ci.yml: extend check-package test to Config.* files Now that all issues in Config.in files have been fixed, let's try to make sure we don't introduce new ones by checking regularly these files issues in Gitlab CI. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 3 ++- .gitlab-ci.yml.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd1aeb3408..fcb53d6451 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,8 @@ check-flake8: check-package: script: - - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} + + - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) + -exec ./utils/check-package {} + .defconfig: &defconfig # Running the defconfigs for every push is too much, so limit to diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in index bffcb02be1..fb2650c5ce 100644 --- a/.gitlab-ci.yml.in +++ b/.gitlab-ci.yml.in @@ -43,7 +43,8 @@ check-flake8: check-package: script: - - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} + + - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) + -exec ./utils/check-package {} + .defconfig: &defconfig # Running the defconfigs for every push is too much, so limit to From 8ba80282c3bb580c6a45ea114e70acac98fe1690 Mon Sep 17 00:00:00 2001 From: Sasha Shyrokov Date: Tue, 6 Mar 2018 10:58:10 -0500 Subject: [PATCH 0531/2640] opencv3: fix Python module build for Python 3.x When the OpenCV3 Python support is enabled with Python 3.x, it builds properly, and the resulting .so file is built for the target architecture, but its name is wrong: output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-x86_64-linux-gnu.so This prevents Python 3.x from importing the module: >>> import cv2 Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'cv2' In order to fix this, we simply need to pass PKG_PYTHON_DISTUTILS_ENV in the environment. The Python module then gets named: output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-arm-linux-gnueabi.so And can be imported properly: >>> import cv2 >>> This solution was suggested by Arnout Vandecappelle in https://stackoverflow.com/questions/49059035/buildroot-opencv3-python-package-builds-for-the-wrong-target. With Python 2.x, the module is named just cv2.so so this problem isn't visible. However, for consistency, we also pass PKG_PYTHON_DISTUTILS_ENV when building against Python 2.x, by putting the OPENCV3_CONF_ENV assignment inside the BR2_PACKAGE_OPENCV3_LIB_PYTHON condition, but outside the BR2_PACKAGE_PYTHON3/BR2_PACKAGE_PYTHON condition. Signed-off-by: Sasha Shyrokov [Thomas: extend the commit log, apply the solution to Python 2.x.] Signed-off-by: Thomas Petazzoni --- package/opencv3/opencv3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index cffe66b892..15e4eadfe3 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -327,6 +327,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 endif +OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ From 5e6fa93483caac317ab8844feb2ae9c07078a6c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 10:46:41 +0200 Subject: [PATCH 0532/2640] openblas: drop SSE_GENERIC target Fixes #10856 The SSE_GENERIC target fails to build with a "sgemm_kernel.o: No such file or directory" error. Several upstream bug reports exist for this: https://github.com/xianyi/OpenBLAS/issues/502 https://github.com/xianyi/OpenBLAS/issues/685 In both cases, upstream suggests using a different target definition instead. E.G. from issue 685: You may use NORTHWOOD on x86: make TARGET=NORTHWOOD that uses SSE2 instructions. It's very hard to find non-SSE2 x86 CPUs today. For x86-64 use the PRESCOTT target So drop the SSE_GENERIC target. The only x86_64 variant we support not covered by a more specific openblas target is the default variant, nocona and jaguar. Nocona was a Xeon variant of the P4 "Prescott" architecture, so use the PRESCOTT openblas target: https://en.wikipedia.org/wiki/Xeon#Nocona_and_Irwindale Jaguar is from the Bobcat family, so use the BOBCAT openblas target: https://en.wikipedia.org/wiki/List_of_AMD_microprocessors#Bobcat_core_architecture_(APU) [Peter: add Jaguar as pointed out by Arnout] Signed-off-by: Peter Korsgaard --- package/openblas/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index eb93e319e4..8e71a43f98 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "P2" if BR2_x86_pentium2 default "KATMAI" if BR2_x86_pentium3 default "NORTHWOOD" if BR2_x86_pentium4 - default "PRESCOTT" if BR2_x86_prescott + default "PRESCOTT" if BR2_x86_prescott || BR2_x86_nocona default "BANIAS" if BR2_x86_pentium_m default "CORE2" if BR2_x86_core2 default "NEHALEM" if BR2_x86_corei7 || BR2_x86_silvermont @@ -14,9 +14,9 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "OPTERON" if BR2_x86_opteron default "OPTERON_SSE3" if BR2_x86_opteron_sse3 default "BARCELONA" if BR2_x86_barcelona + default "JAGUAR" if BR2_x86_jaguar default "STEAMROLLER" if BR2_x86_steamroller default "VIAC3" if BR2_x86_c3 || BR2_x86_c32 - default "SSE_GENERIC" if BR2_X86_CPU_HAS_SSE default "POWER4" if BR2_powerpc_power4 default "POWER5" if BR2_powerpc_power5 default "POWER6" if BR2_powerpc_power6 From dae0d7b3caae25246882455e6204fea9b367ab24 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 10:46:42 +0200 Subject: [PATCH 0533/2640] openblas: bump version to v0.2.20 Drop 0001-Complete-support-for-MIPS-n32-ABI.patch as it is now upstream and rebase 0002-Makefile.arm-remove-march-flags.patch. Also add a hash for the license file. Signed-off-by: Peter Korsgaard --- ...01-Complete-support-for-MIPS-n32-ABI.patch | 116 ------------------ ...0001-Makefile.arm-remove-march-flags.patch | 55 +++++++++ ...0002-Makefile.arm-remove-march-flags.patch | 73 ----------- package/openblas/openblas.hash | 3 +- package/openblas/openblas.mk | 2 +- 5 files changed, 58 insertions(+), 191 deletions(-) delete mode 100644 package/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch create mode 100644 package/openblas/0001-Makefile.arm-remove-march-flags.patch delete mode 100644 package/openblas/0002-Makefile.arm-remove-march-flags.patch diff --git a/package/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch b/package/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch deleted file mode 100644 index 6e6c5a68bc..0000000000 --- a/package/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 7f28cd1f88145a701e5dbbf50558bb65fce79f61 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 14 Jul 2016 17:20:51 +0100 -Subject: [PATCH] Complete support for MIPS n32 ABI - -Pull request: https://github.com/xianyi/OpenBLAS/pull/926 - -Signed-off-by: Vicente Olivert Riera ---- - Makefile.system | 27 +++++++++------------------ - c_check | 9 +++++++-- - f_check | 7 ++++++- - 3 files changed, 22 insertions(+), 21 deletions(-) - -diff --git a/Makefile.system b/Makefile.system -index 24a7a64..bbcdb82 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -502,13 +502,16 @@ endif - - ifdef NO_BINARY_MODE - --ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) -+ifeq ($(ARCH), $(filter $(ARCH),mips64)) - ifdef BINARY64 - CCOMMON_OPT += -mabi=64 - else --CCOMMON_OPT += -mabi=32 -+CCOMMON_OPT += -mabi=n32 - endif - BINARY_DEFINED = 1 -+else ifeq ($(ARCH), $(filter $(ARCH),mips)) -+CCOMMON_OPT += -mabi=32 -+BINARY_DEFINED = 1 - endif - - ifeq ($(CORE), LOONGSON3A) -@@ -599,12 +602,14 @@ ifneq ($(NO_LAPACK), 1) - EXTRALIB += -lgfortran - endif - ifdef NO_BINARY_MODE --ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) -+ifeq ($(ARCH), $(filter $(ARCH),mips64)) - ifdef BINARY64 - FCOMMON_OPT += -mabi=64 - else --FCOMMON_OPT += -mabi=32 -+FCOMMON_OPT += -mabi=n32 - endif -+else ifeq ($(ARCH), $(filter $(ARCH),mips)) -+FCOMMON_OPT += -mabi=32 - endif - else - ifdef BINARY64 -@@ -688,20 +693,6 @@ endif - endif - endif - --ifeq ($(filter $(ARCH),mips64 mips)) --ifndef BINARY64 --FCOMMON_OPT += -m32 --else --FCOMMON_OPT += -m64 --endif --else --ifdef BINARY64 --FCOMMON_OPT += -mabi=64 --else --FCOMMON_OPT += -mabi=32 --endif --endif -- - ifeq ($(USE_OPENMP), 1) - FCOMMON_OPT += -mp - endif -diff --git a/c_check b/c_check -index 50ff360..9f457df 100644 ---- a/c_check -+++ b/c_check -@@ -79,8 +79,13 @@ if ($os eq "AIX") { - $defined = 1; - } - --if (($architecture eq "mips") || ($architecture eq "mips64")) { -- $compiler_name .= " -mabi=32" if ($binary eq "32"); -+if ($architecture eq "mips") { -+ $compiler_name .= " -mabi=32"; -+ $defined = 1; -+} -+ -+if ($architecture eq "mips64") { -+ $compiler_name .= " -mabi=n32" if ($binary eq "32"); - $compiler_name .= " -mabi=64" if ($binary eq "64"); - $defined = 1; - } -diff --git a/f_check b/f_check -index 4c03ac7..3520e8b 100644 ---- a/f_check -+++ b/f_check -@@ -223,7 +223,12 @@ if (!$?) { - } - #For gfortran MIPS - if ($?) { -- $link = `$compiler $openmp -mabi=32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ $mips_data = `$compiler_bin -E -dM - < /dev/null`; -+ if ($mips_data =~ /_MIPS_ISA_MIPS64/) { -+ $link = `$compiler $openmp -mabi=n32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ } else { -+ $link = `$compiler $openmp -mabi=32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ } - } - $binary = "" if ($?); - } --- -2.7.3 - diff --git a/package/openblas/0001-Makefile.arm-remove-march-flags.patch b/package/openblas/0001-Makefile.arm-remove-march-flags.patch new file mode 100644 index 0000000000..db975de59d --- /dev/null +++ b/package/openblas/0001-Makefile.arm-remove-march-flags.patch @@ -0,0 +1,55 @@ +From e6c498f68b61057fb5505e41c3858c2b5d223227 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 7 Aug 2016 23:20:00 +0200 +Subject: [PATCH] Makefile.arm: remove -march flags + +The provided -march flags, especially for ARMv5 and ARMv6 may not +necessarily match the needed ones: for ARMv5, it might be armv5, +armv5te, armv5t, etc. If the wrong one is used, the incorrect toolchain +sysroot can be used in a multilib toolchain. + +Therefore, let the user building OpenBLAS pass the appropriate -march +flag. + +The other flags, such as -mfpu=vfp or -mfloat-abi=hard are kept, as they +are actually required for the build to proceed (OpenBLAS uses VFP +instructions, and assume an EABIhf ABI). + +[Peter: update for v0.2.20] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Peter Korsgaard +--- + Makefile.arm | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/Makefile.arm b/Makefile.arm +index eedd39b7..b5d80f8e 100644 +--- a/Makefile.arm ++++ b/Makefile.arm +@@ -1,7 +1,7 @@ + ifeq ($(CORE), $(filter $(CORE),ARMV7 CORTEXA9 CORTEXA15)) + ifeq ($(OSNAME), Android) +-CCOMMON_OPT += -mfpu=neon -march=armv7-a +-FCOMMON_OPT += -mfpu=neon -march=armv7-a ++CCOMMON_OPT += -mfpu=neon ++FCOMMON_OPT += -mfpu=neon + else + CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a + FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a +@@ -9,11 +9,6 @@ endif + endif + + ifeq ($(CORE), ARMV6) +-CCOMMON_OPT += -mfpu=vfp -march=armv6 +-FCOMMON_OPT += -mfpu=vfp -march=armv6 +-endif +- +-ifeq ($(CORE), ARMV5) +-CCOMMON_OPT += -march=armv5 +-FCOMMON_OPT += -march=armv5 ++CCOMMON_OPT += -mfpu=vfp ++FCOMMON_OPT += -mfpu=vfp + endif +-- +2.11.0 + diff --git a/package/openblas/0002-Makefile.arm-remove-march-flags.patch b/package/openblas/0002-Makefile.arm-remove-march-flags.patch deleted file mode 100644 index 39058f7dfc..0000000000 --- a/package/openblas/0002-Makefile.arm-remove-march-flags.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 71b9e9b7f080c464777d07bd1a917a1c449d2ef8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2016 23:20:00 +0200 -Subject: [PATCH] Makefile.arm: remove -march flags - -The provided -march flags, especially for ARMv5 and ARMv6 may not -necessarily match the needed ones: for ARMv5, it might be armv5, -armv5te, armv5t, etc. If the wrong one is used, the incorrect toolchain -sysroot can be used in a multilib toolchain. - -Therefore, let the user building OpenBLAS pass the appropriate -march -flag. - -The other flags, such as -mfpu=vfp or -mfloat-abi=hard are kept, as they -are actually required for the build to proceed (OpenBLAS uses VFP -instructions, and assume an EABIhf ABI). - -Signed-off-by: Thomas Petazzoni ---- - Makefile.arm | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Makefile.arm b/Makefile.arm -index 62bf275..c0d6ab8 100644 ---- a/Makefile.arm -+++ b/Makefile.arm -@@ -1,31 +1,31 @@ - # ifeq logical or - ifeq ($(CORE), $(filter $(CORE),CORTEXA9 CORTEXA15)) - ifeq ($(OSNAME), Android) --CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard - else --CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard - endif - endif - - ifeq ($(CORE), ARMV7) - ifeq ($(OSNAME), Android) --CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch --FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch -+CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -Wl,--no-warn-mismatch -+FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -Wl,--no-warn-mismatch - else --CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard - endif - endif - - ifeq ($(CORE), ARMV6) --CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6 --FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6 -+CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard - endif - - - ifeq ($(CORE), ARMV5) --CCOMMON_OPT += -marm -march=armv5 --FCOMMON_OPT += -marm -march=armv5 -+CCOMMON_OPT += -marm -+FCOMMON_OPT += -marm - endif --- -2.7.4 - diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index b402cac522..e4a3989f67 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2ad0270a39dbaf891b439baacf198ea4ab149cd6ed39a5f50c494723f1936be5 openblas-f04af36ad0e85b64f12a7c38095383192cc52345.tar.gz +sha256 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394 openblas-v0.2.20.tar.gz +sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 93dbc1f932..e9a87b0262 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = f04af36ad0e85b64f12a7c38095383192cc52345 +OPENBLAS_VERSION = v0.2.20 OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,$(OPENBLAS_VERSION)) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From ee156ad4804f0f23c4f939831377a0bb9d42717d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Mon, 4 Sep 2017 22:30:08 +0200 Subject: [PATCH 0534/2640] New board: SolidRun ClearFog Base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit My goal was to rely on upstreamed features as much as possible, which means that some bits are only half-baked for now: - Due to the DTS restructuring in upstream kernel, we require 4.11+. The latest LTS or CIP kernels do not know about the -Base model. - Linux has no generic support for SFP cages (yet). It seems that this has hit the net-next tree in August 2017, but there's been no release (it's probably targettting 4.14). Also, the merge only included the required infrastructure; the mvneta driver conversion is not included. Patches which finalize this exist in Russel King's tree and also in random vendor trees. - There's no access to the SPI flash in these versions of uboot/linux/dts. Signed-off-by: Jan Kundrát [Arnout: - rename to solidrun_clearfog_defconfig; - specify kernel headers version (default is now 4.15); - remove ext2 fs size override, the 4 extra MB are not needed; - U-Boot needs dtc and openssl; - add comments to defconfig; - update .gitlab-ci.yml; - mention in readme.txt that SFP support is missing; - add Jan to DEVELOPERS. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 1 + DEVELOPERS | 4 ++ board/solidrun/clearfog/boot.scr.txt | 5 ++ board/solidrun/clearfog/genimage.cfg | 16 ++++++ board/solidrun/clearfog/linux.fragment | 1 + board/solidrun/clearfog/post-build.sh | 3 ++ board/solidrun/clearfog/readme.txt | 68 ++++++++++++++++++++++++++ configs/solidrun_clearfog_defconfig | 44 +++++++++++++++++ 8 files changed, 142 insertions(+) create mode 100644 board/solidrun/clearfog/boot.scr.txt create mode 100644 board/solidrun/clearfog/genimage.cfg create mode 100644 board/solidrun/clearfog/linux.fragment create mode 100755 board/solidrun/clearfog/post-build.sh create mode 100644 board/solidrun/clearfog/readme.txt create mode 100644 configs/solidrun_clearfog_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcb53d6451..423f729660 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,6 +240,7 @@ snps_archs38_haps_defconfig: *defconfig snps_archs38_hsdk_defconfig: *defconfig snps_archs38_vdk_defconfig: *defconfig socrates_cyclone5_defconfig: *defconfig +solidrun_clearfog_defconfig: *defconfig solidrun_macchiatobin_mainline_defconfig: *defconfig solidrun_macchiatobin_marvell_defconfig: *defconfig stm32f429_disco_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ee66cdd6c1..45c13d39eb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -861,6 +861,10 @@ F: package/yad/ N: Jan Heylen F: package/opentracing-cpp/ +N: Jan Kundrát +F: configs/solidrun_clearfog_defconfig +F: board/solidrun/clearfog/ + N: Jan Kraval F: board/orangepi/orangepi-lite F: configs/orangepi_lite_defconfig diff --git a/board/solidrun/clearfog/boot.scr.txt b/board/solidrun/clearfog/boot.scr.txt new file mode 100644 index 0000000000..a2332e3960 --- /dev/null +++ b/board/solidrun/clearfog/boot.scr.txt @@ -0,0 +1,5 @@ +setenv fdtfile armada-388-clearfog-base.dtb +setenv bootargs root=/dev/mmcblk0p1 +load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}/${fdtfile} +load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}/zImage +bootz ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/solidrun/clearfog/genimage.cfg b/board/solidrun/clearfog/genimage.cfg new file mode 100644 index 0000000000..8963619cc5 --- /dev/null +++ b/board/solidrun/clearfog/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-spl.kwb" + offset = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/solidrun/clearfog/linux.fragment b/board/solidrun/clearfog/linux.fragment new file mode 100644 index 0000000000..b7ed5b00d6 --- /dev/null +++ b/board/solidrun/clearfog/linux.fragment @@ -0,0 +1 @@ +CONFIG_SENSORS_MCP3021=y diff --git a/board/solidrun/clearfog/post-build.sh b/board/solidrun/clearfog/post-build.sh new file mode 100755 index 0000000000..ff22ebd6e5 --- /dev/null +++ b/board/solidrun/clearfog/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/solidrun/clearfog/readme.txt b/board/solidrun/clearfog/readme.txt new file mode 100644 index 0000000000..b56f0a9b49 --- /dev/null +++ b/board/solidrun/clearfog/readme.txt @@ -0,0 +1,68 @@ +********************** +SolidRun Clearfog Base +********************** + +This file documents Buildroot's support for the Clearfog Base by Solid Run. + +Vendor's documentation: +https://wiki.solid-run.com/doku.php?id=products:a38x:documents + +Warning for eMMC variant of the MicroSoM +======================================== + +If you bought a MicroSoM version that includes an on-board eMMC flash, the +built-in microSD card slot *WILL NOT WORK*. The Internet says that you have to +upload the first bootloader via UART. This manual does not cover these steps; +only MicroSoMs without the eMMC are supported. + +Limitations +=========== + +There's no access to the SPI flash in this combination of kernel/uboot/dts. + +There is no support for the SFP. + +Build +===== + +Start with the default Buildroot's configuration for Clearfog: + + make solidrun_clearfog_defconfig + +Build all components: + + make + +The results of the build are available in ./output/images. + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a microSD card. Launch the following +command as root: + + dd if=./output/images/sdcard.img of=/dev/ + +*** WARNING! The script will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/solidrun/clearfog/genimage.cfg. + +Boot the Clearfog board +======================= + +Here's how to boot the board: + +- Set up the DIP switches for microSD boot. The correct values are: + 1: off, 2: off, 3: ON, 4: ON, 5: ON. In this scheme, switch #1" is closer to + the ethernet ports and #5 is closer to the microSD card, "ON" means towards + the SOM, and "off" means towards the SFP cage. +- Connect to the board's console over the microUSB port. +- Insert the SD card into the slot on the board (pins up). +- Power up the board. diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig new file mode 100644 index 0000000000..7c426e5ad9 --- /dev/null +++ b/configs/solidrun_clearfog_defconfig @@ -0,0 +1,44 @@ +# Architecture +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON=y + +# Linux headers same as kernel, a 4.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y + +# System configuration +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.10" +BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="armada-388-clearfog-base" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-spl.kwb" +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/solidrun/clearfog/boot.scr.txt" From 0d386f8847ef1849794237378b8d9a4740059d1d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Apr 2018 09:48:22 +0200 Subject: [PATCH 0535/2640] package/freetype: bump version to 2.9 Changelog: https://sourceforge.net/projects/freetype/files/freetype2/2.9/ Upstream changed its project URL to https in docs/FTL.TXT. We do the same in Config.in and update the license hash for docs/FTL.TXT. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freetype/Config.in | 2 +- package/freetype/freetype.hash | 10 +++++----- package/freetype/freetype.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/freetype/Config.in b/package/freetype/Config.in index ded87388e8..06c6a8546d 100644 --- a/package/freetype/Config.in +++ b/package/freetype/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_FREETYPE help a free, high-quality and portable font engine. - http://www.freetype.org/ + https://www.freetype.org/ diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 51d018465f..806375c058 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/ -md5 bf0a210b6fe781228fa0e4a80691a521 freetype-2.8.1.tar.bz2 -sha1 417bb3747c4ac95b6f2652024a53fad45581fa1c freetype-2.8.1.tar.bz2 +# From https://sourceforge.net/projects/freetype/files/freetype2/2.9/ +md5 513c403c110016fdc7e537216a642b1d freetype-2.9.tar.bz2 +sha1 94c4399b1a55c5892812e732843fcb4a7c2fe657 freetype-2.9.tar.bz2 # Locally calculated -sha256 e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 freetype-2.8.1.tar.bz2 +sha256 e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a freetype-2.9.tar.bz2 sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT -sha256 4a9a548027a2c1d37788519dea833294c9c81f1ebc280e817f41f50d0c642d78 docs/FTL.TXT +sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1028664799..05e9498c69 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.8.1 +FREETYPE_VERSION = 2.9 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 083716cdfbc42ac5cd53d3d10ac76a57427c11af Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 13:53:59 +0200 Subject: [PATCH 0536/2640] gnupg: fix prompt of Config.in.host It should be "host gnupg" and not "host-gnupg" to be consistent with all other Config.in.host options. Signed-off-by: Thomas Petazzoni --- package/gnupg/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnupg/Config.in.host b/package/gnupg/Config.in.host index a872ec820f..3686415796 100644 --- a/package/gnupg/Config.in.host +++ b/package/gnupg/Config.in.host @@ -1,5 +1,5 @@ config BR2_PACKAGE_HOST_GNUPG - bool "host-gnupg" + bool "host gnupg" help GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880. GnuPG allows From 1fb409167f8ff04f1867159ae47fe5a9bc6a75ab Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Fri, 20 Oct 2017 22:34:34 +0200 Subject: [PATCH 0537/2640] python-xlrd: add as host package Post-build/image scripts may need to extract information from Microsoft Excel (tm) spreadsheet files. Signed-off-by: Lothar Felten [Arnout: add package/Config.in.host entry] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in.host | 1 + package/python-xlrd/Config.in.host | 7 +++++++ package/python-xlrd/python-xlrd.mk | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/python-xlrd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 199a8e9856..563a277795 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -44,6 +44,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" + source "package/python-xlrd/Config.in.host" source "package/qemu/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" diff --git a/package/python-xlrd/Config.in.host b/package/python-xlrd/Config.in.host new file mode 100644 index 0000000000..493592562c --- /dev/null +++ b/package/python-xlrd/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_XLRD + bool "host python-xlrd" + help + Library for developers to extract data from Microsoft Excel (tm) + spreadsheet files. + + http://www.python-excel.org/ diff --git a/package/python-xlrd/python-xlrd.mk b/package/python-xlrd/python-xlrd.mk index e3f078c355..5d1363886d 100644 --- a/package/python-xlrd/python-xlrd.mk +++ b/package/python-xlrd/python-xlrd.mk @@ -12,3 +12,4 @@ PYTHON_XLRD_LICENSE = BSD-3-Clause PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py $(eval $(python-package)) +$(eval $(host-python-package)) From 83d2644b1197564358b6cd87b2f221d79671b5cc Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 6 Feb 2018 13:59:23 +0100 Subject: [PATCH 0538/2640] core: rename FOO_BASE_NAME to FOO_BASENAME to avoid clashes In current Buildroot, clashes occur between the variables _NAME and _BASE_NAME for two packages called foo and foo-base, i.e. Package foo: FOO_NAME = foo FOO_BASE_NAME = foo-1.2.3 Package foo-base: FOO_BASE_NAME = foo-base FOO_BASE_BASE_NAME = foo-base-4.5.6 where variable FOO_BASE_NAME is clashing between these two packages. Specific cases where this clash is already existing are: - alljoyn-base - alljoyn-tcl-base - perl-xml-sax-base The problem is generic and can occur for a number of variables in Buildroot. A non-exhaustive list: _BASE and _BASE_NAME _BASE_NAME and _RAW_BASE_NAME _DIR and _DL_DIR _VERSION and _DL_VERSION _SOURCE and _TARGET_SOURCE _INSTALL_IMAGES and _TARGET_INSTALL_IMAGES (same for _STAGING and _TARGET) _LICENSE_FILES and _MANIFEST_LICENSE_FILES _DEPENDENCIES and _FINAL_DEPENDENCIES One solution is to use another separator than '_' to separate the package name from the rest of the variable name. For example, a double underscore: FOO__NAME FOO__BASE_NAME FOO_BASE__NAME FOO_BASE__BASE_NAME However, making that change for only this case means that the variable naming is no longer consistent. And making the change for all variables has a large impact, also on certain user scripts. For now, keep it simple, and rename FOO_BASE_NAME into FOO_BASENAME, so that the variables become: FOO_NAME FOO_BASENAME FOO_BASE_NAME FOO_BASE_BASENAME For consistency, also adapt FOO_RAW_BASE_NAME. Since FOO_RAW_BASENAME would still pose a conflict with a package called 'foo-raw', take the opportunity to rename it into FOO_BASENAME_RAW instead, which does not pose a conflict as we have no variable called FOO_RAW. Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Reviewed-by: Sam Voss Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 10 +++++----- package/pkg-generic.mk | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3712b9ccc6..6f15deba28 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -79,7 +79,7 @@ define DOWNLOAD_GIT -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -90,7 +90,7 @@ define DOWNLOAD_BZR -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -102,7 +102,7 @@ define DOWNLOAD_CVS $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ $($(PKG)_RAWNAME) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -113,7 +113,7 @@ define DOWNLOAD_SVN -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -137,7 +137,7 @@ define DOWNLOAD_HG -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 88375916fd..d870921def 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -430,10 +430,10 @@ ifdef $(3)_OVERRIDE_SRCDIR $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) endif -$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) -$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) +$(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) +$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) $(2)_DL_DIR = $$(DL_DIR) -$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) +$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR ifdef $(3)_SUBDIR @@ -462,7 +462,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz + $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz endif endif @@ -536,7 +536,7 @@ endif $(2)_REDISTRIBUTE ?= YES -$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME) +$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW) # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular @@ -873,9 +873,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) # is that the license still applies to the files distributed as part # of the rootfs, even if the sources are not themselves redistributed. ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - $(Q)$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) + $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined)) else - $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_RAW_BASE_NAME),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local) From 4553fea6478f745f3237a095dcd1942e8850615f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 3 Feb 2018 23:07:33 +0100 Subject: [PATCH 0539/2640] quotatool: new package Signed-off-by: Peter Seiderer [Thomas: as suggested by Romain Naour, use QUOTATOOL_INSTALL_TARGET_OPTS to avoid installing man pages, as it fails due to a bug in the upstream package Makefile] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...sing-__P-definition-for-musl-compile.patch | 36 +++++++++++++++++++ package/quotatool/Config.in | 7 ++++ package/quotatool/quotatool.hash | 5 +++ package/quotatool/quotatool.mk | 17 +++++++++ 6 files changed, 67 insertions(+) create mode 100644 package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch create mode 100644 package/quotatool/Config.in create mode 100644 package/quotatool/quotatool.hash create mode 100644 package/quotatool/quotatool.mk diff --git a/DEVELOPERS b/DEVELOPERS index 45c13d39eb..035376eca8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1459,6 +1459,7 @@ F: package/libevdev/ F: package/log4cplus/ F: package/postgresql/ F: package/qt5/ +F: package/quotatool/ F: package/racehound/ F: package/wiringpi/ diff --git a/package/Config.in b/package/Config.in index de10dd0613..3481598646 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1997,6 +1997,7 @@ menu "System tools" source "package/psmisc/Config.in" source "package/pwgen/Config.in" source "package/quota/Config.in" + source "package/quotatool/Config.in" source "package/rauc/Config.in" source "package/rsyslog/Config.in" source "package/runc/Config.in" diff --git a/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch new file mode 100644 index 0000000000..927e62ba8c --- /dev/null +++ b/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch @@ -0,0 +1,36 @@ +From 0e096badc901f755f3bcefabdc57091725a5a0c5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 1 Feb 2018 23:50:43 +0100 +Subject: [PATCH] fix missing __P definition for musl compile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + In file included from src/quota.h:40:0, + from src/parse.c:26: + src/linux/linux_quota.h:120:15: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__P’ + long quotactl __P((int, const char *, qid_t, caddr_t)); + ^~~ + +Signed-off-by: Peter Seiderer +--- + src/linux/linux_quota.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/linux/linux_quota.h b/src/linux/linux_quota.h +index 11f9871..2b29a89 100644 +--- a/src/linux/linux_quota.h ++++ b/src/linux/linux_quota.h +@@ -14,6 +14,7 @@ + #ifndef LINUX_QUOTA_H + #define LINUX_QUOTA_H + ++#include + #include + #include "system.h" + +-- +2.16.1 + diff --git a/package/quotatool/Config.in b/package/quotatool/Config.in new file mode 100644 index 0000000000..4015cef6c8 --- /dev/null +++ b/package/quotatool/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_QUOTATOOL + bool "quotatool" + help + Quotatool is a utility to manipulate filesystem quotas from + the commandline. + + http://quotatool.ekenberg.se/ diff --git a/package/quotatool/quotatool.hash b/package/quotatool/quotatool.hash new file mode 100644 index 0000000000..45b477830e --- /dev/null +++ b/package/quotatool/quotatool.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 e53adc480d54ae873d160dc0e88d78095f95d9131e528749fd982245513ea090 quotatool-1.6.2.tar.gz + +# Hash for license files: +sha256 94686eeb98a40edc64106c6f8644068d8a08816a510a3cde75e50f1bf470564d COPYING diff --git a/package/quotatool/quotatool.mk b/package/quotatool/quotatool.mk new file mode 100644 index 0000000000..7b63c01316 --- /dev/null +++ b/package/quotatool/quotatool.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# quotatool +# +################################################################################ + +QUOTATOOL_VERSION = 1.6.2 +QUOTATOOL_SITE = http://quotatool.ekenberg.se +QUOTATOOL_LICENSE = GPL-2.0 +QUOTATOOL_LICENSE_FILES = COPYING + +# men="" allows to disable installing the man pages, which fails +# because the package Makefile doesn't create the appropriate +# directory. +QUOTATOOL_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install men="" + +$(eval $(autotools-package)) From 25cc88079459beba0827e95733f54ecad0bf995c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 31 Mar 2018 18:20:23 +0200 Subject: [PATCH 0540/2640] package/erlang: bump version to 20.3 Removed patch 0001, not needed anymore after upstream commit https://github.com/erlang/otp/commit/aa9054e0ea48a127f2aeafcdce1df4d1aec09574 Renumbered remaining patches, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/erlang/0001-build-fix.patch | 13 ------------- ...d-instruct-libatomic_ops-we-do-require-CA.patch} | 0 ...ts-emulator-reorder-inclued-headers-paths.patch} | 0 ...-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch} | 0 package/erlang/erlang.hash | 5 +++-- package/erlang/erlang.mk | 4 ++-- 6 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 package/erlang/0001-build-fix.patch rename package/erlang/{0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch => 0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch} (100%) rename package/erlang/{0003-erts-emulator-reorder-inclued-headers-paths.patch => 0002-erts-emulator-reorder-inclued-headers-paths.patch} (100%) rename package/erlang/{0004-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch => 0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch} (100%) diff --git a/package/erlang/0001-build-fix.patch b/package/erlang/0001-build-fix.patch deleted file mode 100644 index ff821c9fc0..0000000000 --- a/package/erlang/0001-build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -apply-patches.sh deletes this file from the source directory. - ---- erlang-R15B01.old/lib/tools/emacs/Makefile 2012-04-04 -+++ erlang-R15B01/lib/tools/emacs/Makefile 2012-04-04 15:55:16.978957307 +0100 -@@ -51,7 +51,7 @@ - - ELC_FILES = $(EMACS_FILES:%=%.elc) - --TEST_FILES = test.erl.indented test.erl.orig -+TEST_FILES = test.erl.indented - - # ---------------------------------------------------- - # Targets diff --git a/package/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch similarity index 100% rename from package/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch rename to package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch diff --git a/package/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch similarity index 100% rename from package/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch rename to package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch diff --git a/package/erlang/0004-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch similarity index 100% rename from package/erlang/0004-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch rename to package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index cf820cec1b..f5ff74022c 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,3 +1,4 @@ # md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 2faed2c3519353e6bc2501ed4d8e6ae7 otp_src_20.0.tar.gz -sha256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 otp_src_20.0.tar.gz +md5 a683c8c0aacfe0305c4bf47b3abfde6a otp_src_20.3.tar.gz +sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 otp_src_20.3.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 5705b98d8e..b7fdb6b9ce 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,7 +5,7 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 20.0 +ERLANG_VERSION = 20.3 ERLANG_SITE = http://www.erlang.org/download ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -19,7 +19,7 @@ ERLANG_AUTORECONF = YES # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.10 +ERLANG_EI_VSN = 3.10.1 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes From 29b7cc88f401dcc69a085be5af067851f896da58 Mon Sep 17 00:00:00 2001 From: Jason Pruitt Date: Sat, 31 Mar 2018 22:57:58 +0200 Subject: [PATCH 0541/2640] hackrf: new package This patch adds hackrf/host tools for HackRF, a low cost, open source Software Defined Radio platform. Sources of host tools are available on GitHub here: https://github.com/mossmann/hackrf/tree/master/host Signed-off-by: Jason Pruitt Signed-off-by: Alexey Brodkin [Arnout: - Rename package to hackrf to match upstream name; - Reorder dependencies and remove empty line (check-package); - Use only sha256 hash; - Add hash for license file; - Bump to 2018.01.1; - Use uploaded tarball rather than github-generated one; - Fix dependencies of comment (|| instead of &&) - Add UDEV_RULES_GROUP=plugdev in case the build host doesn't have this group; - Add patch fixing build without C++ compiler. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + .../0001-Don-t-require-a-C-compiler.patch | 37 +++++++++++++++++++ package/hackrf/Config.in | 16 ++++++++ package/hackrf/hackrf.hash | 3 ++ package/hackrf/hackrf.mk | 26 +++++++++++++ 5 files changed, 83 insertions(+) create mode 100644 package/hackrf/0001-Don-t-require-a-C-compiler.patch create mode 100644 package/hackrf/Config.in create mode 100644 package/hackrf/hackrf.hash create mode 100644 package/hackrf/hackrf.mk diff --git a/package/Config.in b/package/Config.in index 3481598646..b98f661783 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1201,6 +1201,7 @@ menu "Hardware handling" source "package/ccid/Config.in" source "package/dtc/Config.in" source "package/gnu-efi/Config.in" + source "package/hackrf/Config.in" source "package/hidapi/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/hackrf/0001-Don-t-require-a-C-compiler.patch b/package/hackrf/0001-Don-t-require-a-C-compiler.patch new file mode 100644 index 0000000000..3369dca670 --- /dev/null +++ b/package/hackrf/0001-Don-t-require-a-C-compiler.patch @@ -0,0 +1,37 @@ +From 8b0a8b2be8cf2e4a76c03d3bcdf99bff5025ba22 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Sat, 31 Mar 2018 22:50:37 +0200 +Subject: [PATCH] Don't require a C++ compiler + +By default, CMake assumes that the project is using both C and C++. By +explicitly passing 'C' as argument of the project() macro, we tell CMake +that only C is used, which prevents CMake from erroring out if a C++ +compiler doesn't exist. + +Upstream status: https://github.com/mossmann/hackrf/pull/469 + +This patch differs from upstream because: +- project name upstream has been changed into HackRF; +- in Buildroot, we are only interested in host, not firmware. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + host/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt +index 874163f..d9cbe31 100644 +--- a/host/CMakeLists.txt ++++ b/host/CMakeLists.txt +@@ -1,7 +1,7 @@ + #top dir cmake project for libhackrf + tools + + cmake_minimum_required(VERSION 2.8) +-project (hackrf_all) ++project (hackrf_all C) + + add_subdirectory(libhackrf) + add_subdirectory(hackrf-tools) +-- +2.16.3 + diff --git a/package/hackrf/Config.in b/package/hackrf/Config.in new file mode 100644 index 0000000000..4fa27699c4 --- /dev/null +++ b/package/hackrf/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_HACKRF + bool "hackrf" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE + select BR2_PACKAGE_LIBUSB + help + Library and tools for accessing HackRF SDR boards. + + https://github.com/mossmann/hackrf/tree/master/host + +comment "hackrf needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + +comment "hackrf needs fftw's single precision" + depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash new file mode 100644 index 0000000000..c0cf732213 --- /dev/null +++ b/package/hackrf/hackrf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a89badc09a1d2fa18367b3b2c974580ad5f6ce93aaa4e54557dc3d013c029d14 hackrf-2018.01.1.tar.xz +sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk new file mode 100644 index 0000000000..acab0be1d3 --- /dev/null +++ b/package/hackrf/hackrf.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# hackrf +# +################################################################################ + +HACKRF_VERSION = 2018.01.1 +HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) +HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz +HACKRF_LICENSE = GPL-2.0+ BSD-3c +HACKRF_LICENSE_FILES = COPYING +HACKRF_DEPENDENCIES = fftw libusb +HACKRF_SUBDIR = host +HACKRF_INSTALL_STAGING = YES + +HACKRF_CONF_OPTS += -DBUILD_HACKRF_TOOLS=ON + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +HACKRF_CONF_OPTS += \ + -DINSTALL_UDEV_RULES=ON \ + -DUDEV_RULES_GROUP=plugdev +else +HACKRF_CONF_OPTS += -DINSTALL_UDEV_RULES=OFF +endif + +$(eval $(cmake-package)) From cf9bf7d28b8a6c55e639b17c90f35ea11cae88ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sun, 5 Nov 2017 19:46:50 -0500 Subject: [PATCH 0542/2640] support/download: keep files downloaded without hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the situation where the hash is missing from the hash file, the dl-wrapper downloads the file again and again until the developer specifies the hash to complete the download step. To avoid this situation, the freshly-downloaded file is not removed anymore after a successful download. After this change, the behaviour is as follows: - Hash file doesn't exist, or file is in BR_NO_CHECK_HASH_FOR => always succeeds. - Hash file exists, but file is not present => file is NOT removed, build is terminated immediately (i.e. secondary site is not tried). - Hash file exists, file is present, but hash mismatch => file is removed, secondary site is tried. => If all primary/secondary site downloads or hash checks fail, the build is terminated. Signed-off-by: Gaël PORTAY [Arnout: extend commit log] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/download/dl-wrapper | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index f944b71db5..b018819833 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -21,7 +21,7 @@ set -e main() { local OPT OPTARG - local backend output hfile recurse quiet + local backend output hfile recurse quiet rc # Parse our options; anything after '--' is for the backend while getopts :hb:o:H:rq OPT; do @@ -93,9 +93,16 @@ main() { # Check if the downloaded file is sane, and matches the stored hashes # for that file - if ! support/download/check-hash ${quiet} "${hfile}" "${tmpf}" "${output##*/}"; then - rm -rf "${tmpd}" - exit 1 + if support/download/check-hash ${quiet} "${hfile}" "${tmpf}" "${output##*/}"; then + rc=0 + else + if [ ${?} -ne 3 ]; then + rm -rf "${tmpd}" + exit 1 + fi + + # the hash file exists and there was no hash to check the file against + rc=1 fi # tmp_output is in the same directory as the final output, so we can @@ -141,6 +148,8 @@ main() { rm -f "${tmp_output}" exit 1 fi + + return ${rc} } help() { From 9657e964f08033c1c71a8d94968fdc997360af4f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Apr 2018 15:58:08 +0200 Subject: [PATCH 0543/2640] package/kodi-adsp-*: remove packages Those packages are unmaintained and not in a working state, for details see https://github.com/xbmc/xbmc/pull/13723 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 15 +++++++++++++++ package/kodi-adsp-basic/Config.in | 12 ------------ package/kodi-adsp-basic/kodi-adsp-basic.hash | 2 -- package/kodi-adsp-basic/kodi-adsp-basic.mk | 15 --------------- package/kodi-adsp-freesurround/Config.in | 11 ----------- .../kodi-adsp-freesurround.hash | 2 -- .../kodi-adsp-freesurround.mk | 15 --------------- package/kodi/Config.in | 5 ----- 8 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 package/kodi-adsp-basic/Config.in delete mode 100644 package/kodi-adsp-basic/kodi-adsp-basic.hash delete mode 100644 package/kodi-adsp-basic/kodi-adsp-basic.mk delete mode 100644 package/kodi-adsp-freesurround/Config.in delete mode 100644 package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash delete mode 100644 package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk diff --git a/Config.in.legacy b/Config.in.legacy index fa083eaf79..2e3b1b6001 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,21 @@ comment "unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2018.05" + +config BR2_PACKAGE_KODI_ADSP_BASIC + bool "kodi-adsp-basic package removed" + select BR2_LEGACY + help + kodi-adsp-basic is unmaintained + +config BR2_PACKAGE_KODI_ADSP_FREESURROUND + bool "kodi-adsp-freesurround package removed" + select BR2_LEGACY + help + kodi-adsp-freesurround is unmaintained + ############################################################################### comment "Legacy options removed in 2018.02" diff --git a/package/kodi-adsp-basic/Config.in b/package/kodi-adsp-basic/Config.in deleted file mode 100644 index 87bdd1973c..0000000000 --- a/package/kodi-adsp-basic/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_KODI_ADSP_BASIC - bool "kodi-adsp-basic" - select BR2_PACKAGE_LIBPLATFORM - select BR2_PACKAGE_KODI_PLATFORM - help - This add-on contains basic dsp related parts to handle - speaker delays, channel related volume amplification. As - mode it supports a Dolby Pro Logic II compatible - multichannel downmix to stereo, which becomes available if - only 2 channel output on Kodi is selected. - - https://github.com/kodi-adsp/adsp.basic diff --git a/package/kodi-adsp-basic/kodi-adsp-basic.hash b/package/kodi-adsp-basic/kodi-adsp-basic.hash deleted file mode 100644 index 10dd773c1e..0000000000 --- a/package/kodi-adsp-basic/kodi-adsp-basic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d6ef031157ceb825a6e6ba114fb20c622ef7f396ddd17ae8bf1954aab25bc2af kodi-adsp-basic-2ae604e591346741324663260696cfa231931870.tar.gz diff --git a/package/kodi-adsp-basic/kodi-adsp-basic.mk b/package/kodi-adsp-basic/kodi-adsp-basic.mk deleted file mode 100644 index bb114a41ea..0000000000 --- a/package/kodi-adsp-basic/kodi-adsp-basic.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-adsp-basic -# -################################################################################ - -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_ADSP_BASIC_VERSION = 2ae604e591346741324663260696cfa231931870 -KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION)) -KODI_ADSP_BASIC_LICENSE = GPL-3.0+ -KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md -KODI_ADSP_BASIC_DEPENDENCIES = libplatform kodi-platform - -$(eval $(cmake-package)) diff --git a/package/kodi-adsp-freesurround/Config.in b/package/kodi-adsp-freesurround/Config.in deleted file mode 100644 index 80aadf1d40..0000000000 --- a/package/kodi-adsp-freesurround/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_ADSP_FREESURROUND - bool "kodi-adsp-freesurround" - select BR2_PACKAGE_LIBPLATFORM - select BR2_PACKAGE_KODI_PLATFORM - help - FreeSurround is meant to be the KODI equivalent of your - hi-fi receiver's Dolby ProLogic II button. It's purpose is - to decode surround information from your stereo music and to - produce multichannel output from it. - - https://github.com/kodi-adsp/adsp.freesurround diff --git a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash deleted file mode 100644 index 2649bbdcbf..0000000000 --- a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 cf6985be6839530027861b54e2146693d05e802363281ef6f8c1f352dbf94b5c kodi-adsp-freesurround-34f50406bcba22e364711562e5b9205e57ae844b.tar.gz diff --git a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk deleted file mode 100644 index 927af74da7..0000000000 --- a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-adsp-freesurround -# -################################################################################ - -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_ADSP_FREESURROUND_VERSION = 34f50406bcba22e364711562e5b9205e57ae844b -KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION)) -KODI_ADSP_FREESURROUND_LICENSE = GPL-3.0+ -KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md -KODI_ADSP_FREESURROUND_DEPENDENCIES = libplatform kodi-platform - -$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 071c03d640..d96d546bf9 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -280,11 +280,6 @@ menu "Audio decoder addons" source "package/kodi-audiodecoder-vgmstream/Config.in" endmenu -menu "Audio DSP addons" - source "package/kodi-adsp-basic/Config.in" - source "package/kodi-adsp-freesurround/Config.in" -endmenu - menu "Audio encoder addons" source "package/kodi-audioencoder-flac/Config.in" source "package/kodi-audioencoder-lame/Config.in" From 7cebb3fe0ff188b1e376cc73ebd07dc596596a02 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Apr 2018 16:00:45 +0200 Subject: [PATCH 0544/2640] package/kodi-inputstream-adaptive: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 78b48c16b6..15ecf494f1 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 572b2e898484a5ada74c4095539cebf43c198a3147f0f24fe350bc79db053695 kodi-inputstream-adaptive-9af21218a87572bd4ab8d8d660c11f6295144f97.tar.gz +sha256 872a6ffefb90b6201a1e01fe5a52e05877e2040737e052b2f249725b9a8a44ff kodi-inputstream-adaptive-c51b9a9b58a645f820883e6d99982277fc58aac5.tar.gz diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index f7a4c66e8c..ab810d3248 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 9af21218a87572bd4ab8d8d660c11f6295144f97 +KODI_INPUTSTREAM_ADAPTIVE_VERSION = c51b9a9b58a645f820883e6d99982277fc58aac5 KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp From 6087e548007b78ead9cb73bb4d642e3fb5236bd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Apr 2018 14:26:40 +0200 Subject: [PATCH 0545/2640] package/apache: fix lua detection Patch suggested by Thomas: Adding a path to --with-lua disables pkgconf-based detection of lua, which in some cases needs libdl. This patch removes --with-lua which fixes http://autobuild.buildroot.net/results/cc1/cc13f4cef9cf6f18615d58f1d83b233812f19fa0/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apache/apache.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 3b39be4a40..23414fe44d 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -57,9 +57,7 @@ APACHE_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_LUA),y) -APACHE_CONF_OPTS += \ - --enable-lua \ - --with-lua=$(STAGING_DIR)/usr +APACHE_CONF_OPTS += --enable-lua APACHE_DEPENDENCIES += lua else APACHE_CONF_OPTS += --disable-lua From 5e58509bfe497c5e85db58f8213b0a44ac79dd3f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Mar 2018 19:54:20 +0200 Subject: [PATCH 0546/2640] toolchain-wrapper: use -ffp-contract=off on MIPS Xburst for gcc >= 4.6 Since gcc 4.6, GCC deprecated -mfused-madd, -ffp-contract=off should be used for the Xburst workaround. Tested with the MIPS Sourcery 2011.03 toolchain (based on gcc 4.5), the toolchain wrapper uses -mno-fused-madd, as expected: $ BR2_DEBUG_WRAPPER=2 ./output/host/bin/mips-linux-gnu-gcc -o toto toto.c Toolchain wrapper executing: '/home/thomas/toolchains/mips-2011.03/bin/mips-linux-gnu-gcc' '--sysroot' '/home/thomas/projets/buildroot/output/host/mipsel-buildroot-linux-gnu/sysroot' '-mabi=32' '-msoft-float' '-mno-fused-madd' '-EL' '-march=mips32r2' '-o' 'toto' 'toto.c' And with the MIPS Sourcery 2012.09 toolchain (based on gcc 4.7), the toolchain wrapper uses -ffp-contract=off, as expected: $ BR2_DEBUG_WRAPPER=2 ./output/host/bin/mips-linux-gnu-gcc -o toto toto.c Toolchain wrapper executing: '/home/thomas/toolchains/mips-2012.09/bin/mips-linux-gnu-gcc' '--sysroot' '/home/thomas/projets/buildroot/output/host/mipsel-buildroot-linux-gnu/sysroot' '-mabi=32' '-msoft-float' '-ffp-contract=off' '-EL' '-march=mips32r2' '-o' 'toto' 'toto.c' Fixes the ci20_defconfig build: https://gitlab.com/buildroot.org/buildroot/-/jobs/60303132 Signed-off-by: Waldemar Brodkorb [Thomas: rework to continue supporting pre-gcc-4.6 toolchains, extend the commit log after doing more testing.] Signed-off-by: Thomas Petazzoni Reviewed-by: Ezequiel Garcia Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 3 +++ toolchain/toolchain-wrapper.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 2928ea42d0..c5eb813dd0 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -82,6 +82,9 @@ static char *predef_args[] = { #ifdef BR_NO_FUSED_MADD "-mno-fused-madd", #endif +#ifdef BR_FP_CONTRACT_OFF + "-ffp-contract=off", +#endif #ifdef BR_BINFMT_FLAT "-Wl,-elf2flt", #endif diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 0b26037d48..b8074efc3c 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -32,8 +32,14 @@ endif # Avoid FPU bug on XBurst CPUs ifeq ($(BR2_mips_xburst),y) +# Before gcc 4.6, -mno-fused-madd was needed, after -ffp-contract is +# needed +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_6),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR_FP_CONTRACT_OFF +else TOOLCHAIN_WRAPPER_ARGS += -DBR_NO_FUSED_MADD endif +endif ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' From 1fdd63ad372d7af555c71ae42e0a471c86a0cec9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 22:48:13 +0100 Subject: [PATCH 0547/2640] toolchain-configs.csv: re-organize for test-pkg This commit reorganizes the toolchain-configs.csv so that the first toolchains are a subset of "useful" toolchains to be tested by contributors to validate a package. This subset is the one that will be used by default by test-pkg. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../autobuild/toolchain-configs.csv | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 2010113f44..1bce7ac577 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -1,20 +1,41 @@ +# This file is sorted by "importance" of toolchains, so that by +# default test-pkg tests a useful subset of toolchains + +# Toolchains used by default by test-pkg: + +# Test a regular uClibc toolchain +support/config-fragments/autobuild/br-arm-full.config,x86_64 + +# Test a toolchain with glibc and a very recent gcc version +support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config,x86_64 + +# Test a noMMU toolchain with no dynamic library support +support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64 + +# Test a musl toolchain +support/config-fragments/autobuild/br-x86-64-musl.config,x86_64 + +# Test a noMMU toolchain with dynamic library support +support/config-fragments/autobuild/br-bfin-full.config,x86_64 + +# Test a MMU toolchain without dynamic library support +support/config-fragments/autobuild/br-arm-full-static.config,x86_64 + +# Test a toolchain with an old gcc version (gcc 4.8) support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config,x86 + +# Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config,x86 support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64 support/config-fragments/autobuild/br-arc-full-internal.config,any support/config-fragments/autobuild/br-arc-internal-glibc.config,any support/config-fragments/autobuild/br-arcle-hs38.config,x86_64 support/config-fragments/autobuild/br-arm-basic.config,x86_64 -support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config,x86_64 support/config-fragments/autobuild/br-arm-cortex-a9-musl.config,x86_64 -support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64 -support/config-fragments/autobuild/br-arm-full.config,x86_64 support/config-fragments/autobuild/br-arm-full-nothread.config,x86_64 -support/config-fragments/autobuild/br-arm-full-static.config,x86_64 support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any -support/config-fragments/autobuild/br-bfin-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 support/config-fragments/autobuild/br-m68k-5208-full.config,x86_64 @@ -36,7 +57,6 @@ support/config-fragments/autobuild/br-sh4-full.config,x86_64 support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64 support/config-fragments/autobuild/br-x86-64-core2-full.config,x86_64 -support/config-fragments/autobuild/br-x86-64-musl.config,x86_64 support/config-fragments/autobuild/br-xtensa-full.config,x86_64 support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/i686-ctng-linux-gnu.config,x86 From 0534da0f9fe4ace9dccd30e47c620532c9affb29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 22:48:14 +0100 Subject: [PATCH 0548/2640] test-pkg: test a subset of toolchains by default, add -a and -n options During the latest Buildroot Developers meeting, we discussed that test-pkg would perhaps be more widely used if it tested a smaller subset of toolchains. Indeed, it currently tests 47 toolchains, which takes very long to build. Several of the toolchain configurations are quite similar, and it is perhaps not necessary for contributors to test them all before submitting a package. Therefore, this commit changes the test-pkg script to only test a subset of the toolchain configurations by default. The N first configurations of the CSV files are tested, where N is hard-coded in the script. The CSV file has therefore been re-organized to have the first N toolchains be the most important ones. A -a/--all option is added to test with all toolchains, while a -n/--number option is added to test with the first N toolchains, N being passed on the command line. Note that the list of toolchains (built in the "toolchains" shell variable) is no longer sorted. Indeed, when the first N toolchains are tested, we want them to be tested in the same order as they are listed in the CSV file, as we are careful to order them in an interesting order. We only sort when all toolchains are tested. Signed-off-by: Thomas Petazzoni Tested-by: Matt Weber Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- utils/test-pkg | 56 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index cd7b9dad7b..2e069b6005 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,28 +5,37 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' main() { local o O opts - local cfg dir pkg random toolchains_dir toolchain + local cfg dir pkg random toolchains_dir toolchain all number mode local ret nb nb_skip nb_fail nb_legal nb_tc build_dir local -a toolchains - o='hc:d:p:r:t:' + o='hac:d:n:p:r:t:' O='help,config-snippet:build-dir:package:,random:,toolchains-dir:' opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" random=0 + all=0 + number=0 + mode=0 toolchains_csv="${TOOLCHAINS_CSV}" while [ ${#} -gt 0 ]; do case "${1}" in (-h|--help) help; exit 0 ;; + (-a|--all) + all=1; shift 1 + ;; (-c|--config-snippet) cfg="${2}"; shift 2 ;; (-d|--build-dir) dir="${2}"; shift 2 ;; + (-n|--number) + number="${2}"; shift 2 + ;; (-p|--package) pkg="${2}"; shift 2 ;; @@ -51,15 +60,37 @@ main() { dir="${HOME}/br-test-pkg" fi + if [ ${random} -gt 0 ]; then + mode=$((mode+1)) + fi + + if [ ${number} -gt 0 ]; then + mode=$((mode+1)) + fi + + if [ ${all} -eq 1 ]; then + mode=$((mode+1)) + fi + + # Default mode is to test the N first toolchains, which have been + # chosen to be a good selection of toolchains. + if [ ${mode} -eq 0 ] ; then + number=7 + elif [ ${mode} -gt 1 ] ; then + printf "error: --all, --number and --random are mutually exclusive\n" >&2; exit 1 + fi + # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ |if [ ${random} -gt 0 ]; then \ sort -R |head -n ${random} - else - cat - fi |sort + elif [ ${number} -gt 0 ]; then \ + head -n ${number} + else + sort + fi ) ) @@ -154,6 +185,10 @@ toolchain config fragment and the required host architecture, separated by a comma. The config fragments should contain only the toolchain and architecture settings. +By default, a useful subset of toolchains is tested. If needed, all +toolchains can be tested (-a), an arbitrary number of toolchains (-n +in order, -r for random). + Options: -h, --help @@ -170,9 +205,16 @@ Options: Test-build the package PKG, by running 'make PKG'; if not specified, just runs 'make'. + -a, --all + Test all toolchains, instead of the default subset defined by + Buildroot developers. + + -n N, --number N + Test N toolchains, in the order defined in the toolchain CSV + file. + -r N, --random N - Limit the tests to the N randomly selected toolchains, instead of - building with all toolchains. + Limit the tests to the N randomly selected toolchains. -t CSVFILE, --toolchains-csv CSVFILE CSV file containing the paths to config fragments of toolchains to From b8c16d9c4f9d19236f6919edee60e6acd2871e38 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 22:48:15 +0100 Subject: [PATCH 0549/2640] docs/manual: update the documentation about test-pkg Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-tips.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt index 19577fa821..f37f9874e7 100644 --- a/docs/manual/adding-packages-tips.txt +++ b/docs/manual/adding-packages-tips.txt @@ -77,9 +77,14 @@ and what package to test: $ ./utils/test-pkg -c libcurl.config -p libcurl ---- -This will try to build your package against all the toolchains used -by the autobuilders (except for the internal toolchains, because it takes -too long to do so). The output lists all toolchains and the corresponding +By default, +test-pkg+ will build your package against a subset of the +toolchains used by the autobuilders, which has been selected by the +Buildroot developers as being the most useful and representative +subset. If you want to test all toolchains, pass the +-a+ option. Note +that in any case, internal toolchains are excluded as they take too +long to build. + +The output lists all toolchains that are tested and the corresponding result (excerpt, results are fake): ---- From c4c85c12eb7f39d2faf54f080de973f7d69224f0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 13:51:35 +0200 Subject: [PATCH 0550/2640] package/pkg-golang: use 'build' instead of 'install' So far, we were using the 'go install' mechanism to build a package and have its binary installed in $$($(2)_WORKSPACE)/bin/linux_$$(GO_GOARCH). This worked fine when building on x86-64 for ARM, but failed when building on x86-64 for x86-64 because the binaries were installed in $$($(2)_WORKSPACE)/bin/. Instead of doing some complicated logic to guess whether Go is going to put our binaries in $$($(2)_WORKSPACE)/bin/ or in $$($(2)_WORKSPACE)/bin/linux_$$(GO_GOARCH), we revert back to using "go build", as it was done before the introduction of the golang package infrastructure. "go build" lets us pass explicitly the destination path of the binary to be generated. There's just one complexity with how to decide on the name of the binary that should be produced, and we have two cases: - _BUILD_TARGETS is the default, i.e ".". In this case we assume a single binary is produced by "go build", and we name if after the lower case package name. We allow this to be overridden thanks to _BIN_NAME. - _BUILD_TARGETS is non-default, and typically contains something like "foo bar" or "cmd/foo cmd/bar". In this case, we assume the binaries to be produced are "foo" and "bar", i.e we take the non-directory part of the build target to name the binaries. Because we're using this -o option, we no longer need to explicitly create the binary directory, it is done by "go build". Fixes: http://autobuild.buildroot.net/results/1f9cd7c48e8c8f41326632a9c0de83915d72c45b/ [Peter: use $(or instead of $(if as suggested by Arnout] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-golang.txt | 13 ++++++++++++- package/pkg-golang.mk | 26 ++++++++++++++------------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index b6d1f5e6b4..efcf696867 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -86,7 +86,18 @@ therefore only use a few of them, or none. * +FOO_BUILD_TARGETS+ can be used to pass the list of targets that should be built. If +FOO_BUILD_TARGETS+ is not specified, it - defaults to +.+. + defaults to +.+. We then have two cases: + +** +FOO_BUILD_TARGETS+ is +.+. In this case, we assume only one binary + will be produced, and that by default we name it after the package + name. If that is not appropriate, the name of the produced binary + can be overridden using +FOO_BIN_NAME+. + +** +FOO_BUILD_TARGETS+ is not +.+. In this case, we iterate over the + values to build each target, and for each produced a binary that is + the non-directory component of the target. For example if + +FOO_BUILD_TARGETS = cmd/docker cmd/dockerd+ the binaries produced + are +docker+ and +dockerd+. * +FOO_INSTALL_BINS+ can be used to pass the list of binaries that should be installed in +/usr/bin+ on the target. If diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f51b2ee2e0..342d17fbd9 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -62,12 +62,16 @@ $(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . -$(2)_INSTALL_BINS ?= $(1) +# If the build target is just ".", then we assume the binary to be +# produced is named after the package. If however, a build target has +# been specified, we assume that the binaries to be produced are named +# after each build target building them (below in _BUILD_CMDS). +ifeq ($$($(2)_BUILD_TARGETS),.) +$(2)_BIN_NAME ?= $(1) +endif -# The go build/install command installs the binaries inside -# gopath/bin/linux_GOARCH/ when cross compilation is enabled. We set this -# variable here to be used by packages if needed. -$(2)_BINDIR = $$($(2)_WORKSPACE)/bin/linux_$$(GO_GOARCH) +$(2)_BINDIR = bin +$(2)_INSTALL_BINS ?= $(1) # Source files in Go should be extracted in a precise folder in the hierarchy # of GOPATH. It usually resolves around domain/vendor/software. By default, we @@ -84,17 +88,13 @@ $(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) # file. ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS - mkdir -p $$(@D)/$$($(2)_WORKSPACE)/bin mkdir -p $$(dir $$($(2)_SRC_PATH)) ln -sf $$(@D) $$($(2)_SRC_PATH) endef endif -# Build step. Only define it if not already defined by the package .mk file. We -# use the install command instead of build command here because the install -# command just moves the package binaries into /bin/linux_GOARCH/. -# This leverages the go build infrastructure for building and installing -# multiple binaries. +# Build step. Only define it if not already defined by the package .mk +# file. ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ @@ -102,7 +102,9 @@ define $(2)_BUILD_CMDS $$(GO_TARGET_ENV) \ GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ $$($(2)_GO_ENV) \ - $$(GO_BIN) install -v $$($(2)_BUILD_OPTS) ./$$(d) + $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ + -o $$(@D)/$$($(2)_BINDIR)/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ + ./$$(d) ) endef endif From 888404d7fb940afef28ac368a84117da987ea59c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 13:51:36 +0200 Subject: [PATCH 0551/2640] package/pkg-golang: drop the fixed _BINDIR variable Now that _BINDIR is always "bin", having it as a package variable doesn't make much sense, so get rid of this variable completely, and use "bin". Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/docker-proxy/docker-proxy.mk | 2 +- package/flannel/flannel.mk | 2 +- package/pkg-golang.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index a90271fc35..dfa9d4347d 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -17,7 +17,7 @@ DOCKER_PROXY_WORKSPACE = gopath DOCKER_PROXY_BUILD_TARGETS = cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_PROXY_BINDIR)/proxy $(TARGET_DIR)/usr/bin/docker-proxy + $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy endef $(eval $(golang-package)) diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 07d5d0dfd6..d00d2df92c 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -15,7 +15,7 @@ FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION # Install flannel to its well known location. define FLANNEL_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(FLANNEL_BINDIR)/flannel $(TARGET_DIR)/opt/bin/flanneld + $(INSTALL) -D -m 0755 $(@D)/bin/flannel $(TARGET_DIR)/opt/bin/flanneld $(INSTALL) -D -m 0755 $(@D)/dist/mk-docker-opts.sh $(TARGET_DIR)/opt/bin/mk-docker-opts.sh endef diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 342d17fbd9..f23bda390d 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -70,7 +70,6 @@ ifeq ($$($(2)_BUILD_TARGETS),.) $(2)_BIN_NAME ?= $(1) endif -$(2)_BINDIR = bin $(2)_INSTALL_BINS ?= $(1) # Source files in Go should be extracted in a precise folder in the hierarchy @@ -103,7 +102,7 @@ define $(2)_BUILD_CMDS GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ - -o $$(@D)/$$($(2)_BINDIR)/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ + -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ ./$$(d) ) endef @@ -114,7 +113,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/$$($(2)_BINDIR)/$$(d) $(TARGET_DIR)/usr/bin/$$(d) + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d) ) endef endif From 94e80d78cf22fd4daa047b42467638e3164874ee Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 8 Nov 2017 15:26:41 +0200 Subject: [PATCH 0552/2640] Allow adding per-package override rsync exclusions This allows using _SRCDIR_OVERRIDE_RSYNC_EXCLUSIONS in local.mk to skip copying parts of source trees unneeded for building. For example, when developing WebKitGTK+, it's handy to skip copying all the tests and other build directories, which are huge: WEBKITGTK_OVERRIDE_SRCDIR = /home/aperez/WebKit WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \ --exclude JSTests --exclude ManualTests \ --exclude PerformanceTests --exclude WebDriverTests \ --exclude WebKitBuild --exclude WebKitLibraries \ --exclude WebKit.xcworkspace --exclude Websites \ --exclude Examples This saves a good chunk of time when rsync is used for the first time to copy the source tree over before building. Signed-off-by: Adrian Perez de Castro [Arnout: move documentation to the end of the section] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/using-buildroot-development.txt | 16 ++++++++++++++++ package/pkg-generic.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt index 1071de5132..3389a37b39 100644 --- a/docs/manual/using-buildroot-development.txt +++ b/docs/manual/using-buildroot-development.txt @@ -81,3 +81,19 @@ make busybox-rebuild all the root filesystem image in +output/images+ contains the updated BusyBox. + +Source trees for big projects often contain hundreds or thousands of +files which are not needed for building, but will slow down the process +of copying the sources with _rsync_. Optionally, it is possible define ++_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS+ to skip syncing certain files +from the source tree. For example, when working on the +webkitgtk+ +package, the following will exclude the tests and in-tree builds from +a local WebKit source tree: + +------------------ +WEBKITGTK_OVERRIDE_SRCDIR = /home/bob/WebKit +WEBKITGTK_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS = \ + --exclude JSTests --exclude ManualTests --exclude PerformanceTests \ + --exclude WebDriverTests --exclude WebKitBuild --exclude WebKitLibraries \ + --exclude WebKit.xcworkspace --exclude Websites --exclude Examples +------------------ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index d870921def..84d77822d4 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -168,7 +168,7 @@ $(BUILD_DIR)/%/.stamp_rsynced: @$(call MESSAGE,"Syncing from source dir $(SRCDIR)") $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) - rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D) + rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $($(PKG)_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D) $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ From bcaed9ea7b030068d2a6126be9d3c63e84bc8bb9 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 30 Sep 2017 20:35:20 -0300 Subject: [PATCH 0553/2640] syslinux: use the host compiler to build extlinux Like the utilities, it is meant to run on the host machine, hence must be built using the host toolchain. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...inux-Use-the-host-toolchain-to-build.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch diff --git a/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch b/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch new file mode 100644 index 0000000000..62675cf6cc --- /dev/null +++ b/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch @@ -0,0 +1,53 @@ +From 4df2e7c0ae84bfbdba0ed285c0664aa089b38b7e Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sat, 30 Sep 2017 19:49:55 -0300 +Subject: [PATCH] extlinux: Use the host toolchain to build. + +It is meant to run on the host machine, hence must be built using the +host toolchain. + +Signed-off-by: Carlos Santos +--- + extlinux/Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/extlinux/Makefile b/extlinux/Makefile +index 02d1db51..5c4baa5a 100644 +--- a/extlinux/Makefile ++++ b/extlinux/Makefile +@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk + + OPTFLAGS = -g -Os + INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller +-CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ ++CFLAGS = $(CFLAGS_FOR_BUILD) $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ + $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = ++LDFLAGS = $(LDFLAGS_FOR_BUILD) + + SRCS = main.c \ + mountinfo.c \ +@@ -52,16 +52,16 @@ spotless: clean + installer: extlinux + + extlinux: $(OBJS) +- $(CC) $(LDFLAGS) -o $@ $^ ++ $(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^ + + strip: + $(STRIP) extlinux + + %.o: %.c +- $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< ++ $(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< + %.i: %.c +- $(CC) $(UMAKEDEPS) $(CFLAGS) -E -o $@ $< ++ $(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS) -E -o $@ $< + %.s: %.c +- $(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< ++ $(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< + + -include .*.d +-- +2.13.5 + From e80c892427d528253a1a69ba24db44be2eea66ba Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Sun, 1 Apr 2018 17:16:36 +0200 Subject: [PATCH 0554/2640] package/snort: new package Tested on Beaglebone Black. Build-tested with test-pkg. Patch to fix cross-compilation errors submitted upstream [1]. [1] https://lists.snort.org/pipermail/snort-devel/2018-January/011025.html Signed-off-by: Sergio Prado [Romain: - split patch by build issues - convert AC_RUN_IFELSE to AC_CHECK_MEMBERS (ThomasP) - convert AC_RUN_IFELSE to AC_COMPILE_IFELSE (ThomasP) - remove most make variable from SNORT_CONF_ENV - remove SNORT_SOURCE default value] Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...in-Avoid-path-poisoning-with-libpcap.patch | 35 +++ ...ow-to-override-the-INADDR_NONE-check.patch | 44 ++++ ...vert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch | 239 ++++++++++++++++++ ...vert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch | 48 ++++ package/snort/Config.in | 25 ++ package/snort/snort.hash | 6 + package/snort/snort.mk | 32 +++ 9 files changed, 431 insertions(+) create mode 100644 package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch create mode 100644 package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch create mode 100644 package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch create mode 100644 package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch create mode 100644 package/snort/Config.in create mode 100644 package/snort/snort.hash create mode 100644 package/snort/snort.mk diff --git a/DEVELOPERS b/DEVELOPERS index 035376eca8..d97259e73a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1681,6 +1681,7 @@ F: package/daq/ F: package/libgdiplus/ F: package/mongodb/ F: package/pimd/ +F: package/snort/ F: package/stella/ F: package/traceroute/ F: package/tunctl/ diff --git a/package/Config.in b/package/Config.in index b98f661783..e9f671ddb2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1833,6 +1833,7 @@ endif source "package/shellinabox/Config.in" source "package/smcroute/Config.in" source "package/sngrep/Config.in" + source "package/snort/Config.in" source "package/socat/Config.in" source "package/socketcand/Config.in" source "package/softether/Config.in" diff --git a/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch b/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch new file mode 100644 index 0000000000..286b6f5883 --- /dev/null +++ b/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch @@ -0,0 +1,35 @@ +From 732459ca3423799ae3386df3de3f5d6ea2af1b95 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 1 Apr 2018 15:18:51 +0200 +Subject: [PATCH] configure.in: Avoid path poisoning with libpcap + +Prevent usage of unsafe libpcap header path when cross compiling. + +Signed-off-by: Romain Naour +Cc: Sergio Prado +--- +From http://patchwork.ozlabs.org/patch/860363/ +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 4b3a5db..1e940b1 100644 +--- a/configure.in ++++ b/configure.in +@@ -70,8 +70,10 @@ case "$host" in + *-linux*) + linux="yes" + AC_DEFINE([LINUX],[1],[Define if Linux]) +- AC_SUBST(extra_incl) +- extra_incl="-I/usr/include/pcap" ++ if test -z "x$with_libpcap_includes"; then ++ AC_SUBST(extra_incl) ++ extra_incl="-I/usr/include/pcap" ++ fi + ;; + *-hpux10*|*-hpux11*) + AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) +-- +2.14.3 + diff --git a/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch b/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch new file mode 100644 index 0000000000..6575154240 --- /dev/null +++ b/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch @@ -0,0 +1,44 @@ +From a6817677a42d1294f1a3ce7b9f46b10ec557ddfa Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 1 Apr 2018 15:23:59 +0200 +Subject: [PATCH] configure.in: Allow to override the INADDR_NONE check + +Prevent configure script from trying to run programs in a cross +compilation environment to check if INADDR_NONE is defined. + +In the context of Buildroot, INADDR_NONE is always defined. +The snort package will set have_inaddr_none=yes in +SNORT_CONF_ENV. + +Signed-off-by: Romain Naour +Cc: Sergio Prado +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 1e940b1..938409f 100644 +--- a/configure.in ++++ b/configure.in +@@ -284,8 +284,8 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,int64_t]) + AC_CHECK_TYPES([boolean]) + + # In case INADDR_NONE is not defined (like on Solaris) ++AC_CACHE_CHECK([for INADDR_NONE], [have_inaddr_none], [ + have_inaddr_none="no" +-AC_MSG_CHECKING([for INADDR_NONE]) + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ +@@ -298,7 +298,7 @@ AC_RUN_IFELSE( + return 0; + ]])], + [have_inaddr_none="yes"], +-[have_inaddr_none="no"]) ++[have_inaddr_none="no"])]) + AC_MSG_RESULT($have_inaddr_none) + if test "x$have_inaddr_none" = "xno"; then + AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) +-- +2.14.3 + diff --git a/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch b/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch new file mode 100644 index 0000000000..059190ff6d --- /dev/null +++ b/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch @@ -0,0 +1,239 @@ +From 1ef6bdaeb0463a208a14e5d90646ce337df738fc Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 1 Apr 2018 15:38:55 +0200 +Subject: [PATCH] configure.in: convert AC_RUN_IFELSE to AC_CHECK_MEMBERS + +With AC_CHECK_MEMBERS, we don't need to compile and run a test program +to check if a daq structure element is defined. + +Also check DAQ_Data_Channel_Params_t with params.flags + +typedef struct _DAQ_Data_Channel_Params_t +{ + unsigned flags; /* DAQ_DATA_CHANNEL_* flags*/ + unsigned timeout_ms;/* timeout of the data channel in milliseconds */ + unsigned length; /* [Future] length of the data associated with the data channel */ + uint8_t* data; /* [Future] opaque data blob to return with the data channel */ +} DAQ_Data_Channel_Params_t; + +https://github.com/Xiche/libdaq/blob/master/api/daq_common.h + +Signed-off-by: Romain Naour +Cc: Sergio Prado +--- + configure.in | 143 +++++++++++++++++------------------------------------------ + 1 file changed, 41 insertions(+), 102 deletions(-) + +diff --git a/configure.in b/configure.in +index 938409f..571322b 100644 +--- a/configure.in ++++ b/configure.in +@@ -718,17 +718,11 @@ fi + AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc]) + + AC_MSG_CHECKING([for daq real addresses]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.n_real_dPort = 0; +-]])], +-[have_daq_real_addresses="yes"], +-[have_daq_real_addresses="no"]) ++ ++AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.n_real_dPort], ++ [have_daq_real_addresses="yes"], ++ [have_daq_real_addresses="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_real_addresses) + if test "x$have_daq_real_addresses" = "xyes"; then + AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1], +@@ -756,17 +750,11 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq address space ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +-]])], +-[have_daq_address_space_id="yes"], +-[have_daq_address_space_id="no"]) ++ ++AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.address_space_id], ++ [have_daq_address_space_id="yes"], ++ [have_daq_address_space_id="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_address_space_id) + if test "x$have_daq_address_space_id" = "xyes"; then + AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], +@@ -774,17 +762,10 @@ if test "x$have_daq_address_space_id" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq flow ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.flow_id = 0; +-]])], +-[have_daq_flow_id="yes"], +-[have_daq_flow_id="no"]) ++AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.flow_id], ++ [have_daq_flow_id="yes"], ++ [have_daq_flow_id="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_flow_id) + if test "x$have_daq_flow_id" = "xyes"; then + AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], +@@ -792,19 +773,10 @@ if test "x$have_daq_flow_id" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq extended flow modifiers]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_ModFlow_t mod; +- mod.type = 0; +- mod.length = 0; +- mod.value = NULL; +-]])], +-[have_daq_ext_modflow="yes"], +-[have_daq_ext_modflow="no"]) ++AC_CHECK_MEMBERS([DAQ_ModFlow_t mod.type, DAQ_ModFlow_t mod.length, DAQ_ModFlow_t mod.value], ++ [have_daq_ext_modflow="yes"], ++ [have_daq_ext_modflow="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_ext_modflow) + if test "x$have_daq_ext_modflow" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW" +@@ -813,19 +785,11 @@ if test "x$have_daq_ext_modflow" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq query flow]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_QueryFlow_t mod; +- mod.type = 0; +- mod.length = 0; +- mod.value = NULL; +-]])], +-[have_daq_queryflow="yes"], +-[have_daq_queryflow="no"]) ++ ++AC_CHECK_MEMBERS([DAQ_QueryFlow_t mod.type, DAQ_QueryFlow_t mod.length, DAQ_QueryFlow_t mod.value], ++ [have_daq_queryflow="yes"], ++ [have_daq_queryflow="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_queryflow) + if test "x$have_daq_queryflow" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW" +@@ -834,16 +798,11 @@ if test "x$have_daq_queryflow" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq data channel flags]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_Data_Channel_Params_t params; +-]])], +-[have_daq_data_channel_flags="yes"], +-[have_daq_data_channel_flags="no"]) ++ ++AC_CHECK_MEMBERS([DAQ_Data_Channel_Params_t params.flags], ++ [have_daq_data_channel_flags="yes"], ++ [have_daq_data_channel_flags="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_data_channel_flags) + if test "x$have_daq_data_channel_flags" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS" +@@ -852,17 +811,10 @@ if test "x$have_daq_data_channel_flags" = "xyes"; then + fi + + AC_MSG_CHECKING([for separate IP versions on pinhole endpoints]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_DP_key_t dpKey; +- dpKey.src_af = 0; +-]])], +-[have_daq_data_channel_separate_ip_versions="yes"], +-[have_daq_data_channel_separate_ip_versions="no"]) ++AC_CHECK_MEMBERS([DAQ_DP_key_t dpKey.src_af], ++ [have_daq_data_channel_separate_ip_versions="yes"], ++ [have_daq_data_channel_separate_ip_versions="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions) + if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS" +@@ -889,17 +841,10 @@ if test "x$have_daq_verdict_retry" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq packet trace]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.flags = DAQ_PKT_FLAG_TRACE_ENABLED; +-]])], +-[have_daq_packet_trace="yes"], +-[have_daq_packet_trace="no"]) ++AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.flags], ++ [have_daq_packet_trace="yes"], ++ [have_daq_packet_trace="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_packet_trace) + if test "x$have_daq_packet_trace" = "xyes"; then + AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], +@@ -909,17 +854,11 @@ else + fi + + AC_MSG_CHECKING([for daq verdict reason]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include +-]], +-[[ +- DAQ_ModFlow_t fl; +- fl.type = DAQ_MODFLOW_TYPE_VER_REASON; +-]])], +-[have_daq_verdict_reason="yes"], +-[have_daq_verdict_reason="no"]) ++ ++AC_CHECK_MEMBERS([DAQ_ModFlow_t fl.type], ++ [have_daq_verdict_reason="yes"], ++ [have_daq_verdict_reason="no"], ++ [[#include ]]) + AC_MSG_RESULT($have_daq_verdict_reason) + if test "x$have_daq_verdict_reason" = "xyes"; then + AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1], +-- +2.14.3 + diff --git a/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch b/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch new file mode 100644 index 0000000000..9c5e611b03 --- /dev/null +++ b/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch @@ -0,0 +1,48 @@ +From 075b5cf8d3940ed2c39fb37c1e14a652e4a6f2fc Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 1 Apr 2018 16:21:31 +0200 +Subject: [PATCH] configure.in: convert AC_RUN_IFELSE to AC_COMPILE_IFELSE + +Prevent configure script from trying to run programs in a cross +compilation environment. + +Signed-off-by: Romain Naour +Cc: Sergio Prado +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 571322b..e489037 100644 +--- a/configure.in ++++ b/configure.in +@@ -431,7 +431,7 @@ if test "x$LPCAP" = "xno"; then + fi + + AC_MSG_CHECKING([for pcap_lex_destroy]) +-AC_RUN_IFELSE( ++AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include +@@ -823,7 +823,7 @@ if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then + fi + + AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) +-AC_RUN_IFELSE( ++AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include +@@ -886,7 +886,7 @@ if eval "echo $host_cpu|grep -i sparc >/dev/null"; then + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mcpu=v9 " + AC_MSG_CHECKING([for sparc %time register]) +- AC_RUN_IFELSE( ++ AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[]], + [[ +-- +2.14.3 + diff --git a/package/snort/Config.in b/package/snort/Config.in new file mode 100644 index 0000000000..d1a59d5050 --- /dev/null +++ b/package/snort/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_SNORT + bool "snort" + depends on BR2_USE_WCHAR + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # daq + depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_DAQ + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC + help + Snort is a free and open source network intrusion + prevention system (IPS) and network intrusion detection + system (IDS). It can perform protocol analysis, content + searching/matching, and can be used to detect a variety + of attacks and probes, such as buffer overflows, stealth + port scans, CGI attacks, SMB probes, OS fingerprinting + attempts, and much more. + + https://www.snort.org + +comment "snort needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) diff --git a/package/snort/snort.hash b/package/snort/snort.hash new file mode 100644 index 0000000000..211e862b7f --- /dev/null +++ b/package/snort/snort.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 9f6b3aeac5a109f55504bd370564ac431cb1773507929dc461626898f33f46cd snort-2.9.11.1.tar.gz + +# Hash for license files: +sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE +sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/package/snort/snort.mk b/package/snort/snort.mk new file mode 100644 index 0000000000..13f16b3b0f --- /dev/null +++ b/package/snort/snort.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# snort +# +################################################################################ + +SNORT_VERSION = 2.9.11.1 +SNORT_SITE = https://www.snort.org/downloads/snort +SNORT_LICENSE = GPL-2.0 +SNORT_LICENSE_FILES = LICENSE COPYING + +SNORT_DEPENDENCIES = libpcap libdnet daq pcre + +# patching configure.in +SNORT_AUTORECONF = YES + +SNORT_CONF_OPTS = \ + --with-libpcap-includes=$(STAGING_DIR)/usr/include/pcap \ + --disable-static-daq + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +SNORT_DEPENDENCIES += libtirpc host-pkgconf +SNORT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` +SNORT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` +endif + +SNORT_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) $(SNORT_CFLAGS)" \ + LIBS="$(SNORT_LIBS)" \ + have_inaddr_none=yes + +$(eval $(autotools-package)) From 3522e78fc3a455834f99d7b3f2297ddf79815033 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 27 Oct 2017 19:16:22 +0200 Subject: [PATCH 0555/2640] gst1-interpipe: new package [Peter: use a normal config option instead of menuconfig, update DEVELOPERS] Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/gstreamer1/Config.in | 1 + package/gstreamer1/gst1-interpipe/Config.in | 10 +++++++++ .../gst1-interpipe/gst1-interpipe.hash | 5 +++++ .../gst1-interpipe/gst1-interpipe.mk | 21 +++++++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 package/gstreamer1/gst1-interpipe/Config.in create mode 100644 package/gstreamer1/gst1-interpipe/gst1-interpipe.hash create mode 100644 package/gstreamer1/gst1-interpipe/gst1-interpipe.mk diff --git a/DEVELOPERS b/DEVELOPERS index d97259e73a..a438aab4cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1454,6 +1454,7 @@ F: package/dejavu/ F: package/dillo/ F: package/edid-decode/ F: package/ghostscript-fonts/ +F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gst1-validate/ F: package/libevdev/ F: package/log4cplus/ diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 76c32bc6c6..8553cd2b2d 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -8,6 +8,7 @@ source "package/gstreamer1/gst1-plugins-good/Config.in" source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" source "package/gstreamer1/gst1-imx/Config.in" +source "package/gstreamer1/gst1-interpipe/Config.in" source "package/gstreamer1/gst1-libav/Config.in" source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-validate/Config.in" diff --git a/package/gstreamer1/gst1-interpipe/Config.in b/package/gstreamer1/gst1-interpipe/Config.in new file mode 100644 index 0000000000..5640c2b3db --- /dev/null +++ b/package/gstreamer1/gst1-interpipe/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_GST1_INTERPIPE + bool "gst1-interpipe" + select BR2_PACKAGE_GSTREAMER1_CHECK + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + help + GstInterpipe is a Gstreamer plug-in that allows communication + between two independent pipelines. + + https://github.com/RidgeRun/gst-interpipe diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash new file mode 100644 index 0000000000..b9b1c5e429 --- /dev/null +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -0,0 +1,5 @@ +# locally computed hash +sha256 3f8cc5cf4861e5836938c66415b47555550c93b06b1bc9faed83e89bacf705cf gst1-interpipe-10dba89eecc200e49f0b432e299f1c8a4312b657.tar.gz + +# Hashes for license files: +sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk new file mode 100644 index 0000000000..8f810f9cf1 --- /dev/null +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# gst1-interpipe +# +################################################################################ + +GST1_INTERPIPE_VERSION = 10dba89eecc200e49f0b432e299f1c8a4312b657 +GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe +GST1_INTERPIPE_SITE_METHOD = git +# fetch gst-interpipe/common sub module +GST1_INTERPIPE_GIT_SUBMODULES = YES + +GST1_INTERPIPE_LICENSE = LGPL-2.1 +GST1_INTERPIPE_LICENSE_FILES = COPYING + +# from git source +GST1_INTERPIPE_AUTORECONF = YES + +GST1_INTERPIPE_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base + +$(eval $(autotools-package)) From 9ca425d4d2efae531225fbeaeab4ba588c247fef Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 27 Oct 2017 19:44:26 +0200 Subject: [PATCH 0556/2640] gstreamer1-editing-services: new package [Peter: select and add to dependencies good/bad plugins, enable/disable examples if gtk2/3 with x11 backend is available] Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/gstreamer1/Config.in | 1 + .../gstreamer1-editing-services/Config.in | 19 +++++++++ .../gstreamer1-editing-services.hash | 6 +++ .../gstreamer1-editing-services.mk | 40 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 package/gstreamer1/gstreamer1-editing-services/Config.in create mode 100644 package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash create mode 100644 package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 8553cd2b2d..28b1ed25c5 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -14,4 +14,5 @@ source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-validate/Config.in" source "package/gstreamer1/gst1-vaapi/Config.in" source "package/gstreamer1/gst-omx/Config.in" +source "package/gstreamer1/gstreamer1-editing-services/Config.in" endif diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in new file mode 100644 index 0000000000..716a4e5ef7 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES + bool "gstreamer1-editing-services" + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER # runtime + help + GStreamer Editing Services is a high-level library for + facilitating the creation of audio/video non-linear editors. + + http://gstreamer.freedesktop.org diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash new file mode 100644 index 0000000000..e2d31922a7 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -0,0 +1,6 @@ +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.3.tar.xz.sha256sum +sha256 032e2fd040079259aec060d526bcb021c670f8d953219c229f80fdc541465f76 gstreamer-editing-services-1.12.3.tar.xz + +# Hashes for license files: +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk new file mode 100644 index 0000000000..bd51cb5351 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# gstreamer1-editing-services +# +################################################################################ + +GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.3 +GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz +GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services +GSTREAMER1_EDITING_SERVICES_LICENSE = LGPLv2+ +GSTREAMER1_EDITING_SERVICES_LICENSE_FILES = COPYING COPYING.LIB +GSTREAMER1_EDITING_SERVICES_INSTALL_STAGING = YES +GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \ + host-pkgconf \ + gstreamer1 \ + gst1-plugins-base \ + gst1-plugins-good \ + gst1-plugins-bad \ + $(if $(BR2_PACKAGE_GST1_VALIDATE),gst1-validate) \ + libxml2 + +GSTREAMER1_EDITING_SERVICES_CONF_OPTS = --disable-benchmarks + +# examples need GTK2/3 with X11 backend +ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3_X11),) +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --enable-examples + +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=2.0 +GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk2 +else +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --with-gtk=3.0 +GSTREAMER1_EDITING_SERVICES_DEPENDENCIES += libgtk3 +endif + +else +GSTREAMER1_EDITING_SERVICES_CONF_OPTS += --disable-examples +endif + +$(eval $(autotools-package)) From ec08f3a87d402ee868cebb0008c14c367162ecee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 19:34:11 +0200 Subject: [PATCH 0557/2640] gstreamer1-editing-services: bump version to 1.12.4 To match the other gstreamer1 components. Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index e2d31922a7..ddf9cecaed 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.3.tar.xz.sha256sum -sha256 032e2fd040079259aec060d526bcb021c670f8d953219c229f80fdc541465f76 gstreamer-editing-services-1.12.3.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.4.tar.xz.sha256sum +sha256 bd7eaa2c9572db9e7e535064024b6f69250de864fe8a5d5be86fa8c7edacca0c gstreamer-editing-services-1.12.4.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index bd51cb5351..a126ac471c 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.3 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.4 GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPLv2+ From f2c5d59e65e84497a7c048e023433fec8d3b595f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 1 Apr 2018 19:27:39 +0200 Subject: [PATCH 0558/2640] package/snort: select libdnet package "libdnet is in the dependency chain of snort that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in" Fixes: http://autobuild.buildroot.net/results/9cf/9cf5883d1ed95d3d76d529a9a25f0e600adf25cd Signed-off-by: Romain Naour Cc: Sergio Prado Signed-off-by: Peter Korsgaard --- package/snort/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/snort/Config.in b/package/snort/Config.in index d1a59d5050..7d2c52c3f3 100644 --- a/package/snort/Config.in +++ b/package/snort/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_SNORT depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # daq depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc + select BR2_PACKAGE_LIBDNET select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_DAQ select BR2_PACKAGE_PCRE From d28064d46149ff5738e0645745e7e7008e793120 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 19:44:02 +0200 Subject: [PATCH 0559/2640] DEVELOPERS: add an entry for gstreamer1-editing-services Add an entry for the recently added gstreamer1-editing-services package for Peter Seiderer. Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index a438aab4cd..f150effe7c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1456,6 +1456,7 @@ F: package/edid-decode/ F: package/ghostscript-fonts/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gst1-validate/ +F: package/gstreamer1/gstreamer1-editing-services/ F: package/libevdev/ F: package/log4cplus/ F: package/postgresql/ From a7785f47ba7c00dcaa9676d77fa1fffabe628837 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Mar 2018 20:13:50 +0200 Subject: [PATCH 0560/2640] package/wayland-protocols: bump version to 1.13 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/wayland-protocols/wayland-protocols.hash | 8 ++++---- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d1d643caa7..9cbb4fef72 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2017-December/036037.html -md5 ac83c4704003323b6bd5a1b91fb1be53 wayland-protocols-1.12.tar.xz -sha1 ac908e91c6c5e7802c0af48f55725ad683017e72 wayland-protocols-1.12.tar.xz -sha256 3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2 wayland-protocols-1.12.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2018-February/036992.html +md5 29312149dafcd4a0e739ba94995a574d wayland-protocols-1.13.tar.xz +sha1 1b4b3385e168c361b4d350668d92f3a90ceee189 wayland-protocols-1.13.tar.xz +sha256 0758bc8008d5332f431b2a84fea7de64d971ce270ed208206a098ff2ebc68f38 wayland-protocols-1.13.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 0d23e9af32..bba0979934 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.12 +WAYLAND_PROTOCOLS_VERSION = 1.13 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From b19cb8143b0c1337d370010550532c4fc23124d9 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 29 Oct 2017 12:06:00 -0200 Subject: [PATCH 0561/2640] testing/infra/builder: call make with empty env Use an empty environment when calling make, but import PATH so the buildroot tree under test can find binaries from the host machine. Since environment variables are now ignored, move the handling of BR2_DL_DIR to the defconfig to keep the current precedence of -d: BR2_DL_DIR | -d DIR | test downloads | BR downloads ------------+----------+------------------+-------------- unset | unset | [error] | [error] unset | set | in $(DIR) | in $(DIR) set | unset | in $(BR2_DL_DIR) | in $(BR2_DL_DIR) set | set | in $(DIR) | in $(DIR) Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 1 + support/testing/infra/builder.py | 7 +++++-- support/testing/run-tests | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 754922692c..b85e8627fd 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -42,6 +42,7 @@ class BRTest(unittest.TestCase): self.testname = self.__class__.__name__ self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) self.emulator = None + self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir) self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) def show_msg(self, msg): diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 7512339ae1..36f4801a2d 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -24,15 +24,18 @@ class Builder(object): "> end defconfig\n") self.logfile.flush() + env = {"PATH": os.environ["PATH"]} cmd = ["make", "O={}".format(self.builddir), "olddefconfig"] - ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile) + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, + env=env) if ret != 0: raise SystemError("Cannot olddefconfig") cmd = ["make", "-C", self.builddir] - ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile) + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, + env=env) if ret != 0: raise SystemError("Build failed") diff --git a/support/testing/run-tests b/support/testing/run-tests index f8cee09ed1..270e78cff7 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -58,7 +58,6 @@ def main(): return 1 BRTest.downloaddir = os.path.abspath(args.download) - os.putenv("BR2_DL_DIR", BRTest.downloaddir) if args.output is None: print "Missing output directory, please use -o/--output" From 998300c5f55f61e928acfd352bc4cc24f36f8f7d Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 29 Oct 2017 12:06:01 -0200 Subject: [PATCH 0562/2640] testing/infra/builder: split configure() from build() Some test cases don't use a full build as setup, so split the build() method into configure() and build(). It allows a test case to perform configuration at the setup stage and the build inside the test itself. Call this new method just before build in the BRTest base class, to keep the current behavior for existing test cases. This change will be needed when adding a common class to test the git download infra. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 1 + support/testing/infra/builder.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index b85e8627fd..f3f13ad97f 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -58,6 +58,7 @@ class BRTest(unittest.TestCase): if not self.b.is_finished(): self.show_msg("Building") + self.b.configure() self.b.build() self.show_msg("Building done") diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 36f4801a2d..faf1eb1494 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -12,7 +12,7 @@ class Builder(object): self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) - def build(self): + def configure(self): if not os.path.isdir(self.builddir): os.makedirs(self.builddir) @@ -33,6 +33,8 @@ class Builder(object): if ret != 0: raise SystemError("Cannot olddefconfig") + def build(self): + env = {"PATH": os.environ["PATH"]} cmd = ["make", "-C", self.builddir] ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, env=env) From f179394621e0ac5713c40cae4c50d341cf82de30 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 18:35:39 +0200 Subject: [PATCH 0563/2640] support/scripts/graph-depends: remove global code and most global variables The graph-depends script had no main() function, and the main code was actually spread between the function definitions, which was a real mess. This commit moves the global code into a main() function, which allows to more easily follow the flow of the script. The argument parsing code is moved into a parse_args() function. Most of the global variables are removed, and are instead passed as argument when appropriate. This has the side-effect that the print_pkg_deps() function takes a lot of argument, but this is considered better than tons of global variables. The global variables that are removed are: max_depth, transitive, mode, root_colour, target_colour, host_colour, outfile, dict_deps, dict_version, stop_list, exclude_list, arrow_dir. The root_colour/target_colour/host_colour variables are entirely removed, and instead a single colours array is passed, and it's the function using the colors that actually uses the different entries in the array. The way the print_attrs() function determines if we're display the root node is not is changed. Instead of relying on the package name and the mode (which requires passing the root package name, and the mode), it relies on the depth: when the depth is 0, we're at the root node. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/graph-depends | 289 +++++++++++++++++----------------- 1 file changed, 144 insertions(+), 145 deletions(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 85c9bf0a4f..d86d506f6f 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -31,96 +31,6 @@ import brpkgutil # Modes of operation: MODE_FULL = 1 # draw full dependency graph for all selected packages MODE_PKG = 2 # draw dependency graph for a given package -mode = 0 - -# Limit drawing the dependency graph to this depth. 0 means 'no limit'. -max_depth = 0 - -# Whether to draw the transitive dependencies -transitive = True - -parser = argparse.ArgumentParser(description="Graph packages dependencies") -parser.add_argument("--check-only", "-C", dest="check_only", action="store_true", default=False, - help="Only do the dependency checks (circular deps...)") -parser.add_argument("--outfile", "-o", metavar="OUT_FILE", dest="outfile", - help="File in which to generate the dot representation") -parser.add_argument("--package", '-p', metavar="PACKAGE", - help="Graph the dependencies of PACKAGE") -parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, default=0, - help="Limit the dependency graph to DEPTH levels; 0 means no limit.") -parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", - help="Do not graph past this package (can be given multiple times)." + - " Can be a package name or a glob, " + - " 'virtual' to stop on virtual packages, or " + - "'host' to stop on host packages.") -parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", - help="Like --stop-on, but do not add PACKAGE to the graph.") -parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", - default="lightblue,grey,gainsboro", - help="Comma-separated list of the three colours to use" + - " to draw the top-level package, the target" + - " packages, and the host packages, in this order." + - " Defaults to: 'lightblue,grey,gainsboro'") -parser.add_argument("--transitive", dest="transitive", action='store_true', - default=False) -parser.add_argument("--no-transitive", dest="transitive", action='store_false', - help="Draw (do not draw) transitive dependencies") -parser.add_argument("--direct", dest="direct", action='store_true', default=True, - help="Draw direct dependencies (the default)") -parser.add_argument("--reverse", dest="direct", action='store_false', - help="Draw reverse dependencies") -args = parser.parse_args() - -check_only = args.check_only - -if args.outfile is None: - outfile = sys.stdout -else: - if check_only: - sys.stderr.write("don't specify outfile and check-only at the same time\n") - sys.exit(1) - outfile = open(args.outfile, "w") - -if args.package is None: - mode = MODE_FULL -else: - mode = MODE_PKG - rootpkg = args.package - -max_depth = args.depth - -if args.stop_list is None: - stop_list = [] -else: - stop_list = args.stop_list - -if args.exclude_list is None: - exclude_list = [] -else: - exclude_list = args.exclude_list - -transitive = args.transitive - -if args.direct: - get_depends_func = brpkgutil.get_depends - arrow_dir = "forward" -else: - if mode == MODE_FULL: - sys.stderr.write("--reverse needs a package\n") - sys.exit(1) - get_depends_func = brpkgutil.get_rdepends - arrow_dir = "back" - -# Get the colours: we need exactly three colours, -# so no need not split more than 4 -# We'll let 'dot' validate the colours... -colours = args.colours.split(',', 4) -if len(colours) != 3: - sys.stderr.write("Error: incorrect colour list '%s'\n" % args.colours) - sys.exit(1) -root_colour = colours[0] -target_colour = colours[1] -host_colour = colours[2] allpkgs = [] @@ -145,7 +55,7 @@ def get_targets(): # 'dependencies', which contains tuples of the form (pkg1 -> # pkg2_on_which_pkg1_depends, pkg3 -> pkg4_on_which_pkg3_depends) and # the function finally returns this list. -def get_all_depends(pkgs): +def get_all_depends(pkgs, get_depends_func): dependencies = [] # Filter the packages for which we already have the dependencies @@ -175,7 +85,7 @@ def get_all_depends(pkgs): deps.add(dep) if len(deps) != 0: - newdeps = get_all_depends(deps) + newdeps = get_all_depends(deps, get_depends_func) if newdeps is not None: dependencies += newdeps @@ -193,35 +103,6 @@ TARGET_EXCEPTIONS = [ "target-post-image", ] -# In full mode, start with the result of get_targets() to get the main -# targets and then use get_all_depends() for all targets -if mode == MODE_FULL: - targets = get_targets() - dependencies = [] - allpkgs.append('all') - filtered_targets = [] - for tg in targets: - # Skip uninteresting targets - if tg in TARGET_EXCEPTIONS: - continue - dependencies.append(('all', tg)) - filtered_targets.append(tg) - deps = get_all_depends(filtered_targets) - if deps is not None: - dependencies += deps - rootpkg = 'all' - -# In pkg mode, start directly with get_all_depends() on the requested -# package -elif mode == MODE_PKG: - dependencies = get_all_depends([rootpkg]) - -# Make the dependencies a dictionnary { 'pkg':[dep1, dep2, ...] } -dict_deps = {} -for dep in dependencies: - if dep[0] not in dict_deps: - dict_deps[dep[0]] = [] - dict_deps[dep[0]].append(dep[1]) # Basic cache for the results of the is_dep() function, in order to # optimize the execution time. The cache is a dict of dict of boolean @@ -328,7 +209,7 @@ def check_circular_deps(deps): # This functions trims down the dependency list of all packages. # It applies in sequence all the dependency-elimination methods. -def remove_extra_deps(deps): +def remove_extra_deps(deps, transitive): for pkg in list(deps.keys()): if not pkg == 'all': deps[pkg] = remove_mandatory_deps(pkg, deps) @@ -338,32 +219,22 @@ def remove_extra_deps(deps): return deps -check_circular_deps(dict_deps) -if check_only: - sys.exit(0) - -dict_deps = remove_extra_deps(dict_deps) -dict_version = brpkgutil.get_version([pkg for pkg in allpkgs - if pkg != "all" and not pkg.startswith("root")]) - - # Print the attributes of a node: label and fill-color -def print_attrs(pkg): +def print_attrs(outfile, pkg, version, depth, colors): name = pkg_node_name(pkg) if pkg == 'all': label = 'ALL' else: label = pkg - if pkg == 'all' or (mode == MODE_PKG and pkg == rootpkg): - color = root_colour + if depth == 0: + color = colors[0] else: if pkg.startswith('host') \ or pkg.startswith('toolchain') \ or pkg.startswith('rootfs'): - color = host_colour + color = colors[2] else: - color = target_colour - version = dict_version.get(pkg) + color = colors[1] if version == "virtual": outfile.write("%s [label = <%s>]\n" % (name, label)) else: @@ -371,12 +242,16 @@ def print_attrs(pkg): outfile.write("%s [color=%s,style=filled]\n" % (name, color)) +done_deps = [] + + # Print the dependency graph of a package -def print_pkg_deps(depth, pkg): +def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, + arrow_dir, depth, max_depth, pkg, colors): if pkg in done_deps: return done_deps.append(pkg) - print_attrs(pkg) + print_attrs(outfile, pkg, dict_version.get(pkg), depth, colors) if pkg not in dict_deps: return for p in stop_list: @@ -401,13 +276,137 @@ def print_pkg_deps(depth, pkg): break if add: outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) - print_pkg_deps(depth + 1, d) + print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, + arrow_dir, depth + 1, max_depth, d, colors) -# Start printing the graph data -outfile.write("digraph G {\n") +def parse_args(): + parser = argparse.ArgumentParser(description="Graph packages dependencies") + parser.add_argument("--check-only", "-C", dest="check_only", action="store_true", default=False, + help="Only do the dependency checks (circular deps...)") + parser.add_argument("--outfile", "-o", metavar="OUT_FILE", dest="outfile", + help="File in which to generate the dot representation") + parser.add_argument("--package", '-p', metavar="PACKAGE", + help="Graph the dependencies of PACKAGE") + parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, default=0, + help="Limit the dependency graph to DEPTH levels; 0 means no limit.") + parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", + help="Do not graph past this package (can be given multiple times)." + + " Can be a package name or a glob, " + + " 'virtual' to stop on virtual packages, or " + + "'host' to stop on host packages.") + parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", + help="Like --stop-on, but do not add PACKAGE to the graph.") + parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", + default="lightblue,grey,gainsboro", + help="Comma-separated list of the three colours to use" + + " to draw the top-level package, the target" + + " packages, and the host packages, in this order." + + " Defaults to: 'lightblue,grey,gainsboro'") + parser.add_argument("--transitive", dest="transitive", action='store_true', + default=False) + parser.add_argument("--no-transitive", dest="transitive", action='store_false', + help="Draw (do not draw) transitive dependencies") + parser.add_argument("--direct", dest="direct", action='store_true', default=True, + help="Draw direct dependencies (the default)") + parser.add_argument("--reverse", dest="direct", action='store_false', + help="Draw reverse dependencies") + return parser.parse_args() -done_deps = [] -print_pkg_deps(0, rootpkg) -outfile.write("}\n") +def main(): + args = parse_args() + + check_only = args.check_only + + if args.outfile is None: + outfile = sys.stdout + else: + if check_only: + sys.stderr.write("don't specify outfile and check-only at the same time\n") + sys.exit(1) + outfile = open(args.outfile, "w") + + if args.package is None: + mode = MODE_FULL + else: + mode = MODE_PKG + rootpkg = args.package + + if args.stop_list is None: + stop_list = [] + else: + stop_list = args.stop_list + + if args.exclude_list is None: + exclude_list = [] + else: + exclude_list = args.exclude_list + + if args.direct: + get_depends_func = brpkgutil.get_depends + arrow_dir = "forward" + else: + if mode == MODE_FULL: + sys.stderr.write("--reverse needs a package\n") + sys.exit(1) + get_depends_func = brpkgutil.get_rdepends + arrow_dir = "back" + + # Get the colours: we need exactly three colours, + # so no need not split more than 4 + # We'll let 'dot' validate the colours... + colours = args.colours.split(',', 4) + if len(colours) != 3: + sys.stderr.write("Error: incorrect colour list '%s'\n" % args.colours) + sys.exit(1) + + # In full mode, start with the result of get_targets() to get the main + # targets and then use get_all_depends() for all targets + if mode == MODE_FULL: + targets = get_targets() + dependencies = [] + allpkgs.append('all') + filtered_targets = [] + for tg in targets: + # Skip uninteresting targets + if tg in TARGET_EXCEPTIONS: + continue + dependencies.append(('all', tg)) + filtered_targets.append(tg) + deps = get_all_depends(filtered_targets, get_depends_func) + if deps is not None: + dependencies += deps + rootpkg = 'all' + + # In pkg mode, start directly with get_all_depends() on the requested + # package + elif mode == MODE_PKG: + dependencies = get_all_depends([rootpkg], get_depends_func) + + # Make the dependencies a dictionnary { 'pkg':[dep1, dep2, ...] } + dict_deps = {} + for dep in dependencies: + if dep[0] not in dict_deps: + dict_deps[dep[0]] = [] + dict_deps[dep[0]].append(dep[1]) + + check_circular_deps(dict_deps) + if check_only: + sys.exit(0) + + dict_deps = remove_extra_deps(dict_deps, args.transitive) + dict_version = brpkgutil.get_version([pkg for pkg in allpkgs + if pkg != "all" and not pkg.startswith("root")]) + + # Start printing the graph data + outfile.write("digraph G {\n") + + print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, + arrow_dir, 0, args.depth, rootpkg, colours) + + outfile.write("}\n") + + +if __name__ == "__main__": + sys.exit(main()) From 3cd92ac71199de25837af7ff4f7ab190c677ea66 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 18:35:40 +0200 Subject: [PATCH 0564/2640] support/scripts/graph-depends: use colors instead of colours The graph-depends was not very consistent in colors vs. colours: some parts were using colours, some parts were using colors. Let's settle on the US spelling, colors. This change the user-visble option --colours to --colors, but it is unlikely that a lot of users customize the colors through BR2_GRAPH_DEPS_OPTS, so this user interface change is considered reasonable. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- docs/manual/common-usage.txt | 4 ++-- support/scripts/graph-depends | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index a22da20188..e3d7578c85 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -224,12 +224,12 @@ The +graph-depends+ behaviour can be controlled by setting options in the * +--transitive+, +--no-transitive+, to draw (or not) the transitive dependencies. The default is to not draw transitive dependencies. -* +--colours R,T,H+, the comma-separated list of colours to draw the +* +--colors R,T,H+, the comma-separated list of colors to draw the root package (+R+), the target packages (+T+) and the host packages (+H+). Defaults to: +lightblue,grey,gainsboro+ -------------------------------- -BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colours=red,green,blue' make graph-depends +BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends -------------------------------- === Graphing the build duration diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index d86d506f6f..dc265ae28c 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -297,9 +297,9 @@ def parse_args(): "'host' to stop on host packages.") parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", help="Like --stop-on, but do not add PACKAGE to the graph.") - parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", + parser.add_argument("--colors", "-c", metavar="COLOR_LIST", dest="colors", default="lightblue,grey,gainsboro", - help="Comma-separated list of the three colours to use" + + help="Comma-separated list of the three colors to use" + " to draw the top-level package, the target" + " packages, and the host packages, in this order." + " Defaults to: 'lightblue,grey,gainsboro'") @@ -353,12 +353,12 @@ def main(): get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" - # Get the colours: we need exactly three colours, + # Get the colors: we need exactly three colors, # so no need not split more than 4 - # We'll let 'dot' validate the colours... - colours = args.colours.split(',', 4) - if len(colours) != 3: - sys.stderr.write("Error: incorrect colour list '%s'\n" % args.colours) + # We'll let 'dot' validate the colors... + colors = args.colors.split(',', 4) + if len(colors) != 3: + sys.stderr.write("Error: incorrect color list '%s'\n" % args.colors) sys.exit(1) # In full mode, start with the result of get_targets() to get the main @@ -403,7 +403,7 @@ def main(): outfile.write("digraph G {\n") print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, - arrow_dir, 0, args.depth, rootpkg, colours) + arrow_dir, 0, args.depth, rootpkg, colors) outfile.write("}\n") From 8993436dea344b7e6400581fb174d72ddec05d46 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 9 Mar 2018 23:33:37 +0100 Subject: [PATCH 0565/2640] libcdio-paranoia: new package CD paranoia on top of libcdio http://www.gnu.org/software/libcdio/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libcdio-paranoia/Config.in | 8 ++++++++ .../libcdio-paranoia/libcdio-paranoia.hash | 3 +++ package/libcdio-paranoia/libcdio-paranoia.mk | 19 +++++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/libcdio-paranoia/Config.in create mode 100644 package/libcdio-paranoia/libcdio-paranoia.hash create mode 100644 package/libcdio-paranoia/libcdio-paranoia.mk diff --git a/DEVELOPERS b/DEVELOPERS index f150effe7c..54c508e4f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -661,6 +661,7 @@ F: package/gupnp-dlna/ F: package/gupnp-tools/ F: package/hiredis/ F: package/igd2-for-linux/ +F: package/libcdio-paranoia/ F: package/libmpdclient/ F: package/libupnp/ F: package/libupnp18/ diff --git a/package/Config.in b/package/Config.in index e9f671ddb2..6b2b27ba58 100644 --- a/package/Config.in +++ b/package/Config.in @@ -999,6 +999,7 @@ menu "Audio/Sound" source "package/libcdaudio/Config.in" source "package/libcddb/Config.in" source "package/libcdio/Config.in" + source "package/libcdio-paranoia/Config.in" source "package/libcodec2/Config.in" source "package/libcue/Config.in" source "package/libcuefile/Config.in" diff --git a/package/libcdio-paranoia/Config.in b/package/libcdio-paranoia/Config.in new file mode 100644 index 0000000000..28c9ac9cd5 --- /dev/null +++ b/package/libcdio-paranoia/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBCDIO_PARANOIA + bool "libcdio-paranoia" + depends on BR2_USE_MMU # libcdio + select BR2_PACKAGE_LIBCDIO + help + CD paranoia on top of libcdio + + http://www.gnu.org/software/libcdio/ diff --git a/package/libcdio-paranoia/libcdio-paranoia.hash b/package/libcdio-paranoia/libcdio-paranoia.hash new file mode 100644 index 0000000000..33e59ba704 --- /dev/null +++ b/package/libcdio-paranoia/libcdio-paranoia.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 d60f82ece97eeb92407a9ee03f3499c8983206672c28ae5e4e22179063c81941 libcdio-paranoia-10.2+0.94+2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcdio-paranoia/libcdio-paranoia.mk b/package/libcdio-paranoia/libcdio-paranoia.mk new file mode 100644 index 0000000000..3281aa0145 --- /dev/null +++ b/package/libcdio-paranoia/libcdio-paranoia.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libcdio-paranoia +# +################################################################################ + +LIBCDIO_PARANOIA_VERSION = 10.2+0.94+2 +LIBCDIO_PARANOIA_SITE = $(BR2_GNU_MIRROR)/libcdio +LIBCDIO_PARANOIA_LICENSE = GPL-3.0+ +LIBCDIO_PARANOIA_LICENSE_FILES = COPYING +LIBCDIO_PARANOIA_INSTALL_STAGING = YES +LIBCDIO_PARANOIA_DEPENDENCIES = host-pkgconf libcdio +LIBCDIO_PARANOIA_CONF_OPTS = --disable-example-progs + +ifeq ($(BR2_INSTALL_LIBSTDCPP),) +LIBCDIO_PARANOIA_CONF_OPTS += --disable-cxx +endif + +$(eval $(autotools-package)) From cea7aa873aa1b6034c3ac93aec21d74d9901b270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 2 Mar 2018 11:28:12 -0500 Subject: [PATCH 0566/2640] qt5webkit: fix build issue with 32-bits armv8-a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds WTF platform support for the 32-bits armv8-a architectures. Fixes: In file included from ./config.h:30:0, from ... ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" # error "Not supported ARM architecture" ^~~~~ from this defconfig: BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV3D16=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5WEBKIT=y The patch is an adaptation of an upstream fix in version 5.212 of qtwebkit[1]. Unfortunately, the commit cannot be backported and has to be fixed since the toolchain does not define __ARM_ARCH_8__ but __ARM_ARCH_8A__. $ host/bin/arm-buildroot-linux-gnueabihf-g++ -dM -E - < /dev/null | grep ARM_ARCH #define __ARM_ARCH_ISA_ARM 1 #define __ARM_ARCH_8A__ 1 #define __ARM_ARCH_PROFILE 65 #define __ARM_ARCH_ISA_THUMB 2 #define __ARM_ARCH 8 #define __ARM_ARCH_EXT_IDIV__ 1 [1]: https://github.com/qt/qtwebkit/blob/35655d5f4bad248ead1700b59c381cc568b4e98b/Source/WTF/wtf/Platform.h#L241-L242 Cc: Arnout Vandecappelle Reported-by: Brock Williams Reviewed-by: Adrian Perez de Castro Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-Detect-32-bits-armv8-a-architecture.patch | 48 +++++++++++++++++++ ...-Detect-32-bits-armv8-a-architecture.patch | 48 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch create mode 100644 package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch diff --git a/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch new file mode 100644 index 0000000000..9c2205dd94 --- /dev/null +++ b/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch @@ -0,0 +1,48 @@ +From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Tue, 15 Aug 2017 18:28:49 -0400 +Subject: [PATCH] Detect 32-bits armv8-a architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Adds WTF platform support for the 32-bits armv8-a architectures. + +Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) +and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). + +This commit catches this new architecture (armv8a) within a #ifdef/#endif +inside the if statement dedicated for 32-bits ARM detection. + +Fixes: + + In file included from ./config.h:30:0, + from ... + ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" + # error "Not supported ARM architecture" + ^~~~~ + +Upstream-Status: Backport [with adaptations] +Signed-off-by: Gaël PORTAY +--- + Source/WTF/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 562840cf7..9cf656845 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -243,6 +243,10 @@ + || defined(__ARM_ARCH_7S__) + #define WTF_ARM_ARCH_VERSION 7 + ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) ++#define WTF_ARM_ARCH_VERSION 8 ++ + /* MSVC sets _M_ARM */ + #elif defined(_M_ARM) + #define WTF_ARM_ARCH_VERSION _M_ARM +-- +2.16.1 + diff --git a/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch new file mode 100644 index 0000000000..9c2205dd94 --- /dev/null +++ b/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch @@ -0,0 +1,48 @@ +From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Tue, 15 Aug 2017 18:28:49 -0400 +Subject: [PATCH] Detect 32-bits armv8-a architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Adds WTF platform support for the 32-bits armv8-a architectures. + +Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) +and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). + +This commit catches this new architecture (armv8a) within a #ifdef/#endif +inside the if statement dedicated for 32-bits ARM detection. + +Fixes: + + In file included from ./config.h:30:0, + from ... + ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" + # error "Not supported ARM architecture" + ^~~~~ + +Upstream-Status: Backport [with adaptations] +Signed-off-by: Gaël PORTAY +--- + Source/WTF/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 562840cf7..9cf656845 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -243,6 +243,10 @@ + || defined(__ARM_ARCH_7S__) + #define WTF_ARM_ARCH_VERSION 7 + ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) ++#define WTF_ARM_ARCH_VERSION 8 ++ + /* MSVC sets _M_ARM */ + #elif defined(_M_ARM) + #define WTF_ARM_ARCH_VERSION _M_ARM +-- +2.16.1 + From fffbd2c9f7ece83a80c18ebe68473fee9da54614 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Mar 2018 23:24:01 +0200 Subject: [PATCH 0567/2640] i2pd: new package i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client. I2P (Invisible Internet Protocol) is a universal anonymous network layer. All communications over I2P are anonymous and end-to-end encrypted, participants don't reveal their real IP addresses. http://i2pd.website Signed-off-by: Fabrice Fontaine [Thomas: - Add third patch to not install the license file in /usr/LICENSE and the source code in /usr/src instead of using a post-install-target hook to remove /usr/LICENSE and /usr/src. Indeed, we're not sure if /usr/src contains only stuff installed by this package. - Clarify the comment that explains why -DTHREADS_PTHREAD_ARG=OFF is passed, especially because it's only needed for older versions of CMake, and causes a warning with newer versions of CMake. - Propagate architecture dependencies to the Config.in comment about the exception_ptr requirement.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...ake-error-when-DBUILD_SHARED_LIBS-ON.patch | 28 ++++++++ package/i2pd/0002-Install-libi2pdclient.patch | 69 +++++++++++++++++++ ....txt-don-t-install-source-and-licens.patch | 58 ++++++++++++++++ package/i2pd/Config.in | 37 ++++++++++ package/i2pd/S99i2pd | 38 ++++++++++ package/i2pd/i2pd.hash | 3 + package/i2pd/i2pd.mk | 63 +++++++++++++++++ package/i2pd/i2pd.service | 29 ++++++++ 10 files changed, 327 insertions(+) create mode 100644 package/i2pd/0001-Fix-cmake-error-when-DBUILD_SHARED_LIBS-ON.patch create mode 100644 package/i2pd/0002-Install-libi2pdclient.patch create mode 100644 package/i2pd/0003-build-CMakeLists.txt-don-t-install-source-and-licens.patch create mode 100644 package/i2pd/Config.in create mode 100644 package/i2pd/S99i2pd create mode 100644 package/i2pd/i2pd.hash create mode 100644 package/i2pd/i2pd.mk create mode 100644 package/i2pd/i2pd.service diff --git a/DEVELOPERS b/DEVELOPERS index 54c508e4f9..855654bde9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -660,6 +660,7 @@ F: package/gupnp/ F: package/gupnp-dlna/ F: package/gupnp-tools/ F: package/hiredis/ +F: package/i2pd/ F: package/igd2-for-linux/ F: package/libcdio-paranoia/ F: package/libmpdclient/ diff --git a/package/Config.in b/package/Config.in index 6b2b27ba58..5fef0a2b26 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1711,6 +1711,7 @@ menu "Networking applications" source "package/hostapd/Config.in" source "package/hplip/Config.in" source "package/httping/Config.in" + source "package/i2pd/Config.in" source "package/ibrdtn-tools/Config.in" source "package/ibrdtnd/Config.in" source "package/ifenslave/Config.in" diff --git a/package/i2pd/0001-Fix-cmake-error-when-DBUILD_SHARED_LIBS-ON.patch b/package/i2pd/0001-Fix-cmake-error-when-DBUILD_SHARED_LIBS-ON.patch new file mode 100644 index 0000000000..d30e62f4f3 --- /dev/null +++ b/package/i2pd/0001-Fix-cmake-error-when-DBUILD_SHARED_LIBS-ON.patch @@ -0,0 +1,28 @@ +From 6d15be9a32989b0d00312a5b2589e36ba0ea7836 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 4 Mar 2018 18:29:13 +0100 +Subject: [PATCH] Fix cmake error when -DBUILD_SHARED_LIBS=ON + +Fixes "CMake Error: TARGETS given no LIBRARY DESTINATION for shared +library target" by adding LIBRARY parameter to INSTALL call + +Signed-off-by: Fabrice Fontaine +--- + build/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index 4f875b33..a1c8957b 100644 +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -97,6 +97,7 @@ set_target_properties(libi2pd PROPERTIES PREFIX "") + install(TARGETS libi2pd + EXPORT libi2pd + ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib + COMPONENT Libraries) + # TODO Make libi2pd available to 3rd party projects via CMake as imported target + # FIXME This pulls stdafx +-- +2.14.1 + diff --git a/package/i2pd/0002-Install-libi2pdclient.patch b/package/i2pd/0002-Install-libi2pdclient.patch new file mode 100644 index 0000000000..1774977965 --- /dev/null +++ b/package/i2pd/0002-Install-libi2pdclient.patch @@ -0,0 +1,69 @@ +From 1d934bd543360bfdd40e1501d16d8beb2016ccd8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 5 Mar 2018 14:55:54 +0100 +Subject: [PATCH] Install libi2pdclient + +When building with -DBUILD_SHARED_LIBS=ON, libi2pdclient is not +installed on target so install it by calling install. Moreover, rename +i2pdclient to libi2pdclient so library is installed with correct name. + +Signed-off-by: Fabrice Fontaine +--- + build/CMakeLists.txt | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index a1c8957b..364c3304 100644 +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -120,7 +120,13 @@ set (CLIENT_SRC + if(WITH_WEBSOCKETS) + list (APPEND CLIENT_SRC "${LIBI2PD_CLIENT_SRC_DIR}/Websocket.cpp") + endif () +-add_library(i2pdclient ${CLIENT_SRC}) ++add_library(libi2pdclient ${CLIENT_SRC}) ++set_target_properties(libi2pdclient PROPERTIES PREFIX "") ++install(TARGETS libi2pdclient ++ EXPORT libi2pdclient ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ COMPONENT Libraries) + + set(DAEMON_SRC_DIR ../daemon) + +@@ -304,7 +310,7 @@ if (WITH_PCH) + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + target_compile_options(libi2pd PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$/stdafx.pch") +- target_compile_options(i2pdclient PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$/stdafx.pch") ++ target_compile_options(libi2pdclient PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$/stdafx.pch") + else() + string(TOUPPER ${CMAKE_BUILD_TYPE} BTU) + get_directory_property(DEFS DEFINITIONS) +@@ -313,12 +319,12 @@ if (WITH_PCH) + COMMAND ${CMAKE_CXX_COMPILER} ${FLAGS} -c ${CMAKE_CURRENT_SOURCE_DIR}/../libi2pd/stdafx.h -o ${CMAKE_BINARY_DIR}/stdafx.h.gch + ) + target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h) +- target_compile_options(i2pdclient PRIVATE -include libi2pd/stdafx.h) ++ target_compile_options(libi2pdclient PRIVATE -include libi2pd/stdafx.h) + endif() + target_link_libraries(libi2pd stdafx) + endif() + +-target_link_libraries(i2pdclient libi2pd) ++target_link_libraries(libi2pdclient libi2pd) + + find_package ( Boost COMPONENTS system filesystem program_options date_time REQUIRED ) + if(NOT DEFINED Boost_INCLUDE_DIRS) +@@ -451,7 +457,7 @@ if (WITH_BINARY) + if (WITH_STATIC) + set(DL_LIB ${CMAKE_DL_LIBS}) + endif() +- target_link_libraries( "${PROJECT_NAME}" libi2pd i2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) ++ target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) + + install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime) + set (APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}") +-- +2.14.1 + diff --git a/package/i2pd/0003-build-CMakeLists.txt-don-t-install-source-and-licens.patch b/package/i2pd/0003-build-CMakeLists.txt-don-t-install-source-and-licens.patch new file mode 100644 index 0000000000..bf5807f8d7 --- /dev/null +++ b/package/i2pd/0003-build-CMakeLists.txt-don-t-install-source-and-licens.patch @@ -0,0 +1,58 @@ +From 5fec22461a6d8d1045c849e468436b00ec7f9616 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 1 Apr 2018 20:11:21 +0200 +Subject: [PATCH] build/CMakeLists.txt: don't install source and license + +The CMakeLists.txt has the interesting (weird?) idea of installing the +license to /usr/LICENSE and the source code to /usr/src/, which is a +bit annoying. Let's not install such things. + +Signed-off-by: Thomas Petazzoni +--- + build/CMakeLists.txt | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index a6736a0b..3de79f3e 100644 +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -473,36 +473,6 @@ if (WITH_BINARY) + endif () + endif () + +-install(FILES ../LICENSE +- DESTINATION . +- COMPONENT Runtime +- ) +-# Take a copy on Appveyor +-install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE" +- DESTINATION . +- COMPONENT Runtime +- RENAME LICENSE_OPENSSL +- OPTIONAL # for local builds only! +- ) +- +-file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*") +-install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source) +-# install(DIRECTORY ../ DESTINATION src/ +-# # OPTIONAL +-# COMPONENT Source FILES_MATCHING +-# PATTERN .git EXCLUDE +-# PATTERN "*.cpp" +-# ) +- +-file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h") +-install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers) +-# install(DIRECTORY ../ DESTINATION src/ +-# # OPTIONAL +-# COMPONENT Headers FILES_MATCHING +-# PATTERN .git EXCLUDE +-# PATTERN "*.h" +-# ) +- + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Purple I2P, a C++ I2P daemon") + set(CPACK_PACKAGE_VENDOR "Purple I2P") + set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md") +-- +2.14.3 + diff --git a/package/i2pd/Config.in b/package/i2pd/Config.in new file mode 100644 index 0000000000..5b9ac33e28 --- /dev/null +++ b/package/i2pd/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_I2PD + bool "i2pd" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_ATOMIC + # pthread_condattr_setclock + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # boost + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB + help + i2pd (I2P Daemon) is a full-featured C++ implementation of I2P + client. + + I2P (Invisible Internet Protocol) is a universal anonymous + network layer. + All communications over I2P are anonymous and end-to-end + encrypted, participants don't reveal their real IP addresses. + + http://i2pd.website + +comment "i2pd needs a toolchain w/ C++, NPTL, wchar" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR + +comment "i2pd needs exception_ptr" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/i2pd/S99i2pd b/package/i2pd/S99i2pd new file mode 100644 index 0000000000..32775cdb97 --- /dev/null +++ b/package/i2pd/S99i2pd @@ -0,0 +1,38 @@ +#!/bin/sh + +NAME=i2pd +PIDFILE=/var/run/$NAME.pid +DAEMON=/usr/bin/$NAME +DAEMON_ARGS="--conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/var/run/i2pd.pid --logfile=/var/log/i2pd.log --daemon --service" + +start() { + printf "Starting $NAME: " + start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping $NAME: " + start-stop-daemon -K -q -p $PIDFILE + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash new file mode 100644 index 0000000000..b7a60c9164 --- /dev/null +++ b/package/i2pd/i2pd.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 8834190418de0c4e56c46eb8b9dc4422ef14f1ad7d6591e9daae99493bf7170e i2pd-2.18.0.tar.gz +sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk new file mode 100644 index 0000000000..c79a9d0b4a --- /dev/null +++ b/package/i2pd/i2pd.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# i2pd +# +################################################################################ + +I2PD_VERSION = 2.18.0 +I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) +I2PD_LICENSE = BSD-3-Clause +I2PD_LICENSE_FILES = LICENSE +I2PD_SUBDIR = build +I2PD_DEPENDENCIES = \ + boost \ + openssl \ + zlib + +I2PD_CONF_OPTS += -DWITH_GUI=OFF + +# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to +# disable a try_run() call in the FindThreads tests, which caused a +# build failure when cross-compiling. +I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +I2PD_CONF_OPTS += -DWITH_STATIC=ON +else +I2PD_CONF_OPTS += -DWITH_STATIC=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) +I2PD_DEPENDENCIES += libminiupnpc +I2PD_CONF_OPTS += -DWITH_UPNP=ON +else +I2PD_CONF_OPTS += -DWITH_UPNP=OFF +endif + +define I2PD_INSTALL_CONFIGURATION_FILES + $(INSTALL) -D -m 644 $(@D)/contrib/i2pd.conf \ + $(TARGET_DIR)/etc/i2pd/i2pd.conf + $(INSTALL) -D -m 644 $(@D)/contrib/tunnels.conf \ + $(TARGET_DIR)/etc/i2pd/tunnels.conf + mkdir -p $(TARGET_DIR)/var/lib/i2pd + cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd +endef + +define I2PD_USERS + i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon +endef + +define I2PD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/i2pd/S99i2pd \ + $(TARGET_DIR)/etc/init.d/S99i2pd +endef + +define I2PD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/i2pd/i2pd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/i2pd.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/i2pd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/i2pd.service +endef + +$(eval $(cmake-package)) diff --git a/package/i2pd/i2pd.service b/package/i2pd/i2pd.service new file mode 100644 index 0000000000..0fdee59532 --- /dev/null +++ b/package/i2pd/i2pd.service @@ -0,0 +1,29 @@ +[Unit] +Description=I2P Router written in C++ +After=network.target + +[Service] +User=i2pd +Group=i2pd +RuntimeDirectory=i2pd +RuntimeDirectoryMode=0700 +LogsDirectory=i2pd +LogsDirectoryMode=0700 +Type=simple +ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service +ExecReload=/bin/kill -HUP $MAINPID +PIDFile=/run/i2pd/i2pd.pid +### Uncomment, if auto restart needed +#Restart=on-failure + +### Use SIGINT for graceful stop daemon. +# i2pd stops accepting new tunnels and waits ~10 min while old ones do not die. +KillSignal=SIGINT +TimeoutStopSec=10m + +# If you have problems with hanging i2pd, you can try enable this +#LimitNOFILE=4096 +PrivateDevices=yes + +[Install] +WantedBy=multi-user.target From 0b02fed5a00f02ed303133d975ad9fcaf2d95b73 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 2 Mar 2018 20:34:35 +0100 Subject: [PATCH 0568/2640] sqlite: add option for meta-data about tables/queries Enables SQLITE_ENABLE_COLUMN_METADATA to gain access to: - sqlite3_column_database_name() - sqlite3_column_database_name16() - sqlite3_column_table_name() - sqlite3_column_table_name16() - sqlite3_column_origin_name() - sqlite3_column_origin_name16() Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sqlite/Config.in | 7 +++++++ package/sqlite/sqlite.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index ec7396860c..517af50e67 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -16,6 +16,13 @@ config BR2_PACKAGE_SQLITE_STAT3 query planner that can help SQLite to choose a better query plan under certain situations. +config BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA + bool "Enable convenient access to meta-data about tables and queries" + help + When this option is defined there are some additional APIs + enabled to acces meta-data about tables and queries (see + https://sqlite.org/compile.html). + config BR2_PACKAGE_SQLITE_ENABLE_FTS3 bool "Enable version 3 of the full-text search engine" help diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index e8ce92df56..d0030d43ab 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -15,6 +15,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3 endif +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y) +SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA +endif + ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3 endif From ce1104f6a10d0ebfdc48e1d7eea9eaf096e739fd Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 15 Feb 2018 14:32:35 +0100 Subject: [PATCH 0569/2640] poco: add new options for Json, CppParser, MongoDB, PDF and Redis New options allow to build following components: * Json * Redis * MongoDB * CppParser * PDF This allows to significantly reduce the size of the POCO libraries. Even though it breaks backward compatibility because those features were enabled and are now disable by default, Buildroot's policy is to build the minimal feature-set by default. And users will get a very clear build failure, which should be easy to fix. Signed-off-by: Yegor Yefremov [Thomas: add an explanation about backward compatibility.] Signed-off-by: Thomas Petazzoni --- package/poco/Config.in | 17 +++++++++++++++++ package/poco/poco.mk | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index 9199b54f0c..b908ea220c 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -18,6 +18,9 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_JSON + bool "json" + config BR2_PACKAGE_POCO_XML bool "xml" select BR2_PACKAGE_EXPAT @@ -46,6 +49,20 @@ config BR2_PACKAGE_POCO_ZIP select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_PDF + bool "pdf" + +config BR2_PACKAGE_POCO_REDIS + bool "redis" + select BR2_PACKAGE_POCO_NET + +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET + config BR2_PACKAGE_POCO_DATA bool diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 3dddb435e9..018344d5c7 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -18,12 +18,17 @@ POCO_DEPENDENCIES = zlib pcre \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_XML),,XML) \ $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ + $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) From b773c33bf18d82e4cf7d0712dfe88a0bae61c865 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Thu, 8 Mar 2018 06:15:36 -0800 Subject: [PATCH 0570/2640] motion: fix config file location Install the motion.config file were the program expects it to be. From the motion source code: snprintf(filename, PATH_MAX, "%s/motion/motion.conf", sysconfdir); Signed-off-by: Christopher McCrory Signed-off-by: Thomas Petazzoni --- package/motion/motion.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 2ba16fc837..0f4898674b 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -59,7 +59,7 @@ endif # directories: docs, examples and init scripts define MOTION_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ - $(TARGET_DIR)/etc/motion.conf + $(TARGET_DIR)/etc/motion/motion.conf $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion endef From 3543d174410567707737f0c8a219c0654428e08a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 21:14:48 +0200 Subject: [PATCH 0571/2640] support/scripts/graph-depends: use the standard python logging module Instead of hardcoded sys.stderr.write() calls. No functional change, but allows us to easily implement a quiet option. Signed-off-by: Peter Korsgaard Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/brpkgutil.py | 13 +++++++------ support/scripts/graph-depends | 16 ++++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/support/scripts/brpkgutil.py b/support/scripts/brpkgutil.py index 4c99ae9110..e70d525353 100644 --- a/support/scripts/brpkgutil.py +++ b/support/scripts/brpkgutil.py @@ -1,5 +1,6 @@ # Copyright (C) 2010-2013 Thomas Petazzoni +import logging import sys import subprocess @@ -7,18 +8,18 @@ import subprocess # Execute the "make -show-version" command to get the version of a given # list of packages, and return the version formatted as a Python dictionary. def get_version(pkgs): - sys.stderr.write("Getting version for %s\n" % pkgs) + logging.info("Getting version for %s" % pkgs) cmd = ["make", "-s", "--no-print-directory"] for pkg in pkgs: cmd.append("%s-show-version" % pkg) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) output = p.communicate()[0] if p.returncode != 0: - sys.stderr.write("Error getting version %s\n" % pkgs) + logging.error("Error getting version %s" % pkgs) sys.exit(1) output = output.split("\n") if len(output) != len(pkgs) + 1: - sys.stderr.write("Error getting version\n") + logging.error("Error getting version") sys.exit(1) version = {} for i in range(0, len(pkgs)): @@ -28,18 +29,18 @@ def get_version(pkgs): def _get_depends(pkgs, rule): - sys.stderr.write("Getting dependencies for %s\n" % pkgs) + logging.info("Getting dependencies for %s" % pkgs) cmd = ["make", "-s", "--no-print-directory"] for pkg in pkgs: cmd.append("%s-%s" % (pkg, rule)) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) output = p.communicate()[0] if p.returncode != 0: - sys.stderr.write("Error getting dependencies %s\n" % pkgs) + logging.error("Error getting dependencies %s\n" % pkgs) sys.exit(1) output = output.split("\n") if len(output) != len(pkgs) + 1: - sys.stderr.write("Error getting dependencies\n") + logging.error("Error getting dependencies") sys.exit(1) deps = {} for i in range(0, len(pkgs)): diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index dc265ae28c..17bfaa0cf5 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -21,6 +21,7 @@ # # Copyright (C) 2010-2013 Thomas Petazzoni +import logging import sys import subprocess import argparse @@ -39,7 +40,7 @@ allpkgs = [] # Buildroot PACKAGES and return it formatted as a Python list. This # list is used as the starting point for full dependency graphs def get_targets(): - sys.stderr.write("Getting targets\n") + logging.info("Getting targets") cmd = ["make", "-s", "--no-print-directory", "show-targets"] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) output = p.communicate()[0].strip() @@ -192,10 +193,10 @@ def check_circular_deps(deps): chain.append(pkg) for p in deps[pkg]: if p in chain: - sys.stderr.write("\nRecursion detected for : %s\n" % (p)) + logging.warning("\nRecursion detected for : %s" % (p)) while True: _p = chain.pop() - sys.stderr.write("which is a dependency of: %s\n" % (_p)) + logging.warning("which is a dependency of: %s" % (_p)) if p == _p: sys.exit(1) recurse(p) @@ -319,11 +320,14 @@ def main(): check_only = args.check_only + logging.basicConfig(stream=sys.stderr, format='%(message)s', + level=logging.INFO) + if args.outfile is None: outfile = sys.stdout else: if check_only: - sys.stderr.write("don't specify outfile and check-only at the same time\n") + logging.error("don't specify outfile and check-only at the same time") sys.exit(1) outfile = open(args.outfile, "w") @@ -348,7 +352,7 @@ def main(): arrow_dir = "forward" else: if mode == MODE_FULL: - sys.stderr.write("--reverse needs a package\n") + logging.error("--reverse needs a package") sys.exit(1) get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" @@ -358,7 +362,7 @@ def main(): # We'll let 'dot' validate the colors... colors = args.colors.split(',', 4) if len(colors) != 3: - sys.stderr.write("Error: incorrect color list '%s'\n" % args.colors) + logging.error("Error: incorrect color list '%s'" % args.colors) sys.exit(1) # In full mode, start with the result of get_targets() to get the main From dcfcb777f480dc9ee4ff6503c338d792806d7bab Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 21:14:49 +0200 Subject: [PATCH 0572/2640] support/scripts/graph-depends: add --quiet option This will be useful for the upcoming recursive show-depends and show-rdepends features. Signed-off-by: Peter Korsgaard Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/graph-depends | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 17bfaa0cf5..4ec0e46f7b 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -312,6 +312,8 @@ def parse_args(): help="Draw direct dependencies (the default)") parser.add_argument("--reverse", dest="direct", action='store_false', help="Draw reverse dependencies") + parser.add_argument("--quiet", '-q', dest="quiet", action='store_true', + help="Quiet") return parser.parse_args() @@ -321,7 +323,7 @@ def main(): check_only = args.check_only logging.basicConfig(stream=sys.stderr, format='%(message)s', - level=logging.INFO) + level=logging.WARNING if args.quiet else logging.INFO) if args.outfile is None: outfile = sys.stdout From 3146ba76331690fb693de3ff2fcebbaec43ca54e Mon Sep 17 00:00:00 2001 From: George Redivo Date: Sat, 31 Mar 2018 18:35:42 +0200 Subject: [PATCH 0573/2640] support/scripts/graph-depends: add --flat-list option graph-depends currently spits out a graph in .dot format. However, as part of the upcoming introduction of -show-recursive-depends and -show-recursive-rdepends, we need graph-depends to be able to display a flat list. Signed-off-by: George Redivo [Thomas: - Rebase on top of graph-depends changes - Do not display the package name itself in the list, only its dependencies (or reverse dependencies) - Display the result on a single line, instead of one package per line, in order to match what -show-depends and -show-rdepends are doing today.] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/graph-depends | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 4ec0e46f7b..621e603278 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -248,11 +248,14 @@ done_deps = [] # Print the dependency graph of a package def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, - arrow_dir, depth, max_depth, pkg, colors): + arrow_dir, draw_graph, depth, max_depth, pkg, colors): if pkg in done_deps: return done_deps.append(pkg) - print_attrs(outfile, pkg, dict_version.get(pkg), depth, colors) + if draw_graph: + print_attrs(outfile, pkg, dict_version.get(pkg), depth, colors) + elif depth != 0: + outfile.write("%s " % pkg) if pkg not in dict_deps: return for p in stop_list: @@ -276,9 +279,10 @@ def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, add = False break if add: - outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) + if draw_graph: + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, - arrow_dir, depth + 1, max_depth, d, colors) + arrow_dir, draw_graph, depth + 1, max_depth, d, colors) def parse_args(): @@ -314,6 +318,8 @@ def parse_args(): help="Draw reverse dependencies") parser.add_argument("--quiet", '-q', dest="quiet", action='store_true', help="Quiet") + parser.add_argument("--flat-list", '-f', dest="flat_list", action='store_true', default=False, + help="Do not draw graph, just print a flat list") return parser.parse_args() @@ -359,6 +365,8 @@ def main(): get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" + draw_graph = not args.flat_list + # Get the colors: we need exactly three colors, # so no need not split more than 4 # We'll let 'dot' validate the colors... @@ -406,12 +414,16 @@ def main(): if pkg != "all" and not pkg.startswith("root")]) # Start printing the graph data - outfile.write("digraph G {\n") + if draw_graph: + outfile.write("digraph G {\n") print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, - arrow_dir, 0, args.depth, rootpkg, colors) + arrow_dir, draw_graph, 0, args.depth, rootpkg, colors) - outfile.write("}\n") + if draw_graph: + outfile.write("}\n") + else: + outfile.write("\n") if __name__ == "__main__": From ca9b17a2639b7727b6ed5dfc214bb8bee4d776c0 Mon Sep 17 00:00:00 2001 From: George Redivo Date: Sat, 31 Mar 2018 18:35:43 +0200 Subject: [PATCH 0574/2640] package/pkg-generic: add -show-recursive-(r)depends targets This commit adds the support for -show-recursive-depends and -show-recursive-rdepends which respectively show the list of all dependencies or reverse dependencies for a given package. The existing show-depends and show-rdepends only show the first-level dependencies, while show-recursive-depends and show-recursive-rdepends show recursively the dependencies. It is worth mentioning that while show-recursive-depends really shows all dependencies, show-recursive-rdepends is a bit limited because the reverse dependencies of host packages are not properly accounted for. But that's a limitation that already exists in show-rdepends, and that cannot easily be solved. Signed-off-by: George Redivo [Thomas: - split from the patch that was also changing graph-depends - rename show-rrdepends to show-recursive-rdepends - add show-recursive-depends - don't create GRAPHS_DIR.] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 4 ++++ package/pkg-generic.mk | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 71c77f474d..0724f28f45 100644 --- a/Makefile +++ b/Makefile @@ -1033,6 +1033,10 @@ help: @echo ' -build - Build up to the build step' @echo ' -show-depends - List packages on which depends' @echo ' -show-rdepends - List packages which have as a dependency' + @echo ' -show-recursive-depends' + @echo ' - Recursively list packages on which depends' + @echo ' -show-recursive-rdepends' + @echo ' - Recursively list packages which have as a dependency' @echo ' -graph-depends - Generate a graph of '\''s dependencies' @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' @echo ' -dirclean - Remove build directory' diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 84d77822d4..25a34e6ca2 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -762,9 +762,17 @@ $(1)-show-version: $(1)-show-depends: @echo $$($(2)_FINAL_ALL_DEPENDENCIES) +$(1)-show-recursive-depends: + @cd "$$(CONFIG_DIR)" && \ + $$(TOPDIR)/support/scripts/graph-depends -p $(1) -f -q + $(1)-show-rdepends: @echo $$($(2)_RDEPENDENCIES) +$(1)-show-recursive-rdepends: + @cd "$$(CONFIG_DIR)" && \ + $$(TOPDIR)/support/scripts/graph-depends -p $(1) --reverse -f -q + $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES)) $$(info $(1)) From b3a5ab4c7aeebee21370655e82be5aeeaa84cf28 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 1 Apr 2018 22:05:16 +0200 Subject: [PATCH 0575/2640] check-package: support symlinks to the script The check-package script finds base_dir (= the Buildroot directory) and cd's into it. To be able to support relative paths as arguments, it first recalculates the arguments relative to base_dir. However, if there is a symlink anywhere on the path to the check-package script, the relative paths will be wrong. To solve this, use realpath() instead of abspath(), so symlinks are resolved before calculating the relative path. Cc: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- utils/check-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index d9b719783d..3dbc28b0a2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -143,7 +143,7 @@ def __main__(): if flags.intree_only: # change all paths received to be relative to the base dir - base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in flags.files] # move current dir so the script find the files os.chdir(base_dir) From 225c8aaf27af908ce8a9ef5fb3fde4eb9d0cdc94 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 17:39:04 +0200 Subject: [PATCH 0576/2640] coreutils: rewrite for loop with foreach This brings up error checking at each iteration of the loop for free, which removes the need for "|| exit 1". Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 8259f42f4a..8880e77dcc 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -104,9 +104,9 @@ endif ifeq ($(BR2_ROOTFS_MERGED_USR),) define COREUTILS_CLEANUP_BIN # some things go in root rather than usr - for f in $(COREUTILS_BIN_PROGS); do \ - mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f || exit 1; \ - done + $(foreach f,$(COREUTILS_BIN_PROGS), \ + mv -f $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin/$(f) + ) endef COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN endif From 256bb383fb7d30ea0df81c65550eef4aac9a9215 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 1 Apr 2018 17:39:05 +0200 Subject: [PATCH 0577/2640] coreutils: use single binary in symlink method The symlink method is faster, since there is no shell fork/exec, and provides extra space savings. Signed-off-by: Carlos Santos [Thomas: use the symlinks method not only for the merged /usr case, but also in the non-merged case to be consistent, and therefore adjust the logic that was moving the shell wrappers to a logic that recreates the symlinks.] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 8880e77dcc..4ef888829f 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -14,7 +14,7 @@ COREUTILS_LICENSE_FILES = COPYING COREUTILS_AUTORECONF = YES COREUTILS_GETTEXTIZE = YES -COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=shebangs \ +COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=symlinks \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_chown_works=yes \ @@ -103,9 +103,10 @@ endif ifeq ($(BR2_ROOTFS_MERGED_USR),) define COREUTILS_CLEANUP_BIN - # some things go in root rather than usr + # some things go in /bin rather than /usr/bin $(foreach f,$(COREUTILS_BIN_PROGS), \ - mv -f $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin/$(f) + rm -f $(TARGET_DIR)/usr/bin/$(f) && \ + ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f) ) endef COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN From d515ca8dd88f6e0e4e0972d73770d25cd15c517f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 1 Mar 2018 16:34:25 -0500 Subject: [PATCH 0578/2640] qt5base: fix build issue with mesa3d w/out xcb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mesa's EGL/eglplatform.h header includes X11 headers unless the flag MESA_EGL_NO_X11_HEADERS is defined[1]. A build issue happens when mesa3d is selected as then OpenGL EGL backend but the XCB library is not selected. For instance, with this defconfig: BR2_arm=y BR2_cortex_a9=y BR2_ARM_FPU_VFPV3D16=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5WEBKIT=y Also the odroid-mali EGL backend suffers the same problem. This commit backports the patch from the Gerrit of Qt which is in review[5]. It extends the QMAKE_CXXFLAGS with cflags contained in the egl.pc file. In this situation, the define MESA_EGL_NO_X11_HEADERS is given to the compiler that prevent from including the missing X headers. The issues QTBUG-61712[3] and QTBUG-66233[4] are opened in the Qt tracker. Fixes http://autobuild.buildroot.net/results/8781a561ae1a89e4d70ddaba65d8817eabe3ce69 [1]: https://github.com/mesa3d/mesa/blob/79ee1b2ff0b85f4eeb4165d23a7943c28d3a3d93/include/EGL/eglplatform.h#L109-L125 [2]: https://codereview.qt-project.org/#/c/198906/ [3]: https://bugreports.qt.io/browse/QTBUG-61712 [4]: https://bugreports.qt.io/browse/QTBUG-66233 Cc: Julien CORJON Cc: Peter Seiderer Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...tbase-Fix-build-error-when-using-EGL.patch | 37 +++++++++++++++++++ ...tbase-Fix-build-error-when-using-EGL.patch | 37 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch create mode 100644 package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch new file mode 100644 index 0000000000..0d0e0f922b --- /dev/null +++ b/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch @@ -0,0 +1,37 @@ +From d69bd3fd52502c7eb2799397fea14afe350e2cbf Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu +Date: Mon, 27 Mar 2017 15:33:35 +0800 +Subject: [PATCH] qtbase: Fix build error when using EGL +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +A build error was occurring due to missing EGL configuration. + +Fixed by adding the necessary ties to the EGL pkg-config. + +Task-number: QTBUG-61712 +Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc +Upstream-Status: Pending +Signed-off-by: Gaël PORTAY +--- + mkspecs/features/egl.prf | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf +index 9fa0c9e219..85d5852ba6 100644 +--- a/mkspecs/features/egl.prf ++++ b/mkspecs/features/egl.prf +@@ -1,3 +1,9 @@ ++# egl headers need a definition ++PKG_CONFIG = $$pkgConfigExecutable() ++PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) ++PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) ++QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS ++ + INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL + QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL +-- +2.16.1 + diff --git a/package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch new file mode 100644 index 0000000000..6876498022 --- /dev/null +++ b/package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch @@ -0,0 +1,37 @@ +From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu +Date: Mon, 27 Mar 2017 15:33:35 +0800 +Subject: [PATCH] qtbase: Fix build error when using EGL +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +A build error was occurring due to missing EGL configuration. + +Fixed by adding the necessary ties to the EGL pkg-config. + +Task-number: QTBUG-61712 +Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc +Upstream-Status: Pending +Signed-off-by: Gaël PORTAY +--- + mkspecs/features/egl.prf | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf +index 9fa0c9e219..85d5852ba6 100644 +--- a/mkspecs/features/egl.prf ++++ b/mkspecs/features/egl.prf +@@ -1,3 +1,9 @@ ++# egl headers need a definition ++PKG_CONFIG = $$pkgConfigExecutable() ++PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) ++PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) ++QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS ++ + INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL + QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL +-- +2.16.1 + From d675b1184364bad1adf7c5fde6e927f3f0438c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 1 Mar 2018 16:34:26 -0500 Subject: [PATCH 0579/2640] Revert "qt5wayland: fix build issue with mesa3d w/out xcb" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 85483968bec8c5bb3332f61b22cc9be8f0ad15f7. Supersede by: qt5base: fix build issue with mesa3d w/out xcb Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5wayland/qt5wayland.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 8a7f2e1fb5..0a7bdb8cf9 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -26,13 +26,6 @@ ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor endif -# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag -# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if -# the libxcb is not selected. -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx) -QT5WAYLAND_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS -endif - define QT5WAYLAND_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) endef From 3f52e9d584b573ac0b4e582e07b9b371215bffc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 1 Mar 2018 16:34:27 -0500 Subject: [PATCH 0580/2640] Revert "qt5webkit: fix build issue with mesa3d w/out xcb" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e46f9fde78e53740bd00c077275d3cd80d7792c7. Supersede by: qt5base: fix build issue with mesa3d w/out xcb Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 5186671663..e8d368fb01 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -44,15 +44,8 @@ define QT5WEBKIT_PYTHON2_SYMLINK endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK -# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag -# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if -# the libxcb is not selected. -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx) -QT5WEBKIT_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS -endif - define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBKIT_QMAKEFLAGS)) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake) endef define QT5WEBKIT_BUILD_CMDS From 7a41e1c672fdb2b6e7f70dbdf117d0fac3a79a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 1 Mar 2018 16:34:28 -0500 Subject: [PATCH 0581/2640] Revert "qt5multimedia: fix build issue with mesa3d w/out xcb" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fadaaabe6f79da130f3e68fca23f12f0ffd6b20f. Superseded by: qt5base: fix build issue with mesa3d w/out xcb Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5multimedia/qt5multimedia.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 041ef49092..6df96bcab4 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -34,15 +34,8 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y) QT5MULTIMEDIA_DEPENDENCIES += alsa-lib endif -# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag -# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if -# the libxcb is not selected. -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx) -QT5MULTIMEDIA_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS -endif - define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5MULTIMEDIA_QMAKEFLAGS)) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) endef define QT5MULTIMEDIA_BUILD_CMDS From 80928388286b6f25a9e70466dba57aa0587db8c0 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Thu, 1 Mar 2018 15:16:28 +0100 Subject: [PATCH 0582/2640] package/qt5/qt5scxml: install missing QML module Fixes: qrc:/MainUI.qml:2 module "QtScxml" is not installed Signed-off-by: Bartosz Bilas Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5scxml/qt5scxml.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 2d197a2bca..b6281975c6 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -35,6 +35,10 @@ define QT5SCXML_INSTALL_TARGET_LIBS endef endif +define QT5SCXML_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtScxml/ $(TARGET_DIR)/usr/qml/ +endef + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5SCXML_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/ @@ -43,6 +47,7 @@ endif define QT5SCXML_INSTALL_TARGET_CMDS $(QT5SCXML_INSTALL_TARGET_LIBS) + $(QT5SCXML_INSTALL_TARGET_QMLS) $(QT5SCXML_INSTALL_TARGET_EXAMPLES) endef From 70e6b08d41be1c5d5a4272c8b4210963ca9a278e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Apr 2018 19:56:51 +0200 Subject: [PATCH 0583/2640] ncmpc: fix build with ncursesw Fixes: http://autobuild.buildroot.net/results/c5bb5f978602896179ff9c58ecf4ced40bb96b57 When ncurses is built with wide support, we install libncursesw (plus a libncurses symlink) but NOT ncursesw.h, only ncurses.h. This combination confuses the ncmpc build system as it expects a ncursesw.h when it finds libncursesw: meson.build:92:4: ERROR: Problem encountered: No ncursesw header found The ncurses/ncursesw logic in the build system is only used to know what header file to #include, and what library to link with. As we already provide a libncurses symlink when building with wide support we can simply force ncmpc to use the ncurses variant. [Peter: extend commit message] Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ncmpc/ncmpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 0c9dfd4658..6bce627562 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -14,6 +14,7 @@ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS += \ --prefix=/usr \ + -Dcurses=ncurses \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf From dab038d1ac2ada87f89aa3bbae8a816481091e05 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Sun, 1 Apr 2018 15:01:13 -0500 Subject: [PATCH 0584/2640] configs/qemu_ppc64_e5500: new defconfig Adding basic support modeled after the Freescale/NXP T1040RDBD4 board. This target is used to support testing of the bootlin e5500 toolchain. Signed-off-by: Matthew Weber [Thomas: update .gitlab-ci.yml.] Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/qemu/ppc64-e5500/linux.fragment | 10 ++++++++++ board/qemu/ppc64-e5500/readme.txt | 7 +++++++ configs/qemu_ppc64_e5500_defconfig | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 board/qemu/ppc64-e5500/linux.fragment create mode 100644 board/qemu/ppc64-e5500/readme.txt create mode 100644 configs/qemu_ppc64_e5500_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 423f729660..3229fcf12c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -210,6 +210,7 @@ qemu_mips64r6_malta_defconfig: *defconfig qemu_mips64r6el_malta_defconfig: *defconfig qemu_nios2_10m50_defconfig: *defconfig qemu_or1k_defconfig: *defconfig +qemu_ppc64_e5500_defconfig: *defconfig qemu_ppc64_pseries_defconfig: *defconfig qemu_ppc64le_pseries_defconfig: *defconfig qemu_ppc_g3beige_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 855654bde9..d6eb24a1fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1171,8 +1171,10 @@ F: package/ts4900-fpga/ N: Matt Weber F: board/freescale/p* F: board/freescale/t* +F: board/qemu/ppc64-e5500/ F: configs/freescale_p* F: configs/freescale_t* +F: configs/qemu_ppc64_e5500_defconfig F: package/argp-standalone/ F: package/aufs/ F: package/aufs-util/ diff --git a/board/qemu/ppc64-e5500/linux.fragment b/board/qemu/ppc64-e5500/linux.fragment new file mode 100644 index 0000000000..071a55ccf7 --- /dev/null +++ b/board/qemu/ppc64-e5500/linux.fragment @@ -0,0 +1,10 @@ +# Enables generic PPC e500 base arch support for QEMU. +# The e5500 is a variant of the e500 arch. +CONFIG_PPC_QEMU_E500=y + +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc64-e5500/readme.txt b/board/qemu/ppc64-e5500/readme.txt new file mode 100644 index 0000000000..0bfd41d76b --- /dev/null +++ b/board/qemu/ppc64-e5500/readme.txt @@ -0,0 +1,7 @@ +Run the emulation with: + + qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append 'console=ttyS0 root=/dev/vda' -serial mon:stdio -nographic + +The login prompt will appear in the terminal that started Qemu. + +Tested with QEMU 2.0.0 diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig new file mode 100644 index 0000000000..e4a7518f32 --- /dev/null +++ b/configs/qemu_ppc64_e5500_defconfig @@ -0,0 +1,20 @@ +# Architecture +BR2_powerpc64=y +BR2_powerpc_e5500=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Linux headers same as the kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set From 01e9dd2995891934bf06d49caeb876d3bba11731 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 19:31:56 -0300 Subject: [PATCH 0585/2640] docs/manual: add check-package to "Tips and tricks" And add two references to it: in "Submitting patches" and in "Adding new packages to Buildroot" sections. Signed-off-by: Ricardo Martincoski Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-tips.txt | 32 ++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 5 +++-- docs/manual/contribute.txt | 4 ++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt index f37f9874e7..d10f276e83 100644 --- a/docs/manual/adding-packages-tips.txt +++ b/docs/manual/adding-packages-tips.txt @@ -32,6 +32,38 @@ using the following rules: with `.` and `-` characters substituted with `_` (e.g.: +FOO_BAR_BOO_VERSION+). +[[check-package]] +==== How to check the coding style + +Buildroot provides a script in +utils/check-package+ that checks new or +changed files for coding style. It is not a complete language validator, +but it catches many common mistakes. It is meant to run in the actual +files you created or modified, before creating the patch for submission. + +This script can be used for packages, filesystem makefiles, Config.in +files, etc. It does not check the files defining the package +infrastructures and some other files containing similar common code. + +To use it, run the +check-package+ script, by telling which files you +created or changed: + +---- +$ ./utils/check-package package/new-package/* +---- + +If you have the +utils+ directory in your path you can also run: + +---- +$ cd package/new-package/ +$ check-package * +---- + +The tool can also be used for packages in a br2-external: + +---- +$ check-package -b /path/to/br2-ext-tree/package/my-package/* +---- + [[testing-package]] ==== How to test your package diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index c642146287..4a4a17e879 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -9,8 +9,9 @@ applications) can be integrated into Buildroot. It also shows how existing packages are integrated, which is needed for fixing issues or tuning their configuration. -When you add a new package, be sure to test it in various conditions; -see xref:testing-package[] +When you add a new package, be sure to test it in various conditions +(see xref:testing-package[]) and also check it for coding style (see +xref:check-package[]). include::adding-packages-directory.txt[] diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 8bbc2b9eb7..b531ea987e 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -264,6 +264,10 @@ yourself to the DEVELOPERS file. This should be done in the same patch creating or modifying the package. See xref:DEVELOPERS[the DEVELOPERS file] for more information. +Buildroot provides a handy tool to check for common coding style +mistakes on files you created or modified, called +check-package+ (see +xref:check-package[] for more information). + ==== Preparing a patch series Starting from the changes committed in your local git view, _rebase_ From cc22fb65c3942b40c165ad7a2e1ec4796fa08a8d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Apr 2018 21:36:53 +0200 Subject: [PATCH 0586/2640] mpv: enable cdda support through libcdio-paranoia Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mpv/mpv.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index f38a6b916f..b8260213b7 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -20,7 +20,6 @@ MPV_CONF_OPTS = \ --prefix=/usr \ --disable-android \ --disable-caca \ - --disable-cdda \ --disable-cocoa \ --disable-coreaudio \ --disable-cuda-hwaccel \ @@ -99,6 +98,14 @@ else MPV_CONF_OPTS += --disable-libbluray endif +# libcdio-paranoia +ifeq ($(BR2_PACKAGE_LIBCDIO_PARANOIA),y) +MPV_CONF_OPTS += --enable-cdda +MPV_DEPENDENCIES += libcdio-paranoia +else +MPV_CONF_OPTS += --disable-cdda +endif + # libdvdnav ifeq ($(BR2_PACKAGE_LIBDVDNAV),y) MPV_CONF_OPTS += --enable-dvdnav From 252218881b1e807ca4d625f457675f01d1158f99 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Mar 2018 10:33:58 +0100 Subject: [PATCH 0587/2640] mpd: add support for libupnp18 Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 if BR2_PACKAGE_LIBUPNP is not enabled Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mpd/Config.in | 2 +- package/mpd/mpd.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 5991b6f4bb..bad32f8440 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -309,7 +309,7 @@ config BR2_PACKAGE_MPD_TCP config BR2_PACKAGE_MPD_UPNP bool "UPnP" select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP help Enable MPD UPnP client support. diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 26e82af0a8..f50e3d90c7 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -236,7 +236,9 @@ MPD_CONF_OPTS += --disable-twolame-encoder endif ifeq ($(BR2_PACKAGE_MPD_UPNP),y) -MPD_DEPENDENCIES += expat libupnp +MPD_DEPENDENCIES += \ + expat \ + $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) MPD_CONF_OPTS += --enable-upnp else MPD_CONF_OPTS += --disable-upnp From f8546e836784c17aa26970f6345db9d515411700 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Mar 2018 20:46:59 +0100 Subject: [PATCH 0588/2640] uclibc: update to 1.0.29 This release adds a lot of bugfixes for x86_64 and aarch64. It integrates gettext-tiny useful to be used with libintl stub. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...utils-fix-compile-of-msgfmt-msgmerge.patch | 48 +++++++++++++++++++ package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 package/uclibc/0001-utils-fix-compile-of-msgfmt-msgmerge.patch diff --git a/package/uclibc/0001-utils-fix-compile-of-msgfmt-msgmerge.patch b/package/uclibc/0001-utils-fix-compile-of-msgfmt-msgmerge.patch new file mode 100644 index 0000000000..968d682127 --- /dev/null +++ b/package/uclibc/0001-utils-fix-compile-of-msgfmt-msgmerge.patch @@ -0,0 +1,48 @@ +From 01e9f2f202a0afc658bfd82c0ff1770de7900bb1 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 5 Mar 2018 20:29:56 +0100 +Subject: [PATCH] utils: fix compile of msgfmt/msgmerge + +The host utils are missing the dependencies, the target +utils need libiconv enabled. + +Signed-off-by: Waldemar Brodkorb +--- + utils/Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/utils/Makefile.in b/utils/Makefile.in +index 99241845f..2f8d1c96a 100644 +--- a/utils/Makefile.in ++++ b/utils/Makefile.in +@@ -83,7 +83,9 @@ utils_OUT := $(top_builddir)utils + DEPS-ldconfig := $(utils_DIR)/chroot_realpath.c + DEPS-ldconfig.host := $(DEPS-ldconfig) + DEPS-msgfmt := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c ++DEPS-msgfmt.host := $(DEPS-msgfmt) + DEPS-msgmerge := $(utils_DIR)/poparser.c $(utils_DIR)/StringEscape.c ++DEPS-msgmerge.host := $(DEPS-msgmerge) + + utils_OBJ := getconf + ifeq ($(HAVE_SHARED),y) +@@ -96,7 +98,7 @@ utils_OBJ += iconv + utils_LOCALE_OBJ += $(utils_OUT)/locale + endif + +-ifeq ($(UCLIBC_HAS_LIBINTL),y) ++ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy) + utils_OBJ += msgfmt msgmerge + endif + +@@ -141,7 +143,7 @@ ifeq ($(UCLIBC_HAS_LOCALE),y) + $(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv + $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale + endif +-ifeq ($(UCLIBC_HAS_LIBINTL),y) ++ifeq ($(UCLIBC_HAS_LIBINTL)$(UCLIBC_HAS_LIBICONV),yy) + $(Q)$(INSTALL) -m 755 $(utils_OUT)/msgmerge$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgmerge + $(Q)$(INSTALL) -m 755 $(utils_OUT)/msgfmt$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/msgfmt + $(Q)$(INSTALL) -m 755 $(utils_OUT)/xgettext $(PREFIX)$(DEVEL_PREFIX)bin +-- +2.16.1 + diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 0a1568368f..14f71d0fbb 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From https://uclibc-ng.org/ -sha256 a1504ddc34a29cc9bfd1f5a7419c4b63bb510d9e2faed81618d1b596ceb0a5a9 uClibc-ng-1.0.28.tar.xz +sha256 e014e34abb13e97ca81694927f8ba95484cca2d3abac64b71f1a7981a96cb99c uClibc-ng-1.0.29.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index c5b0c6b16d..8d198f669a 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.28 +UCLIBC_VERSION = 1.0.29 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From f6d28852ab36ddcacfd37368f6b2c07d437cbc6b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 2 Apr 2018 09:12:26 +0200 Subject: [PATCH 0589/2640] snort: avoid detecting the host pcre The pcre configure script does this: if test "x$with_libpcre_libraries" != "xno"; then LDFLAGS="${LDFLAGS} -L${with_libpcre_libraries}" else LDFLAGS="${LDFLAGS} `pcre-config --libs`" fi So if you don't pass --with-libpcre-libraries, it calls pcre-config as available in the PATH. So it picks up pcre-config from $(HOST_DIR) or the system, which return results inappropriate for cross-compilation. So, let's explicitly pass --with-libpcre-includes and --with-libpcre-libraries to avoid those issues. Fixes: http://autobuild.buildroot.net/results/3df11c48c8e2f795f478d1ee666dda9de19133d0/ Signed-off-by: Thomas Petazzoni --- package/snort/snort.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 13f16b3b0f..568393468b 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -15,6 +15,8 @@ SNORT_DEPENDENCIES = libpcap libdnet daq pcre SNORT_AUTORECONF = YES SNORT_CONF_OPTS = \ + --with-libpcre-includes=$(STAGING_DIR)/usr/include \ + --with-libpcre-libraries=$(STAGING_DIR)/usr/lib \ --with-libpcap-includes=$(STAGING_DIR)/usr/include/pcap \ --disable-static-daq From af26608c65cfbc544787ff86c666e2af064844a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Apr 2018 22:19:46 +0200 Subject: [PATCH 0590/2640] lxc: bump to version 3.0.0 - Remove both patches (applied upstream), and therefore remove AUTORECONF = YES. - Remove --disable-python as python support has been removed (https://github.com/lxc/lxc/commit/e144a06bd792f99c96395a9d4c16cf7c656fb99d) - Remove lua optional dependency as lua support has been removed (https://github.com/lxc/lxc/commit/b52a5bef6fa56481a6d817f4c73cb91ed012fe2c) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ilation-on-toolchain-without-prlimit.patch | 98 ------------------- ...legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch | 49 ---------- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 17 +--- 4 files changed, 3 insertions(+), 163 deletions(-) delete mode 100644 package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch delete mode 100644 package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch diff --git a/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch b/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch deleted file mode 100644 index 031f77539f..0000000000 --- a/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch +++ /dev/null @@ -1,98 +0,0 @@ -From f48b5fd8ab03c200eaf5e3a9b03bcd01b2659cf3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 2 Nov 2017 16:00:33 +0100 -Subject: [PATCH] Fix compilation on toolchain without prlimit - -Some toolchains which are not bionic like uclibc does not support -prlimit or prlimit64. In this case, return an error. -Moreover, if prlimit64 is available, use lxc implementation of prlimit. - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 ++++ - src/lxc/Makefile.am | 6 ++++++ - src/lxc/conf.c | 12 +++++++++--- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 642b78e7..63df7466 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -671,6 +671,10 @@ AC_CHECK_FUNCS([prlimit], - AM_CONDITIONAL(HAVE_PRLIMIT, true) - AC_DEFINE(HAVE_PRLIMIT,1,[Have prlimit]), - AM_CONDITIONAL(HAVE_PRLIMIT, false)) -+AC_CHECK_FUNCS([prlimit64], -+ AM_CONDITIONAL(HAVE_PRLIMIT64, true) -+ AC_DEFINE(HAVE_PRLIMIT64,1,[Have prlimit64]), -+ AM_CONDITIONAL(HAVE_PRLIMIT64, false)) - - # Check for some libraries - AC_SEARCH_LIBS(sem_open, [rt pthread]) -diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am -index fff32ae4..8f0c11ec 100644 ---- a/src/lxc/Makefile.am -+++ b/src/lxc/Makefile.am -@@ -45,7 +45,10 @@ noinst_HEADERS += \ - ../include/ifaddrs.h \ - ../include/openpty.h \ - ../include/lxcmntent.h -+endif -+ - if !HAVE_PRLIMIT -+if HAVE_PRLIMIT64 - noinst_HEADERS += ../include/prlimit.h - endif - endif -@@ -143,7 +146,10 @@ liblxc_la_SOURCES += \ - ../include/ifaddrs.c ../include/ifaddrs.h \ - ../include/openpty.c ../include/openpty.h \ - ../include/lxcmntent.c ../include/lxcmntent.h -+endif -+ - if !HAVE_PRLIMIT -+if HAVE_PRLIMIT64 - liblxc_la_SOURCES += ../include/prlimit.c ../include/prlimit.h - endif - endif -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 44d97843..8a66f2d0 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -97,13 +97,14 @@ - - #if IS_BIONIC - #include <../include/lxcmntent.h> --#ifndef HAVE_PRLIMIT --#include <../include/prlimit.h> --#endif - #else - #include - #endif - -+#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64) -+#include <../include/prlimit.h> -+#endif -+ - lxc_log_define(lxc_conf, lxc); - - #if HAVE_LIBCAP -@@ -2399,10 +2400,15 @@ int setup_resource_limits(struct lxc_list *limits, pid_t pid) { - return -1; - } - -+#if HAVE_PRLIMIT || HAVE_PRLIMIT64 - if (prlimit(pid, resid, &lim->limit, NULL) != 0) { - ERROR("failed to set limit %s: %s", lim->resource, strerror(errno)); - return -1; - } -+#else -+ ERROR("Cannot set limit %s as prlimit is missing", lim->resource); -+ return -1; -+#endif - } - return 0; - } --- -2.14.1 - diff --git a/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch b/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch deleted file mode 100644 index a11f785002..0000000000 --- a/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 995accccbb07d59381aa60939cd44b41dc092dda Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 6 Nov 2017 09:35:48 +0100 -Subject: [PATCH] lxc/start.c: Fix legacy PR_{G,S}ET_NO_NEW_PRIVS handling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The configure checks for these use AC_CHECK_DECLS, which define the symbol -to 0 if not available - So adjust the code to match. From the autoconf -manual: - -https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Generic-Declarations.html) - -For each of the symbols (comma-separated list), define HAVE_DECL_symbol (in -all capitals) to ‘1’ if symbol is declared, otherwise to ‘0’. - -[Submitted upstream: https://github.com/lxc/lxc/pull/1901] -Signed-off-by: Peter Korsgaard ---- - src/lxc/start.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/lxc/start.c b/src/lxc/start.c -index 2632a9b1..fe76b235 100644 ---- a/src/lxc/start.c -+++ b/src/lxc/start.c -@@ -52,15 +52,15 @@ - #include - #endif - --#ifndef HAVE_DECL_PR_CAPBSET_DROP -+#if !HAVE_DECL_PR_CAPBSET_DROP - #define PR_CAPBSET_DROP 24 - #endif - --#ifndef HAVE_DECL_PR_SET_NO_NEW_PRIVS -+#if !HAVE_DECL_PR_SET_NO_NEW_PRIVS - #define PR_SET_NO_NEW_PRIVS 38 - #endif - --#ifndef HAVE_DECL_PR_GET_NO_NEW_PRIVS -+#if !HAVE_DECL_PR_GET_NO_NEW_PRIVS - #define PR_GET_NO_NEW_PRIVS 39 - #endif - --- -2.11.0 - diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index d8526e93a3..e2f9108507 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68663a67450a8d6734e137eac54cc7077209fb15c456eec401a2c26e6386eff6 lxc-2.1.1.tar.gz +sha256 6230224c27f050201b372b18a9f39cd220ed584899c5f0cf73c6b313dabc8d8a lxc-3.0.0.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index a65c166664..5a7038f88f 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,17 +4,15 @@ # ################################################################################ -LXC_VERSION = 2.1.1 +LXC_VERSION = 3.0.0 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPL-2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES -# We're patching configure.ac -LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ - --disable-python --disable-werror \ + --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) ifeq ($(BR2_PACKAGE_GNUTLS),y) @@ -45,15 +43,4 @@ else LXC_CONF_OPTS += --disable-selinux endif -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) -LXC_CONF_OPTS += --enable-lua -LXC_DEPENDENCIES += luainterpreter -ifeq ($(BR2_PACKAGE_LUAJIT),y) -# By default, lxc will only search for lua.pc -LXC_CONF_OPTS += --with-lua-pc=luajit -endif -else -LXC_CONF_OPTS += --disable-lua -endif - $(eval $(autotools-package)) From c5d4c907aff95334f3a073f3fbac65b91ffc5f26 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 15 Dec 2017 13:38:29 -0200 Subject: [PATCH 0591/2640] iqvlinux: bump to version 1.2.0.3 This package is really annoying since the archive name doesn't contain the version (iqvlinux.tar.gz), so we have added an iqvlinux-1.2.0.3.tar.gz tarball on sources.buildroot.net. The package will try to download iqvlinux-1.2.0.3.tar.gz from the upstream sourceforge location, which will fail, and then fallback to the backup mirror, where it will successfully find iqvlinux-1.2.0.3.tar.gz. Also add hashes for license files. Signed-off-by: Carlos Santos [Thomas: don't add custom logic for download, use iqvlinux-1.2.0.3.tar.gz, which is hosted on sources.buildroot.net.] Signed-off-by: Thomas Petazzoni --- package/iqvlinux/Config.in | 2 +- package/iqvlinux/iqvlinux.hash | 9 +++++---- package/iqvlinux/iqvlinux.mk | 10 +++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/package/iqvlinux/Config.in b/package/iqvlinux/Config.in index 8959955745..09502d141e 100644 --- a/package/iqvlinux/Config.in +++ b/package/iqvlinux/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_IQVLINUX Note: This driver requires PCI support to be enabled (i.e. CONFIG_PCI). - http://sourceforge.net/projects/e1000/files/iqvlinux/ + https://sourceforge.net/projects/e1000/files/iqvlinux/ comment "iqvlinux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL diff --git a/package/iqvlinux/iqvlinux.hash b/package/iqvlinux/iqvlinux.hash index ddf57b712c..20d612ddc5 100644 --- a/package/iqvlinux/iqvlinux.hash +++ b/package/iqvlinux/iqvlinux.hash @@ -1,5 +1,6 @@ -# From http://sourceforge.net/projects/e1000/files/iqvlinux/1.1.5.3/ -sha1 bd94416e4364015dbbd78a22e51080bf7ea81fac iqvlinux.tar.gz -md5 fb6a2a4dc122d39070fcb06985c97a05 iqvlinux.tar.gz # locally computed -sha256 8cb19f3bfe040100a13bb2d05cb2b54f2b259e55cef23f8cc5aa6f2f31e98bec iqvlinux.tar.gz +sha256 4020a661940ba6d50f24654b90a41280eb8eccf00061fe6d105c654d3d97d551 iqvlinux-1.2.0.3.tar.gz +sha256 386086e232db4708770f717595d4f83188f776aa6e7313cd12fb039e869f494b COPYING +sha256 beded926a8f18aad5d911daf581759e2b25697588034d2b29033ae1a929506ff src/linux/driver/files.txt +sha256 ecf93b9b739fc82f7b87b34f8c6411dfdd271234af2fe45212293d9df2b654b3 inc/linux/files.txt +sha256 0a309350c1b32be72479e8fe08f7f6bbbad2e8c3d9a1cbcad3d482ea48a236ad inc/files.txt diff --git a/package/iqvlinux/iqvlinux.mk b/package/iqvlinux/iqvlinux.mk index 165c7c4687..d6d445e666 100644 --- a/package/iqvlinux/iqvlinux.mk +++ b/package/iqvlinux/iqvlinux.mk @@ -4,9 +4,13 @@ # ################################################################################ -IQVLINUX_VERSION = 1.1.5.3 -IQVLINUX_SITE = http://sourceforge.net/projects/e1000/files/iqvlinux/$(IQVLINUX_VERSION) -IQVLINUX_SOURCE = iqvlinux.tar.gz +# The upstream tarball is just named iqvlinux.tar.gz, which we cannot +# use because it doesn't contain a version number. Therefore, the +# download from the upstream site will fail, and fallback to the +# backup mirror, where we have added an iqvlinux-1.2.0.3.tar.gz +# tarball. +IQVLINUX_VERSION = 1.2.0.3 +IQVLINUX_SITE = https://downloads.sourceforge.net/project/e1000/iqvlinux/$(IQVLINUX_VERSION) IQVLINUX_LICENSE = GPL-2.0, BSD-3-Clause IQVLINUX_LICENSE_FILES = \ From 82aef67f2bb61acd971ad640b0b072d5fc24e5cc Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 15 Dec 2017 13:38:30 -0200 Subject: [PATCH 0592/2640] iqvlinux: add patch to support Linux kernel 4.12 and later Tested on machines with four NIC models: - Intel(R) Ethernet Connection X553 10 GbE SFP+ - Intel(R) Ethernet Connection X553 1 GbE - Intel(R) Ethernet Connection I354 - Intel(R) I210 Gigabit Network Connection Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...-Support-Linux-kernel-4.12-and-later.patch | 66 +++++++++++++++++++ package/iqvlinux/Config.in | 7 +- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch diff --git a/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch b/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch new file mode 100644 index 0000000000..22ee03cdc9 --- /dev/null +++ b/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch @@ -0,0 +1,66 @@ +From 517d70780b903caa41ee93adbbb9bb985da23a29 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Tue, 12 Dec 2017 13:40:44 -0200 +Subject: [PATCH] Support Linux kernel 4.12 and later + +Signed-off-by: Carlos Santos +--- + src/linux/driver/linuxdrivermemory_i.c | 5 +++++ + src/linux/driver/linuxdriveros_i.c | 5 +++++ + src/linux/driver/linuxnaldriver.c | 5 +++++ + 3 files changed, 15 insertions(+) + +diff --git a/src/linux/driver/linuxdrivermemory_i.c b/src/linux/driver/linuxdrivermemory_i.c +index bdf1d42..53366d7 100644 +--- a/src/linux/driver/linuxdrivermemory_i.c ++++ b/src/linux/driver/linuxdrivermemory_i.c +@@ -49,7 +49,12 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#include ++#else + #include ++#endif + #include + #include + +diff --git a/src/linux/driver/linuxdriveros_i.c b/src/linux/driver/linuxdriveros_i.c +index 653bec9..43df25e 100644 +--- a/src/linux/driver/linuxdriveros_i.c ++++ b/src/linux/driver/linuxdriveros_i.c +@@ -49,7 +49,12 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#include ++#else + #include ++#endif + #include + #include + +diff --git a/src/linux/driver/linuxnaldriver.c b/src/linux/driver/linuxnaldriver.c +index 93c2f80..c1ddbcf 100644 +--- a/src/linux/driver/linuxnaldriver.c ++++ b/src/linux/driver/linuxnaldriver.c +@@ -39,7 +39,12 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++#include ++#else + #include ++#endif + #include "naltypes.h" + #include "nalioctl.h" + #include "linuxnaldriver.h" +-- +2.14.3 + diff --git a/package/iqvlinux/Config.in b/package/iqvlinux/Config.in index 09502d141e..73804ac02a 100644 --- a/package/iqvlinux/Config.in +++ b/package/iqvlinux/Config.in @@ -2,8 +2,11 @@ config BR2_PACKAGE_IQVLINUX bool "iqvlinux" depends on BR2_LINUX_KERNEL help - Intel Ethernet Adapter Debug Driver for Linux (iqvlinux), - which supports kernel versions 2.6.x up through 4.0.x. + Intel Ethernet Adapter Debug Driver for Linux (iqvlinux). + + Officially supports kernel versions 2.6.x up through 4.0.x but + the Buildroot package contains a patch to allow it to be built + on newer kernel versions. This debug driver supports all Intel's networking Tools based on the SDK version 2.19.36.0 or higher which support Intel From 9f1900ecaa56d917e41e2df0b50728f0dbc69434 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 10:37:07 +0200 Subject: [PATCH 0593/2640] package/libressl: bump version to 2.7.2 Removed patch 0001, a different version was applied upstream, please see upstream PR 82 for details. Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ild-with-musl-and-older-Linux-kernel.patch | 38 ------------------- package/libressl/libressl.hash | 4 +- package/libressl/libressl.mk | 2 +- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch diff --git a/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch b/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch deleted file mode 100644 index ddb953402d..0000000000 --- a/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Baruch Siach -Date: Fri, 29 Sep 2017 10:06:52 +0300 -Subject: [PATCH] Fix build with musl and older Linux kernel - -The musl libc carries its own copy of Linux system calls. When building -with Linux headers older than v3.17, musl provides SYS_getrandom -definition, but not GRND_NONBLOCK. This causes build failure for -libressl and openntpd: - -getentropy_linux.c: In function 'getentropy_getrandom': -getentropy_linux.c:205:42: error: 'GRND_NONBLOCK' undeclared (first use in this function) - ret = syscall(SYS_getrandom, buf, len, GRND_NONBLOCK); - ^~~~~~~~~~~~~ - -Define GRND_NONBLOCK locally when its definition is missing to fix the -build. There should be no run-time effect. Older kernels return ENOSYS -for unsupported syscall(). - -[ from upstream pull request with file location changed ] -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/libressl-portable/openbsd/pull/82 - -diff -Nuar libressl-2.5.5-orig/crypto/compat/getentropy_linux.c libressl-2.5.5/crypto/compat/getentropy_linux.c ---- libressl-2.5.5-orig/crypto/compat/getentropy_linux.c 2017-07-09 13:59:48.000000000 +0300 -+++ libressl-2.5.5/crypto/compat/getentropy_linux.c 2017-09-29 10:03:32.447958829 +0300 -@@ -194,6 +194,11 @@ - } - - #ifdef SYS_getrandom -+ -+#ifndef GRND_NONBLOCK -+#define GRND_NONBLOCK 0x0001 -+#endif -+ - static int - getentropy_getrandom(void *buf, size_t len) - { diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 9d926c677b..53b7e0af59 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,2 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f libressl-2.6.4.tar.gz +sha256 917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995 libressl-2.7.2.tar.gz +# Locally computed +sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 2467086161..1a1dda1000 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 2.6.4 +LIBRESSL_VERSION = 2.7.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 7e7caee21ef08c98c0e4acd8b720a1545f474a69 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 10:37:08 +0200 Subject: [PATCH 0594/2640] package/openvpn: bump version to 2.4.5 Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24 This bump depends on libressl 2.7.2 to avoid a build error with this defconfig: BR2_PACKAGE_LIBRESSL=y BR2_PACKAGE_OPENVPN=y Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 3 ++- package/openvpn/openvpn.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 318f9edb88..079595d440 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,3 @@ # Locally calculated after checking signature -sha256 96cd1b8fe1e8cb2920f07c3fd3985faea756e16fdeebd11d3e146d5bd2b04a80 openvpn-2.4.4.tar.xz +sha256 43c0a363a332350f620d1cd93bb431e082bedbc93d4fb872f758650d53c1d29e openvpn-2.4.5.tar.xz +sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 086f99bf4d..fbe65ad863 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.4 +OPENVPN_VERSION = 2.4.5 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From f66bd4805d34e898781e5aca6e7d429cbc2265d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Apr 2018 10:46:17 +0200 Subject: [PATCH 0595/2640] ffmpeg: libcdio support through libcdio-paranoia Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 5d2f89fb43..71d642cf4c 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -49,7 +49,6 @@ FFMPEG_CONF_OPTS = \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ - --disable-libcdio \ --disable-libdc1394 \ --disable-libgsm \ --disable-libilbc \ @@ -203,6 +202,13 @@ else FFMPEG_CONF_OPTS += --disable-libfdk-aac endif +ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy) +FFMPEG_CONF_OPTS += --enable-libcdio +FFMPEG_DEPENDENCIES += libcdio-paranoia +else +FFMPEG_CONF_OPTS += --disable-libcdio +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl FFMPEG_DEPENDENCIES += gnutls From 7e7b9db61a8f35eef9b6fee3e502628432ba0a5a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 1 Apr 2018 11:04:55 +0200 Subject: [PATCH 0596/2640] configs: switch to a wget download for kernels on github The linux git trees on github can be huge, and takes a long time to download, which is not very nice nor convenient for newcomers. Switch them to using a wget, with the github macro. A nice side effect of this conversion, is that we no longer need to wait for the git clone to finish to notice that the ref is gone; doing a wget will instantly fail in that case. Mechanical patch, obtained by running (hang-on tight): $ sed -r -i -e 's/BR2_LINUX_KERNEL_CUSTOM_GIT/BR2_LINUX_KERNEL_CUSTOM_TARBALL/; /BR2_LINUX_KERNEL_CUSTOM_REPO_URL/N; s:BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https\://github.com/([^/]+)/(.+)"\nBR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="(.+)":BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,\1,\2,\3)/linux-\3.tar.gz":; s/(call github.*)\.git/\1/;' $(grep -l 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com' configs/*) olimex_a20_olinuxino_lime_mali had a comment in between, so it was manually fixed thereafter; that comment was also moved. Except for socrates_cyclone5 which did not work previously (missing tag in git tree?), all the affected defconfigs still download their sources. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- configs/amarula_vyasa_rk3288_defconfig | 5 ++--- configs/arcturus_ucls1012a_defconfig | 5 ++--- configs/at91sam9x5ek_defconfig | 5 ++--- configs/at91sam9x5ek_dev_defconfig | 5 ++--- configs/at91sam9x5ek_mmc_defconfig | 5 ++--- configs/at91sam9x5ek_mmc_dev_defconfig | 5 ++--- configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 5 ++--- configs/atmel_sama5d2_xplained_mmc_defconfig | 5 ++--- configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 5 ++--- configs/atmel_sama5d3_xplained_defconfig | 5 ++--- configs/atmel_sama5d3_xplained_dev_defconfig | 5 ++--- configs/atmel_sama5d3_xplained_mmc_defconfig | 5 ++--- configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 5 ++--- configs/atmel_sama5d3xek_defconfig | 5 ++--- configs/atmel_sama5d4_xplained_defconfig | 5 ++--- configs/atmel_sama5d4_xplained_dev_defconfig | 5 ++--- configs/atmel_sama5d4_xplained_mmc_defconfig | 5 ++--- configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 5 ++--- configs/ci20_defconfig | 5 ++--- configs/galileo_defconfig | 5 ++--- configs/odroidc2_defconfig | 5 ++--- configs/olimex_a20_olinuxino_lime_mali_defconfig | 8 +++----- configs/raspberrypi0_defconfig | 5 ++--- configs/raspberrypi0w_defconfig | 5 ++--- configs/raspberrypi2_defconfig | 5 ++--- configs/raspberrypi3_64_defconfig | 5 ++--- configs/raspberrypi3_defconfig | 5 ++--- configs/raspberrypi3_qt5we_defconfig | 5 ++--- configs/raspberrypi_defconfig | 5 ++--- configs/roseapplepi_defconfig | 5 ++--- configs/socrates_cyclone5_defconfig | 5 ++--- configs/solidrun_macchiatobin_marvell_defconfig | 5 ++--- configs/ts7680_defconfig | 5 ++--- configs/zynq_microzed_defconfig | 5 ++--- configs/zynq_zc706_defconfig | 5 ++--- configs/zynq_zed_defconfig | 5 ++--- 36 files changed, 73 insertions(+), 110 deletions(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index 4cd46e79de..ccaab9551e 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -21,9 +21,8 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/openedev/linux-openedev" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d127129e85a020879f334154300ddd3f7ec21c1e" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,openedev,linux-openedev,d127129e85a020879f334154300ddd3f7ec21c1e)/linux-d127129e85a020879f334154300ddd3f7ec21c1e.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index 0ce7d1341c..9d1da8c2cc 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -13,9 +13,8 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ArcturusNetworks/uCLS1012A-kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v0.2.1811" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v0.2.1811)/linux-v0.2.1811.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index cac305436e..9dd8fbb367 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -3,9 +3,8 @@ BR2_arm926t=y # Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index ba97212dca..dee365a56c 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -17,9 +17,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index dc15bbcacb..8777606fe1 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -11,9 +11,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 5c8658c356..a8fdad72b7 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -20,9 +20,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 4cea358b29..f3cb11ce70 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -11,9 +11,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek at91-sama5d27_som1_ek_pda4 at91-sama5d27_som1_ek_pda7 at91-sama5d27_som1_ek_pda7b" diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 5be2fe9dcc..57ced6940f 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index bff9cdf8fa..78d082f9cb 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -23,9 +23,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index 5b356ed724..b8b33c5e78 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -4,9 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index 976a77f7a6..91ded5bfeb 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -19,9 +19,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 0a40b054d6..8fd9a7c2f8 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -6,9 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index d3a30bc5b1..20dc8929ab 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -22,9 +22,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index c57076c9f9..4fa4d79282 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -9,9 +9,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.5)/linux-linux4sam_5.5.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d33ek sama5d34ek sama5d35ek sama5d36ek" diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index e5a76411ee..522f7fc9d8 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -5,9 +5,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index d45175bf28..69a71eb51e 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -20,9 +20,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index 6fbaf3c748..f69acb288a 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index 1907a7590a..60692d98cb 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -23,9 +23,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index f28dd4da10..6e860b1e7e 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -15,9 +15,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7dff33297116643485ca37141d804eddd793e834" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MIPS,CI20_linux,7dff33297116643485ca37141d804eddd793e834)/linux-7dff33297116643485ca37141d804eddd793e834.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 72ab0ff061..03ca23f414 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -10,9 +10,8 @@ BR2_ROOTFS_OVERLAY="board/intel/galileo/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/intel/galileo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/intel/galileo/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mdr78/Linux-x1000.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8b3c9d8ce1656a26b1097d9091d53bfb39fef640" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,mdr78,Linux-x1000,8b3c9d8ce1656a26b1097d9091d53bfb39fef640)/linux-8b3c9d8ce1656a26b1097d9091d53bfb39fef640.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index f52f29adeb..63c5d2edc1 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -14,9 +14,8 @@ BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="3.14.79" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,hardkernel,linux,f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa)/linux-f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="odroidc2" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_BUILD_DEFAULT_DTS=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index d076581ede..de13b2e47e 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -15,12 +15,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" -# Kernel +# Kernel, based on Linux version 3.4.113 BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/dan-and/linux-sunxi.git" -# based on Linux version 3.4.113 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc385cc6dfa350382ecc94a520a716b57e654410" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sun7i" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 8a213fc4b1..749189b1d5 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -8,9 +8,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 973412380d..b014a5674f 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -8,9 +8,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 962a58cefb..724e0568a1 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -11,9 +11,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 6a35ac36a1..9dfa3f35be 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -10,9 +10,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 9304f0cb74..01c5198fca 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -10,9 +10,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index d4ada47588..5ceb53c7a6 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -11,9 +11,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index daca8362e6..2be84b07c6 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -10,9 +10,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 6627ff4711..327176254a 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -9,9 +9,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/roseapplepi/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/xapp-le/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,xapp-le,kernel,59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b)/linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="actduino_bubble_gum_linux" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/socrates_cyclone5_defconfig b/configs/socrates_cyclone5_defconfig index 45355c1b85..7995f9acfb 100644 --- a/configs/socrates_cyclone5_defconfig +++ b/configs/socrates_cyclone5_defconfig @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/altera/socrates_cyclone5/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.1.33-ltsi_17.07.02_pr" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="socfpga" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates" diff --git a/configs/solidrun_macchiatobin_marvell_defconfig b/configs/solidrun_macchiatobin_marvell_defconfig index 5489136e1c..33700e1b45 100644 --- a/configs/solidrun_macchiatobin_marvell_defconfig +++ b/configs/solidrun_macchiatobin_marvell_defconfig @@ -26,9 +26,8 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/linux-marvell" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux-4.4.52-armada-17.10" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MarvellEmbeddedProcessors,linux-marvell,linux-4.4.52-armada-17.10)/linux-linux-4.4.52-armada-17.10.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v8_lsp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 09629a7364..829af057a2 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -3,9 +3,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/embeddedarm/linux-3.14.28-imx28.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ff01621df09b97d9fd546d1b49f4013060142892" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-3.14.28-imx28,ff01621df09b97d9fd546d1b49f4013060142892)/linux-ff01621df09b97d9fd546d1b49f4013060142892.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts76xx" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index a6366ee0c0..c89b4e6d9d 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -6,9 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 069034021d..758069b30f 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -6,9 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index d08f83db59..26ff245169 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -6,9 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From f03cf639cfba961ca4cbfb73435f23b951941685 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Fri, 2 Mar 2018 10:07:55 -0800 Subject: [PATCH 0597/2640] memcached: bump to version 1.5.6 From ReleaseNotes156: """ This is a bugfix release, but it primarily disables the UDP protocol by default. In the last few days reports of UDP amplification attacks utilizing inesure memcached instances have surfaced. Attackers are able to set large values into memcached, then send requests via spoofed UDP packets. Memcached will then send a very large number of very large UDP packets back in response. """ Signed-off-by: Christopher McCrory Signed-off-by: Thomas Petazzoni --- package/memcached/memcached.hash | 7 +++---- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 204590d27c..8278933827 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,3 @@ -# From http://www.memcached.org/files/memcached-1.5.0.tar.gz.sha1 -sha1 e12af93e63c05ab7e89398e4cfd0bfc7b7bff1c5 memcached-1.5.0.tar.gz -# Calculated based on the hash above -sha256 c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32 memcached-1.5.0.tar.gz +# From http://www.memcached.org/files/memcached-1.5.6.tar.gz.sha1 +sha1 ca35929e74b132c2495a6957cfdc80556337fb90 memcached-1.5.6.tar.gz +sha256 9675ee859d7d81f7a950f190a6812720b26f08228d356044ec517d4d5af25f03 memcached-1.5.6.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index d0e3bc01d9..c15abc79bf 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.5.0 +MEMCACHED_VERSION = 1.5.6 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 91e776b5af11f6f98646168fc8c16254fa3bb012 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 2 Apr 2018 10:14:22 +0200 Subject: [PATCH 0598/2640] core/pkg-download: change all helpers to use common options Currently all download helpers accepts the local output file, the remote locations, the changesets and so on... as positional arguments. This was well and nice when that's was all we needed. But then we added an option to quiesce their verbosity, and that was shoehorned with a trivial getopts, still keeping all the existing positional arguments as... positional arguments. Adding yet more options while keeping positional arguments will not be very easy, even if we do not envision any new option in the foreseeable future (but 640K ought to be enough for everyone, remember? ;-) ). Change all helpers to accept a set of generic options (-q for quiet and -o for the output file) as well as helper-specific options (like -r for the repository, -c for a changeset...). Maxime: Changed -R to -r for recurse (only for the git backend) Changed -r to -u for URI (for all backend) Change -R to -c for cset (for CVS and SVN backend) Add the export of the BR_BACKEND_DL_GETOPTS so all the backend wrapper can use the same option easily Now all the backends use the same common options. Signed-off-by: "Yann E. MORIN" Signed-off-by: Maxime Hadjinlian Cc: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 38 ++++++++++++++++++------------------- support/download/bzr | 25 +++++++++++++----------- support/download/cp | 17 +++++++++-------- support/download/cvs | 34 ++++++++++++++++++--------------- support/download/dl-wrapper | 7 ++++++- support/download/git | 33 ++++++++++++++++---------------- support/download/hg | 25 +++++++++++++----------- support/download/scp | 19 ++++++++++--------- support/download/svn | 25 +++++++++++++----------- support/download/wget | 17 +++++++++-------- 10 files changed, 131 insertions(+), 109 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 6f15deba28..a410dce1ee 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -77,9 +77,9 @@ define DOWNLOAD_GIT -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_BASENAME_RAW) \ + -u $($(PKG)_SITE) \ + -c $($(PKG)_DL_VERSION) \ + -n $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -88,9 +88,9 @@ define DOWNLOAD_BZR -o $(DL_DIR)/$($(PKG)_SOURCE) \ $(QUIET) \ -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_BASENAME_RAW) \ + -u $($(PKG)_SITE) \ + -c $($(PKG)_DL_VERSION) \ + -n $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -99,10 +99,10 @@ define DOWNLOAD_CVS -o $(DL_DIR)/$($(PKG)_SOURCE) \ $(QUIET) \ -- \ - $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAWNAME) \ - $($(PKG)_BASENAME_RAW) \ + -u $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ + -c $($(PKG)_DL_VERSION) \ + -N $($(PKG)_RAWNAME) \ + -n $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -111,9 +111,9 @@ define DOWNLOAD_SVN -o $(DL_DIR)/$($(PKG)_SOURCE) \ $(QUIET) \ -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_BASENAME_RAW) \ + -u $($(PKG)_SITE) \ + -c $($(PKG)_DL_VERSION) \ + -n $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -126,7 +126,7 @@ define DOWNLOAD_SCP -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - '$(call stripurischeme,$(call qstrip,$(1)))' \ + -u '$(call stripurischeme,$(call qstrip,$(1)))' \ $($(PKG)_DL_OPTS) endef @@ -135,9 +135,9 @@ define DOWNLOAD_HG -o $(DL_DIR)/$($(PKG)_SOURCE) \ $(QUIET) \ -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_BASENAME_RAW) \ + -u $($(PKG)_SITE) \ + -c $($(PKG)_DL_VERSION) \ + -n $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -147,7 +147,7 @@ define DOWNLOAD_WGET -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - '$(call qstrip,$(1))' \ + -u '$(call qstrip,$(1))' \ $($(PKG)_DL_OPTS) endef @@ -157,7 +157,7 @@ define DOWNLOAD_LOCALFILES -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - $(call stripurischeme,$(call qstrip,$(1))) \ + -u $(call stripurischeme,$(call qstrip,$(1))) \ $($(PKG)_DL_OPTS) endef diff --git a/support/download/bzr b/support/download/bzr index 75b7b415c1..5289a421cd 100755 --- a/support/download/bzr +++ b/support/download/bzr @@ -5,28 +5,31 @@ set -e # Download helper for bzr, to be called from the download wrapper script # -# Call it as: -# .../bzr [-q] OUT_FILE REPO_URL REV BASENAME +# Options: +# -q Be quiet +# -o FILE Generate archive in FILE. +# -u URI Clone from repository at URI. +# -c CSET Use changeset (or revision) CSET. +# -n NAME Use basename NAME. # # Environment: # BZR : the bzr command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + c) cset="${OPTARG}";; + n) basename="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -repo="${2}" -rev="${3}" -basename="${4}" - -shift 4 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -51,5 +54,5 @@ if [ ${bzr_version} -ge ${bzr_min_version} ]; then fi _bzr export ${verbose} --root="'${basename}/'" --format=tgz \ - ${timestamp_opt} - "${@}" "'${repo}'" -r "'${rev}'" \ + ${timestamp_opt} - "${@}" "'${uri}'" -r "'${cset}'" \ >"${output}" diff --git a/support/download/cp b/support/download/cp index 0ee1f3ba82..52fe2de83d 100755 --- a/support/download/cp +++ b/support/download/cp @@ -5,8 +5,10 @@ set -e # Download helper for cp, to be called from the download wrapper script # -# Call it as: -# .../cp [-q] OUT_FILE SRC_FILE +# Options: +# -q Be quiet. +# -o FILE Copy to file FILE. +# -u FILE Copy from file FILE. # # Environment: # LOCALFILES: the cp command to call @@ -17,18 +19,17 @@ set -e # Make 'cp' verbose by default, so it behaves a bit like the others. verbose=-v -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=;; + o) output="${OPTARG}";; + u) source="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -source="${2}" - -shift 2 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) diff --git a/support/download/cvs b/support/download/cvs index 50050ab1c9..69d5c71f28 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -5,28 +5,32 @@ set -e # Download helper for cvs, to be called from the download wrapper script # -# Call it as: -# .../cvs [-q] OUT_FILE CVS_URL REV PKG_NAME BASENAME +# Options: +# -q Be quiet +# -o FILE Generate archive in FILE. +# -u URI Checkout from repository at URI. +# -c REV Use revision REV. +# -N RAWNAME Use rawname (aka module name) RAWNAME. +# -n NAME Use basename NAME. # # Environment: # CVS : the cvs command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-Q;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + c) rev="${OPTARG}";; + N) rawname="${OPTARG}";; + n) basename="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -repo="${2}" -rev="${3}" -rawname="${4}" -basename="${5}" - -shift 5 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -42,14 +46,14 @@ else select="-r" fi -# The absence of an initial : on ${repo} means access method undefined -if [[ ! "${repo}" =~ ^: ]]; then +# The absence of an initial : on ${uri} means access method undefined +if [[ ! "${uri}" =~ ^: ]]; then # defaults to anonymous pserver - repo=":pserver:anonymous@${repo}" + uri=":pserver:anonymous@${uri}" fi export TZ=UTC -_cvs ${verbose} -z3 -d"'${repo}'" \ +_cvs ${verbose} -z3 -d"'${uri}'" \ co "${@}" -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'" tar czf "${output}" "${basename}" diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index b018819833..abc51f637a 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -19,6 +19,8 @@ # We want to catch any unexpected failure, and exit immediately. set -e +export BR_BACKEND_DL_GETOPTS=":hc:o:n:N:H:ru:q" + main() { local OPT OPTARG local backend output hfile recurse quiet rc @@ -83,7 +85,10 @@ main() { # If the backend fails, we can just remove the temporary directory to # remove all the cruft it may have left behind. Then we just exit in # error too. - if ! "${OLDPWD}/support/download/${backend}" ${quiet} ${recurse} "${tmpf}" "${@}"; then + if ! "${OLDPWD}/support/download/${backend}" \ + ${quiet} ${recurse} \ + -o "${tmpf}" "${@}" + then rm -rf "${tmpd}" exit 1 fi diff --git a/support/download/git b/support/download/git index f590ff6494..58a2c6ad9d 100755 --- a/support/download/git +++ b/support/download/git @@ -5,32 +5,33 @@ set -e # Download helper for git, to be called from the download wrapper script # -# Call it as: -# .../git [-q] [-r] OUT_FILE REPO_URL CSET BASENAME -# -# -q Be quiet. -# -r Clone and archive sub-modules. +# Options: +# -q Be quiet. +# -r Clone and archive sub-modules. +# -o FILE Generate archive in FILE. +# -u URI Clone from repository at URI. +# -c CSET Use changeset CSET. +# -n NAME Use basename NAME. # # Environment: # GIT : the git command to call verbose= recurse=0 -while getopts :qr OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q; exec >/dev/null;; r) recurse=1;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + c) cset="${OPTARG}";; + n) basename="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -repo="${2}" -cset="${3}" -basename="${4}" - -shift 4 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -46,9 +47,9 @@ _git() { # Messages for the type of clone used are provided to ease debugging in case of # problems git_done=0 -if [ -n "$(_git ls-remote "'${repo}'" "'${cset}'" 2>&1)" ]; then +if [ -n "$(_git ls-remote "'${uri}'" "'${cset}'" 2>&1)" ]; then printf "Doing shallow clone\n" - if _git clone ${verbose} "${@}" --depth 1 -b "'${cset}'" "'${repo}'" "'${basename}'"; then + if _git clone ${verbose} "${@}" --depth 1 -b "'${cset}'" "'${uri}'" "'${basename}'"; then git_done=1 else printf "Shallow clone failed, falling back to doing a full clone\n" @@ -56,7 +57,7 @@ if [ -n "$(_git ls-remote "'${repo}'" "'${cset}'" 2>&1)" ]; then fi if [ ${git_done} -eq 0 ]; then printf "Doing full clone\n" - _git clone ${verbose} "${@}" "'${repo}'" "'${basename}'" + _git clone ${verbose} "${@}" "'${uri}'" "'${basename}'" fi pushd "${basename}" >/dev/null diff --git a/support/download/hg b/support/download/hg index 3af01690b3..efb515fca5 100755 --- a/support/download/hg +++ b/support/download/hg @@ -5,27 +5,30 @@ set -e # Download helper for hg, to be called from the download wrapper script # -# Call it as: -# .../hg [-q] OUT_FILE REPO_URL CSET BASENAME +# Options: +# -q Be quiet. +# -o FILE Generate archive in FILE. +# -u URI Clone from repository at URI. +# -c CSET Use changeset (or revision) CSET. +# -n NAME Use basename NAME. # # Environment: # HG : the hg command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + c) cset="${OPTARG}";; + n) basename="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -repo="${2}" -cset="${3}" -basename="${4}" - -shift 4 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -33,7 +36,7 @@ _hg() { eval ${HG} "${@}" } -_hg clone ${verbose} "${@}" --noupdate "'${repo}'" "'${basename}'" +_hg clone ${verbose} "${@}" --noupdate "'${uri}'" "'${basename}'" _hg archive ${verbose} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ diff --git a/support/download/scp b/support/download/scp index 825fd41c64..8ecf2f4b22 100755 --- a/support/download/scp +++ b/support/download/scp @@ -5,25 +5,26 @@ set -e # Download helper for scp, to be called from the download wrapper script # -# Call it as: -# .../scp [-q] OUT_FILE SRC_URL +# Options: +# -q Be quiet. +# -o FILE Copy to local file FILE. +# -u FILE Copy from remote file FILE. # # Environment: # SCP : the scp command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -url="${2}" - -shift 2 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -31,4 +32,4 @@ _scp() { eval ${SCP} "${@}" } -_scp ${verbose} "${@}" "'${url}'" "'${output}'" +_scp ${verbose} "${@}" "'${uri}'" "'${output}'" diff --git a/support/download/svn b/support/download/svn index 77abf3d02d..542b25c0a2 100755 --- a/support/download/svn +++ b/support/download/svn @@ -5,27 +5,30 @@ set -e # Download helper for svn, to be called from the download wrapper script # -# Call it as: -# .../svn [-q] OUT_FILE REPO_URL REV BASNAME +# Options: +# -q Be quiet. +# -o FILE Generate archive in FILE. +# -u URI Checkout from repository at URI. +# -c REV Use revision REV. +# -n NAME Use basename NAME. # # Environment: # SVN : the svn command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; + o) output="${OPTARG}";; + u) uri="${OPTARG}";; + c) rev="${OPTARG}";; + n) basename="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -repo="${2}" -rev="${3}" -basename="${4}" - -shift 4 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -33,6 +36,6 @@ _svn() { eval ${SVN} "${@}" } -_svn export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'" +_svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" tar czf "${output}" "${basename}" diff --git a/support/download/wget b/support/download/wget index 768de904c3..fece6663ca 100755 --- a/support/download/wget +++ b/support/download/wget @@ -5,25 +5,26 @@ set -e # Download helper for wget, to be called from the download wrapper script # -# Call it as: -# .../wget [-q] OUT_FILE URL +# Options: +# -q Be quiet. +# -o FILE Save into file FILE. +# -u URL Download file at URL. # # Environment: # WGET : the wget command to call verbose= -while getopts :q OPT; do +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; + o) output="${OPTARG}";; + u) url="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac done -shift $((OPTIND-1)) -output="${1}" -url="${2}" - -shift 2 # Get rid of our options +shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) From c8ef0c03b0b7f8238068f76a8c4f5c1c249c02e8 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 10:14:23 +0200 Subject: [PATCH 0599/2640] download: put most of the infra in dl-wrapper The goal here is to simplify the infrastructure by putting most of the code in the dl-wrapper as it is easier to implement and to read. Most of the functions were common already, this patch finalizes it by making the pkg-download.mk pass all the parameters needed to the dl-wrapper which in turn will pass everything to every backend. The backend will then cherry-pick what it needs from these arguments and act accordingly. It eases the transition to the addition of a sub directory per package in the DL_DIR, and later on, a git cache. [Peter: drop ';' in BR_NO_CHECK_HASH_FOR in DOWNLOAD macro and swap cd/rm -rf as mentioned by Yann, fix typos] Signed-off-by: Maxime Hadjinlian Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 170 +++++++----------------------------- support/download/cvs | 2 +- support/download/dl-wrapper | 139 ++++++++++++++++++----------- support/download/wget | 10 ++- 4 files changed, 129 insertions(+), 192 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index a410dce1ee..2847a99d2f 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -42,6 +42,8 @@ DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd) # # geturischeme: http geturischeme = $(firstword $(subst ://, ,$(call qstrip,$(1)))) +# getschemeplusuri: git|parameter+http://example.com +getschemeplusuri = $(call geturischeme,$(1))$(if $(2),\|$(2))+$(1) # stripurischeme: www.example.com/dir/file stripurischeme = $(lastword $(subst ://, ,$(call qstrip,$(1)))) # domain: www.example.com @@ -61,152 +63,42 @@ github = https://github.com/$(1)/$(2)/archive/$(3) export BR_NO_CHECK_HASH_FOR = ################################################################################ -# The DOWNLOAD_* helpers are in charge of getting a working copy -# of the source repository for their corresponding SCM, -# checking out the requested version / commit / tag, and create an -# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with -# ssh authentication. DOWNLOAD_WGET is the normal wget-based download -# mechanism. -# -################################################################################ - -define DOWNLOAD_GIT - $(EXTRA_ENV) $(DL_WRAPPER) -b git \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(if $($(PKG)_GIT_SUBMODULES),-r) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - -u $($(PKG)_SITE) \ - -c $($(PKG)_DL_VERSION) \ - -n $($(PKG)_BASENAME_RAW) \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_BZR - $(EXTRA_ENV) $(DL_WRAPPER) -b bzr \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - -u $($(PKG)_SITE) \ - -c $($(PKG)_DL_VERSION) \ - -n $($(PKG)_BASENAME_RAW) \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_CVS - $(EXTRA_ENV) $(DL_WRAPPER) -b cvs \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - -u $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ - -c $($(PKG)_DL_VERSION) \ - -N $($(PKG)_RAWNAME) \ - -n $($(PKG)_BASENAME_RAW) \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_SVN - $(EXTRA_ENV) $(DL_WRAPPER) -b svn \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - -u $($(PKG)_SITE) \ - -c $($(PKG)_DL_VERSION) \ - -n $($(PKG)_BASENAME_RAW) \ - $($(PKG)_DL_OPTS) -endef - -# SCP URIs should be of the form scp://[user@]host:filepath -# Note that filepath is relative to the user's home directory, so you may want -# to prepend the path with a slash: scp://[user@]host:/absolutepath -define DOWNLOAD_SCP - $(EXTRA_ENV) $(DL_WRAPPER) -b scp \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - -u '$(call stripurischeme,$(call qstrip,$(1)))' \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_HG - $(EXTRA_ENV) $(DL_WRAPPER) -b hg \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - -u $($(PKG)_SITE) \ - -c $($(PKG)_DL_VERSION) \ - -n $($(PKG)_BASENAME_RAW) \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_WGET - $(EXTRA_ENV) $(DL_WRAPPER) -b wget \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - -u '$(call qstrip,$(1))' \ - $($(PKG)_DL_OPTS) -endef - -define DOWNLOAD_LOCALFILES - $(EXTRA_ENV) $(DL_WRAPPER) -b cp \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - -u $(call stripurischeme,$(call qstrip,$(1))) \ - $($(PKG)_DL_OPTS) -endef - -################################################################################ -# DOWNLOAD -- Download helper. Will try to download source from: +# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download +# source from: # 1) BR2_PRIMARY_SITE if enabled # 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set # # Argument 1 is the source location # -# E.G. use like this: -# $(call DOWNLOAD,$(FOO_SITE)) -# -# For PRIMARY and BACKUP site, any ? in the URL is replaced by %3F. A ? in -# the URL is used to separate query arguments, but the PRIMARY and BACKUP -# sites serve just plain files. ################################################################################ -define DOWNLOAD - $(call DOWNLOAD_INNER,$(1),$(notdir $(1)),DOWNLOAD) -endef +ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) +DOWNLOAD_URIS += \ + -u $(call getschemeplusuri,$(BR2_PRIMARY_SITE),urlencode) +endif -define DOWNLOAD_INNER - $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),export BR_NO_CHECK_HASH_FOR=$(2);) \ - if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ - case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \ - file) $(call $(3)_LOCALFILES,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ - scp) $(call $(3)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ - *) $(call $(3)_WGET,$(BR2_PRIMARY_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ;; \ - esac ; \ - fi ; \ - if test "$(BR2_PRIMARY_SITE_ONLY)" = "y" ; then \ - exit 1 ; \ - fi ; \ - if test -n "$(1)" ; then \ - case "$($(PKG)_SITE_METHOD)" in \ - git) $($(3)_GIT) && exit ;; \ - svn) $($(3)_SVN) && exit ;; \ - cvs) $($(3)_CVS) && exit ;; \ - bzr) $($(3)_BZR) && exit ;; \ - file) $($(3)_LOCALFILES) && exit ;; \ - scp) $($(3)_SCP) && exit ;; \ - hg) $($(3)_HG) && exit ;; \ - *) $(call $(3)_WGET,$(1),$(2)) && exit ;; \ - esac ; \ - fi ; \ - if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \ - $(call $(3)_WGET,$(BR2_BACKUP_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ; \ - fi ; \ - exit 1 +ifeq ($(BR2_PRIMARY_SITE_ONLY),) +DOWNLOAD_URIS += \ + -u $($(PKG)_SITE_METHOD)+$(dir $(1)) +ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) +DOWNLOAD_URIS += \ + -u $(call getschemeplusuri,$(BR2_BACKUP_SITE),urlencode) +endif +endif + +define DOWNLOAD + $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),BR_NO_CHECK_HASH_FOR=$(notdir $(1))) \ + $(EXTRA_ENV) $(DL_WRAPPER) \ + -c $($(PKG)_DL_VERSION) \ + -f $(notdir $(1)) \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ + -n $($(PKG)_BASENAME_RAW) \ + -N $($(PKG)_RAWNAME) \ + -o $(DL_DIR)/$(notdir $(1)) \ + $(if $($(PKG)_GIT_SUBMODULES),-r) \ + $(DOWNLOAD_URIS) \ + $(QUIET) \ + -- \ + $($(PKG)_DL_OPTS) endef diff --git a/support/download/cvs b/support/download/cvs index 69d5c71f28..3f77b849e4 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -21,7 +21,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-Q;; o) output="${OPTARG}";; - u) uri="${OPTARG}";; + u) uri="${OPTARG#*://}";; c) rev="${OPTARG}";; N) rawname="${OPTARG}";; n) basename="${OPTARG}";; diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index abc51f637a..cd903f92d9 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -19,31 +19,34 @@ # We want to catch any unexpected failure, and exit immediately. set -e -export BR_BACKEND_DL_GETOPTS=":hc:o:n:N:H:ru:q" +export BR_BACKEND_DL_GETOPTS=":hc:o:n:N:H:ru:qf:e" main() { local OPT OPTARG local backend output hfile recurse quiet rc + local -a uris # Parse our options; anything after '--' is for the backend - while getopts :hb:o:H:rq OPT; do + while getopts ":hc:o:n:N:H:rf:u:q" OPT; do case "${OPT}" in h) help; exit 0;; - b) backend="${OPTARG}";; + c) cset="${OPTARG}";; o) output="${OPTARG}";; + n) raw_base_name="${OPTARG}";; + N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; r) recurse="-r";; + f) filename="${OPTARG}";; + u) uris+=( "${OPTARG}" );; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac done + # Forget our options, and keep only those for the backend shift $((OPTIND-1)) - if [ -z "${backend}" ]; then - error "no backend specified, use -b\n" - fi if [ -z "${output}" ]; then error "no output specified, use -o\n" fi @@ -66,48 +69,85 @@ main() { warn "Re-downloading '%s'...\n" "${output##*/}" fi - # tmpd is a temporary directory in which backends may store intermediate - # by-products of the download. - # tmpf is the file in which the backends should put the downloaded content. - # tmpd is located in $(BUILD_DIR), so as not to clutter the (precious) - # $(BR2_DL_DIR) - # We let the backends create tmpf, so they are able to set whatever - # permission bits they want (although we're only really interested in - # the executable bit.) - tmpd="$(mktemp -d "${BUILD_DIR}/.${output##*/}.XXXXXX")" - tmpf="${tmpd}/output" + # Look through all the uris that we were given to download the package + # source + download_and_check=0 + rc=1 + for uri in "${uris[@]}"; do + backend=${uri%+*} + case "${backend}" in + git|svn|cvs|bzr|file|scp|hg) ;; + *) backend="wget" ;; + esac + uri=${uri#*+} - # Helpers expect to run in a directory that is *really* trashable, so - # they are free to create whatever files and/or sub-dirs they might need. - # Doing the 'cd' here rather than in all backends is easier. - cd "${tmpd}" + urlencode=${backend#*|} + # urlencode must be "urlencode" + [ "${urlencode}" != "urlencode" ] && urlencode="" - # If the backend fails, we can just remove the temporary directory to - # remove all the cruft it may have left behind. Then we just exit in - # error too. - if ! "${OLDPWD}/support/download/${backend}" \ - ${quiet} ${recurse} \ - -o "${tmpf}" "${@}" - then - rm -rf "${tmpd}" - exit 1 - fi + # tmpd is a temporary directory in which backends may store + # intermediate by-products of the download. + # tmpf is the file in which the backends should put the downloaded + # content. + # tmpd is located in $(BUILD_DIR), so as not to clutter the (precious) + # $(BR2_DL_DIR) + # We let the backends create tmpf, so they are able to set whatever + # permission bits they want (although we're only really interested in + # the executable bit.) + tmpd="$(mktemp -d "${BUILD_DIR}/.${output##*/}.XXXXXX")" + tmpf="${tmpd}/output" - # cd back to free the temp-dir, so we can remove it later - cd "${OLDPWD}" + # Helpers expect to run in a directory that is *really* trashable, so + # they are free to create whatever files and/or sub-dirs they might need. + # Doing the 'cd' here rather than in all backends is easier. + cd "${tmpd}" - # Check if the downloaded file is sane, and matches the stored hashes - # for that file - if support/download/check-hash ${quiet} "${hfile}" "${tmpf}" "${output##*/}"; then - rc=0 - else - if [ ${?} -ne 3 ]; then + # If the backend fails, we can just remove the content of the temporary + # directory to remove all the cruft it may have left behind, and try + # the next URI until it succeeds. Once out of URI to try, we need to + # cleanup and exit. + if ! "${OLDPWD}/support/download/${backend}" \ + $([ -n "${urlencode}" ] && printf %s '-e') \ + -c "${cset}" \ + -n "${raw_base_name}" \ + -N "${raw_name}" \ + -f "${filename}" \ + -u "${uri}" \ + -o "${tmpf}" \ + ${quiet} ${recurse} "${@}" + then + # cd back to keep path coherence + cd "${OLDPWD}" rm -rf "${tmpd}" - exit 1 + continue fi - # the hash file exists and there was no hash to check the file against - rc=1 + # cd back to free the temp-dir, so we can remove it later + cd "${OLDPWD}" + + # Check if the downloaded file is sane, and matches the stored hashes + # for that file + if support/download/check-hash ${quiet} "${hfile}" "${tmpf}" "${output##*/}"; then + rc=0 + else + if [ ${?} -ne 3 ]; then + rm -rf "${tmpd}" + continue + fi + + # the hash file exists and there was no hash to check the file + # against + rc=1 + fi + download_and_check=1 + break + done + + # We tried every URI possible, none seems to work or to check against the + # available hash. *ABORT MISSION* + if [ "${download_and_check}" -eq 0 ]; then + rm -rf "${tmpd}" + exit 1 fi # tmp_output is in the same directory as the final output, so we can @@ -173,16 +213,13 @@ DESCRIPTION -h This help text. - -b BACKEND - Wrap the specified BACKEND. Known backends are: - bzr Bazaar - cp Local files - cvs Concurrent Versions System - git Git - hg Mercurial - scp Secure copy - svn Subversion - wget HTTP download + -u URIs + The URI to get the file from, the URI must respect the format given in + the example. + You may give as many '-u URI' as you want, the script will stop at the + frist successful download. + + Example: backend+URI; git+http://example.com or http+http://example.com -o FILE Store the downloaded archive in FILE. diff --git a/support/download/wget b/support/download/wget index fece6663ca..c69e6071aa 100755 --- a/support/download/wget +++ b/support/download/wget @@ -8,7 +8,9 @@ set -e # Options: # -q Be quiet. # -o FILE Save into file FILE. +# -f FILENAME The filename of the tarball to get at URL # -u URL Download file at URL. +# -e ENCODE Tell wget to urlencode the filename passed to it # # Environment: # WGET : the wget command to call @@ -18,7 +20,9 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=-q;; o) output="${OPTARG}";; + f) filename="${OPTARG}";; u) url="${OPTARG}";; + e) encode="-e";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac @@ -32,4 +36,8 @@ _wget() { eval ${WGET} "${@}" } -_wget ${verbose} "${@}" -O "'${output}'" "'${url}'" +# Replace every '?' with '%3F' in the filename; only for the PRIMARY and BACKUP +# mirror +[ -n "${encode}" ] && filename=${filename//\?/%3F} + +_wget ${verbose} "${@}" -O "'${output}'" "'${url}/${filename}'" From cdac332d20d2d1326dee0111e188fa214549122b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 2 Apr 2018 11:48:08 +0200 Subject: [PATCH 0600/2640] check-host-tar.sh: bump minimum tar version to 1.27 for reproducible tar files with long paths Fixes: http://autobuild.buildroot.net/results/b18/b187e64a61918f17f69588e2355a03286bc5808e tar 1.27 subtly changed the tar format when a GNU long link entry is added (which is done for path elements > 100 characters). The code used to set the permission mode of the link entry to 0: header = start_private_header ("././@LongLink", size, time (NULL)); FILL (header->header.mtime, '0'); FILL (header->header.mode, '0'); FILL (header->header.uid, '0'); FILL (header->header.gid, '0'); FILL (header->header.devmajor, 0); FILL (header->header.devminor, 0); This got dropped in 1.27 by commit df7b55a8f6354e3 (Fix some problems with negative and out-of-range integers), so the settings from start_private_header() are used directly - Which are: TIME_TO_CHARS (t < 0 ? 0 : min (t, MAX_OCTAL_VAL (header->header.mtime)), header->header.mtime); MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode); UID_TO_CHARS (0, header->header.uid); GID_TO_CHARS (0, header->header.gid); The end result is that tar >= 1.27 sets mode to 644. The consequence of this is that we create different tar files when long path names are encountered (which often happens when a package downloads a specific sha1 from a git repo) depending on the host tar version used, causing hash mismatches. As a workaround, bump our minimum tar version to 1.27. It would be nicer to only do this if we have packages from bzr/git/hg enabled, but that is an exercise for later. Signed-off-by: Peter Korsgaard Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- support/dependencies/check-host-tar.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/support/dependencies/check-host-tar.sh b/support/dependencies/check-host-tar.sh index 2143877524..0857307396 100755 --- a/support/dependencies/check-host-tar.sh +++ b/support/dependencies/check-host-tar.sh @@ -26,10 +26,11 @@ if [ ! -z "${version_bsd}" ] ; then minor=0 fi -# Minimal version = 1.17 (previous versions do not correctly unpack archives -# containing hard-links if the --strip-components option is used). +# Minimal version = 1.27 (previous versions do not correctly unpack archives +# containing hard-links if the --strip-components option is used or create +# different gnu long link headers for path elements > 100 characters). major_min=1 -minor_min=17 +minor_min=27 # Maximal version = 1.29 (1.30 changed --numeric-owner output for # filenames > 100 characters). This is really a fix for a bug in From 1189d03fe70f8b74384649d9a9edbacca3586240 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Apr 2018 13:10:18 +0200 Subject: [PATCH 0601/2640] ncmpc: add optional dependency to lirc-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ncmpc/ncmpc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 6bce627562..1d464b72de 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -18,6 +18,13 @@ NCMPC_CONF_OPTS += \ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf +ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) +NCMPC_DEPENDENCIES += lirc-tools +NCMPC_CONF_OPTS += -Dlirc=true +else +NCMPC_CONF_OPTS += -Dlirc=false +endif + NCMPC_NINJA_OPTS = $(if $(VERBOSE),-v) define NCMPC_CONFIGURE_CMDS From 55ec9b4e40b08a11cb9c1662c427c8d58351924a Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 27 Nov 2017 08:41:29 -0200 Subject: [PATCH 0602/2640] nmap: add sub-options for ncat, nping and ndiff The forthcoming "libvirt" package will need a "nc" command with support for Unix domain sockets in order to permit remote management using the virt-manager utility. netcat-openbsd provides such command but requires glibc, so we would not have remote management on uClibc-based systems. Ncat is a much-improved reimplementation of the venerable Netcat and is compatible with uClibc and musl. It provides features not available in the ancient GNU netcat and its Busybox double like IPv6, proxies, and Unix sockets. Since 'nmap' itself is a fairly big program (~2.3 MB), we want to be able to install only ncat. In addition, nmap requires an external library, pcre. So this commit adds sub-options to selectively enable/disable the different programs part of nmap: nmap, nping, ndiff and ncat. Finally, we symlink 'nc' to ncat if neiter netcat nor netcat-openbsd is selected, even though ncat does not have the same interface as netcat-openbsd. However, since Fedora/RHEL install nmap-ncat as 'nc', it can be assumed that packages that depend on 'nc' know how to deal with this diversity. For example, the virt-manager package does that. Also user-supplied scripts can be assumed to do the right thing, since the user also selects whether nmap-ncat, netcat or netcat-openbsd is installed. Signed-off-by: Carlos Santos [Thomas: - don't just handle the ncat case in a special way: create sub-options for all nmap tools, and use _MAKE_OPTS and _INSTALL_TARGET_OPTS to select which ones should be built/installed.] Signed-off-by: Thomas Petazzoni --- package/nmap/Config.in | 47 +++++++++++++++++++++++++++++++++++++-- package/nmap/nmap.mk | 50 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/package/nmap/Config.in b/package/nmap/Config.in index 79f587afd1..c1aafeceb9 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -4,13 +4,56 @@ config BR2_PACKAGE_NMAP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_NMAP_NMAP \ + if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF help Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing. http://nmap.org -comment "nmap needs a toolchain w/ C++, threads" +if BR2_PACKAGE_NMAP + +config BR2_PACKAGE_NMAP_NCAT + bool "install ncat" + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + help + Ncat is a feature-packed networking utility which reads and + writes data across networks from the command line. Ncat was + written for the Nmap Project as a much-improved + reimplementation of the venerable Netcat. + + If symlink to "nc" is installed if neither netcat or + netcat-openbsd is selected. + +comment "a symlink from ncat to 'nc' will be installed" + depends on BR2_PACKAGE_NMAP_NCAT + depends on !BR2_PACKAGE_NETCAT + depends on !BR2_PACKAGE_NETCAT_OPENBSD + +config BR2_PACKAGE_NMAP_NDIFF + bool "install ndiff" + # ndiff only works with python2.x + depends on BR2_PACKAGE_PYTHON + help + This option installs the 'ndiff' tool. + +comment "ndiff needs Python 2.x" + depends on !BR2_PACKAGE_PYTHON + +config BR2_PACKAGE_NMAP_NMAP + bool "install nmap" + select BR2_PACKAGE_PCRE + help + This option installs 'nmap' itself. + +config BR2_PACKAGE_NMAP_NPING + bool "install nping" + help + This option installs the 'nping' tool. + +endif + +comment "nmap-nmap needs a toolchain w/ C++, threads" depends on BR2_USE_MMU depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index ceb08ec006..92a2be1b54 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -7,10 +7,9 @@ NMAP_VERSION = 7.60 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 -NMAP_DEPENDENCIES = libpcap pcre host-autoconf +NMAP_DEPENDENCIES = libpcap host-autoconf NMAP_CONF_OPTS = --without-liblua --without-zenmap \ - --with-libdnet=included --with-liblinear=included \ - --with-libpcre="$(STAGING_DIR)/usr" --without-ncat + --with-libdnet=included --with-liblinear=included NMAP_LICENSE = GPL-2.0 NMAP_LICENSE_FILES = COPYING @@ -51,11 +50,52 @@ else NMAP_CONF_OPTS += --without-openssl endif -# ndiff only works with python2.x -ifeq ($(BR2_PACKAGE_PYTHON),y) +NMAP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) + +ifeq ($(BR2_PACKAGE_NMAP_NCAT),y) +NMAP_CONF_OPTS += --with-ncat +NMAP_MAKE_OPTS += build-ncat +NMAP_INSTALL_TARGET_OPTS += install-ncat +else +NMAP_CONF_OPTS += --without-ncat +endif + +ifeq ($(BR2_PACKAGE_NMAP_NDIFF),y) NMAP_DEPENDENCIES += python +NMAP_CONF_OPTS += --with-ndiff +NMAP_MAKE_OPTS += build-ndiff +NMAP_INSTALL_TARGET_OPTS += install-ndiff else NMAP_CONF_OPTS += --without-ndiff endif +ifeq ($(BR2_PACKAGE_NMAP_NMAP),y) +NMAP_DEPENDENCIES += pcre +NMAP_CONF_OPTS += --with-libpcre="$(STAGING_DIR)/usr" +NMAP_MAKE_OPTS += nmap +NMAP_INSTALL_TARGET_OPTS += install-nmap +endif + +ifeq ($(BR2_PACKAGE_NMAP_NPING),y) +NMAP_CONF_OPTS += --with-nping +NMAP_MAKE_OPTS += build-nping +NMAP_INSTALL_TARGET_OPTS += install-nping +else +NMAP_CONF_OPTS += --without-nping +endif + +# If we are going to install ncat, ensure Busybox gets built/installed +# before, so that this package overrides Busybox nc. +ifeq ($(BR2_PACKAGE_NMAP_NCAT)$(BR2_PACKAGE_BUSYBOX),yy) +NMAP_DEPENDENCIES += busybox +endif + +# Add a symlink to "nc" if none of the competing netcats is selected +ifeq ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:) +define NMAP_INSTALL_NCAT_SYMLINK + ln -fs ncat $(TARGET_DIR)/usr/bin/nc +endef +NMAP_POST_INSTALL_TARGET_HOOKS += NMAP_INSTALL_NCAT_SYMLINK +endif + $(eval $(autotools-package)) From 765e94ea4d585ddf03a76cdc57cb593201e61ed4 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 15:33:53 +0200 Subject: [PATCH 0603/2640] core/pkg-download: fix autobuilder fallout Some arguments can be empty, so we need to add single quote around them But since they are sinple quote; double quote inside them are now not interpreted by the shell and as such must be removed; hence the use of qstrip. Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2847a99d2f..2d5f26bfc5 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -75,12 +75,12 @@ export BR_NO_CHECK_HASH_FOR = ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(BR2_PRIMARY_SITE),urlencode) + -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) endif ifeq ($(BR2_PRIMARY_SITE_ONLY),) DOWNLOAD_URIS += \ - -u $($(PKG)_SITE_METHOD)+$(dir $(1)) + -u $($(PKG)_SITE_METHOD)+$(dir $(call qstrip,$(1))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ -u $(call getschemeplusuri,$(BR2_BACKUP_SITE),urlencode) @@ -88,14 +88,15 @@ endif endif define DOWNLOAD - $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),BR_NO_CHECK_HASH_FOR=$(notdir $(1))) \ + $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)), + BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ $(EXTRA_ENV) $(DL_WRAPPER) \ - -c $($(PKG)_DL_VERSION) \ - -f $(notdir $(1)) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - -n $($(PKG)_BASENAME_RAW) \ - -N $($(PKG)_RAWNAME) \ - -o $(DL_DIR)/$(notdir $(1)) \ + -c '$($(PKG)_DL_VERSION)' \ + -f '$(notdir $(1))' \ + -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ + -n '$($(PKG)_BASENAME_RAW)' \ + -N '$($(PKG)_RAWNAME)' \ + -o '$(DL_DIR)/$(notdir $(1))' \ $(if $($(PKG)_GIT_SUBMODULES),-r) \ $(DOWNLOAD_URIS) \ $(QUIET) \ From 9447e866187728009addf0cc62aa0c6b293b6dcd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 15:06:34 +0200 Subject: [PATCH 0604/2640] package/git: bump version to 2.16.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 504f7d993a..fea1a1e904 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 cfad4337f2fdbfc1e2c8abce5e17e1dd4e1718a34ac2cbe3238fbe2426f2ea19 git-2.16.1.tar.xz +sha256 d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48 git-2.16.3.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1109f7a8a2..2115e04e31 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.16.1 +GIT_VERSION = 2.16.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 514291f39ef066cbe4dd9b41e1a3b0268fc8efb8 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 15:09:24 +0200 Subject: [PATCH 0605/2640] packages: use new $($PKG)_DL_DIR) variable Instead of DL_DIR, the package should now use $(PKG)_DL_DIR to ease the transition into a new directory structure for DL_DIR. This commit has been generated with the following scripts: for i in $(find . -iname "*.mk"); do if ! grep -q "\$(DL_DIR)" ${i}; then continue fi pkg_name="$(basename $(dirname ${i}))" [ "${pkg_name}" = "package" ] && continue raw_pkg_name=$(echo ${pkg_name} | tr [a-z] [A-Z] | tr '-' '_') pkg_dl_dir="${raw_pkg_name}_DL_DIR" sed -i "s/\$(DL_DIR)/\$($pkg_dl_dir)/" ${i} done Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- boot/at91bootstrap/at91bootstrap.mk | 2 +- package/amd-catalyst/amd-catalyst.mk | 2 +- package/android-tools/android-tools.mk | 2 +- package/angularjs/angularjs.mk | 2 +- package/bootstrap/bootstrap.mk | 2 +- package/cache-calibrator/cache-calibrator.mk | 2 +- package/cargo/cargo.mk | 4 ++-- package/cracklib/cracklib.mk | 2 +- package/cryptopp/cryptopp.mk | 2 +- package/devmem2/devmem2.mk | 2 +- package/dhrystone/dhrystone.mk | 2 +- package/doom-wad/doom-wad.mk | 2 +- package/espeak/espeak.mk | 2 +- package/fan-ctrl/fan-ctrl.mk | 2 +- package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk | 2 +- package/freescale-imx/imx-codec/imx-codec.mk | 2 +- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 2 +- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 2 +- package/freescale-imx/imx-parser/imx-parser.mk | 2 +- package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +- package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk | 2 +- package/freescale-imx/libz160/libz160.mk | 2 +- package/gcc/gcc.mk | 2 +- package/irrlicht/irrlicht.mk | 2 +- package/jquery-mobile/jquery-mobile.mk | 2 +- package/jquery-sparkline/jquery-sparkline.mk | 2 +- package/jquery-ui-themes/jquery-ui-themes.mk | 2 +- package/jquery-ui/jquery-ui.mk | 2 +- package/jquery-validation/jquery-validation.mk | 2 +- package/jquery/jquery.mk | 2 +- package/kodi/kodi.mk | 6 +++--- package/libb64/libb64.mk | 2 +- package/libfreeimage/libfreeimage.mk | 2 +- package/libjson/libjson.mk | 2 +- package/libsoil/libsoil.mk | 2 +- package/lsof/lsof.mk | 2 +- package/musl-compat-headers/musl-compat-headers.mk | 2 +- package/nmon/nmon.mk | 2 +- package/nvidia-driver/nvidia-driver.mk | 2 +- .../nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk | 2 +- package/opentyrian-data/opentyrian-data.mk | 2 +- package/perl/perl.mk | 2 +- package/python-keyring/python-keyring.mk | 1 - package/python-pytz/python-pytz.mk | 2 +- package/python-simplegeneric/python-simplegeneric.mk | 2 +- package/rapidxml/rapidxml.mk | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- package/rust-bin/rust-bin.mk | 2 +- package/sam-ba/sam-ba.mk | 2 +- package/spidev_test/spidev_test.mk | 2 +- package/tar/tar.mk | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- package/ti-cgt-pru/ti-cgt-pru.mk | 4 ++-- package/ti-gfx/ti-gfx.mk | 4 ++-- package/ts4900-fpga/ts4900-fpga.mk | 2 +- package/unscd/unscd.mk | 2 +- package/urg/urg.mk | 2 +- package/waf/waf.mk | 2 +- package/whetstone/whetstone.mk | 2 +- package/wilc1000-firmware/wilc1000-firmware.mk | 2 +- package/zynq-boot-bin/zynq-boot-bin.mk | 2 +- 62 files changed, 66 insertions(+), 67 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index f6550588d3..c68b56b6ec 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -17,7 +17,7 @@ AT91BOOTSTRAP_INSTALL_IMAGES = YES AT91BOOTSTRAP_INSTALL_TARGET = NO define AT91BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) + $(UNZIP) -d $(BUILD_DIR) $(AT91BOOTSTRAP_DL_DIR)/$(AT91BOOTSTRAP_SOURCE) mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D) rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) endef diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index b9396e11fa..d864095c31 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -17,7 +17,7 @@ AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX) AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64) define AMD_CATALYST_EXTRACT_CMDS - unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D) + unzip -q $(AMD_CATALYST_DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D) $(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D) endef diff --git a/package/android-tools/android-tools.mk b/package/android-tools/android-tools.mk index f6c6913a68..11e0a15a7f 100644 --- a/package/android-tools/android-tools.mk +++ b/package/android-tools/android-tools.mk @@ -15,7 +15,7 @@ ANDROID_TOOLS_LICENSE_FILES = debian/copyright # Extract the Debian tarball inside the sources define ANDROID_TOOLS_DEBIAN_EXTRACT $(call suitable-extractor,$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS))) \ - $(DL_DIR)/$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS)) | \ + $(ANDROID_TOOLS_DL_DIR)/$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS)) | \ $(TAR) -C $(@D) $(TAR_OPTIONS) - endef diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk index 60702a26d2..a941bc3828 100644 --- a/package/angularjs/angularjs.mk +++ b/package/angularjs/angularjs.mk @@ -12,7 +12,7 @@ ANGULARJS_LICENSE = MIT ANGULARJS_LICENSE_FILES = angular.js define ANGULARJS_EXTRACT_CMDS - unzip $(DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) + unzip $(ANGULARJS_DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) mv $(@D)/angular-$(ANGULARJS_VERSION)/* $(@D) rmdir $(@D)/angular-$(ANGULARJS_VERSION) endef diff --git a/package/bootstrap/bootstrap.mk b/package/bootstrap/bootstrap.mk index 61d6c826fc..005dd9a714 100644 --- a/package/bootstrap/bootstrap.mk +++ b/package/bootstrap/bootstrap.mk @@ -11,7 +11,7 @@ BOOTSTRAP_LICENSE = MIT BOOTSTRAP_LICENSE_FILES = css/bootstrap.css define BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) + $(UNZIP) $(BOOTSTRAP_DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) endef define BOOTSTRAP_INSTALL_TARGET_CMDS diff --git a/package/cache-calibrator/cache-calibrator.mk b/package/cache-calibrator/cache-calibrator.mk index 6f12d119ef..203732e4f7 100644 --- a/package/cache-calibrator/cache-calibrator.mk +++ b/package/cache-calibrator/cache-calibrator.mk @@ -10,7 +10,7 @@ CACHE_CALIBRATOR_LICENSE = Cache calibrator license CACHE_CALIBRATOR_LICENSE_FILES = calibrator.c.license define CACHE_CALIBRATOR_EXTRACT_CMDS - cp $(DL_DIR)/$(CACHE_CALIBRATOR_SOURCE) $(@D) + cp $(CACHE_CALIBRATOR_DL_DIR)/$(CACHE_CALIBRATOR_SOURCE) $(@D) endef define CACHE_CALIBRATOR_EXTRACT_LICENSE diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk index 3fd088d727..36b2718e90 100644 --- a/package/cargo/cargo.mk +++ b/package/cargo/cargo.mk @@ -37,7 +37,7 @@ HOST_CARGO_HOME = $(HOST_DIR)/share/cargo define HOST_CARGO_EXTRACT_DEPS @mkdir -p $(@D)/vendor $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(DL_DIR)/$(CARGO_DEPS_SOURCE) | \ + $(CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - endef @@ -46,7 +46,7 @@ HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS define HOST_CARGO_EXTRACT_INSTALLER @mkdir -p $(@D)/src/rust-installer $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ + $(CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - endef diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 2fa3d3b4ea..aeee60d1e7 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -29,7 +29,7 @@ HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y) CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz -CRACKLIB_DICT_SOURCE = $(DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz +CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz else CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small endif diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index d7aabf04b8..6da39b09f2 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -12,7 +12,7 @@ CRYPTOPP_LICENSE_FILES = License.txt CRYPTOPP_INSTALL_STAGING = YES define HOST_CRYPTOPP_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) + $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) endef HOST_CRYPTOPP_MAKE_OPTS = \ diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk index eb92db6098..044e6fa596 100644 --- a/package/devmem2/devmem2.mk +++ b/package/devmem2/devmem2.mk @@ -11,7 +11,7 @@ DEVMEM2_LICENSE = GPL-2.0+ DEVMEM2_LICENSE_FILES = devmem2.c.license define DEVMEM2_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ + cp $(DEVMEM2_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ endef define DEVMEM2_EXTRACT_LICENSE diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk index c0bca9895d..d54c8d94e8 100644 --- a/package/dhrystone/dhrystone.mk +++ b/package/dhrystone/dhrystone.mk @@ -9,7 +9,7 @@ DHRYSTONE_SOURCE = dhry-c DHRYSTONE_SITE = http://www.netlib.org/benchmark define DHRYSTONE_EXTRACT_CMDS - (cd $(@D) && $(SHELL) $(DL_DIR)/$($(PKG)_SOURCE)) + (cd $(@D) && $(SHELL) $(DHRYSTONE_DL_DIR)/$($(PKG)_SOURCE)) $(Q)cp package/dhrystone/Makefile $(@D)/ endef diff --git a/package/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk index d3ac731bd5..f348fc2207 100644 --- a/package/doom-wad/doom-wad.mk +++ b/package/doom-wad/doom-wad.mk @@ -11,7 +11,7 @@ DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware define DOOM_WAD_EXTRACT_CMDS - $(UNZIP) -p $(DL_DIR)/$($(PKG)_SOURCE) 'DOOMS_19.[12]' > \ + $(UNZIP) -p $(DOOM_WAD_DL_DIR)/$($(PKG)_SOURCE) 'DOOMS_19.[12]' > \ $(@D)/doom-$(DOOM_WAD_VERSION).zip $(UNZIP) -d $(@D) $(@D)/doom-$(DOOM_WAD_VERSION).zip DOOM1.WAD endef diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk index 226f17fc05..aa0b5b0716 100644 --- a/package/espeak/espeak.mk +++ b/package/espeak/espeak.mk @@ -21,7 +21,7 @@ ESPEAK_DEPENDENCIES = pulseaudio endif define ESPEAK_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(ESPEAK_SOURCE) + $(UNZIP) -d $(@D) $(ESPEAK_DL_DIR)/$(ESPEAK_SOURCE) mv $(@D)/espeak-$(ESPEAK_VERSION)-source/* $(@D) $(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source endef diff --git a/package/fan-ctrl/fan-ctrl.mk b/package/fan-ctrl/fan-ctrl.mk index 53533a8a17..81a52f1e9f 100644 --- a/package/fan-ctrl/fan-ctrl.mk +++ b/package/fan-ctrl/fan-ctrl.mk @@ -12,7 +12,7 @@ FAN_CTRL_LICENSE = GPL-2.0+ FAN_CTRL_LICENSE_FILES = fan-ctrl.c define FAN_CTRL_EXTRACT_CMDS - cp $(DL_DIR)/$(FAN_CTRL_SOURCE) $(@D)/fan-ctrl.c + cp $(FAN_CTRL_DL_DIR)/$(FAN_CTRL_SOURCE) $(@D)/fan-ctrl.c endef define FAN_CTRL_BUILD_CMDS diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 630afcaa37..d5387b38da 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -15,7 +15,7 @@ FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_BLOBS = sdma vpu define FIRMWARE_IMX_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef define FIRMWARE_IMX_INSTALL_TARGET_CMDS diff --git a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk index 44a6b4c7d2..5586073712 100644 --- a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk +++ b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk @@ -23,7 +23,7 @@ GPU_AMD_BIN_MX51_LICENSE_FILES = EULA GPU_AMD_BIN_MX51_REDISTRIBUTE = NO define GPU_AMD_BIN_MX51_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) endef # Upstream headers need to be compiled with -D_LINUX. It is more convenient diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index ea4d90110f..784c1fa4a9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu endif define IMX_CODEC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_CODEC_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 0c92b826c4..aafd70dc9d 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -15,7 +15,7 @@ IMX_GPU_G2D_LICENSE_FILES = EULA COPYING IMX_GPU_G2D_REDISTRIBUTE = NO define IMX_GPU_G2D_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_G2D_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) endef define IMX_GPU_G2D_INSTALL_STAGING_CMDS diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index a9f8b9d9bd..0dc2072984 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -26,7 +26,7 @@ IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif define IMX_GPU_VIV_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef # Instead of building, we fix up the inconsistencies that exist diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk index d79a4444c8..11536e5024 100644 --- a/package/freescale-imx/imx-parser/imx-parser.mk +++ b/package/freescale-imx/imx-parser/imx-parser.mk @@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw endif define IMX_PARSER_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_PARSER_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE)) endef # The Makefile installs several versions of the libraries, but we only diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index e3a1ee661d..2bcfe53eba 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING IMX_VPU_REDISTRIBUTE = NO define IMX_VPU_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE)) endef define IMX_VPU_BUILD_CMDS diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk index 7cbf7784c9..edba87279f 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk @@ -15,7 +15,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING IMX_VPUWRAP_REDISTRIBUTE = NO define IMX_VPUWRAP_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPUWRAP_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE)) endef $(eval $(autotools-package)) diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk index af43b1859d..5b1feeb441 100644 --- a/package/freescale-imx/libz160/libz160.mk +++ b/package/freescale-imx/libz160/libz160.mk @@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA LIBZ160_REDISTRIBUTE = NO define LIBZ160_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBZ160_SOURCE)) + $(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE)) endef define LIBZ160_INSTALL_STAGING_CMDS diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 27fc1e987c..f42f36a967 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -316,7 +316,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk index ccd1045ca0..a1e190d98d 100644 --- a/package/irrlicht/irrlicht.mk +++ b/package/irrlicht/irrlicht.mk @@ -25,7 +25,7 @@ IRRLICHT_SUBDIR = source/Irrlicht IRRLICHT_DEPENDENCIES = libgl xlib_libXxf86vm define IRRLICHT_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(IRRLICHT_SOURCE) + $(UNZIP) -d $(@D) $(IRRLICHT_DL_DIR)/$(IRRLICHT_SOURCE) mv $(@D)/irrlicht-$(IRRLICHT_VERSION)/* $(@D) $(RM) -r $(@D)/irrlicht-$(IRRLICHT_VERSION) endef diff --git a/package/jquery-mobile/jquery-mobile.mk b/package/jquery-mobile/jquery-mobile.mk index 1067952904..1171e60d0a 100644 --- a/package/jquery-mobile/jquery-mobile.mk +++ b/package/jquery-mobile/jquery-mobile.mk @@ -10,7 +10,7 @@ JQUERY_MOBILE_SOURCE = jquery.mobile-$(JQUERY_MOBILE_VERSION).zip JQUERY_MOBILE_LICENSE = MIT define JQUERY_MOBILE_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE) + $(UNZIP) -d $(@D) $(JQUERY_MOBILE_DL_DIR)/$(JQUERY_MOBILE_SOURCE) endef JQUERY_MOBILE_INSTALLED_FILES = \ diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk index 165c2fa99c..683d84f4aa 100644 --- a/package/jquery-sparkline/jquery-sparkline.mk +++ b/package/jquery-sparkline/jquery-sparkline.mk @@ -10,7 +10,7 @@ JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js JQUERY_SPARKLINE_LICENSE = BSD-3-Clause define JQUERY_SPARKLINE_EXTRACT_CMDS - cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D) + cp $(JQUERY_SPARKLINE_DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D) endef define JQUERY_SPARKLINE_INSTALL_TARGET_CMDS diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk index cd3dab6d87..5108389a77 100644 --- a/package/jquery-ui-themes/jquery-ui-themes.mk +++ b/package/jquery-ui-themes/jquery-ui-themes.mk @@ -12,7 +12,7 @@ JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui define JQUERY_UI_THEMES_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_THEMES_SOURCE) + $(UNZIP) -d $(@D) $(JQUERY_UI_THEMES_DL_DIR)/$(JQUERY_UI_THEMES_SOURCE) mv $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)/* $(@D) $(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION) endef diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk index d829d6241b..9284e683f1 100644 --- a/package/jquery-ui/jquery-ui.mk +++ b/package/jquery-ui/jquery-ui.mk @@ -14,7 +14,7 @@ JQUERY_UI_LICENSE = MIT JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt define JQUERY_UI_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE) + $(UNZIP) -d $(@D) $(JQUERY_UI_DL_DIR)/$(JQUERY_UI_SOURCE) mv $(@D)/jquery-ui-$(JQUERY_UI_VERSION)/* $(@D) $(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION) endef diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk index 10d2a92afc..a8c2897983 100644 --- a/package/jquery-validation/jquery-validation.mk +++ b/package/jquery-validation/jquery-validation.mk @@ -11,7 +11,7 @@ JQUERY_VALIDATION_LICENSE = MIT JQUERY_VALIDATION_LICENSE_FILES = README.md define JQUERY_VALIDATION_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE) + $(UNZIP) -d $(@D) $(JQUERY_VALIDATION_DL_DIR)/$(JQUERY_VALIDATION_SOURCE) endef define JQUERY_VALIDATION_INSTALL_TARGET_CMDS diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk index 363ee09633..f75eded8b3 100644 --- a/package/jquery/jquery.mk +++ b/package/jquery/jquery.mk @@ -10,7 +10,7 @@ JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js JQUERY_LICENSE = MIT define JQUERY_EXTRACT_CMDS - cp $(DL_DIR)/$(JQUERY_SOURCE) $(@D) + cp $(JQUERY_DL_DIR)/$(JQUERY_SOURCE) $(@D) endef define JQUERY_INSTALL_TARGET_CMDS diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 9d3b65ae91..f3fa0b55b0 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -69,9 +69,9 @@ KODI_CONF_OPTS += \ -DDEPENDS_PATH=$(@D) \ -DWITH_FFMPEG=$(STAGING_DIR)/usr \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ - -DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ - -DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ - -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \ + -DLIBDVDCSS_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ + -DLIBDVDNAV_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ + -DLIBDVDREAD_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \ -DENABLE_IMX=OFF ifeq ($(BR2_ENABLE_LOCALE),) diff --git a/package/libb64/libb64.mk b/package/libb64/libb64.mk index 4dea9593a0..ed6d3cf4b4 100644 --- a/package/libb64/libb64.mk +++ b/package/libb64/libb64.mk @@ -14,7 +14,7 @@ LIBB64_INSTALL_STAGING = YES LIBB64_INSTALL_TARGET = NO define LIBB64_EXTRACT_CMDS - unzip $(DL_DIR)/$(LIBB64_SOURCE) -d $(BUILD_DIR) + unzip $(LIBB64_DL_DIR)/$(LIBB64_SOURCE) -d $(BUILD_DIR) endef define LIBB64_BUILD_CMDS diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk index 0ca23933a6..e0aa1f0ae8 100644 --- a/package/libfreeimage/libfreeimage.mk +++ b/package/libfreeimage/libfreeimage.mk @@ -12,7 +12,7 @@ LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt LIBFREEIMAGE_INSTALL_STAGING = YES define LIBFREEIMAGE_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(LIBFREEIMAGE_SOURCE) -d $(@D) + $(UNZIP) $(LIBFREEIMAGE_DL_DIR)/$(LIBFREEIMAGE_SOURCE) -d $(@D) mv $(@D)/FreeImage/* $(@D) rmdir $(@D)/FreeImage endef diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk index 74224ba657..d04ddc40f3 100644 --- a/package/libjson/libjson.mk +++ b/package/libjson/libjson.mk @@ -23,7 +23,7 @@ endif LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)" define LIBJSON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE) + $(UNZIP) -d $(@D) $(LIBJSON_DL_DIR)/$(LIBJSON_SOURCE) mv $(@D)/libjson/* $(@D) $(RM) -r $(@D)/libjson $(SED) '/ldconfig/d' $(@D)/makefile diff --git a/package/libsoil/libsoil.mk b/package/libsoil/libsoil.mk index efa67d9eee..2945edd8dd 100644 --- a/package/libsoil/libsoil.mk +++ b/package/libsoil/libsoil.mk @@ -14,7 +14,7 @@ LIBSOIL_LICENSE_FILES = src/stb_image_aug.c src/image_helper.c LIBSOIL_MAKEFILE = ../projects/makefile/alternate_Makefile.txt define LIBSOIL_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBSOIL_SOURCE) + $(UNZIP) -d $(@D) $(LIBSOIL_DL_DIR)/$(LIBSOIL_SOURCE) mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D) endef diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index e5cd4bce6e..0dc8e2de2f 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -32,7 +32,7 @@ endif # The .tar.bz2 contains another .tar, which contains the source code. define LSOF_EXTRACT_CMDS - $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \ + $(call suitable-extractor,$(LSOF_SOURCE)) $(LSOF_DL_DIR)/$(LSOF_SOURCE) | \ $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \ $(TAR) --strip-components=1 -C $(LSOF_DIR) $(TAR_OPTIONS) - endef diff --git a/package/musl-compat-headers/musl-compat-headers.mk b/package/musl-compat-headers/musl-compat-headers.mk index 91f5074ef6..1cfa894879 100644 --- a/package/musl-compat-headers/musl-compat-headers.mk +++ b/package/musl-compat-headers/musl-compat-headers.mk @@ -20,7 +20,7 @@ MUSL_COMPAT_HEADERS_INSTALL_STAGING = YES # Copying both headers so legal-info finds them (they are _LICENSE_FILES) define MUSL_COMPAT_HEADERS_EXTRACT_CMDS - $(INSTALL) -m 0644 -D $(DL_DIR)/$(notdir $(MUSL_COMPAT_HEADERS_QUEUE_H)) $(@D)/queue.h + $(INSTALL) -m 0644 -D $(MUSL_COMPAT_HEADERS_DL_DIR)/$(notdir $(MUSL_COMPAT_HEADERS_QUEUE_H)) $(@D)/queue.h $(INSTALL) -m 0644 -D $(MUSL_COMPAT_HEADERS_PKGDIR)/cdefs.h $(@D)/cdefs.h endef diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index f561d6dcc0..f7edd66a26 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -13,7 +13,7 @@ NMON_DEPENDENCIES = ncurses NMON_CFLAGS = $(TARGET_CFLAGS) -D JFS -D GETUSER -D LARGEMEM -D DEBIAN define NMON_EXTRACT_CMDS - cp $(DL_DIR)/$(NMON_SOURCE) $(@D) + cp $(NMON_DL_DIR)/$(NMON_SOURCE) $(@D) endef define NMON_BUILD_CMDS diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index e56661059f..404fa881ec 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -144,7 +144,7 @@ endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y # virtually everywhere, and it is fine enough to provide useful options. # Except it can't extract into an existing (even empty) directory. define NVIDIA_DRIVER_EXTRACT_CMDS - $(SHELL) $(DL_DIR)/$(NVIDIA_DRIVER_SOURCE) --extract-only --target \ + $(SHELL) $(NVIDIA_DRIVER_DL_DIR)/$(NVIDIA_DRIVER_SOURCE) --extract-only --target \ $(@D)/tmp-extract chmod u+w -R $(@D) mv $(@D)/tmp-extract/* $(@D)/tmp-extract/.manifest $(@D) diff --git a/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk b/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk index 5514643416..2885021c58 100644 --- a/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk +++ b/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk @@ -15,7 +15,7 @@ NVIDIA_TEGRA23_CODECS_REDISTRIBUTE = NO define NVIDIA_TEGRA23_CODECS_EXTRACT_CMDS $(INSTALL) -d $(@D) $(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \ - $(DL_DIR)/$(NVIDIA_TEGRA23_CODECS_SOURCE) | \ + $(NVIDIA_TEGRA23_CODECS_DL_DIR)/$(NVIDIA_TEGRA23_CODECS_SOURCE) | \ $(TAR) --strip-components=0 -C $(@D) $(TAR_OPTIONS) - $(INSTALL) -d $(@D)/restricted_codecs $(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \ diff --git a/package/opentyrian-data/opentyrian-data.mk b/package/opentyrian-data/opentyrian-data.mk index 4b879df1c3..9e38b61bfa 100644 --- a/package/opentyrian-data/opentyrian-data.mk +++ b/package/opentyrian-data/opentyrian-data.mk @@ -10,7 +10,7 @@ OPENTYRIAN_DATA_SOURCE = tyrian21.zip OPENTYRIAN_DATA_LICENSE = Freeware define OPENTYRIAN_DATA_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE) + $(UNZIP) -d $(@D) $(OPENTYRIAN_DATA_DL_DIR)/$(OPENTYRIAN_DATA_SOURCE) endef define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 58bf3eb6ae..c47367b9da 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -24,7 +24,7 @@ PERL_EXTRA_DOWNLOADS = $(PERL_CROSS_SITE)/$(PERL_CROSS_SOURCE) # as a separate package. Instead, it is downloaded and extracted # together with perl define PERL_CROSS_EXTRACT - $(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \ + $(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(PERL_DL_DIR)/$(PERL_CROSS_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - endef PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 27db2802ed..8ac18ae052 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -6,7 +6,6 @@ PYTHON_KEYRING_VERSION = 10.5.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 6e130a6b2f..1d3603389b 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -12,7 +12,7 @@ PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt define PYTHON_PYTZ_EXTRACT_CMDS - unzip $(DL_DIR)/$(PYTHON_PYTZ_SOURCE) -d $(@D) + unzip $(PYTHON_PYTZ_DL_DIR)/$(PYTHON_PYTZ_SOURCE) -d $(@D) mv $(@D)/pytz-$(PYTHON_PYTZ_VERSION)/* $(@D) rmdir $(@D)/pytz-$(PYTHON_PYTZ_VERSION) endef diff --git a/package/python-simplegeneric/python-simplegeneric.mk b/package/python-simplegeneric/python-simplegeneric.mk index cc84320428..d3bfa69a7e 100644 --- a/package/python-simplegeneric/python-simplegeneric.mk +++ b/package/python-simplegeneric/python-simplegeneric.mk @@ -16,7 +16,7 @@ PYTHON_SIMPLEGENERIC_LICENSE = ZPL-2.1 PYTHON_SIMPLEGENERIC_SETUP_TYPE = setuptools define PYTHON_SIMPLEGENERIC_EXTRACT_CMDS - unzip $(DL_DIR)/$(PYTHON_SIMPLEGENERIC_SOURCE) -d $(@D) + unzip $(PYTHON_SIMPLEGENERIC_DL_DIR)/$(PYTHON_SIMPLEGENERIC_SOURCE) -d $(@D) mv $(@D)/simplegeneric-$(PYTHON_SIMPLEGENERIC_VERSION)/* $(@D) rmdir $(@D)/simplegeneric-$(PYTHON_SIMPLEGENERIC_VERSION) endef diff --git a/package/rapidxml/rapidxml.mk b/package/rapidxml/rapidxml.mk index 2bec8fe1f2..9d034d8205 100644 --- a/package/rapidxml/rapidxml.mk +++ b/package/rapidxml/rapidxml.mk @@ -15,7 +15,7 @@ RAPIDXML_INSTALL_TARGET = NO RAPIDXML_INSTALL_STAGING = YES define RAPIDXML_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDXML_SOURCE) + $(UNZIP) -d $(@D) $(RAPIDXML_DL_DIR)/$(RAPIDXML_SOURCE) mv $(@D)/rapidxml-$(RAPIDXML_VERSION)/* $(@D)/ rmdir $(@D)/rapidxml-$(RAPIDXML_VERSION) endef diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 6c855a8e14..83473d5bb9 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -12,7 +12,7 @@ RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-n RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY define RPI_WIFI_FIRMWARE_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ + cp $(RPI_WIFI_FIRMWARE_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ endef define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index cd5844b115..759d468304 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -22,7 +22,7 @@ HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAM define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std $(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS), \ - $(call suitable-extractor,$(f)) $(DL_DIR)/$(f) | \ + $(call suitable-extractor,$(f)) $(RUST_BIN_DL_DIR)/$(f) | \ $(TAR) -C $(@D)/std $(TAR_OPTIONS) - ) cd $(@D)/rustc/lib/rustlib; \ diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index a7941459c7..acc03a3b6b 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -13,7 +13,7 @@ SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h define HOST_SAM_BA_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE) + $(UNZIP) -d $(BUILD_DIR) $(SAM_BA_DL_DIR)/$(SAM_BA_SOURCE) mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D) rmdir $(BUILD_DIR)/sam-ba_cdc_linux/ endef diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index 1d657803b4..bf8170cd2c 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -32,7 +32,7 @@ endef SPIDEV_TEST_POST_PATCH_HOOKS += SPIDEV_ADD_LINUX_IOCTL define SPIDEV_TEST_EXTRACT_CMDS - cp $(DL_DIR)/$(SPIDEV_TEST_SOURCE) $(@D)/spidev_test.c + cp $(SPIDEV_TEST_DL_DIR)/$(SPIDEV_TEST_SOURCE) $(@D)/spidev_test.c endef define SPIDEV_TEST_BUILD_CMDS diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 92b6e9eaa5..9942e77737 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -40,7 +40,7 @@ HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz define HOST_TAR_EXTRACT_CMDS mkdir -p $(@D) cd $(@D) && \ - $(call suitable-extractor,$(HOST_TAR_SOURCE)) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i --preserve-modification-time + $(call suitable-extractor,$(HOST_TAR_SOURCE)) $(TAR_DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i --preserve-modification-time mv $(@D)/tar-$(TAR_VERSION)/* $(@D) rmdir $(@D)/tar-$(TAR_VERSION) endef diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index 9e315b239a..919a4360ed 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -62,7 +62,7 @@ TESSERACT_OCR_PRE_CONFIGURE_HOOKS += TESSERACT_OCR_PRECONFIGURE # Language data files installation define TESSERACT_OCR_INSTALL_LANG_DATA $(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \ - $(INSTALL) -D -m 0644 $(DL_DIR)/$(langfile) \ + $(INSTALL) -D -m 0644 $(TESSERACT_OCR_DL_DIR)/$(langfile) \ $(TARGET_DIR)/usr/share/tessdata/$(langfile) ) endef diff --git a/package/ti-cgt-pru/ti-cgt-pru.mk b/package/ti-cgt-pru/ti-cgt-pru.mk index 0b9a64b3c9..df3b97bef5 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/package/ti-cgt-pru/ti-cgt-pru.mk @@ -13,8 +13,8 @@ TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \ pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx define HOST_TI_CGT_PRU_EXTRACT_CMDS - chmod +x $(DL_DIR)/$(TI_CGT_PRU_SOURCE) - $(DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended + chmod +x $(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) + $(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended mv $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/* $(@D) rmdir $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/ endef diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk index 428878a08b..9fad553780 100644 --- a/package/ti-gfx/ti-gfx.mk +++ b/package/ti-gfx/ti-gfx.mk @@ -94,8 +94,8 @@ TI_GFX_HDR_DIRS = OGLES2/EGL OGLES2/EWS OGLES2/GLES2 OGLES2/KHR \ OGLES/GLES bufferclass_ti/ pvr2d/ wsegl/ define TI_GFX_EXTRACT_CMDS - chmod +x $(DL_DIR)/$(TI_GFX_SOURCE) - printf "Y\nY\n qY\n\n" | $(DL_DIR)/$(TI_GFX_SOURCE) \ + chmod +x $(TI_GFX_DL_DIR)/$(TI_GFX_SOURCE) + printf "Y\nY\n qY\n\n" | $(TI_GFX_DL_DIR)/$(TI_GFX_SOURCE) \ --prefix $(@D) \ --mode console endef diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index ed951b8c8f..7bb62a3984 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -11,7 +11,7 @@ TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900- # https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS - cp $(DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) + cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) endef define TS4900_FPGA_INSTALL_TARGET_CMDS diff --git a/package/unscd/unscd.mk b/package/unscd/unscd.mk index f0eb5d6ad6..36f2de271b 100644 --- a/package/unscd/unscd.mk +++ b/package/unscd/unscd.mk @@ -11,7 +11,7 @@ UNSCD_LICENSE = GPL-2.0 UNSCD_LICENSE_FILES = $(UNSCD_SOURCE) define UNSCD_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ + cp $(UNSCD_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ endef define UNSCD_BUILD_CMDS diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 966627fe36..86b7ec2c17 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -25,7 +25,7 @@ endif URG_CONFIG_SCRIPTS = c_urg-config urg-config define URG_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(URG_SOURCE) + $(UNZIP) -d $(BUILD_DIR) $(URG_DL_DIR)/$(URG_SOURCE) endef $(eval $(autotools-package)) diff --git a/package/waf/waf.mk b/package/waf/waf.mk index e7ac891b39..639c26a3b0 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -9,7 +9,7 @@ WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io/ define HOST_WAF_EXTRACT_CMDS - $(INSTALL) -D -m 0755 $(DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf + $(INSTALL) -D -m 0755 $(WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf endef define HOST_WAF_INSTALL_CMDS diff --git a/package/whetstone/whetstone.mk b/package/whetstone/whetstone.mk index d9b45638c5..3b6ec3419b 100644 --- a/package/whetstone/whetstone.mk +++ b/package/whetstone/whetstone.mk @@ -9,7 +9,7 @@ WHETSTONE_SOURCE = whetstone.c WHETSTONE_SITE = http://www.netlib.org/benchmark define WHETSTONE_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ + cp $(WHETSTONE_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ endef define WHETSTONE_BUILD_CMDS diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc1000-firmware/wilc1000-firmware.mk index 5dcf19045b..6f504d67a0 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc1000-firmware/wilc1000-firmware.mk @@ -11,7 +11,7 @@ WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip WILC1000_FIRMWARE_LICENSE = PROPRIETARY define WILC1000_FIRMWARE_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) + $(UNZIP) -d $(BUILD_DIR) $(WILC1000_FIRMWARE_DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D) rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware endef diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk index 3648c63654..c523e04f45 100644 --- a/package/zynq-boot-bin/zynq-boot-bin.mk +++ b/package/zynq-boot-bin/zynq-boot-bin.mk @@ -12,7 +12,7 @@ ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS - cp $(DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) + cp $(ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) endef define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS From 01c1889f9f641f6f8adc0345e17b70e80026554d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 2 Apr 2018 15:09:25 +0200 Subject: [PATCH 0606/2640] arc/xtensa: store the Xtensa overlay in the per-package DL_DIR Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- arch/arch.mk.xtensa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index 2b6cd26d03..fd410f6bfa 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -12,7 +12,7 @@ BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),) ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE) -ARCH_XTENSA_OVERLAY_FILE = $(DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE)) +ARCH_XTENSA_OVERLAY_FILE = $($(PKG)_DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE)) # Do not check that file, we can't know its hash BR_NO_CHECK_HASH_FOR += $(notdir $(ARCH_XTENSA_OVERLAY_URL)) else From d506f873e41c88ee9d6d502078afc36f23d86b32 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 15:09:26 +0200 Subject: [PATCH 0607/2640] pkg-{download, generic, luarocks}: use existing $($(PKG)_DL_DIR) Let the infrastructure use the already existing variable $(PKG)_DL_DIR Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 2 +- package/pkg-generic.mk | 8 ++++---- package/pkg-luarocks.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2d5f26bfc5..3f525ee5e4 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -96,7 +96,7 @@ define DOWNLOAD -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ -n '$($(PKG)_BASENAME_RAW)' \ -N '$($(PKG)_RAWNAME)' \ - -o '$(DL_DIR)/$(notdir $(1))' \ + -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ $(if $($(PKG)_GIT_SUBMODULES),-r) \ $(DOWNLOAD_URIS) \ $(QUIET) \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 25a34e6ca2..01d61ac0ad 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -133,7 +133,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) # Only show the download message if it isn't already downloaded $(Q)for p in $($(PKG)_ALL_DOWNLOADS); do \ - if test ! -e $(DL_DIR)/`basename $$p` ; then \ + if test ! -e $($(PKG)_DL_DIR)/`basename $$p` ; then \ $(call MESSAGE,"Downloading") ; \ break ; \ fi ; \ @@ -185,7 +185,7 @@ $(BUILD_DIR)/%/.stamp_patched: @$(call step_start,patch) @$(call MESSAGE,"Patching") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) - $(foreach p,$($(PKG)_PATCH),$(APPLY_PATCHES) $(@D) $(DL_DIR) $(notdir $(p))$(sep)) + $(foreach p,$($(PKG)_PATCH),$(APPLY_PATCHES) $(@D) $($(PKG)_DL_DIR) $(notdir $(p))$(sep)) $(Q)( \ for D in $(PATCH_BASE_DIRS); do \ if test -d $${D}; then \ @@ -613,7 +613,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned # default extract command $(2)_EXTRACT_CMDS ?= \ - $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$(DL_DIR)/$$($(2)_SOURCE) | \ + $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$($(2)_DL_DIR)/$$($(2)_SOURCE) | \ $$(TAR) --strip-components=$$($(2)_STRIP_COMPONENTS) \ -C $$($(2)_DIR) \ $$(foreach x,$$($(2)_EXCLUDES),--exclude='$$(x)' ) \ @@ -901,7 +901,7 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) # patches, as they are handled specially afterwards. $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ $$(Q)support/scripts/hardlink-or-copy \ - $$(DL_DIR)/$$(e) \ + $$($(2)_DL_DIR)/$$(e) \ $$($(2)_REDIST_SOURCES_DIR)$$(sep)) # Save patches and generate the series file $$(Q)while read f; do \ diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index d762867111..e2b48cfb4c 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -52,7 +52,7 @@ ifndef $(2)_EXTRACT_CMDS define $(2)_EXTRACT_CMDS mkdir -p $$($(2)_DIR)/luarocks-extract cd $$($(2)_DIR)/luarocks-extract && \ - $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$(DL_DIR)/$$($(2)_SOURCE) + $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$($(2)_DL_DIR)/$$($(2)_SOURCE) mv $$($(2)_DIR)/luarocks-extract/*/* $$($(2)_DIR) endef endif From 08252b545783951a36590db38e51afd49f647f3d Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 15:09:27 +0200 Subject: [PATCH 0608/2640] support/download: make sure the download folder is created At the moment, it means that we make sure that BR2_DL_DIR is created, in the future, it will make sure that BR2_DL_DIR/PKG_NAME/ is created. [Peter: drop trailing / on mkdir] Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3f525ee5e4..3f35661a16 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -88,6 +88,7 @@ endif endif define DOWNLOAD + $(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)), BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ $(EXTRA_ENV) $(DL_WRAPPER) \ From d9ec8526bb68ea50a8e9b9847ab119c6248c66fd Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 2 Apr 2018 16:14:46 +0200 Subject: [PATCH 0609/2640] qt5script: correct license information The license information in qt5script was just copied from all the other qt5 modules, but it is different (and complicated). - libQt5Script itself contains the third-party JavaScriptCore source. JavaScriptCore has a number of licenses: BSD-2-Clause, BSD-3-Clause, LGPL-2.0+, LGPL-2.1+. Since it is all linked together, the end result will be BSD-3-Clause and LGPL-2.1+. The different BSD licenses are all slightly different (different authors, which affects the third clause in particular). Only one separate license file is provided, so let's use that one. There is an LGPL-2.0 license file, which is slightly different from the top-level LICENSE.LGPLv21, so let's add that one as well. - libQt5Script also contains Qt-specific code which is all licensed under LGPL-2.1 only. This is covered by the LICENSE.LGPLv21 file. It merges with the LGPL-2.1+ from JavaScriptCore but limits it to 2.1 only. - libQt5ScriptTools is a separate libary containing just the script debugger. It is covered by the usual Qt license: * LGPL-2.1 or LGPL-3.0 with exception for Qt 5.6; * LGPL-3.0 or GPL-2.0+ for Qt 5.9 (actually it is GPL-2.0 or GPL-3.0 or any later version approved by the KDE Qt foundation, but let's keep it simple :-). Note that there is no LICENSE.GPLv2 provided, only LICENSE.GPLv3. Also, there is an LGPL_EXCEPTION.txt file but no mention of an exception anywhere in the sources. Update the license information with all of the above. Also add hashes for the new license files from JavaScriptCore. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5script/qt5script.hash | 2 ++ package/qt5/qt5script/qt5script.mk | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index bcb37801a8..9b43e5fd65 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -10,3 +10,5 @@ sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE. sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB +sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index b6c02d0d1c..9539f56df6 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -10,8 +10,21 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES -QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +# JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. +# This is linked into libQt5Script, which also contains Qt sources under +# LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause. +# libQt5ScriptTools is under the normal Qt opensource license. +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv3 LICENSE.FDL +else +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL +endif +# License files from JavaScriptCore +QT5SCRIPT_LICENSE_FILES += \ + src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \ + src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING define QT5SCRIPT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) From d9e7d8674ae7b0868caebf4be151de95f7707743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 15 Mar 2018 15:50:51 -0400 Subject: [PATCH 0610/2640] package: add libnpsr host package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libnspr/libnspr.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 14381bb5e8..d91393f6e8 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -49,4 +49,7 @@ LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIBRARY= install LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIBRARY= install endif +HOST_LIBNSPR_CONF_OPTS += --$(if $(filter %64,$(HOSTARCH)),en,dis)able-64bit + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From f61d220772538f612b45ccf9955386da42a99707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 15 Mar 2018 15:50:52 -0400 Subject: [PATCH 0611/2640] package: add libnss host package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-add-zlib-include-dir-variable.patch | 49 +++++++++++++++++++ package/libnss/libnss.mk | 48 ++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 package/libnss/0002-add-zlib-include-dir-variable.patch diff --git a/package/libnss/0002-add-zlib-include-dir-variable.patch b/package/libnss/0002-add-zlib-include-dir-variable.patch new file mode 100644 index 0000000000..cd0bdeec31 --- /dev/null +++ b/package/libnss/0002-add-zlib-include-dir-variable.patch @@ -0,0 +1,49 @@ +Add ZLIB_INCLUDE_DIR variable + +On Linux platform[1], the build system forces to use zlib from the +system instead of compiling the one located intree. + +The following error is raised when the zlib header is installed +somewhere else than in the default system include path: + + ssl3con.c:39:18: fatal error: zlib.h: No such file or directory + #include "zlib.h" + +The same trick setup for sqlite include directory is reproduced for +zlib. The build system disallows in any manner to give arguments to the +compiler explicity. + +The variable ZLIB_INCLUDE_DIR point to the directory where the zlib +header is located. + +[1]: https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/coreconf/Linux.mk#l180 +[2]: https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/lib/softoken/manifest.mn#l17 + +Signed-off-by: Gaël PORTAY + +--- libnss-3.33.orig/nss/lib/ssl/manifest.mn 2017-09-20 02:47:27.000000000 -0400 ++++ libnss-3.33/nss/lib/ssl/manifest.mn 2018-02-16 16:45:41.512709898 -0500 +@@ -6,6 +6,10 @@ + + # DEFINES = -DTRACE + ++ifdef ZLIB_INCLUDE_DIR ++INCLUDES += -I$(ZLIB_INCLUDE_DIR) ++endif ++ + EXPORTS = \ + ssl.h \ + sslt.h \ +--- host-libnss-3.33.orig/nss/cmd/signtool/manifest.mn.orig 2018-02-16 17:08:58.474777871 -0500 ++++ host-libnss-3.33/nss/cmd/signtool/manifest.mn 2018-02-16 17:09:22.603710963 -0500 +@@ -6,6 +6,10 @@ + + MODULE = nss + ++ifdef ZLIB_INCLUDE_DIR ++INCLUDES += -I$(ZLIB_INCLUDE_DIR) ++endif ++ + EXPORTS = + + CSRCS = signtool.c \ diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 2bef2bcc66..0fa7f2cfac 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -92,4 +92,52 @@ define LIBNSS_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc endef +HOST_LIBNSS_BUILD_VARS = \ + MOZILLA_CLIENT=1 \ + NSPR_INCLUDE_DIR=$(HOST_DIR)/include/nspr \ + NSPR_LIB_DIR=$(HOST_DIR)/lib \ + BUILD_OPT=1 \ + NS_USE_GCC=1 \ + NSS_DISABLE_GTESTS=1 \ + NSS_USE_SYSTEM_SQLITE=1 \ + SQLITE_INCLUDE_DIR=$(HOST_DIR)/include \ + ZLIB_INCLUDE_DIR=$(HOST_DIR)/include \ + NSS_ENABLE_ECC=1 + +HOST_LIBNSS_DEPENDENCIES = host-libnspr host-sqlite host-zlib + +ifneq ($(filter %64,$(HOSTARCH)),) +HOST_LIBNSS_BUILD_VARS += USE_64=1 +endif + +define HOST_LIBNSS_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss coreconf \ + SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ + DIST=$(@D)/$(LIBNSS_DISTDIR) \ + CHECKLOC= \ + $(HOST_LIBNSS_BUILD_VARS) + $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss lib/dbm all \ + SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ + DIST=$(@D)/$(LIBNSS_DISTDIR) \ + CHECKLOC= \ + $(HOST_LIBNSS_BUILD_VARS) +endef + +define HOST_LIBNSS_INSTALL_CMDS + $(INSTALL) -m 755 -t $(HOST_DIR)/lib/ \ + $(@D)/$(LIBNSS_DISTDIR)/lib/*.so + $(INSTALL) -m 755 -d $(HOST_DIR)/include/nss + $(INSTALL) -m 644 -t $(HOST_DIR)/include/nss \ + $(@D)/$(LIBNSS_DISTDIR)/public/nss/* + $(INSTALL) -m 755 -t $(HOST_DIR)/lib/ \ + $(@D)/$(LIBNSS_DISTDIR)/lib/*.a + $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ + $(HOST_DIR)/lib/pkgconfig/nss.pc + $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ + $(HOST_DIR)/lib/pkgconfig/nss.pc + $(SED) '/^prefix/s,=.*,=$(HOST_DIR),g;' \ + $(HOST_DIR)/lib/pkgconfig/nss.pc +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) From 3c6958423f6f66d890f2a6df8fce2c3a7fe4dc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 15 Mar 2018 15:50:54 -0400 Subject: [PATCH 0612/2640] qt5: bump latest version to 5.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tarball filename has changed since 5.10. The module suffix *opensource-src* has changed to *everywhere-src*. I introduced the *QT5_SOURCE_TARBALL_PREFIX* variable to set the right filename according to the Qt version. qtwebengine: Select libnss. It is a requirement[1] because OpenSSL certificate validation[2] and NSS bundle[3] was dropped. Add host-libnss and host-libpng to satisfy new requirement to build an internal host-tool. Set ninja host pkg-config tool using environment variable $GN_PKG_CONFIG_HOST[4]. The build system uses pkg-config to get package data for both host and target architectures. Using the same call to pkg-config for both target and host leads to build mismatches: it tries to link a host-tool using target libraries. qt5base: sqlite plugin now uses sqlite3_column_table_name16() so select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA to make sure it is available. qt5multimedia: libqgsttools was renamed to libQtMultimediaGstTools. The latter name matches the libQt5Multimedia*.so.* pattern so no additional copy command is needed for it anymore. qt5xmlpatterns: Names of the license files have changed: LICENSE.(L)GPLv3 -> LICENSE.(L)GPL3. The new files in fact already existed in 5.9.4 but the old ones were not removed yet. The new files are slightly different: there used to be a Qt header in front of it which is now removed. Also LICENSE.LGPL3 is rewrapped. qt5location, qt5quickcontrols, qt5serialport: Same license files issue, and for LICENSE.GPLv2 as well. LICENSE.GPL2 has the "How to Apply These Terms to Your New Programs" text appended to it. qt5script: Similar license file issues, but the new license files were not present yet. LICENSE.GPLv21 was removed so there is no longer a license file for the LGPL-2.1-covered Qt code. [1]: https://github.com/qt/qtwebengine/commit/9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb [2]: https://codereview.chromium.org/2862543003 [3]: https://codereview.chromium.org/1882433002 [4]: https://github.com/qt/qtwebengine/blob/v5.10.1/src/core/config/linux.pri#L111-L125 Signed-off-by: Gaël PORTAY [Peter: - fix sqlite plugin support in qt5base; - fix target installation of qt5multimedia ] Signed-off-by: Peter Seiderer [Arnout: - create a local host-pkg-config tool instead of extending pkgconf; - pass the same options to host-pkg-config as we do for other packages; - carry the EGL mesa3d X11 headers patch; - update license file names and hashes ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/Config.in | 4 ++-- package/qt5/qt5.mk | 6 ++++-- package/qt5/qt53d/qt53d.hash | 4 ++-- package/qt5/qt53d/qt53d.mk | 2 +- ...01-qtbase-Fix-build-error-when-using-EGL.patch | 0 package/qt5/qt5base/Config.in | 1 + package/qt5/qt5base/qt5base.hash | 4 ++-- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 ++-- package/qt5/qt5canvas3d/qt5canvas3d.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 4 ++-- package/qt5/qt5charts/qt5charts.mk | 2 +- package/qt5/qt5connectivity/qt5connectivity.hash | 4 ++-- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.hash | 4 ++-- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5enginio/qt5enginio.mk | 2 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 4 ++-- .../qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.hash | 4 ++-- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 7 +++++-- package/qt5/qt5location/qt5location.mk | 4 ++-- package/qt5/qt5multimedia/qt5multimedia.hash | 4 ++-- package/qt5/qt5multimedia/qt5multimedia.mk | 8 +++++--- .../qt5/qt5quickcontrols/qt5quickcontrols.hash | 7 +++++-- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 4 ++-- .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 4 ++-- .../qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5script/qt5script.hash | 8 +++++--- package/qt5/qt5script/qt5script.mk | 5 +++-- package/qt5/qt5scxml/qt5scxml.hash | 4 ++-- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 4 ++-- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 ++-- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 7 +++++-- package/qt5/qt5serialport/qt5serialport.mk | 4 ++-- package/qt5/qt5svg/qt5svg.hash | 4 ++-- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 4 ++-- package/qt5/qt5tools/qt5tools.mk | 2 +- .../qt5virtualkeyboard/qt5virtualkeyboard.hash | 4 ++-- .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- package/qt5/qt5wayland/qt5wayland.hash | 4 ++-- package/qt5/qt5wayland/qt5wayland.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 ++-- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/host-pkg-config.in | 6 ++++++ package/qt5/qt5webengine/qt5webengine.hash | 4 ++-- package/qt5/qt5webengine/qt5webengine.mk | 15 ++++++++++++++- .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 ++-- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 ++-- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 6 ++++-- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++-- 60 files changed, 131 insertions(+), 92 deletions(-) rename package/qt5/qt5base/{5.9.4 => 5.10.1}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) create mode 100644 package/qt5/qt5webengine/host-pkg-config.in diff --git a/package/qt5/Config.in b/package/qt5/Config.in index a9ee44c11f..b7786f7a63 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -35,14 +35,14 @@ choice prompt "Qt5 version" config BR2_PACKAGE_QT5_VERSION_LATEST - bool "Latest (5.9)" + bool "Latest (5.10)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ # no built-in double-conversion support depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa help - This option builds Qt 5.9, which is licensed under + This option builds Qt 5.10, which is licensed under (L)GPL-3.0+. comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3c03c10066..14a2b938a0 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,11 +5,13 @@ ################################################################################ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.9 -QT5_VERSION = $(QT5_VERSION_MAJOR).4 +QT5_VERSION_MAJOR = 5.10 +QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_SOURCE_TARBALL_PREFIX = everywhere-src else QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).3 +QT5_SOURCE_TARBALL_PREFIX = opensource-src endif QT5_SITE = https://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 9d629eb540..9d9ff8f69c 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ad18b1c98a100025a96d600008c9478f646432c9e8cf11fb9a405c55f1970550 qt3d-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 041fb42536a72bbf9be17a6f52d4b73ce93fb98b456fd63503cc47d80d196b3b qt3d-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index fcb743db21..d5a3a8edcc 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -6,7 +6,7 @@ QT53D_VERSION = $(QT5_VERSION) QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-opensource-src-$(QT53D_VERSION).tar.xz +QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz QT53D_DEPENDENCIES = qt5base qt5declarative QT53D_INSTALL_STAGING = YES diff --git a/package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.10.1/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from package/qt5/qt5base/5.9.4/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to package/qt5/qt5base/5.10.1/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index b5755e2b9c..b9aba2d389 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -103,6 +103,7 @@ config BR2_PACKAGE_QT5BASE_SQLITE_QT config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM bool "System SQLite" select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA help Use system SQLite. diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a72d8cd4da..d788c071d8 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 69e6bde3ab00673a77e1506173551fec7d0cd899fcbf9b1260517db1b61004cf qtbase-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969 qtbase-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b3f9c799cb..76c129d2e4 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -6,7 +6,7 @@ QT5BASE_VERSION = $(QT5_VERSION) QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz +QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf zlib QT5BASE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 68d1691d3d..d15fde9df7 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcanvas3d-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ef358503e2f243c2e162c3fef2181707ff3485376198d8e4fcc6d979e6ebed29 qtcanvas3d-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 de829a8e6aa4b8496048e9b6f3bff306a80c35935855a94426025ddfb8bcb0c0 qtcanvas3d-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index 97b0ec494e..13e233f237 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -6,7 +6,7 @@ QT5CANVAS3D_VERSION = $(QT5_VERSION) QT5CANVAS3D_SITE = $(QT5_SITE) -QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz +QT5CANVAS3D_SOURCE = qtcanvas3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CANVAS3D_VERSION).tar.xz QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative QT5CANVAS3D_INSTALL_STAGING = YES diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index a0c2d0d739..5a5845ef9f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 75f72983fde6720a093d5f065d33f47e77a4bd2188ae9d41ebb9a4fcc459d3e7 qtcharts-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9 qtcharts-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 17fdd96702..123cb658fe 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -6,7 +6,7 @@ QT5CHARTS_VERSION = $(QT5_VERSION) QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-opensource-src-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz QT5CHARTS_DEPENDENCIES = qt5base QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 21d0ded4e0..8364536309 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 dba750363bf55648a08bc44372f423d31f405f6deac5393f0b76376a3e9e0c8b qtconnectivity-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 652821dc6819658ec4bc1a6bf149fd7a61008748ff4745b54f038ccf276d3ec9 qtconnectivity-everywhere-src-5.10.1.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 4369a411a5..6de1536b78 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -6,7 +6,7 @@ QT5CONNECTIVITY_VERSION = $(QT5_VERSION) QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 308a4f0f56..1634a88ecc 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 dc638a3b207dd2c6607a21415f6dd8d760568535dfe4b485fdb4576c98832d65 qtdeclarative-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553 qtdeclarative-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index de8b048329..2fe72b3be6 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -6,7 +6,7 @@ QT5DECLARATIVE_VERSION = $(QT5_VERSION) QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index 603b2a517d..38f309646f 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -7,7 +7,7 @@ # Qt5Enginio does not follow Qt versionning # see https://bugreports.qt.io/browse/QTBUG-50111 QT5ENGINIO_VERSION = 1.6.3 -QT5ENGINIO_SITE = $(QT5_SITE) +QT5ENGINIO_SITE = https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz QT5ENGINIO_DEPENDENCIES = openssl qt5base QT5ENGINIO_INSTALL_STAGING = YES diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9a1bbdac32..0eb188f139 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 97f75327d7d20ec02e920f1c86ee2bc4063396833d93215e509e95c58e24b8ef qtgraphicaleffects-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 3f3b0631b579630bf58e99f3ca0d8dfdb6a44153c63cf90ac9e07041b4b1847f qtgraphicaleffects-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 2f6380f712..c5011a94f0 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -6,7 +6,7 @@ QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 37d0519ed4..ac858ea244 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 69e17081a8649b7db138073942d07d2e99f78f4b954ccd6aab3a406e92dbddd9 qtimageformats-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 2804baa2779eae015096820e233d7f86bb7fde9853b7c9150a321a453422a283 qtimageformats-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index f70f131d50..fa13ebedaf 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -6,7 +6,7 @@ QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 3f9ba667c1..f18c838800 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,13 +1,16 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 37ed68b0243a30b836cda79802e3f33404b1792f7b845a25b2e4989dc2fed2a0 qtlocation-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 5e5cc05517c701a2c8ebba1fbe3ddff2b6b90d5aa554d307b1c477fe0cfd72c9 qtlocation-everywhere-src-5.10.1.tar.xz # Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index e9f1e4d93d..05cd1168a3 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -6,13 +6,13 @@ QT5LOCATION_VERSION = $(QT5_VERSION) QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) -QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL else QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 5cb253790a..0fb25b6e09 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 4952a00712e209ad34241b22cb338bad2f44c42a77316b3b05389faeee1e4e74 qtmultimedia-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 a1fa98015ee5a6b81f2d337abc98d8b297c6718f7714a1f13fccfd2934c23649 qtmultimedia-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 6df96bcab4..c97aebfd95 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -6,7 +6,7 @@ QT5MULTIMEDIA_VERSION = $(QT5_VERSION) QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES @@ -48,7 +48,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools +# and is installed by the default target install step below +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy) define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib endef @@ -59,7 +61,7 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) endef -endif +endif # !BR2_STATIC_LIBS # this is only built with quick/opengl support enabled ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index ca1e217d83..809cb6b888 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,11 +1,14 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 16a205a09bfe9d54c38e9ef555e6f1ecd082576ef2a33cb80b6d49a7ccaed98b qtquickcontrols-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 d231a1993dc6a3f0dbc60a21d01fc0be15b0c26e881bd0631573952ea61682b7 qtquickcontrols-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 88e767bcf9..5517cc1537 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -6,12 +6,12 @@ QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) -QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL define QT5QUICKCONTROLS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 15f23b5e4b..f446980e87 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 1528a7a356e7073f5eeca93ba6e3330ba708d31c3a8f10dc1ce4546d9557640c qtquickcontrols2-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 5dc64a1b901e418b76fd3bf65dfa87a0cb11338741fb8970211c1df6df0e604a qtquickcontrols2-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index f27cafc63b..c2004c2ee7 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -6,7 +6,7 @@ QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 9b43e5fd65..6038f315c4 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,13 +1,15 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 4045da078600b5928f8206341c442cc7f5eec8c51f477f7367072ab5c28ee053 qtscript-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 e0618af7cb1f1f30d292c04cf484e3507cf6f4815f79870e35d2b0ce7ac9532d qtscript-everywhere-src-5.10.1.tar.xz # Hashes for license files: -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 9539f56df6..fe0ad9e888 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -6,7 +6,7 @@ QT5SCRIPT_VERSION = $(QT5_VERSION) QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES @@ -16,7 +16,8 @@ QT5SCRIPT_INSTALL_STAGING = YES # libQt5ScriptTools is under the normal Qt opensource license. ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv3 LICENSE.FDL +# LGPL-2.1 license file is missing +QT5SCRIPT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL else QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs) QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index dbe81ecbb6..d272881843 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 1decc54e157a1492066fe0e7d534c6a9888c096731af7cac9b64c52fd3950b75 qtscxml-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 0b42d201e4f96af1c404a61f01da6726bab9bfba4e280cc4a82c717f0db26103 qtscxml-everywhere-src-5.10.1.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index b6281975c6..de9ece597c 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -6,7 +6,7 @@ QT5SCXML_VERSION = $(QT5_VERSION) QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-opensource-src-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz QT5SCXML_DEPENDENCIES = qt5base qt5declarative QT5SCXML_INSTALL_STAGING = YES diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 1a78d46770..0b7222f14d 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 793f3aa056b7ce9ae91acb599eab80525983e5e973bb4a2fdba82776ec9cd458 qtsensors-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 bb0df76c0e53cf2b39d10dbf0964706a264413aae74a4596119143ab4d165c96 qtsensors-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index d4dc47e89c..805abcccd1 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -6,7 +6,7 @@ QT5SENSORS_VERSION = $(QT5_VERSION) QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 005fd0b5dc..d392897816 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ce91402e9781ef6ff37e313ce504b7f6fecb74e83d57d640fcbf82f1133fcbc4 qtserialbus-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 0650a17950f140130ec20520b06592618850cc5673a815cb4fd585590d922257 qtserialbus-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 218aba4e0a..c9a2139556 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -6,7 +6,7 @@ QT5SERIALBUS_VERSION = $(QT5_VERSION) QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 04122ef804..d73056cec7 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,13 +1,16 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 0c3d8e2908743c167113ce27be7b685e6f5c827c108107411d0c4c8b2f2b519c qtserialport-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 08e4cb13bbf165eb99857301f3cffe280a4946ff58a34ccc542ad1f790194a9e qtserialport-everywhere-src-5.10.1.tar.xz # Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 LICENSE.FDL sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 479870b16e..1cddaf857e 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -6,13 +6,13 @@ QT5SERIALPORT_VERSION = $(QT5_VERSION) QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) -QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL else QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index a94082c4bf..3a10080e29 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 a2f22732bfd4f0f0204443daaa59448298ab5018750dce4600d01d969355037a qtsvg-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a qtsvg-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 5a12755f94..168c4c063f 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -6,7 +6,7 @@ QT5SVG_VERSION = $(QT5_VERSION) QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz +QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 40176e6aee..83e6ef41be 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 95aa5782d5a79be22fba36cea4dc2319cf2a2060a3cc1e24e6585b8d98996e87 qttools-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53 qttools-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index cf181e576b..a972756d3a 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -6,7 +6,7 @@ QT5TOOLS_VERSION = $(QT5_VERSION) QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-opensource-src-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz QT5TOOLS_DEPENDENCIES = qt5base QT5TOOLS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 81c81edff1..44ef1f230f 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 bf742a886054f12a73621952879cf7a2182304c498bc31ec8a61ef376b07e1ee qtvirtualkeyboard-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 4319f90e68a571974d03f39507dde548971412e31f971081ca7eaf388187d52e qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 7d2201b55d..bd943b08ac 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -6,7 +6,7 @@ QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-opensource-src-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 86dc65179f..b28677ad29 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 3f7496522013e6122bb8dc00d0c3cc7753a44dca94fa3b22096eaa21e6099874 qtwayland-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 f5a7643a5ebcdc50d02b293191e675f387f67dc360c27bf6f94345372fba6356 qtwayland-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0a7bdb8cf9..d018cccd6d 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -6,7 +6,7 @@ QT5WAYLAND_VERSION = $(QT5_VERSION) QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland QT5WAYLAND_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index f1b69438d8..f94942f577 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 90303a72da63f250b6d6731b74827b0a1764904aac790a7264a3f65c94039aa9 qtwebchannel-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 c22c449fecb052597d12f8dd59498db39767037f9098123f3defc04eb20a3764 qtwebchannel-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index d46e053a53..f1c08532c0 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -6,7 +6,7 @@ QT5WEBCHANNEL_VERSION = $(QT5_VERSION) QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 7c99255061..969582712e 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -38,6 +38,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBNSS if !BR2_PACKAGE_QT5_VERSION_5_6 select BR2_PACKAGE_LIBVPX select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP diff --git a/package/qt5/qt5webengine/host-pkg-config.in b/package/qt5/qt5webengine/host-pkg-config.in new file mode 100644 index 0000000000..86a980648b --- /dev/null +++ b/package/qt5/qt5webengine/host-pkg-config.in @@ -0,0 +1,6 @@ +#!/bin/sh +PKG_CONFIG_SYSROOT_DIR="/" \ +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ +PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ +PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig" \ +exec @HOST_DIR@/bin/pkgconf "$@" diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 9195c7f3b6..3b54435822 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 04b4305489b326bbbfe32b5f1da4a33ae034e54130776e3616b9e6d45a5a8271 qtwebengine-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 12644f8d2ba8354a2a533d5a7f3f5139c6ff168c2f51aa3e21b701db6dbc01de qtwebengine-everywhere-src-5.10.1.tar.xz diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 4d423f8329..e527e6bc36 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -6,7 +6,7 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-opensource-src-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ host-pkgconf host-python @@ -22,6 +22,10 @@ QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst endif +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +endif + QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) @@ -44,6 +48,15 @@ define QT5WEBENGINE_PYTHON2_SYMLINK endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config + chmod +x $(@D)/host-bin/host-pkg-config +endef +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG +QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +endif + define QT5WEBENGINE_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS)) endef diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 4c01d8318a..94153fd652 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -# no 5.9.2 package available, fall back to 5.9.1 version +# no 5.10 package available, fall back to 5.9.1 version ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 368be9b497..34cd6e6ce1 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 72970209f0d4260d11688d3d38d9e953d7fa4309a8a55e2c32726a545333e800 qtwebsockets-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 6ecf790955ffe42dce731e10557f4ba625e359e867953d73f7fb453c0bad53ea qtwebsockets-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 4cb2aed1db..4d9df9257b 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -6,7 +6,7 @@ QT5WEBSOCKETS_VERSION = $(QT5_VERSION) QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 943577bbd6..173e9e6b57 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 879b18c44550e1be86c29adcca555c92915aab9222c40384beae2f7aa22b22a8 qtx11extras-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 c38a371fd50b2da976ed809230678284f029cefb02d240253dcbb3d575dc97b4 qtx11extras-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 0905d5f738..c439e2d31d 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -6,7 +6,7 @@ QT5X11EXTRAS_VERSION = $(QT5_VERSION) QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 9c68eae1d8..0aa062c13a 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,13 +1,15 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 faf51ad39e5c2b856b38989c79d69253ad74d4b8d3278d4aaa79d3c547047f79 qtxmlpatterns-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz.mirrorlist +sha256 3cdef59ce96a796606e5adc5756c63c8607fb29b281fddb38acee3e674d5e9fe qtxmlpatterns-everywhere-src-5.10.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 65fd9bd345..0a8b47ac53 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -6,13 +6,13 @@ QT5XMLPATTERNS_VERSION = $(QT5_VERSION) QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL else QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL From dbe32d364a5ff44c6d0bb086626ceb8cd76dee18 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 2 Apr 2018 15:41:45 +0200 Subject: [PATCH 0613/2640] package/pkg-golang: add PATH in GO_TARGET_ENV Some Go packages use pkg-config to detect native libraries, so we must have $(BR_PATH) in the PATH so that our pkg-config in HOST_DIR gets used. Fixes: http://autobuild.buildroot.net/results/f85414244c25aba07a05109b5cd7658ae44a64ea/ Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f23bda390d..bf178622b5 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -27,6 +27,7 @@ GO_BIN = $(HOST_DIR)/bin/go # cross-compiled binaries when GOBIN is set" GO_TARGET_ENV = \ $(HOST_GO_TARGET_ENV) \ + PATH=$(BR_PATH) \ GOBIN= \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) From 23df65e10eca34359945028ee10c2267de8d435d Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Thu, 15 Feb 2018 12:37:18 +0100 Subject: [PATCH 0614/2640] configs: beaglebone: bump kernel and uboot version Switch to Linux kernel version 4.9.59 from the TI SDK 04.02.00.09 (TI SDK release date: 23.12.2017) Updated uboot to version 2018.01 uEnv.txt corrected to boot from sd card on the ti-am335x-evm Signed-off-by: Lothar Felten Signed-off-by: Thomas Petazzoni --- board/beaglebone/uEnv.txt | 8 ++++++-- configs/beaglebone_defconfig | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/board/beaglebone/uEnv.txt b/board/beaglebone/uEnv.txt index 70b3b72146..a665f20889 100644 --- a/board/beaglebone/uEnv.txt +++ b/board/beaglebone/uEnv.txt @@ -1,4 +1,8 @@ bootpart=0:1 +devtype=mmc bootdir= -bootargs=console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait -uenvcmd=run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr}; +bootfile=zImage +bootpartition=mmcblk0p2 +set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi +set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait +uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr} diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 611b694137..80b271475e 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f9f6f0db2d5e4f9d2ff46eb31a5a05276a92ed7d" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a75d8e93056181d512f6c818e8627bd4554aaf92" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk" @@ -16,13 +16,11 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y From 1a10d5f77f001f20a174b65fcb9aa9d25b13ed98 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:27:06 +0200 Subject: [PATCH 0615/2640] package/openldap: bump version to 2.4.46 Changelog: https://www.openldap.org/software/release/changes.html Added sha256 hashes for tarball and license. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.hash | 11 +++++++---- package/openldap/openldap.mk | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index aec4aaebfd..37e2673c4b 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,4 +1,7 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.md5 -md5 00ff8301277cdfd0af728a6927042a13 openldap-2.4.45.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.sha1 -sha1 c98437385d3eaee80c9e2c09f3f0d4b7c140233d openldap-2.4.45.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.md5 +md5 829016c5a9f45c51adc50073ac6f9fd7 openldap-2.4.46.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.sha1 +sha1 a9ae2273eb9bdd70090dafe0d018a3132606bef6 openldap-2.4.46.tgz +# Locally computed +sha256 9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d openldap-2.4.46.tgz +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 2bf6fc3f27..6dd2390923 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.45 +OPENLDAP_VERSION = 2.4.46 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From da41a058e662cb98290c21441b5aebedab7d37c3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:27:07 +0200 Subject: [PATCH 0616/2640] package/openldap: add support for libressl Openldap builds fine with current libressl 2.7.2. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 6dd2390923..3f00f2b7df 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -12,9 +12,9 @@ OPENLDAP_LICENSE_FILES = LICENSE OPENLDAP_INSTALL_STAGING = YES OPENLDAP_DEPENDENCIES = host-pkgconf -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENLDAP_TLS = openssl -OPENLDAP_DEPENDENCIES += libopenssl +OPENLDAP_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_GNUTLS),y) OPENLDAP_TLS = gnutls OPENLDAP_DEPENDENCIES += gnutls From 81321edb0b8ceb5c7a92d069a7df7af7e67904e1 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:57:55 +0200 Subject: [PATCH 0617/2640] pkg-generic: add a subdirectory to the DL_DIR With all the previous changes, we are now ready to add a subdirectory to the DL_DIR. The structure will now be DL_DIR/PKG_NAME/{FILE1,FILE2} This is needed for multiple reasons: - Avoid patches with name like SHA1.patch laying flat in DL_DIR, which makes it hard to know to which packages they apply - Avoid possible collisions if two releases have the same name (e.g: v01.tar) - Allow the possibility to handle a git cache per package in the newly created subdirectory. Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 01d61ac0ad..20ee73d438 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -432,7 +432,7 @@ endif $(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_DIR = $$(DL_DIR) +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR From ddf3feb1047da7e728f89329f2eed6529bcf8636 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:57:56 +0200 Subject: [PATCH 0618/2640] pkg-generic: introduce _DL_SUBDIR This per package variable can be used to specify the download subdirectory used by that package. The use case here is for example linux-headers and linux, which share the same sources (because they are the same upstream project), so we don't want to download twice the kernel, nor store it multiple times either. Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 20ee73d438..3c6a1839ff 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -432,7 +432,8 @@ endif $(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) +$(2)_DL_SUBDIR ?= $$($(2)_RAWNAME) +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_DL_SUBDIR) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR From ef87b0326c71d78f5f7e1551a9985b0bcc5ae380 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:57:57 +0200 Subject: [PATCH 0619/2640] pkg-download: support new subdirs for mirrors Since we introduced subdirectories to the DL_DIR, we need to support them in the PRIMARY and BACKUP mirrors as they evolve to the new tree structure. We check first the new URI (with the subdir), and in case of failure, we check without. By checking both URIs, we ensure that old mirror are usable. Also, add a missing qstrip call for BR2_BACKUP_SITE. Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3f35661a16..7ca6fcc757 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -75,6 +75,7 @@ export BR_NO_CHECK_HASH_FOR = ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) DOWNLOAD_URIS += \ + -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) endif @@ -83,7 +84,8 @@ DOWNLOAD_URIS += \ -u $($(PKG)_SITE_METHOD)+$(dir $(call qstrip,$(1))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(BR2_BACKUP_SITE),urlencode) + -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ + -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) endif endif From 8f3c77245982c00c2c76b8e3a57a62123e74d522 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 2 Apr 2018 16:57:58 +0200 Subject: [PATCH 0620/2640] package: share downloaded files for big packages Theses packages are given as an example of the use of the *_DL_SUBDIR feature. There maybe other packages that would benefit from that feature, they would need to be added on a case by case basis. Signed-off-by: "Yann E. MORIN" Signed-off-by: Maxime Hadjinlian Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gcc/gcc-final/gcc-final.mk | 2 ++ package/gcc/gcc-initial/gcc-initial.mk | 5 +++++ package/linux-headers/linux-headers.mk | 3 +++ package/mesa3d-headers/mesa3d-headers.mk | 1 + 4 files changed, 11 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 213f3d7b66..b7b27aec13 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -8,6 +8,8 @@ GCC_FINAL_VERSION = $(GCC_VERSION) GCC_FINAL_SITE = $(GCC_SITE) GCC_FINAL_SOURCE = $(GCC_SOURCE) +HOST_GCC_FINAL_DL_SUBDIR = gcc + HOST_GCC_FINAL_DEPENDENCIES = \ $(HOST_GCC_COMMON_DEPENDENCIES) \ $(BR_LIBC) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index c476b2faeb..9b20eb18f9 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -8,6 +8,11 @@ GCC_INITIAL_VERSION = $(GCC_VERSION) GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) +# We do not have a 'gcc' package per-se; we only have two incarnations, +# gcc-initial and gcc-final. gcc-initial is just am internal step that +# users should not care about, while gcc-final is the one they shall see. +HOST_GCC_INITIAL_DL_SUBDIR = gcc + HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES) HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES) diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index f1e3790608..954c6b7978 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -82,6 +82,9 @@ endif endif # ! BR2_KERNEL_HEADERS_AS_KERNEL +# linux-headers really is the same as the linux package +LINUX_HEADERS_DL_SUBDIR = linux + LINUX_HEADERS_LICENSE = GPL-2.0 LINUX_HEADERS_LICENSE_FILES = COPYING diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b48d965d8a..19d1c6fdf1 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -15,6 +15,7 @@ endif MESA3D_HEADERS_VERSION = 18.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive +MESA3D_HEADERS_DL_SUBDIR = mesa3d MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos MESA3D_HEADERS_LICENSE_FILES = docs/license.html From 072374918de92aef9b8ca5a3248a3905cba70ba2 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:57:59 +0200 Subject: [PATCH 0621/2640] help/manual: update help about the new $(LIBFOO_DL_DIR) Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in | 3 +++ docs/manual/adding-packages-generic.txt | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index 71b9f60e5b..c2a1925088 100644 --- a/Config.in +++ b/Config.in @@ -200,6 +200,9 @@ config BR2_DL_DIR If the Linux shell environment has defined the BR2_DL_DIR environment variable, then this overrides this configuration item. + The directory is organized with a subdirectory for each package. + Each package has its own $(LIBFOO_DL_DIR) variable that can be used + to find the correct path. The default is $(TOPDIR)/dl diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 9d1428ad40..62906d92bb 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -263,7 +263,7 @@ information is (assuming the package name is +libfoo+) : the file using this URL. Otherwise, Buildroot will assume the file to be downloaded is located at +LIBFOO_SITE+. Buildroot will not do anything with those additional files, except download them: it will - be up to the package recipe to use them from +$(DL_DIR)+. + be up to the package recipe to use them from +$(LIBFOO_DL_DIR)+. * +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the package source code. In many cases, Buildroot guesses the method @@ -554,8 +554,8 @@ In the action definitions, you can use the following variables: * +$(@D)+, which contains the directory in which the package source code has been uncompressed. -* +$(DL_DIR)+ contains the path to the directory where all the downloads made - by Buildroot are stored. +* +$(LIBFOO_DL_DIR)+ contains the path to the directory where all the downloads + made by Buildroot for +libfoo+ are stored in. * +$(TARGET_CC)+, +$(TARGET_LD)+, etc. to get the target cross-compilation utilities From 573f8c750fbd18f2f2de23bfdc8e360ed30a8687 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:58:00 +0200 Subject: [PATCH 0622/2640] download: add flock call before dl-wrapper In order to introduce the cache mechanisms, we need to have a lock on the $(LIBFOO_DL_DIR), otherwise it would be impossible to do parallel download (a shared DL_DIR for two buildroot instances) without risking conflicts. Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7ca6fcc757..4fdb283acc 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -19,6 +19,7 @@ SSH := $(call qstrip,$(BR2_SSH)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) DL_WRAPPER = support/download/dl-wrapper +FLOCK = flock $($(PKG)_DL_DIR)/ # DL_DIR may have been set already from the environment ifeq ($(origin DL_DIR),undefined) @@ -93,7 +94,7 @@ define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)), BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ - $(EXTRA_ENV) $(DL_WRAPPER) \ + $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -f '$(notdir $(1))' \ -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ From 5d2a018ddf950b53d1d50d09d3af92849d8f5994 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:58:01 +0200 Subject: [PATCH 0623/2640] download: add missing '-d' option The infrastructure needs to give the 'dl_dir' to the dl-wrapper which in its turn needs to give it to the helper. It will only be used by the 'git' helper as of now. Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 4fdb283acc..b7f1d43920 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -96,6 +96,7 @@ define DOWNLOAD BR_NO_CHECK_HASH_FOR=$(notdir $(call qstrip,$(1)))) \ $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ + -d '$($(PKG)_DL_DIR)' \ -f '$(notdir $(1))' \ -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ -n '$($(PKG)_BASENAME_RAW)' \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index cd903f92d9..af2950ac3b 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -19,7 +19,7 @@ # We want to catch any unexpected failure, and exit immediately. set -e -export BR_BACKEND_DL_GETOPTS=":hc:o:n:N:H:ru:qf:e" +export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:ru:qf:e" main() { local OPT OPTARG @@ -27,10 +27,11 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":hc:o:n:N:H:rf:u:q" OPT; do + while getopts ":hc:d:o:n:N:H:rf:u:q" OPT; do case "${OPT}" in h) help; exit 0;; c) cset="${OPTARG}";; + d) dl_dir="${OPTARG}";; o) output="${OPTARG}";; n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; @@ -109,6 +110,7 @@ main() { if ! "${OLDPWD}/support/download/${backend}" \ $([ -n "${urlencode}" ] && printf %s '-e') \ -c "${cset}" \ + -d "${dl_dir}" \ -n "${raw_base_name}" \ -N "${raw_name}" \ -f "${filename}" \ From e80d1d0af448c33f93a9a913cd0a34c406a29cf4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 2 Apr 2018 17:13:58 +0200 Subject: [PATCH 0624/2640] core/download: look for archives in the global download dir first For existing setups, the global donload directory may have a lot of the required archives, so look into there before attempting a download. We simply hard-link them if found there and not in the new per-package loaction. Then we resume the existing procedure (which means the new hardlink will get removed if it happened to not match the hash). Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index b7f1d43920..7ed95f2b2c 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -97,6 +97,7 @@ define DOWNLOAD $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -d '$($(PKG)_DL_DIR)' \ + -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ -n '$($(PKG)_BASENAME_RAW)' \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index af2950ac3b..ce44752df0 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -27,11 +27,12 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":hc:d:o:n:N:H:rf:u:q" OPT; do + while getopts ":hc:d:D:o:n:N:H:rf:u:q" OPT; do case "${OPT}" in h) help; exit 0;; c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; + D) old_dl_dir="${OPTARG}";; o) output="${OPTARG}";; n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; @@ -52,6 +53,13 @@ main() { error "no output specified, use -o\n" fi + # Legacy handling: check if the file already exists in the global + # download directory. If it does, hard-link it. If it turns out it + # was an incorrect download, we'd still check it below anyway. + if [ ! -e "${output}" -a -e "${old_dl_dir}/${filename}" ]; then + ln "${old_dl_dir}/${filename}" "${output}" + fi + # If the output file already exists and: # - there's no .hash file: do not download it again and exit promptly # - matches all its hashes: do not download it again and exit promptly From 6d938bcb524987f3e4a56fc311692ba9127417d9 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 16:58:02 +0200 Subject: [PATCH 0625/2640] download: git: introduce cache feature Now we keep the git clone that we download and generates our tarball from there. The main goal here is that if you change the version of a package (say Linux), instead of cloning all over again, you will simply 'git fetch' from the repo the missing objects, then generates the tarball again. This should speed the 'source' part of the build significantly. The drawback is that the DL_DIR will grow much larger; but time is more important than disk space nowadays. Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- support/download/git | 65 ++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/support/download/git b/support/download/git index 58a2c6ad9d..58dbcd211c 100755 --- a/support/download/git +++ b/support/download/git @@ -25,6 +25,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; + d) dl_dir="${OPTARG}";; n) basename="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; @@ -39,29 +40,41 @@ _git() { eval ${GIT} "${@}" } -# Try a shallow clone, since it is faster than a full clone - but that only -# works if the version is a ref (tag or branch). Before trying to do a shallow -# clone we check if ${cset} is in the list provided by git ls-remote. If not -# we fall back on a full clone. +# We want to check if a cache of the git clone of this repo already exists. +git_cache="${dl_dir}/git" + +# If the cache directory doesn't exists, init a new repo, which will be +# fetch'ed later. +if [ ! -d "${git_cache}" ]; then + _git init "'${git_cache}'" + _git -C "'${git_cache}'" remote add origin "'${uri}'" +fi + +pushd "${git_cache}" >/dev/null + +_git remote set-url origin "'${uri}'" + +# Try to fetch with limited depth, since it is faster than a full clone - but +# that only works if the version is a ref (tag or branch). Before trying to do +# a shallow clone we check if ${cset} is in the list provided by git ls-remote. +# If not we fallback to a full fetch. # -# Messages for the type of clone used are provided to ease debugging in case of -# problems +# Messages for the type of clone used are provided to ease debugging in +# case of problems git_done=0 -if [ -n "$(_git ls-remote "'${uri}'" "'${cset}'" 2>&1)" ]; then - printf "Doing shallow clone\n" - if _git clone ${verbose} "${@}" --depth 1 -b "'${cset}'" "'${uri}'" "'${basename}'"; then +if [ -n "$(_git ls-remote origin "'${cset}'" 2>&1)" ]; then + printf "Doing a shallow fetch\n" + if _git fetch "${@}" --depth 1 origin "'${cset}'"; then git_done=1 else - printf "Shallow clone failed, falling back to doing a full clone\n" + printf "Shallow fetch failed, falling back to fetching all refs\n" fi fi if [ ${git_done} -eq 0 ]; then - printf "Doing full clone\n" - _git clone ${verbose} "${@}" "'${uri}'" "'${basename}'" + printf "Fetching all references\n" + _git fetch origin -t fi -pushd "${basename}" >/dev/null - # Try to get the special refs exposed by some forges (pull-requests for # github, changes for gerrit...). There is no easy way to know whether # the cset the user passed us is such a special ref or a tag or a sha1 @@ -86,20 +99,24 @@ if [ ${recurse} -eq 1 ]; then _git submodule update --init --recursive fi -# We do not want the .git dir; we keep other .git files, in case they -# are the only files in their directory. +# Generate the archive, sort with the C locale so that it is reproducible. +# We do not want the .git dir; we keep other .git files, in case they are the +# only files in their directory. # The .git dir would generate non reproducible tarballs as it depends on # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. -rm -rf .git +find . -not -type d \ + -and -not -path "./.git/*" >"${output}.list" +LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" -popd >/dev/null - -# Generate the archive, sort with the C locale so that it is reproducible -find "${basename}" -not -type d >"${basename}.list" -LC_ALL=C sort <"${basename}.list" >"${basename}.list.sorted" # Create GNU-format tarballs, since that's the format of the tarballs on # sources.buildroot.org and used in the *.hash files -tar cf - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ - -T "${basename}.list.sorted" >"${output}.tar" +tar cf - --transform="s/^\.$/${basename}/" \ + --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ + -T "${output}.list.sorted" >"${output}.tar" gzip -6 -n <"${output}.tar" >"${output}" + +rm -f "${output}.list" +rm -f "${output}.list.sorted" + +popd >/dev/null From 158eab173d776414a123cb9b5d569375bfc1a2fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:58:26 +0200 Subject: [PATCH 0626/2640] package/ffmpeg: add support for libressl Ffmpeg builds fine with current libressl 2.7.2. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 71d642cf4c..432e4cda09 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -214,13 +214,13 @@ FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl FFMPEG_DEPENDENCIES += gnutls else FFMPEG_CONF_OPTS += --disable-gnutls -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) # openssl isn't license compatible with GPL ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) FFMPEG_CONF_OPTS += --disable-openssl else FFMPEG_CONF_OPTS += --enable-openssl -FFMPEG_DEPENDENCIES += libopenssl +FFMPEG_DEPENDENCIES += openssl endif else FFMPEG_CONF_OPTS += --disable-openssl From 46a14966b65a1de7538b350ce22163dc0eca16c2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:58:27 +0200 Subject: [PATCH 0627/2640] package/libevent: add support for libressl Libevent builds fine with current libressl 2.7.2. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libevent/libevent.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 65bf1c2b7b..f0c989afa1 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -24,8 +24,8 @@ ifneq ($(BR2_PACKAGE_PYTHON),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBEVENT_DEPENDENCIES += host-pkgconf libopenssl +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBEVENT_DEPENDENCIES += host-pkgconf openssl LIBEVENT_CONF_OPTS += --enable-openssl else LIBEVENT_CONF_OPTS += --disable-openssl From a5c72c86baff42c869f6b0c264e01d53a80c10d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:58:28 +0200 Subject: [PATCH 0628/2640] package/opusfile: add support for libressl Opusfile builds fine with current libressl 2.7.2. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/opusfile/opusfile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 28d4368e85..186288ddff 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,8 +11,8 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -OPUSFILE_DEPENDENCIES += libopenssl +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPUSFILE_DEPENDENCIES += openssl else OPUSFILE_CONF_OPTS += --disable-http endif From 779fc8e6848e8195c2f6570a05d274514e48cf79 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 13:58:29 +0200 Subject: [PATCH 0629/2640] package/ntp: add support for libressl Ntp builds fine with current libressl 2.7.2. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ntp/ntp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index b5e2c1e026..77bb33a42f 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -22,7 +22,7 @@ NTP_CONF_OPTS = \ # 0002-ntp-syscalls-fallback.patch NTP_AUTORECONF = YES -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) NTP_CONF_OPTS += --with-crypto --enable-openssl-random NTP_DEPENDENCIES += openssl else From 90d73e5f66ccae2f1571762bef1f5ab4bae8e775 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Sat, 30 Dec 2017 18:57:34 +0300 Subject: [PATCH 0630/2640] hostapd: select driver support Add support for the wired driver. Add configuration options to select which drivers to build. Select DRIVER_NONE if no other drivers enabled (this may be the case when building hostapd as a standalone RADIUS server). Update makefile logic and apply wireless-specific options only if at least one wireless driver enabled. Otherwise, an attempt to build a wired-only or RADIUS-only hostapd will fail. Signed-off-by: Alexander Mukhin Reviewed-by: Sam Voss Signed-off-by: Thomas Petazzoni --- package/hostapd/Config.in | 31 +++++++++++++++++++++++++++++++ package/hostapd/hostapd.mk | 31 ++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 84156e8f11..f6182a9268 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -14,11 +14,42 @@ config BR2_PACKAGE_HOSTAPD if BR2_PACKAGE_HOSTAPD +config BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP + bool "Enable hostap driver" + default y + select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS + help + Enable support for Host AP driver. + +config BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + bool "Enable nl80211 driver" + default y + select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS + help + Enable support for drivers using the nl80211 kernel interface. + config BR2_PACKAGE_HOSTAPD_DRIVER_RTW bool "Enable rtl871xdrv driver" + select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS help Enable support for Realtek wireless chips. +config BR2_PACKAGE_HOSTAPD_DRIVER_WIRED + bool "Enable wired driver" + help + Enable support for wired authenticator. + +config BR2_PACKAGE_HOSTAPD_DRIVER_NONE + bool + default y + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_RTW + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_WIRED + +config BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS + bool + config BR2_PACKAGE_HOSTAPD_ACS bool "Enable ACS" default y diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 1696670383..f9072784eb 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -18,12 +18,7 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ - CONFIG_HS20 \ - CONFIG_IEEE80211AC \ - CONFIG_IEEE80211N \ - CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_INTERWORKING \ CONFIG_LIBNL32 HOSTAPD_CONFIG_DISABLE = @@ -45,11 +40,37 @@ HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif +ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP),) +HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_HOSTAP +endif + +ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_NL80211),) +HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 +endif + ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) HOSTAPD_PATCH += https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW endif +ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_WIRED),y) +HOSTAPD_CONFIG_ENABLE += CONFIG_DRIVER_WIRED +endif + +ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_NONE),y) +HOSTAPD_CONFIG_ENABLE += CONFIG_DRIVER_NONE +endif + +# Add options for wireless drivers +ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_HS20 \ + CONFIG_IEEE80211AC \ + CONFIG_IEEE80211N \ + CONFIG_IEEE80211R \ + CONFIG_INTERWORKING +endif + ifeq ($(BR2_PACKAGE_HOSTAPD_ACS),y) HOSTAPD_CONFIG_ENABLE += CONFIG_ACS endif From 87a941462db71b0ccdf3b65591a35f4e21d8a170 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Sat, 30 Dec 2017 18:57:35 +0300 Subject: [PATCH 0631/2640] hostapd: make ACS dependent on nl80211 According to hostapd's defconfig file, ACS is currently only supported through the nl80211 driver. Search through the source code also confirms that ACS machinery is present in the nl80211 driver only. Although hostapd can be built with ACS enabled and nl80211 disabled, an attempt to use ACS with other drivers by setting a wireless channel to 0 results in a runtime failure (driver doesn't accept this value). So we might save a user from selecting a meaningless combination by making ACS dependent on nl80211. Signed-off-by: Alexander Mukhin Reviewed-by: Sam Voss Signed-off-by: Thomas Petazzoni --- package/hostapd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index f6182a9268..d23e5e1dca 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS config BR2_PACKAGE_HOSTAPD_ACS bool "Enable ACS" default y + depends on BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 help Enable support for standard ACS (Automatic Channel Selection). Some propietary drivers use a custom algorithm which requires @@ -60,6 +61,9 @@ config BR2_PACKAGE_HOSTAPD_ACS causing hostapd to use the standard one which doesn't work for those cases. +comment "ACS is currently only supported through the nl80211 driver" + depends on !BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 + config BR2_PACKAGE_HOSTAPD_EAP bool "Enable EAP" depends on !BR2_STATIC_LIBS From 47cc1600a0653f30a52b37b65ae846ba99ca50bb Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Sat, 30 Dec 2017 18:57:36 +0300 Subject: [PATCH 0632/2640] hostapd: drop default dependency on netlink Get rid of netlink dependency if the options selected allow that. Signed-off-by: Alexander Mukhin Reviewed-by: Sam Voss [Thomas/Arnout: use a if BR2_PACKAGE_HOSTAPD_VLAN .. endif block.] Signed-off-by: Thomas Petazzoni --- package/hostapd/Config.in | 22 ++++++++++++++-------- package/hostapd/hostapd.mk | 28 ++++++++++++++++------------ 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index d23e5e1dca..37c1126859 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_HOSTAPD bool "hostapd" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBNL help User space daemon for wireless access points. @@ -24,10 +22,15 @@ config BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP config BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 bool "Enable nl80211 driver" default y + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS help Enable support for drivers using the nl80211 kernel interface. +comment "nl80211 driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_HOSTAPD_DRIVER_RTW bool "Enable rtl871xdrv driver" select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS @@ -84,10 +87,11 @@ config BR2_PACKAGE_HOSTAPD_VLAN help Enable support for VLANs. +if BR2_PACKAGE_HOSTAPD_VLAN + config BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC bool "Enable dynamic VLAN support" default y - depends on BR2_PACKAGE_HOSTAPD_VLAN help Enable support for fully dynamic VLANs. This enables hostapd to automatically create @@ -96,13 +100,15 @@ config BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC config BR2_PACKAGE_HOSTAPD_VLAN_NETLINK bool "Use netlink-based API for VLAN operations" default y - depends on BR2_PACKAGE_HOSTAPD_VLAN + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL help Use netlink-based kernel API for VLAN operations instead of ioctl(). -endif - -comment "hostapd needs a toolchain w/ threads" +comment "netlink-based VLAN support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU + +endif # BR2_PACKAGE_HOSTAPD_VLAN + +endif diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index f9072784eb..fa8226805d 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -11,25 +11,16 @@ HOSTAPD_PATCH = \ http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config -HOSTAPD_DEPENDENCIES = host-pkgconf libnl -HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ +HOSTAPD_DEPENDENCIES = host-pkgconf +HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause HOSTAPD_LICENSE_FILES = README HOSTAPD_CONFIG_SET = -HOSTAPD_CONFIG_ENABLE = \ - CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_LIBNL32 +HOSTAPD_CONFIG_ENABLE = CONFIG_INTERNAL_LIBTOMMATH HOSTAPD_CONFIG_DISABLE = -# libnl-3 needs -lm (for rint) and -lpthread if linking statically -# And library order matters hence stick -lnl-3 first since it's appended -# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing -ifeq ($(BR2_STATIC_LIBS),y) -HOSTAPD_LIBS += -lnl-3 -lm -lpthread -endif - # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) HOSTAPD_DEPENDENCIES += libopenssl @@ -105,6 +96,19 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) HOSTAPD_CONFIG_ENABLE += CONFIG_VLAN_NETLINK endif +# Options for building with libnl +ifeq ($(BR2_PACKAGE_LIBNL),y) +HOSTAPD_DEPENDENCIES += libnl +HOSTAPD_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/ +HOSTAPD_CONFIG_ENABLE += CONFIG_LIBNL32 +# libnl-3 needs -lm (for rint) and -lpthread if linking statically +# And library order matters hence stick -lnl-3 first since it's appended +# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing +ifeq ($(BR2_STATIC_LIBS),y) +HOSTAPD_LIBS += -lnl-3 -lm -lpthread +endif +endif + define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ From 149246d0cadbf516e6320cc1994557ef33848317 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 19:14:27 +0200 Subject: [PATCH 0633/2640] waf: use HOST_WAF_DL_DIR instead of WAF_DL_DIR The infrastructure only provides HOST_WAF_DL_DIR, because this package is host only. Ideally the infra should provide WAF_DL_DIR, but it doesn't currently, and that requires more significant changes. Fixes: http://autobuild.buildroot.org/results/01d8c21df4baa9ecc6a0e45744fe6a4d086a0652/ Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/waf/waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 639c26a3b0..cb738a38fd 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -9,7 +9,7 @@ WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io/ define HOST_WAF_EXTRACT_CMDS - $(INSTALL) -D -m 0755 $(WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf + $(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf endef define HOST_WAF_INSTALL_CMDS From 78b729291507a6a92abf43d388cc29d01c086876 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 2 Apr 2018 20:00:25 +0200 Subject: [PATCH 0634/2640] sam-ba: use HOST_SAM_BA_DL_DIR instead of SAM_BA_DL_DIR The infrastructure only provides HOST_SAM_BA_DL_DIR, because this package is host only. Ideally the infra should provide SAM_BA_DL_DIR, but it doesn't currently, and that requires more significant changes. Fixes: http://autobuild.buildroot.net/results/a7c76138a1cf068868904acb6678403e3b25fcb3/ Signed-off-by: Thomas Petazzoni --- package/sam-ba/sam-ba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index acc03a3b6b..11dbb7eef0 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -13,7 +13,7 @@ SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h define HOST_SAM_BA_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(SAM_BA_DL_DIR)/$(SAM_BA_SOURCE) + $(UNZIP) -d $(BUILD_DIR) $(HOST_SAM_BA_DL_DIR)/$(SAM_BA_SOURCE) mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D) rmdir $(BUILD_DIR)/sam-ba_cdc_linux/ endef From bf4fc26f1ae8b516c4d1c4701625c3598af574e4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 2 Apr 2018 20:03:26 +0200 Subject: [PATCH 0635/2640] sam-ba: create $(HOST_DIR)/bin before using it If one runs "make host-sam-ba" from a clean build, sam-ba.mk cannot create its symbolic link because $(HOST_DIR)/bin doesn't exist. So let's create this directory. >>> host-sam-ba 2.16 Installing to host directory mkdir -p /buildroot/output/host/opt/sam-ba/ cp -a /buildroot/output/build/host-sam-ba-2.16/* /buildroot/output/host/opt/sam-ba/ ln -sf ../opt/sam-ba/sam-ba_64 /buildroot/output/host/bin/sam-ba ln: failed to create symbolic link '/buildroot/output/host/bin/sam-ba': No such file or directory make[1]: *** [package/pkg-generic.mk:234: /buildroot/output/build/host-sam-ba-2.16/.stamp_host_installed] Error 1 make: *** [Makefile:79: _all] Error 2 Signed-off-by: Thomas Petazzoni --- package/sam-ba/sam-ba.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index 11dbb7eef0..0d36b0dc59 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -32,6 +32,7 @@ endif define HOST_SAM_BA_INSTALL_CMDS mkdir -p $(HOST_DIR)/opt/sam-ba/ cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ + mkdir -p $(HOST_DIR)/bin/ ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba endef From e8ddb6998f3f894022e683dd8726bfdee46b0cc3 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 20:36:22 +0200 Subject: [PATCH 0636/2640] cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR The infrastructure only provides HOST_CARGO_DL_DIR, because this package is host only. Ideally the infra should provide CARGO_DL_DIR, but it doesn't currently, and that requires more significant changes. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/cargo/cargo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk index 36b2718e90..b3174f5b20 100644 --- a/package/cargo/cargo.mk +++ b/package/cargo/cargo.mk @@ -37,7 +37,7 @@ HOST_CARGO_HOME = $(HOST_DIR)/share/cargo define HOST_CARGO_EXTRACT_DEPS @mkdir -p $(@D)/vendor $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ + $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - endef @@ -46,7 +46,7 @@ HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS define HOST_CARGO_EXTRACT_INSTALLER @mkdir -p $(@D)/src/rust-installer $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ + $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - endef From 7ce411c452d8afc41a05f76d241ed6443bc91e2d Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 20:36:23 +0200 Subject: [PATCH 0637/2640] cryptopp: use HOST_CRYPTOPP_DL_DIR instead of CRYPTOPP_DL_DIR The infrastructure only provides HOST_CRYPTOPP_DL_DIR, because this package is host only. Ideally the infra should provide CRYPTOPP_DL_DIR, but it doesn't currently, and that requires more significant changes. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 6da39b09f2..b4997aba9d 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -12,7 +12,7 @@ CRYPTOPP_LICENSE_FILES = License.txt CRYPTOPP_INSTALL_STAGING = YES define HOST_CRYPTOPP_EXTRACT_CMDS - $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) + $(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) endef HOST_CRYPTOPP_MAKE_OPTS = \ From bec950dde82c255c5cab2af46be7cd56ca7aee1b Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 20:36:24 +0200 Subject: [PATCH 0638/2640] rust-bin: use HOST_RUST_BIN_DL_DIR instead of RUST_BIN_DL_DIR The infrastructure only provides HOST_RUST_BIN_DL_DIR, because this package is host only. Ideally the infra should provide RUST_BIN_DL_DIR, but it doesn't currently, and that requires more significant changes. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 759d468304..b57849093d 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -22,7 +22,7 @@ HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAM define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std $(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS), \ - $(call suitable-extractor,$(f)) $(RUST_BIN_DL_DIR)/$(f) | \ + $(call suitable-extractor,$(f)) $(HOST_RUST_BIN_DL_DIR)/$(f) | \ $(TAR) -C $(@D)/std $(TAR_OPTIONS) - ) cd $(@D)/rustc/lib/rustlib; \ From 3e5874e47c6169b9e037232209d5c71d5b47449f Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 20:36:25 +0200 Subject: [PATCH 0639/2640] ti-cgt-pru: use HOST_TI_CGT_PRU_DL_DIR instead of TI_CGT_PRU_DL_DIR The infrastructure only provides HOST_TI_CGT_PRU_DL_DIR, because this package is host only. Ideally the infra should provide TI_CGT_PRU_DL_DIR, but it doesn't currently, and that requires more significant changes. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/ti-cgt-pru/ti-cgt-pru.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ti-cgt-pru/ti-cgt-pru.mk b/package/ti-cgt-pru/ti-cgt-pru.mk index df3b97bef5..3665d2cec8 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/package/ti-cgt-pru/ti-cgt-pru.mk @@ -13,8 +13,8 @@ TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \ pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx define HOST_TI_CGT_PRU_EXTRACT_CMDS - chmod +x $(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) - $(TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended + chmod +x $(HOST_TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) + $(HOST_TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended mv $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/* $(@D) rmdir $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/ endef From f26c0c62ba9cd5036af665b6c412b7123948758c Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 2 Apr 2018 20:36:26 +0200 Subject: [PATCH 0640/2640] zynq-boot-bin: use HOST_ZYNQ_BOOT_BIN_DL_DIR instead of ZYNQ_BOOT_BIN_DL_DIR The infrastructure only provides HOST_ZYNQ_BOOT_BIN_DL_DIR, because this package is host only. Ideally the infra should provide ZYNQ_BOOT_BIN_DL_DIR, but it doesn't currently, and that requires more significant changes. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/zynq-boot-bin/zynq-boot-bin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk index c523e04f45..c56203fb68 100644 --- a/package/zynq-boot-bin/zynq-boot-bin.mk +++ b/package/zynq-boot-bin/zynq-boot-bin.mk @@ -12,7 +12,7 @@ ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS - cp $(ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) + cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) endef define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS From e7d658e0291b78553bf4eca704f0d0202bcf031f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 00:41:44 +0300 Subject: [PATCH 0641/2640] libcurl: add brotli optional dependency The brotli package has recently been added to Buildroot. Add brotli an an optional dependency to libcurl to make the build consistent. It turns out that libcurl configure script uses pkg-config to figure out link libraries only when --with-brotli is explicitly set. So this also fixes static build failure. Fixes: http://autobuild.buildroot.net/results/64b/64bc0dfe284206390ae0680b94c0876863a3c0f3/ http://autobuild.buildroot.net/results/233/23376d8653dea6361e42b0f17b6aaab3c14d99cf/ http://autobuild.buildroot.net/results/b19/b198db4b69e18e6d01ec95aae9c6096c1912dd9c/ Cc: Adrian Perez de Castro Cc: Matt Weber Signed-off-by: Baruch Siach Reviewed-by: Matt Weber Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index c6289e05f4..a3e66d094c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -76,6 +76,13 @@ else LIBCURL_CONF_OPTS += --without-libssh2 endif +ifeq ($(BR2_PACKAGE_BROTLI),y) +LIBCURL_DEPENDENCIES += brotli +LIBCURL_CONF_OPTS += --with-brotli +else +LIBCURL_CONF_OPTS += --without-brotli +endif + define LIBCURL_FIX_DOT_PC printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in endef From ce91cbdad351cd1ca9d5b997a27ebdc256aca58f Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 2 Apr 2018 15:01:18 -0500 Subject: [PATCH 0642/2640] configs/qemu_ppc64_e5500_defconfig: needs host-openssl for the Linux kernel build Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- configs/qemu_ppc64_e5500_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index e4a7518f32..8173a0251b 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y From df6536e9d1a5300b925bdf5a808a2cca60fd1019 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Mon, 2 Apr 2018 19:12:33 +0300 Subject: [PATCH 0643/2640] python-yieldfrom: new package A backport of the `yield from` semantic from Python 3.x to Python 2.7. Can be useful for both host and target packages. Signed-off-by: Asaf Kahlon Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-yieldfrom/Config.in | 8 ++++++++ package/python-yieldfrom/python-yieldfrom.hash | 4 ++++ package/python-yieldfrom/python-yieldfrom.mk | 15 +++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-yieldfrom/Config.in create mode 100644 package/python-yieldfrom/python-yieldfrom.hash create mode 100644 package/python-yieldfrom/python-yieldfrom.mk diff --git a/DEVELOPERS b/DEVELOPERS index d6eb24a1fe..38e727ecc3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,6 +185,7 @@ F: package/stress/ N: Asaf Kahlon F: package/python-jsonmodels/ +F: package/python-yieldfrom/ N: Ash Charles F: package/pru-software-support/ diff --git a/package/Config.in b/package/Config.in index 5fef0a2b26..d883909094 100644 --- a/package/Config.in +++ b/package/Config.in @@ -971,6 +971,7 @@ menu "External python modules" source "package/python-xlutils/Config.in" source "package/python-xlwt/Config.in" source "package/python-xmltodict/Config.in" + source "package/python-yieldfrom/Config.in" source "package/python-zope-interface/Config.in" endmenu endif diff --git a/package/python-yieldfrom/Config.in b/package/python-yieldfrom/Config.in new file mode 100644 index 0000000000..1a063d3128 --- /dev/null +++ b/package/python-yieldfrom/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_YIELDFROM + bool "python-yieldfrom" + depends on BR2_PACKAGE_PYTHON + help + A backport of the `yield from` semantic from Python 3.x to + Python 2.7. + + https://github.com/Nurdok/yieldfrom/ diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash new file mode 100644 index 0000000000..cee4aaf96b --- /dev/null +++ b/package/python-yieldfrom/python-yieldfrom.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/yieldfrom/json, sha256 locally computed +md5 1a1c6fd152032d49ccd4ac250aad7746 yieldfrom-1.0.3.tar.gz +sha256 388004d0ee8854c2ed7a2c87e664aad13acd70c9b33d7f3c441182d37357739b yieldfrom-1.0.3.tar.gz +sha256 99da56b23b254ccd2ec6f2e82aea731a86d29a916002b3b3bcd801453edab74e LICENSE diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk new file mode 100644 index 0000000000..2e775b3133 --- /dev/null +++ b/package/python-yieldfrom/python-yieldfrom.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-yieldfrom +# +################################################################################ + +PYTHON_YIELDFROM_VERSION = 1.0.3 +PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz +PYTHON_YIELDFROM_SITE = https://pypi.python.org/packages/de/2d/05524f368e691846824d962b64f983e3fde9b8c10839e7efbc1b51d42de3 +PYTHON_YIELDFROM_SETUP_TYPE = setuptools +PYTHON_JSONMODELS_LICENSE = MIT +PYTHON_JSONMODELS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) +$(eval $(host-python-package)) From 0a1576e82d5996cc1f73e8960706ebe4a2909b5f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Apr 2018 08:56:16 +0200 Subject: [PATCH 0644/2640] pkg-generic.mk: fix FOO_ACTUAL_SOURCE_TARBALL handling after DOWNLOAD rework Fixes: http://autobuild.buildroot.net/results/b4a/b4af0de4ae9630ccbe7890f69047f216f2ff5119/ With the change to the DOWNLOAD macro, packages using FOO_ACTUAL_SOURCE_TARBALL fails: >>> skeleton-init-common Collecting legal info sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2: OK (md5: 529a7fecf33d0d113a446413b9d1e173) sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2: OK (sha256: 6e65878d0453708ee19098d3d68985bda244938d35999f3859915a2f5574fa08) /bin/bash: line 1: @mkdir: command not found package/pkg-generic.mk:148: recipe for target '/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-1/output/build/toolchain-external-codesourcery-niosII-2017.05-4/.stamp_actual_downloaded' failed Which is caused by the continuation character '\'. This has been present since the make target was introduced in commit eace9d6133b9 (core/legal-info: ensure legal-info works in off-line mode). It isn't clear to me why it was done like that, but it fails with the DOWNLOAD macro rework, so drop it. Signed-off-by: Peter Korsgaard Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 3c6a1839ff..1c9dd1d734 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -145,7 +145,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: # Retrieve actual source archive, e.g. for prebuilt external toolchains $(BUILD_DIR)/%/.stamp_actual_downloaded: - $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)); \ + $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)) $(Q)mkdir -p $(@D) $(Q)touch $@ From dcf5fafe84d054d1bb168f9d72e36fd83ba30a67 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 2 Apr 2018 19:43:25 -0500 Subject: [PATCH 0645/2640] qemu_ppc64_e5500_defconfig: convert quotes in readme.txt emulation example Resolves an error in the way the bootlin toolchain-builder uses the board/qemu/ppc64-e5500/readme.txt to generate the qemu test command. https://github.com/free-electrons/toolchains-builder/blob/master/build.sh#L186 Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- board/qemu/ppc64-e5500/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/ppc64-e5500/readme.txt b/board/qemu/ppc64-e5500/readme.txt index 0bfd41d76b..a6ad893b4d 100644 --- a/board/qemu/ppc64-e5500/readme.txt +++ b/board/qemu/ppc64-e5500/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append 'console=ttyS0 root=/dev/vda' -serial mon:stdio -nographic + qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 root=/dev/vda" -serial mon:stdio -nographic The login prompt will appear in the terminal that started Qemu. From 2c810ef1ac425f043872653637a4f0fd5f2792bf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 08:25:37 +0300 Subject: [PATCH 0646/2640] libbsd: disable for xtensa and blackfin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d879be30495 (package/libbsd: enable for non-glibc toolchains) implicitly enabled libbsd for the uClibc only architectures xtensa and blackfin. But libbsd does not support these architectures, since its local-elf.h header lacks the required target specific definitions. Fixes: http://autobuild.buildroot.net/results/ff1/ff1a52a53bed43cda9e235081a61b352e6e07aa1/ http://autobuild.buildroot.net/results/b13/b13c2f248f277c72b5d266208f991f34474cea14/ http://autobuild.buildroot.net/results/182/182356701c2110a014c9d6c8d9f18a6efeb26e70/ Cc: Yann E. MORIN Cc: Jörg Krause Signed-off-by: Baruch Siach Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/libbsd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index f6c2e4be4b..e80e9ea824 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd does not support those architectures (see src/local-elf.h) depends on !BR2_microblaze depends on !BR2_arc + depends on !BR2_xtensa + depends on !BR2_bfin config BR2_PACKAGE_LIBBSD bool "libbsd" From b23da4fe46b9ed284440c707a2d540b3e3bd6508 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Apr 2018 13:20:36 +0200 Subject: [PATCH 0647/2640] python-keyring: unbreak after download rework commit 514291f39ef06 (packages: use new $($PKG)_DL_DIR) variable) strangely enough removed the PYTHON_KEYRING_SITE line, breaking the build. Signed-off-by: Peter Korsgaard --- package/python-keyring/python-keyring.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 8ac18ae052..27db2802ed 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -6,6 +6,7 @@ PYTHON_KEYRING_VERSION = 10.5.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz +PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From 9aa99ad004968484c1968ca1b57a78397d1e037f Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 2 Apr 2018 13:53:57 -0300 Subject: [PATCH 0648/2640] tpm2-abrmd: disable for musl The current version requires macros and funtions not availabe on musl (TEMP_FAILURE_RETRY, srand48_r, etc). We could try to circumvent the problem by means of local patches but for the moment let's disable the package for musl toolchains and watch the issue reported upstream at https://github.com/tpm2-software/tpm2-abrmd/issues/237 Propagate the change to tpm2-tools, which has a run-time dependency on tpm2-abrmd. Fixes: http://autobuild.buildroot.net/results/d2fa916613d835f856d14747dc03ef9847ad6396 http://autobuild.buildroot.net/results/e82ff1f7f8a4a930fbabd38353da2149cc54fd9d http://autobuild.buildroot.net/results/7aaf6a7cc384b2e52109c0c31792c0d3888bcefd http://autobuild.buildroot.net/results/a56e55fb4791a90c00906698676656969484383d http://autobuild.buildroot.net/results/7aa020d115a0a3308fee1f3528554e40076ff28d Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/tpm2-abrmd/Config.in | 5 +++-- package/tpm2-tools/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in index 25c27c0abb..0cac754b3c 100644 --- a/package/tpm2-abrmd/Config.in +++ b/package/tpm2-abrmd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TPM2_ABRMD depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus, libglib2 + depends on !BR2_TOOLCHAIN_USES_MUSL # TEMP_FAILURE_RETRY(), etc select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS @@ -21,7 +22,7 @@ config BR2_PACKAGE_TPM2_ABRMD https://github.com/tpm2-software/tpm2-abrmd -comment "tpm2-abrmd needs a toolchain w/ C++, wchar, threads" +comment "tpm2-abrmd needs a uClibc or glibc toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 685b75c475..e5feb18786 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TPM2_TOOLS depends on BR2_USE_MMU # dbus, libglib depends on BR2_USE_WCHAR # libglib -> gettext depends on BR2_TOOLCHAIN_HAS_THREADS # libglib + depends on !BR2_TOOLCHAIN_USES_MUSL # tpm2-abrmd select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBGLIB2 @@ -19,7 +20,7 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools -comment "tpm2-tools needs a toolchain w/ C++, wchar, threads" +comment "tpm2-tools needs a uClibc or glibc toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL From 286a81d7a267488a78c9fb85159fe8d85fa2bd76 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 07:45:24 +0300 Subject: [PATCH 0649/2640] prosody: fix build with musl libc musl libc does not provide the mallinfo() API. Define WITHOUT_MALLINFO to skip the code using it. Fixes: http://autobuild.buildroot.net/results/42c/42cd6e3be761d1cb358bc50acd7fa58c8aa1c750/ http://autobuild.buildroot.net/results/29d/29d8dcbe013e549a865c0c5953272dab1fe5f777/ http://autobuild.buildroot.net/results/a6d/a6deb7440f80b072432c0f9c048e59abe4edf1c0/ Cc: Dushara Jayasinghe Cc: Francois Perrad Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/prosody/prosody.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index c5a83081dc..d95578253d 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -10,12 +10,15 @@ PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl +PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \ + $(if BR2_TOOLCHAIN_USES_MUSL,-DWITHOUT_MALLINFO) + PROSODY_CONF_OPTS = \ --with-lua-bin=$(HOST_DIR)/usr/bin \ --with-lua=$(STAGING_DIR)/usr \ --lua-version=$(LUAINTERPRETER_ABIVER) \ --c-compiler=$(TARGET_CC) \ - --cflags="$(TARGET_CFLAGS) -fPIC -std=c99" \ + --cflags="$(PROSODY_CFLAGS)" \ --linker=$(TARGET_CC) \ --ldflags="$(TARGET_LDFLAGS) -shared" \ --sysconfdir=/etc/prosody \ From c3c0b4383f8b0d87796bdde20f98275e6ef2db14 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 07:45:25 +0300 Subject: [PATCH 0650/2640] prosody: needs MMU prosody POSIX support code calls fork() unconditionally. prosody also uses the mallinfo() API, but uClibc does not provide that for no-MMU targets. Fixes: http://autobuild.buildroot.net/results/2d0/2d0f97e41cc1d4c9c7a0eacd4eec8bad6f00bcff/ http://autobuild.buildroot.net/results/f69/f69dfb1a7d1163b402b1f9bef045891c229539e5/ Cc: Dushara Jayasinghe Cc: Francois Perrad Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/prosody/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/prosody/Config.in b/package/prosody/Config.in index 1bc79b7f2a..ef26e2750b 100644 --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PROSODY bool "prosody" + depends on BR2_USE_MMU # fork depends on BR2_PACKAGE_HAS_LUAINTERPRETER select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime @@ -16,3 +17,4 @@ config BR2_PACKAGE_PROSODY comment "prosody needs the lua interpreter" depends on !BR2_PACKAGE_HAS_LUAINTERPRETER + depends on BR2_USE_MMU From 306242a47492439b493dabb5387f73aa43b08efc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Apr 2018 14:13:39 +0200 Subject: [PATCH 0651/2640] libnss: add upstream patch fixing build on aarch64 Fixes: http://autobuild.buildroot.net/results/037/037c772a36762df8febd529b329743d18ffbf66a/ Build system forgets to compile a file on aarch64, breaking the build. For details, see the upstream bugreport: https://bugzilla.mozilla.org/show_bug.cgi?id=1432455 Signed-off-by: Peter Korsgaard --- ...-Build-Hacl_Poly1305_64_o_on_Aarch64.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch diff --git a/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch b/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch new file mode 100644 index 0000000000..94f1a65273 --- /dev/null +++ b/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch @@ -0,0 +1,38 @@ +# HG changeset patch +# User Daiki Ueno +# Date 1516710574 -3600 +# Node ID 1668fafc1db4f739d5d15fbc94283858f842deb5 +# Parent c3702e37a048e386f88e7c50a228d27669332725 +Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer + +[Upstream: https://hg.mozilla.org/projects/nss/rev/1668fafc1db4 + Peter: adjust paths for tarball] +Signed-off-by: Peter Korsgaard +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY + + ifneq (1,$(CC_IS_GCC)) + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + else + EXTRA_SRCS += chacha20_vec.c + endif + else +- EXTRA_SRCS += poly1305.c ++ ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += Hacl_Poly1305_64.c ++ else ++ EXTRA_SRCS += poly1305.c ++ endif ++ + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + endif # x86_64 + endif # NSS_DISABLE_CHACHAPOLY + + ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) + # All intel architectures get the 64 bit version + # With custom uint128 if necessary (faster than generic 32 bit version). + From 7f4deda135c23e83f255340fd3620b83eea81b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 3 Apr 2018 20:30:07 +0200 Subject: [PATCH 0652/2640] openal: Bump to version 1.18.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Peter Korsgaard --- package/openal/openal.hash | 2 +- package/openal/openal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openal/openal.hash b/package/openal/openal.hash index aead6e15b8..cb41dc4e12 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd openal-soft-1.18.1.tar.bz2 +sha256 9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82 openal-soft-1.18.2.tar.bz2 diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 439f5f109d..c687c08be1 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENAL_VERSION = 1.18.1 +OPENAL_VERSION = 1.18.2 OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2 OPENAL_SITE = http://kcat.strangesoft.net/openal-releases OPENAL_LICENSE = LGPL-2.0+ From 0d19fcf6c24f7dcf585ad3423518068b5789f3b0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 3 Apr 2018 20:54:56 +0200 Subject: [PATCH 0653/2640] core/download: fix when the BR2_DL_DIR does not accept hardlinks When the BR2_DL_DIR is a mountpoint (presumably shared between various machine, or mounted from the local host when running in a VM), it is possible that it does not support hardlinks (e.g. samba, or the VMWare VMFS, etc...). If the hardlink fails, fallback to copying the file. As a last resort, if that also fails, eventually fallback to doing the download. Note: this means that the dl-wrapper is no longer atomic-safe: the code suffers of a TOCTTOU condition: the file may be created in-between the check and the moment we try to ln/cp it. Fortunately, the dl-wrapper is now run under an flock, so we're still safe. If we eventually go for a more fine-grained implementation, we'll have to be careful then. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index ce44752df0..38430738eb 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -56,8 +56,13 @@ main() { # Legacy handling: check if the file already exists in the global # download directory. If it does, hard-link it. If it turns out it # was an incorrect download, we'd still check it below anyway. + # If we can neither link nor copy, fallback to doing a download. + # NOTE! This is not atomic, is subject to TOCTTOU, but the whole + # dl-wrapper runs under an flock, so we're safe. if [ ! -e "${output}" -a -e "${old_dl_dir}/${filename}" ]; then - ln "${old_dl_dir}/${filename}" "${output}" + ln "${old_dl_dir}/${filename}" "${output}" || \ + cp "${old_dl_dir}/${filename}" "${output}" || \ + true fi # If the output file already exists and: From 439826eeccb1a148783c8fc38fc91f55e9fae808 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Tue, 3 Apr 2018 20:48:17 +0300 Subject: [PATCH 0654/2640] Synopsys: Cleanup files related to Synopsys Add missing entries in DEVELOPERS file for synopsys boards. Add missing readme.txt for recently introduced synopsys/hsdk board. Reduce size of FAT partition for HSDK image. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: Alexey Brodkin Cc: arc-buildroot@synopsys.com Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++++ board/synopsys/hsdk/genimage.cfg | 2 +- board/synopsys/hsdk/readme.txt | 33 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 board/synopsys/hsdk/readme.txt diff --git a/DEVELOPERS b/DEVELOPERS index 38e727ecc3..4ed7422645 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -163,7 +163,11 @@ F: package/wf111/ N: ARC Maintainers F: arch/Config.in.arc F: board/synopsys/ +F: configs/snps_arc700_axs101_defconfig +F: configs/snps_archs38_axs103_defconfig +F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig +F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro F: package/axfsutils/ diff --git a/board/synopsys/hsdk/genimage.cfg b/board/synopsys/hsdk/genimage.cfg index 87282fcb79..9103b20299 100644 --- a/board/synopsys/hsdk/genimage.cfg +++ b/board/synopsys/hsdk/genimage.cfg @@ -7,7 +7,7 @@ image boot.vfat { image = "uboot-env.bin" } } - size = 100M + size = 20M } image sdcard.img { diff --git a/board/synopsys/hsdk/readme.txt b/board/synopsys/hsdk/readme.txt new file mode 100644 index 0000000000..f4c6501111 --- /dev/null +++ b/board/synopsys/hsdk/readme.txt @@ -0,0 +1,33 @@ +Synopsys, Inc. +ARC HS Development Kit (HSDK) + +https://embarc.org/platforms.html + +How to build it +=============== + +Select the default configuration for the target: +$ make snps_archs38_hsdk_defconfig + +Optional: modify the configuration: +$ make menuconfig + +Build: +$ make + +Result of the build +=================== +output/images/ +├── boot.vfat +├── rootfs.ext2 +├── sdcard.img +├── u-boot +├── u-boot.bin +├── uboot-env.bin +└── uImage + +To copy the image file to the sdcard use dd: +$ dd if=output/images/sdcard.img of=/dev/XXX + +2018, Evgeniy Didin + From 71d1610029fa206442c305cf7c9b4a597db6e7c6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 22:05:02 +0300 Subject: [PATCH 0655/2640] libbsd: fix build for openrisc with uClibc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d879be30495 (package/libbsd: enable for non-glibc toolchains) enabled libbsd for openrisc. Unfortunately uClibc does not define the EM_OPENRISC macro that libbsd expects for ELF e_machine ID. Add patch making libbsd fallback to the equivalent EM_OR1K macro that uClibc does provide. Fixes: http://autobuild.buildroot.net/results/2f5/2f51eebe5964e8f1be3ecd2032e7d7837bf98b84/ Cc: Waldemar Brodkorb Cc: Yann E. MORIN Cc: Jörg Krause Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...2-Fix-build-for-openrisc-with-uClibc.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch diff --git a/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch b/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch new file mode 100644 index 0000000000..1b28df5a8b --- /dev/null +++ b/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch @@ -0,0 +1,48 @@ +From aa902671bf1e0e808fd994bd6b403d70af7ab6dd Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 3 Apr 2018 20:02:14 +0300 +Subject: [PATCH] Fix build for openrisc with uClibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +uClibc defines EM_OR1K instead of EM_OPENRISC for the OpenRISC ELF +e_machine ID. Use EM_OR1K when EM_OPENRISC is not defined. + +This fixes the following build failure: + +In file included from nlist.c:44:0: +nlist.c: In function ‘__elf_is_okay__’: +local-elf.h:224:23: error: ‘EM_OPENRISC’ undeclared (first use in this function) + #define ELF_TARG_MACH EM_OPENRISC + ^ +nlist.c:77:26: note: in expansion of macro ‘ELF_TARG_MACH’ + if (ehdr->e_machine == ELF_TARG_MACH && + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to libbsd@lists.freedesktop.org + + src/local-elf.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/local-elf.h b/src/local-elf.h +index 1faf182f87d7..79f7d026f6c9 100644 +--- a/src/local-elf.h ++++ b/src/local-elf.h +@@ -221,7 +221,11 @@ + + #elif defined(__or1k__) + ++#if defined(EM_OPENRISC) + #define ELF_TARG_MACH EM_OPENRISC ++#else ++#define ELF_TARG_MACH EM_OR1K ++#endif + #define ELF_TARG_CLASS ELFCLASS32 + #define ELF_TARG_DATA ELFDATA2MSB + +-- +2.16.3 + From 20adc2a9fb8be47187b919f6fa0a048567d6ee0c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 3 Apr 2018 22:03:41 +0200 Subject: [PATCH 0656/2640] mpd: add optional libmpdclient dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 6 ++++++ package/mpd/mpd.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index bad32f8440..6c7468e173 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -285,6 +285,12 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT comment "avahi support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_LIBMPDCLIENT + bool "libmpdclient" + select BR2_PACKAGE_LIBMPDCLIENT + help + Enable libmpdclient support. + config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT bool "neighbor discovery support" depends on BR2_PACKAGE_MPD_LIBSMBCLIENT || BR2_PACKAGE_MPD_UPNP diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index f50e3d90c7..639c8c1981 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -113,6 +113,13 @@ else MPD_CONF_OPTS += --disable-lame-encoder endif +ifeq ($(BR2_PACKAGE_MPD_LIBMPDCLIENT),y) +MPD_DEPENDENCIES += libmpdclient +MPD_CONF_OPTS += --enable-libmpdclient +else +MPD_CONF_OPTS += --disable-libmpdclient +endif + ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y) MPD_DEPENDENCIES += libnfs MPD_CONF_OPTS += --enable-nfs From 61ae04b87a700762995d39f3347817cadfc8716b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 23:20:15 +0300 Subject: [PATCH 0657/2640] libbsd: needs wide character support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d879be30495 (package/libbsd: enable for non-glibc toolchains) enabled build of libbsd with uClibc. libbsd requires wchar support. Disable libbsd when uClibc does not provide wchar support. Fixes: http://autobuild.buildroot.net/results/4fb/4fb576c644a7322730658ed585bcc4a353a42e85/ http://autobuild.buildroot.net/results/459/45946f11524c57ffa59bf88d4a2ea0d4933fa851/ http://autobuild.buildroot.net/results/ee3/ee3ad5172d6a218dfde4cf3e9fecf1906b0fc642/ Cc: Yann E. MORIN Cc: Jörg Krause Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libbsd/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index e80e9ea824..47fce04fef 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_LIBBSD bool "libbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making @@ -20,6 +21,6 @@ config BR2_PACKAGE_LIBBSD http://libbsd.freedesktop.org/ -comment "libbsd needs a toolchain w/ threads" +comment "libbsd needs a toolchain w/ threads, wchar" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR From 794d16fcacfc5c8e041452da67ee12aaab36f441 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 3 Apr 2018 09:11:38 +0300 Subject: [PATCH 0658/2640] package/systemd: add upstream build fix #8456 Signed-off-by: Stefan Becker Tested-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- .../0005-basic-macros-rename-noreturn.patch | 201 ++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patch diff --git a/package/systemd/0005-basic-macros-rename-noreturn.patch b/package/systemd/0005-basic-macros-rename-noreturn.patch new file mode 100644 index 0000000000..6cd847098e --- /dev/null +++ b/package/systemd/0005-basic-macros-rename-noreturn.patch @@ -0,0 +1,201 @@ +From 848e863acc51ecfb0f3955c498874588201d9130 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 15 Mar 2018 06:23:46 +0100 +Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"noreturn" is reserved and can be used in other header files we include: + + [ 16s] In file included from /usr/include/gcrypt.h:30:0, + [ 16s] from ../src/journal/journal-file.h:26, + [ 16s] from ../src/journal/journal-vacuum.c:31: + [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token + [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); + +Here we include grcrypt.h (which in turns include gpg-error.h) *after* we +"noreturn" was defined in macro.h. + +Upstream: https://github.com/systemd/systemd/pull/8456 +Signed-off-by: Stefan Becker +--- + src/basic/log.c | 4 ++-- + src/basic/log.h | 4 ++-- + src/basic/macro.h | 19 +++++++++---------- + src/basic/process-util.c | 2 +- + src/basic/process-util.h | 2 +- + src/core/main.c | 4 ++-- + src/journal/test-journal-interleaving.c | 2 +- + src/shared/pager.c | 2 +- + src/udev/collect/collect.c | 2 +- + 9 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/basic/log.c b/src/basic/log.c +index 7a7f2cbec13..16a2431c548 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -814,7 +814,7 @@ static void log_assert( + log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); + } + +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm( + abort(); + } + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/log.h b/src/basic/log.h +index efcf0f1bfc1..314be128a23 100644 +--- a/src/basic/log.h ++++ b/src/basic/log.h +@@ -186,7 +186,7 @@ int log_dump_internal( + char *buffer); + + /* Logging for various assertions */ +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm( + #define log_assert_failed(text, ...) \ + log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/macro.h b/src/basic/macro.h +index 95be63a2040..8911edfc4be 100644 +--- a/src/basic/macro.h ++++ b/src/basic/macro.h +@@ -53,6 +53,15 @@ + #else + #define _fallthrough_ + #endif ++/* Define C11 noreturn without and even on older gcc ++ * compiler versions */ ++#ifndef _noreturn_ ++#if __STDC_VERSION__ >= 201112L ++#define _noreturn_ _Noreturn ++#else ++#define _noreturn_ __attribute__((noreturn)) ++#endif ++#endif + + /* Temporarily disable some warnings */ + #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ +@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { + #endif + #endif + +-/* Define C11 noreturn without and even on older gcc +- * compiler versions */ +-#ifndef noreturn +-#if __STDC_VERSION__ >= 201112L +-#define noreturn _Noreturn +-#else +-#define noreturn __attribute__((noreturn)) +-#endif +-#endif +- + #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ + static inline void func##p(type *p) { \ + if (*p) \ +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index aa9846db5dc..e6120af5b68 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -987,7 +987,7 @@ bool is_main_thread(void) { + return cached > 0; + } + +-noreturn void freeze(void) { ++_noreturn_ void freeze(void) { + + log_close(); + +diff --git a/src/basic/process-util.h b/src/basic/process-util.h +index 93029e36e5f..5170adec7bb 100644 +--- a/src/basic/process-util.h ++++ b/src/basic/process-util.h +@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid); + + bool is_main_thread(void); + +-noreturn void freeze(void); ++_noreturn_ void freeze(void); + + bool oom_score_adjust_is_valid(int oa); + +diff --git a/src/core/main.c b/src/core/main.c +index 076846a41c0..4b2d1492373 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; + static sd_id128_t arg_machine_id = {}; + static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; + +-noreturn static void freeze_or_reboot(void) { ++_noreturn_ static void freeze_or_reboot(void) { + + if (arg_crash_reboot) { + log_notice("Rebooting in 10s..."); +@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { + freeze(); + } + +-noreturn static void crash(int sig) { ++_noreturn_ static void crash(int sig) { + struct sigaction sa; + pid_t pid; + +diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c +index 5a88b2774fa..d87bdbdd32a 100644 +--- a/src/journal/test-journal-interleaving.c ++++ b/src/journal/test-journal-interleaving.c +@@ -37,7 +37,7 @@ + + static bool arg_keep = false; + +-noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { ++_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { + log_internal(LOG_CRIT, error, file, line, func, + "'%s' failed at %s:%u (%s): %m", text, file, line, func); + abort(); +diff --git a/src/shared/pager.c b/src/shared/pager.c +index 75db3c985bd..681af9c40e3 100644 +--- a/src/shared/pager.c ++++ b/src/shared/pager.c +@@ -47,7 +47,7 @@ static int stored_stderr = -1; + static bool stdout_redirected = false; + static bool stderr_redirected = false; + +-noreturn static void pager_fallback(void) { ++_noreturn_ static void pager_fallback(void) { + int r; + + r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); +diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c +index 2821640e93b..c8fa47b3d7d 100644 +--- a/src/udev/collect/collect.c ++++ b/src/udev/collect/collect.c +@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) + return container_of(node, struct _mate, node); + } + +-noreturn static void sig_alrm(int signo) ++_noreturn_ static void sig_alrm(int signo) + { + exit(4); + } From b3081c69de57424bae4911889d44d4e372643825 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Apr 2018 22:31:15 +0200 Subject: [PATCH 0659/2640] busybox: bump to version 1.28.3 Includes fixes for ash, cpio, grep and hush. Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 9 +++++---- package/busybox/busybox.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 538aa04b9b..8537ceb4b7 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,6 +1,7 @@ -# From https://busybox.net/downloads/busybox-1.28.2.tar.bz2.sign -md5 5db059384469827ab19dac69d3fcd092 busybox-1.28.2.tar.bz2 -sha1 5ddba42aa14b875688727f0a3a9973e42fc51c23 busybox-1.28.2.tar.bz2 +# From https://busybox.net/downloads/busybox-1.28.3.tar.bz2.sign +md5 82e5ad09ae4a07c266fc179492b51757 busybox-1.28.3.tar.bz2 +sha1 64b47e83dccc5db7fe4ca596b28c9b901a136fe3 busybox-1.28.3.tar.bz2 + # Locally calculated -sha256 b64a94a60877c96838ee60e75765576ecc8756bf3636485117637604acb84b0d busybox-1.28.2.tar.bz2 +sha256 ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e busybox-1.28.3.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d2d2e86636..fd4ac600c2 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.28.2 +BUSYBOX_VERSION = 1.28.3 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 9350792309e5f0c51b5b1a207a8b61c8d7ed3713 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Apr 2018 19:12:04 -0300 Subject: [PATCH 0660/2640] configs/warp7: Bump kernel version Bump kernel version to 4.15.15. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 7de4bb5bdb..344c4430b0 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.15" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" From 6ffd13c2ff25d1c5068424f90abbb7a38f95fe66 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 4 Apr 2018 12:38:01 -0300 Subject: [PATCH 0661/2640] uboot: bump to version 2018.03 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 19cf12a073..cef8ccd3cd 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2018.01" + bool "2018.03" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2018.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2018.03" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 9425df3f17..788c1696f8 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda u-boot-2018.01.tar.bz2 +sha256 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd u-boot-2018.03.tar.bz2 From 6f5b0fba991a47077518e3b7dc3fdd6d993bdd57 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 4 Apr 2018 12:38:02 -0300 Subject: [PATCH 0662/2640] uboot-tools: bump to version 2018.03 Drop patch 0004 as it is already applied upstream. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- ...Boot-libfdt-headers-from-their-actua.patch | 33 ------------------- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch diff --git a/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch b/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch deleted file mode 100644 index 9f18342868..0000000000 --- a/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski -Date: Fri, 2 Mar 2018 23:13:42 +0100 -Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path - -There are no headers for libfdt in lib/libfdt, as they are instead -located in scripts/dtc/libfdt. Specifying lib/libfdt for headers -inclusion in host tools results in using the system libfdt headers, -which is not what we want. Change this to the proper path. - -Signed-off-by: Paul Kocialkowski -[Backport from upstream commit e0d20dc1521e74b82dbd69be53a048847798a90a] -Signed-off-by: Thomas Petazzoni ---- - tools/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index d3387fad69..f38f68ee47 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -244,7 +244,7 @@ endif # !LOGO_BMP - # - HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ - $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -- -I$(srctree)/lib/libfdt \ -+ -I$(srctree)/scripts/dtc/libfdt \ - -I$(srctree)/tools \ - -DUSE_HOSTCC \ - -D__KERNEL_STRICT_NAMES \ --- -2.14.3 - diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 9425df3f17..788c1696f8 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda u-boot-2018.01.tar.bz2 +sha256 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd u-boot-2018.03.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index cc57ce84de..882576d2d5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2018.01 +UBOOT_TOOLS_VERSION = 2018.03 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ From e871472dd52ac387348f0195d056b93dbbca19c5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 4 Apr 2018 12:38:03 -0300 Subject: [PATCH 0663/2640] configs/wandboard: Bump to U-Boot 2018.03 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/wandboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index b43c0c0e13..a53ae3a7f4 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From e55789a1c296ebb071b1098d52c0c22a1e25d1a4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 4 Apr 2018 10:49:24 +0300 Subject: [PATCH 0664/2640] libkrb5: needs dynamic library support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even though the configure script checks for the presence of dlfcn.h, the code includes this header unconditionally. Fixes: http://autobuild.buildroot.net/results/0e1/0e19af38d74aa74919a11ff1ebdb3b8c1a494b33/ Cc: André Hentschel Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libkrb5/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libkrb5/Config.in b/package/libkrb5/Config.in index 9147c90489..2e24c87229 100644 --- a/package/libkrb5/Config.in +++ b/package/libkrb5/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBKRB5 bool "libkrb5" # needs fork() depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS help Kerberos is a system for authenticating users and services on a network. Kerberos is a trusted third-party service. @@ -11,3 +12,7 @@ config BR2_PACKAGE_LIBKRB5 reference implementation of Kerberos V5. https://web.mit.edu/kerberos/ + +comment "libkrb5 needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS From 1f89a6379cdc3348d972a09b7e900d1f51aee77a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 4 Apr 2018 10:59:06 +0300 Subject: [PATCH 0665/2640] libkrb5: disable optional tcl support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid detection of host tcl headers. The tcl package in Buildroot is not cross-compile safe. The generated tclConfig.sh script has -L/usr/lib in TCL_LIB_SPEC. Should fix: http://autobuild.buildroot.net/results/d11/d118c3c09f6fc1de26491f2ed480ef28b091dba8/ http://autobuild.buildroot.net/results/035/0353e1443125da1e544d1a98348716bfe67c8726/ Cc: André Hentschel Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libkrb5/libkrb5.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 88cfc61a19..0390507304 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -25,7 +25,8 @@ LIBKRB5_CONF_OPTS = \ --without-system-db \ --without-system-et \ --without-system-ss \ - --without-system-verto + --without-system-verto \ + --without-tcl ifeq ($(BR2_PACKAGE_OPENLDAP),y) LIBKRB5_CONF_OPTS += --with-ldap From 3130ceef1c195bd60e414819743529484736a135 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Apr 2018 10:21:51 +0200 Subject: [PATCH 0666/2640] package/libupnp18: add optional dependency to openssl/libressl Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libupnp18/libupnp18.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/libupnp18/libupnp18.mk b/package/libupnp18/libupnp18.mk index a75558e92b..07ef4382f0 100644 --- a/package/libupnp18/libupnp18.mk +++ b/package/libupnp18/libupnp18.mk @@ -12,4 +12,12 @@ LIBUPNP18_INSTALL_STAGING = YES LIBUPNP18_LICENSE = BSD-3-Clause LIBUPNP18_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBUPNP18_CONF_OPTS += --enable-open-ssl +LIBUPNP18_DEPENDENCIES += host-pkgconf openssl +LIBUPNP18_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" +else +LIBUPNP18_CONF_OPTS += --disable-open-ssl +endif + $(eval $(autotools-package)) From f9ca8fa8ddd71109882f21b1bc232d564dec9887 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Mon, 2 Apr 2018 15:36:58 +0300 Subject: [PATCH 0667/2640] czmq: bump to version 4.1.1 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/czmq/czmq.hash | 6 +++--- package/czmq/czmq.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/czmq/czmq.hash b/package/czmq/czmq.hash index c0a7176f8d..c42525c78d 100644 --- a/package/czmq/czmq.hash +++ b/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 d29baef1079f19a2c6a360eb6be984f8 czmq-4.1.0.tar.gz -sha1 1d201a87205811367f7c92cbbd36a899edda68bf czmq-4.1.0.tar.gz +md5 6d3a6fdd25c2bb29897c53670dce97bf czmq-4.1.1.tar.gz +sha1 629d34e8b5c1f2dd88689350f71f9917a8d76f23 czmq-4.1.1.tar.gz # Locally calculated -sha256 3befa35b4886b5298e8329b4f0aa5bb9bde0e7439bd3c5c53295cb988371fc11 czmq-4.1.0.tar.gz +sha256 f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0 czmq-4.1.1.tar.gz sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENCE diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index aef552415e..6eb9314200 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CZMQ_VERSION = 4.1.0 +CZMQ_VERSION = 4.1.1 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) # 0001-configure.ac-remove-Werror.patch touches configure.ac From ef63a330b4f156e7e05f7ebe41f33a882cc69d01 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 21:54:51 +0100 Subject: [PATCH 0668/2640] support/scripts/pkg-stats-new: rewrite in Python This commit adds a new version of the pkg-stats script, rewritten in Python. It is for now implemented in a separate file called, pkg-stats-new, in order to make the diff easily readable. A future commit will rename it to pkg-stats. Compared to the existing shell-based pkg-stats script, the functionality and output is basically the same. The main difference is that the output no longer goes to stdout, but to the file passed as argument using the -o option. This allows stdout to be used for more debugging related information. The way the script works is that a first function get_pkglist() returns a list of Package objects. Then, the function package_init_make_info() uses 'make printvars' to gather information about all packages, stored as class variables in the Package class. Then, we iterate over all packages, and use various methods of the Package class to retrieve all details about the package: infrastructure, presence of hash file, presence of license information, etc. calculate_stats() then calculates global statistics (how packages have license information, how packages have a hash file, etc.). Finally, dump_html() produces the HTML output, using a number of sub-functions. One improvement over the shell-based version is that we can use regexps to exclude some .mk files. Thanks to this, we can exclude all linux-ext-*.mk files, avoiding incorrect matches. Signed-off-by: Thomas Petazzoni Reviewed-by: Ricardo Martincoski --- support/scripts/pkg-stats-new | 459 ++++++++++++++++++++++++++++++++++ 1 file changed, 459 insertions(+) create mode 100755 support/scripts/pkg-stats-new diff --git a/support/scripts/pkg-stats-new b/support/scripts/pkg-stats-new new file mode 100755 index 0000000000..955d3ce990 --- /dev/null +++ b/support/scripts/pkg-stats-new @@ -0,0 +1,459 @@ +#!/usr/bin/env python + +# Copyright (C) 2009 by Thomas Petazzoni +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import argparse +import datetime +import fnmatch +import os +from collections import defaultdict +import re +import subprocess + +INFRA_RE = re.compile("\$\(eval \$\(([a-z-]*)-package\)\)") + + +class Package: + all_licenses = list() + all_license_files = list() + + def __init__(self, name, path): + self.name = name + self.path = path + self.infras = None + self.has_license = False + self.has_license_files = False + self.has_hash = False + self.patch_count = 0 + self.warnings = 0 + + def pkgvar(self): + return self.name.upper().replace("-", "_") + + def set_infra(self): + """ + Fills in the .infras field + """ + self.infras = list() + with open(self.path, 'r') as f: + lines = f.readlines() + for l in lines: + match = INFRA_RE.match(l) + if not match: + continue + infra = match.group(1) + if infra.startswith("host-"): + self.infras.append(("host", infra[5:])) + else: + self.infras.append(("target", infra)) + + def set_license(self): + """ + Fills in the .has_license and .has_license_files fields + """ + var = self.pkgvar() + if var in self.all_licenses: + self.has_license = True + if var in self.all_license_files: + self.has_license_files = True + + def set_hash_info(self): + """ + Fills in the .has_hash field + """ + hashpath = self.path.replace(".mk", ".hash") + self.has_hash = os.path.exists(hashpath) + + def set_patch_count(self): + """ + Fills in the .patch_count field + """ + self.patch_count = 0 + pkgdir = os.path.dirname(self.path) + for subdir, _, _ in os.walk(pkgdir): + self.patch_count += len(fnmatch.filter(os.listdir(subdir), '*.patch')) + + def set_check_package_warnings(self): + """ + Fills in the .warnings field + """ + cmd = ["./utils/check-package"] + pkgdir = os.path.dirname(self.path) + for root, dirs, files in os.walk(pkgdir): + for f in files: + if f.endswith(".mk") or f.endswith(".hash") or f == "Config.in" or f == "Config.in.host": + cmd.append(os.path.join(root, f)) + o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] + lines = o.splitlines() + for line in lines: + m = re.match("^([0-9]*) warnings generated", line) + if m: + self.warnings = int(m.group(1)) + return + + def __eq__(self, other): + return self.path == other.path + + def __lt__(self, other): + return self.path < other.path + + def __str__(self): + return "%s (path='%s', license='%s', license_files='%s', hash='%s', patches=%d)" % \ + (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count) + + +def get_pkglist(): + """ + Builds the list of Buildroot packages, returning a list of Package + objects. Only the .name and .path fields of the Package object are + initialized. + """ + WALK_USEFUL_SUBDIRS = ["boot", "linux", "package", "toolchain"] + WALK_EXCLUDES = ["boot/common.mk", + "linux/linux-ext-.*.mk", + "package/freescale-imx/freescale-imx.mk", + "package/gcc/gcc.mk", + "package/gstreamer/gstreamer.mk", + "package/gstreamer1/gstreamer1.mk", + "package/gtk2-themes/gtk2-themes.mk", + "package/matchbox/matchbox.mk", + "package/opengl/opengl.mk", + "package/qt5/qt5.mk", + "package/x11r7/x11r7.mk", + "package/doc-asciidoc.mk", + "package/pkg-.*.mk", + "package/nvidia-tegra23/nvidia-tegra23.mk", + "toolchain/toolchain-external/pkg-toolchain-external.mk", + "toolchain/toolchain-external/toolchain-external.mk", + "toolchain/toolchain.mk", + "toolchain/helpers.mk", + "toolchain/toolchain-wrapper.mk"] + packages = list() + for root, dirs, files in os.walk("."): + rootdir = root.split("/") + if len(rootdir) < 2: + continue + if rootdir[1] not in WALK_USEFUL_SUBDIRS: + continue + for f in files: + if not f.endswith(".mk"): + continue + # Strip ending ".mk" + pkgname = f[:-3] + pkgpath = os.path.join(root, f) + skip = False + for exclude in WALK_EXCLUDES: + # pkgpath[2:] strips the initial './' + if re.match(exclude, pkgpath[2:]): + skip = True + continue + if skip: + continue + p = Package(pkgname, pkgpath) + packages.append(p) + return packages + + +def package_init_make_info(): + # Licenses + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_LICENSE"]) + for l in o.splitlines(): + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + # Strip _LICENSE + pkgvar = pkgvar[:-8] + + # If value is "unknown", no license details available + if value == "unknown": + continue + Package.all_licenses.append(pkgvar) + + # License files + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_LICENSE_FILES"]) + for l in o.splitlines(): + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + if pkgvar.endswith("_MANIFEST_LICENSE_FILES"): + continue + + # Strip _LICENSE_FILES + pkgvar = pkgvar[:-14] + + Package.all_license_files.append(pkgvar) + + +def calculate_stats(packages): + stats = defaultdict(int) + for pkg in packages: + # If packages have multiple infra, take the first one. For the + # vast majority of packages, the target and host infra are the + # same. There are very few packages that use a different infra + # for the host and target variants. + if len(pkg.infras) > 0: + infra = pkg.infras[0][1] + stats["infra-%s" % infra] += 1 + else: + stats["infra-unknown"] += 1 + if pkg.has_license: + stats["license"] += 1 + else: + stats["no-license"] += 1 + if pkg.has_license_files: + stats["license-files"] += 1 + else: + stats["no-license-files"] += 1 + if pkg.has_hash: + stats["hash"] += 1 + else: + stats["no-hash"] += 1 + stats["patches"] += pkg.patch_count + return stats + + +html_header = """ + + + +Statistics of Buildroot packages + + +Results
+ +

+""" + + +html_footer = """ + + + +""" + + +def infra_str(infra_list): + if not infra_list: + return "Unknown" + elif len(infra_list) == 1: + return "%s
%s" % (infra_list[0][1], infra_list[0][0]) + elif infra_list[0][1] == infra_list[1][1]: + return "%s
%s + %s" % \ + (infra_list[0][1], infra_list[0][0], infra_list[1][0]) + else: + return "%s (%s)
%s (%s)" % \ + (infra_list[0][1], infra_list[0][0], + infra_list[1][1], infra_list[1][0]) + + +def boolean_str(b): + if b: + return "Yes" + else: + return "No" + + +def dump_html_pkg(f, pkg): + f.write(" \n") + f.write(" %s\n" % pkg.path[2:]) + + # Patch count + td_class = ["centered"] + if pkg.patch_count == 0: + td_class.append("nopatches") + elif pkg.patch_count < 5: + td_class.append("somepatches") + else: + td_class.append("lotsofpatches") + f.write(" %s\n" % + (" ".join(td_class), str(pkg.patch_count))) + + # Infrastructure + infra = infra_str(pkg.infras) + td_class = ["centered"] + if infra == "Unknown": + td_class.append("wrong") + else: + td_class.append("correct") + f.write(" %s\n" % + (" ".join(td_class), infra_str(pkg.infras))) + + # License + td_class = ["centered"] + if pkg.has_license: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" %s\n" % + (" ".join(td_class), boolean_str(pkg.has_license))) + + # License files + td_class = ["centered"] + if pkg.has_license_files: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" %s\n" % + (" ".join(td_class), boolean_str(pkg.has_license_files))) + + # Hash + td_class = ["centered"] + if pkg.has_hash: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" %s\n" % + (" ".join(td_class), boolean_str(pkg.has_hash))) + + # Warnings + td_class = ["centered"] + if pkg.warnings == 0: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" %d\n" % + (" ".join(td_class), pkg.warnings)) + + f.write(" \n") + + +def dump_html_all_pkgs(f, packages): + f.write(""" + + + + + + + + + + +""") + for pkg in sorted(packages): + dump_html_pkg(f, pkg) + f.write("
PackagePatch countInfrastructureLicenseLicense filesHash fileWarnings
") + + +def dump_html_stats(f, stats): + f.write("\n") + f.write("\n") + infras = [infra[6:] for infra in stats.keys() if infra.startswith("infra-")] + for infra in infras: + f.write(" \n" % + (infra, stats["infra-%s" % infra])) + f.write(" \n" % + stats["license"]) + f.write(" \n" % + stats["no-license"]) + f.write(" \n" % + stats["license-files"]) + f.write(" \n" % + stats["no-license-files"]) + f.write(" \n" % + stats["hash"]) + f.write(" \n" % + stats["no-hash"]) + f.write(" \n" % + stats["patches"]) + f.write("
Packages using the %s infrastructure%s
Packages having license information%s
Packages not having license information%s
Packages having license files information%s
Packages not having license files information%s
Packages having a hash file%s
Packages not having a hash file%s
Total number of patches%s
\n") + + +def dump_gen_info(f): + # Updated on Mon Feb 19 08:12:08 CET 2018, Git commit aa77030b8f5e41f1c53eb1c1ad664b8c814ba032 + o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"]) + git_commit = o.splitlines()[0] + f.write("

Updated on %s, git commit %s

\n" % + (str(datetime.datetime.utcnow()), git_commit)) + + +def dump_html(packages, stats, output): + with open(output, 'w') as f: + f.write(html_header) + dump_html_all_pkgs(f, packages) + dump_html_stats(f, stats) + dump_gen_info(f) + f.write(html_footer) + + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('-o', dest='output', action='store', required=True, + help='HTML output file') + return parser.parse_args() + + +def __main__(): + args = parse_args() + print "Build package list ..." + packages = get_pkglist() + print "Getting package make info ..." + package_init_make_info() + print "Getting package details ..." + for pkg in packages: + pkg.set_infra() + pkg.set_license() + pkg.set_hash_info() + pkg.set_patch_count() + pkg.set_check_package_warnings() + print "Calculate stats" + stats = calculate_stats(packages) + print "Write HTML" + dump_html(packages, stats, args.output) + + +__main__() From df8a39468b1f89ab82aad47b95524abe75339458 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 21:54:52 +0100 Subject: [PATCH 0669/2640] support/scripts/pkg-stats-new: add -n and -p options This commit adds the following options to the pkg-stats-new script: -n, to specify a number of packages to parse instead of all packages -p, to specify a list of packages (comma-separated) to parse instead of all packages These options are basically only useful when debugging/developing this script, but they are very useful, because the script is rather slow to run completely with all 2000+ packages, especially once upstream versions will be fetched from release-monitoring.org. Signed-off-by: Thomas Petazzoni Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats-new | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats-new b/support/scripts/pkg-stats-new index 955d3ce990..5dc70f1671 100755 --- a/support/scripts/pkg-stats-new +++ b/support/scripts/pkg-stats-new @@ -23,6 +23,7 @@ import os from collections import defaultdict import re import subprocess +import sys INFRA_RE = re.compile("\$\(eval \$\(([a-z-]*)-package\)\)") @@ -116,11 +117,14 @@ class Package: (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count) -def get_pkglist(): +def get_pkglist(npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package objects. Only the .name and .path fields of the Package object are initialized. + + npackages: limit to N packages + package_list: limit to those packages in this list """ WALK_USEFUL_SUBDIRS = ["boot", "linux", "package", "toolchain"] WALK_EXCLUDES = ["boot/common.mk", @@ -143,6 +147,7 @@ def get_pkglist(): "toolchain/helpers.mk", "toolchain/toolchain-wrapper.mk"] packages = list() + count = 0 for root, dirs, files in os.walk("."): rootdir = root.split("/") if len(rootdir) < 2: @@ -154,6 +159,8 @@ def get_pkglist(): continue # Strip ending ".mk" pkgname = f[:-3] + if package_list and pkgname not in package_list: + continue pkgpath = os.path.join(root, f) skip = False for exclude in WALK_EXCLUDES: @@ -165,6 +172,9 @@ def get_pkglist(): continue p = Package(pkgname, pkgpath) packages.append(p) + count += 1 + if npackages and count == npackages: + return packages return packages @@ -434,13 +444,24 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument('-o', dest='output', action='store', required=True, help='HTML output file') + parser.add_argument('-n', dest='npackages', type=int, action='store', + help='Number of packages') + parser.add_argument('-p', dest='packages', action='store', + help='List of packages (comma separated)') return parser.parse_args() def __main__(): args = parse_args() + if args.npackages and args.packages: + print "ERROR: -n and -p are mutually exclusive" + sys.exit(1) + if args.packages: + package_list = args.packages.split(",") + else: + package_list = None print "Build package list ..." - packages = get_pkglist() + packages = get_pkglist(args.npackages, package_list) print "Getting package make info ..." package_init_make_info() print "Getting package details ..." From 338c7b5e6288a20080d0715408eeb5596c6d2b7f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Mar 2018 21:54:53 +0100 Subject: [PATCH 0670/2640] support/scripts/pkg-stats-new: add current version information This commit adds a new column in the HTML output containing the current version of a package in Buildroot. As such, it isn't terribly useful, but combined with the latest upstream version added in a follow-up commit, it will become very useful. Signed-off-by: Thomas Petazzoni Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats-new | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/support/scripts/pkg-stats-new b/support/scripts/pkg-stats-new index 5dc70f1671..43f7e8d543 100755 --- a/support/scripts/pkg-stats-new +++ b/support/scripts/pkg-stats-new @@ -31,6 +31,7 @@ INFRA_RE = re.compile("\$\(eval \$\(([a-z-]*)-package\)\)") class Package: all_licenses = list() all_license_files = list() + all_versions = dict() def __init__(self, name, path): self.name = name @@ -41,6 +42,7 @@ class Package: self.has_hash = False self.patch_count = 0 self.warnings = 0 + self.current_version = None def pkgvar(self): return self.name.upper().replace("-", "_") @@ -88,6 +90,14 @@ class Package: for subdir, _, _ in os.walk(pkgdir): self.patch_count += len(fnmatch.filter(os.listdir(subdir), '*.patch')) + def set_current_version(self): + """ + Fills in the .current_version field + """ + var = self.pkgvar() + if var in self.all_versions: + self.current_version = self.all_versions[var] + def set_check_package_warnings(self): """ Fills in the .warnings field @@ -217,6 +227,33 @@ def package_init_make_info(): Package.all_license_files.append(pkgvar) + # Version + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_VERSION"]) + + # We process first the host package VERSION, and then the target + # package VERSION. This means that if a package exists in both + # target and host variants, with different version numbers + # (unlikely), we'll report the target version number. + version_list = o.splitlines() + version_list = [x for x in version_list if x.startswith("HOST_")] + \ + [x for x in version_list if not x.startswith("HOST_")] + for l in version_list: + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + if pkgvar.endswith("_DL_VERSION"): + continue + + # Strip _VERSION + pkgvar = pkgvar[:-8] + + Package.all_versions[pkgvar] = value + def calculate_stats(packages): stats = defaultdict(int) @@ -369,6 +406,13 @@ def dump_html_pkg(f, pkg): f.write(" %s\n" % (" ".join(td_class), boolean_str(pkg.has_hash))) + # Current version + if len(pkg.current_version) > 20: + current_version = pkg.current_version[:20] + "..." + else: + current_version = pkg.current_version + f.write(" %s\n" % current_version) + # Warnings td_class = ["centered"] if pkg.warnings == 0: @@ -391,6 +435,7 @@ def dump_html_all_pkgs(f, packages): License License files Hash file +Current version Warnings """) @@ -471,6 +516,7 @@ def __main__(): pkg.set_hash_info() pkg.set_patch_count() pkg.set_check_package_warnings() + pkg.set_current_version() print "Calculate stats" stats = calculate_stats(packages) print "Write HTML" From f955a4eac0909154ee0d73b47261c088287db6cb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 22:05:33 +0200 Subject: [PATCH 0671/2640] support/scripts/pkg-stats: replace with new Python version Rename pkg-stats-new to pkg-stats. Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 833 ++++++++++++++++++---------------- support/scripts/pkg-stats-new | 526 --------------------- 2 files changed, 452 insertions(+), 907 deletions(-) delete mode 100755 support/scripts/pkg-stats-new diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 48a2cc29a1..43f7e8d543 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env python # Copyright (C) 2009 by Thomas Petazzoni # @@ -16,16 +16,275 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# This script generates an HTML file that contains a report about all -# Buildroot packages, their usage of the different package -# infrastructure and possible cleanup actions -# -# Run the script from the Buildroot toplevel directory: -# -# ./support/scripts/pkg-stats > /tmp/pkg.html -# +import argparse +import datetime +import fnmatch +import os +from collections import defaultdict +import re +import subprocess +import sys -echo " +INFRA_RE = re.compile("\$\(eval \$\(([a-z-]*)-package\)\)") + + +class Package: + all_licenses = list() + all_license_files = list() + all_versions = dict() + + def __init__(self, name, path): + self.name = name + self.path = path + self.infras = None + self.has_license = False + self.has_license_files = False + self.has_hash = False + self.patch_count = 0 + self.warnings = 0 + self.current_version = None + + def pkgvar(self): + return self.name.upper().replace("-", "_") + + def set_infra(self): + """ + Fills in the .infras field + """ + self.infras = list() + with open(self.path, 'r') as f: + lines = f.readlines() + for l in lines: + match = INFRA_RE.match(l) + if not match: + continue + infra = match.group(1) + if infra.startswith("host-"): + self.infras.append(("host", infra[5:])) + else: + self.infras.append(("target", infra)) + + def set_license(self): + """ + Fills in the .has_license and .has_license_files fields + """ + var = self.pkgvar() + if var in self.all_licenses: + self.has_license = True + if var in self.all_license_files: + self.has_license_files = True + + def set_hash_info(self): + """ + Fills in the .has_hash field + """ + hashpath = self.path.replace(".mk", ".hash") + self.has_hash = os.path.exists(hashpath) + + def set_patch_count(self): + """ + Fills in the .patch_count field + """ + self.patch_count = 0 + pkgdir = os.path.dirname(self.path) + for subdir, _, _ in os.walk(pkgdir): + self.patch_count += len(fnmatch.filter(os.listdir(subdir), '*.patch')) + + def set_current_version(self): + """ + Fills in the .current_version field + """ + var = self.pkgvar() + if var in self.all_versions: + self.current_version = self.all_versions[var] + + def set_check_package_warnings(self): + """ + Fills in the .warnings field + """ + cmd = ["./utils/check-package"] + pkgdir = os.path.dirname(self.path) + for root, dirs, files in os.walk(pkgdir): + for f in files: + if f.endswith(".mk") or f.endswith(".hash") or f == "Config.in" or f == "Config.in.host": + cmd.append(os.path.join(root, f)) + o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] + lines = o.splitlines() + for line in lines: + m = re.match("^([0-9]*) warnings generated", line) + if m: + self.warnings = int(m.group(1)) + return + + def __eq__(self, other): + return self.path == other.path + + def __lt__(self, other): + return self.path < other.path + + def __str__(self): + return "%s (path='%s', license='%s', license_files='%s', hash='%s', patches=%d)" % \ + (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count) + + +def get_pkglist(npackages, package_list): + """ + Builds the list of Buildroot packages, returning a list of Package + objects. Only the .name and .path fields of the Package object are + initialized. + + npackages: limit to N packages + package_list: limit to those packages in this list + """ + WALK_USEFUL_SUBDIRS = ["boot", "linux", "package", "toolchain"] + WALK_EXCLUDES = ["boot/common.mk", + "linux/linux-ext-.*.mk", + "package/freescale-imx/freescale-imx.mk", + "package/gcc/gcc.mk", + "package/gstreamer/gstreamer.mk", + "package/gstreamer1/gstreamer1.mk", + "package/gtk2-themes/gtk2-themes.mk", + "package/matchbox/matchbox.mk", + "package/opengl/opengl.mk", + "package/qt5/qt5.mk", + "package/x11r7/x11r7.mk", + "package/doc-asciidoc.mk", + "package/pkg-.*.mk", + "package/nvidia-tegra23/nvidia-tegra23.mk", + "toolchain/toolchain-external/pkg-toolchain-external.mk", + "toolchain/toolchain-external/toolchain-external.mk", + "toolchain/toolchain.mk", + "toolchain/helpers.mk", + "toolchain/toolchain-wrapper.mk"] + packages = list() + count = 0 + for root, dirs, files in os.walk("."): + rootdir = root.split("/") + if len(rootdir) < 2: + continue + if rootdir[1] not in WALK_USEFUL_SUBDIRS: + continue + for f in files: + if not f.endswith(".mk"): + continue + # Strip ending ".mk" + pkgname = f[:-3] + if package_list and pkgname not in package_list: + continue + pkgpath = os.path.join(root, f) + skip = False + for exclude in WALK_EXCLUDES: + # pkgpath[2:] strips the initial './' + if re.match(exclude, pkgpath[2:]): + skip = True + continue + if skip: + continue + p = Package(pkgname, pkgpath) + packages.append(p) + count += 1 + if npackages and count == npackages: + return packages + return packages + + +def package_init_make_info(): + # Licenses + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_LICENSE"]) + for l in o.splitlines(): + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + # Strip _LICENSE + pkgvar = pkgvar[:-8] + + # If value is "unknown", no license details available + if value == "unknown": + continue + Package.all_licenses.append(pkgvar) + + # License files + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_LICENSE_FILES"]) + for l in o.splitlines(): + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + if pkgvar.endswith("_MANIFEST_LICENSE_FILES"): + continue + + # Strip _LICENSE_FILES + pkgvar = pkgvar[:-14] + + Package.all_license_files.append(pkgvar) + + # Version + o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", + "-s", "printvars", "VARS=%_VERSION"]) + + # We process first the host package VERSION, and then the target + # package VERSION. This means that if a package exists in both + # target and host variants, with different version numbers + # (unlikely), we'll report the target version number. + version_list = o.splitlines() + version_list = [x for x in version_list if x.startswith("HOST_")] + \ + [x for x in version_list if not x.startswith("HOST_")] + for l in version_list: + # Get variable name and value + pkgvar, value = l.split("=") + + # If present, strip HOST_ from variable name + if pkgvar.startswith("HOST_"): + pkgvar = pkgvar[5:] + + if pkgvar.endswith("_DL_VERSION"): + continue + + # Strip _VERSION + pkgvar = pkgvar[:-8] + + Package.all_versions[pkgvar] = value + + +def calculate_stats(packages): + stats = defaultdict(int) + for pkg in packages: + # If packages have multiple infra, take the first one. For the + # vast majority of packages, the target and host infra are the + # same. There are very few packages that use a different infra + # for the host and target variants. + if len(pkg.infras) > 0: + infra = pkg.infras[0][1] + stats["infra-%s" % infra] += 1 + else: + stats["infra-unknown"] += 1 + if pkg.has_license: + stats["license"] += 1 + else: + stats["no-license"] += 1 + if pkg.has_license_files: + stats["license-files"] += 1 + else: + stats["no-license-files"] += 1 + if pkg.has_hash: + stats["hash"] += 1 + else: + stats["no-hash"] += 1 + stats["patches"] += pkg.patch_count + return stats + + +html_header = """ + -Statistics of Buildroot packages - - -Results
- -

-""" - - -html_footer = """ - - - -""" - - -def infra_str(infra_list): - if not infra_list: - return "Unknown" - elif len(infra_list) == 1: - return "%s
%s" % (infra_list[0][1], infra_list[0][0]) - elif infra_list[0][1] == infra_list[1][1]: - return "%s
%s + %s" % \ - (infra_list[0][1], infra_list[0][0], infra_list[1][0]) - else: - return "%s (%s)
%s (%s)" % \ - (infra_list[0][1], infra_list[0][0], - infra_list[1][1], infra_list[1][0]) - - -def boolean_str(b): - if b: - return "Yes" - else: - return "No" - - -def dump_html_pkg(f, pkg): - f.write(" \n") - f.write(" %s\n" % pkg.path[2:]) - - # Patch count - td_class = ["centered"] - if pkg.patch_count == 0: - td_class.append("nopatches") - elif pkg.patch_count < 5: - td_class.append("somepatches") - else: - td_class.append("lotsofpatches") - f.write(" %s\n" % - (" ".join(td_class), str(pkg.patch_count))) - - # Infrastructure - infra = infra_str(pkg.infras) - td_class = ["centered"] - if infra == "Unknown": - td_class.append("wrong") - else: - td_class.append("correct") - f.write(" %s\n" % - (" ".join(td_class), infra_str(pkg.infras))) - - # License - td_class = ["centered"] - if pkg.has_license: - td_class.append("correct") - else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.has_license))) - - # License files - td_class = ["centered"] - if pkg.has_license_files: - td_class.append("correct") - else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.has_license_files))) - - # Hash - td_class = ["centered"] - if pkg.has_hash: - td_class.append("correct") - else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.has_hash))) - - # Current version - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version - f.write(" %s\n" % current_version) - - # Warnings - td_class = ["centered"] - if pkg.warnings == 0: - td_class.append("correct") - else: - td_class.append("wrong") - f.write(" %d\n" % - (" ".join(td_class), pkg.warnings)) - - f.write(" \n") - - -def dump_html_all_pkgs(f, packages): - f.write(""" - - - - - - - - - - - -""") - for pkg in sorted(packages): - dump_html_pkg(f, pkg) - f.write("
PackagePatch countInfrastructureLicenseLicense filesHash fileCurrent versionWarnings
") - - -def dump_html_stats(f, stats): - f.write("\n") - f.write("\n") - infras = [infra[6:] for infra in stats.keys() if infra.startswith("infra-")] - for infra in infras: - f.write(" \n" % - (infra, stats["infra-%s" % infra])) - f.write(" \n" % - stats["license"]) - f.write(" \n" % - stats["no-license"]) - f.write(" \n" % - stats["license-files"]) - f.write(" \n" % - stats["no-license-files"]) - f.write(" \n" % - stats["hash"]) - f.write(" \n" % - stats["no-hash"]) - f.write(" \n" % - stats["patches"]) - f.write("
Packages using the %s infrastructure%s
Packages having license information%s
Packages not having license information%s
Packages having license files information%s
Packages not having license files information%s
Packages having a hash file%s
Packages not having a hash file%s
Total number of patches%s
\n") - - -def dump_gen_info(f): - # Updated on Mon Feb 19 08:12:08 CET 2018, Git commit aa77030b8f5e41f1c53eb1c1ad664b8c814ba032 - o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"]) - git_commit = o.splitlines()[0] - f.write("

Updated on %s, git commit %s

\n" % - (str(datetime.datetime.utcnow()), git_commit)) - - -def dump_html(packages, stats, output): - with open(output, 'w') as f: - f.write(html_header) - dump_html_all_pkgs(f, packages) - dump_html_stats(f, stats) - dump_gen_info(f) - f.write(html_footer) - - -def parse_args(): - parser = argparse.ArgumentParser() - parser.add_argument('-o', dest='output', action='store', required=True, - help='HTML output file') - parser.add_argument('-n', dest='npackages', type=int, action='store', - help='Number of packages') - parser.add_argument('-p', dest='packages', action='store', - help='List of packages (comma separated)') - return parser.parse_args() - - -def __main__(): - args = parse_args() - if args.npackages and args.packages: - print "ERROR: -n and -p are mutually exclusive" - sys.exit(1) - if args.packages: - package_list = args.packages.split(",") - else: - package_list = None - print "Build package list ..." - packages = get_pkglist(args.npackages, package_list) - print "Getting package make info ..." - package_init_make_info() - print "Getting package details ..." - for pkg in packages: - pkg.set_infra() - pkg.set_license() - pkg.set_hash_info() - pkg.set_patch_count() - pkg.set_check_package_warnings() - pkg.set_current_version() - print "Calculate stats" - stats = calculate_stats(packages) - print "Write HTML" - dump_html(packages, stats, args.output) - - -__main__() From a098636a6b65dd2ca08f29fd6085a46d2b491df0 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Wed, 4 Apr 2018 18:31:18 +0200 Subject: [PATCH 0672/2640] package/llvm: new package This patch installs LLVM tools and libraries for the host and libLLVM.so for the target. In order to cross-compile LLVM for the target, LLVM must be installed on the host, or at least llvm-tblgen. This is necessary as the path to host's llvm-tblgen must be specified when cross-compiling using the LLVM_TABLEGEN option. Also, a version of llvm-config that can run on the host will be required by packages that link with LLVM libraries, so we need to generate it and install it in STAGING_DIR/usr/bin. It is important to remark why we need llvm-config(host variant) installed in STAGING dir. This tool is necessary to build applications that use LLVM, as it prints the compiler flags, linker flags and object libraries needed to link against LLVM libs. More info: https://bugs.chromium.org/p/chromium/issues/detail?id=219369 The original idea was to compile only llvm-tblgen and llvm-config for the host, as they are the only necessary components. However, llvm-config tool does not work as expected if it is not linked with libLLVM.so, so we must also enable LLVM_LINK_LLVM_DYLIB, what builds LLVM as a single shared library and links LLVM tools with it. More info: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224847 in comment #11. If we don't build full LLVM for the host, it would be necessary to patch configure.ac from mesa3d if we want dynamic linking, because it uses llvm-config (host variant installed in STAGING_DIR) to get the necessary LLVM libraries to link with, which has the following problems: - llvm-config --shared mode outputs static (even if LLVM is built as one shared library) which leads to link issues with libgallium. - llvm-config --libs outputs all LLVM tiny libs: -lLLVMLTO, -lLLVMPasses,etc instead of the single shared library containing all LLVM components (-lLLVM-5.0) Mesa tries to execute: llvm-config --link-shared --libs, but this outputs llvm-config: error: libLLVM-5.0.so is missing. Given that these problems may arise with other packages that use LLVM, it is preferable to do a full build for the host. Also, having a complete installation of LLVM on the host will also facilitate the integration of Clang front-end, which is going to be added in a future patch. As option LLVM_BUILD_LLVM_DYLIB is enabled for the llvm target variant, a single shared library containing all LLVM components is built. This option is not compatible with BUILD_SHARED_LIBS, which generates one .so per library and is only recommended for use by LLVM developers. Tools and utils are not built for the target. The patch aims to provide LLVM support for other packages. The main options needed to cross-compile LLVM are the following ones: LLVM_TABLEGEN CMAKE_CROSSCOMPILING LLVM_DEFAULT_TARGET_TRIPLE LLVM_HOST_TRIPLE LLVM_TARGET_ARCH LLVM_TARGETS_TO_BUILD Signed-off-by: Valentin Korenblit [Thomas: - add dependency on thread and C++ and update the Config.in comment accordingly. - make the Config.in comment depend on BR2_PACKAGE_LLVM_ARCH_SUPPORTS so that it isn't disabled on architectures where LLVM is anyway not supported.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + package/Config.in | 1 + package/llvm/Config.in | 30 +++++ package/llvm/llvm.hash | 3 + package/llvm/llvm.mk | 263 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 300 insertions(+) create mode 100644 package/llvm/Config.in create mode 100644 package/llvm/llvm.hash create mode 100644 package/llvm/llvm.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4ed7422645..68374efd01 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1891,6 +1891,9 @@ N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ +N: Valentin Korenblit +F: package/llvm/ + N: Vanya Sergeev F: package/lua-periphery/ diff --git a/package/Config.in b/package/Config.in index d883909094..82c5c40531 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1545,6 +1545,7 @@ menu "Other" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" + source "package/llvm/Config.in" if BR2_PACKAGE_LINUX_PAM comment "linux-pam plugins" source "package/libpam-radius-auth/Config.in" diff --git a/package/llvm/Config.in b/package/llvm/Config.in new file mode 100644 index 0000000000..408fde2e39 --- /dev/null +++ b/package/llvm/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LLVM_ARCH_SUPPORTS + bool + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + +config BR2_PACKAGE_LLVM_TARGET_ARCH + string + default "AArch64" if BR2_aarch64 + default "ARM" if BR2_arm || BR2_armeb + default "X86" if BR2_i386 || BR2_x86_64 + +config BR2_PACKAGE_LLVM + bool "llvm" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + help + The LLVM Project is a collection of modular and reusable + compiler and toolchain technologies. + + http://llvm.org + +comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash new file mode 100644 index 0000000000..3e998c4328 --- /dev/null +++ b/package/llvm/llvm.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0 llvm-5.0.1.src.tar.xz +sha256 abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672 LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk new file mode 100644 index 0000000000..525e0f98f8 --- /dev/null +++ b/package/llvm/llvm.mk @@ -0,0 +1,263 @@ +################################################################################ +# +# llvm +# +################################################################################ + +LLVM_VERSION = 5.0.1 +LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION) +LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz +LLVM_LICENSE = NCSA +LLVM_LICENSE_FILES = LICENSE.TXT +LLVM_SUPPORTS_IN_SOURCE_BUILD = NO +LLVM_INSTALL_STAGING = YES + +# http://llvm.org/docs/GettingStarted.html#software +# host-python: Python interpreter 2.7 or newer is required for builds and testing. +HOST_LLVM_DEPENDENCIES = host-python +LLVM_DEPENDENCIES = host-llvm + +# Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects +# This flag assumes that projects are checked out side-by-side and not nested +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" +LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" + +HOST_LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) +LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) + +# Disable experimental Global Instruction Selection support. +# https://llvm.org/docs/GlobalISel.html +HOST_LLVM_CONF_OPTS += -DLLVM_BUILD_GLOBAL_ISEL=OFF +LLVM_CONF_OPTS += -DLLVM_BUILD_GLOBAL_ISEL=OFF + +# Get target architecture +LLVM_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LLVM_TARGET_ARCH)) + +# Build backend for target architecture. This include backends like AMDGPU. +LLVM_TARGETS_TO_BUILD = $(LLVM_TARGET_ARCH) +HOST_LLVM_CONF_OPTS = -DLLVM_TARGETS_TO_BUILD="$(subst $(space),;,$(LLVM_TARGETS_TO_BUILD))" +LLVM_CONF_OPTS = -DLLVM_TARGETS_TO_BUILD="$(subst $(space),;,$(LLVM_TARGETS_TO_BUILD))" + +# LLVM target to use for native code generation. This is required for JIT generation. +# It must be set to LLVM_TARGET_ARCH for host and target, otherwise we get +# "No available targets are compatible for this triple" with llvmpipe when host +# and target architectures are different. +HOST_LLVM_CONF_OPTS += -DLLVM_TARGET_ARCH=$(LLVM_TARGET_ARCH) +LLVM_CONF_OPTS += -DLLVM_TARGET_ARCH=$(LLVM_TARGET_ARCH) + +# Use native llvm-tblgen from host-llvm (needed for cross-compilation) +LLVM_CONF_OPTS += -DLLVM_TABLEGEN=$(HOST_DIR)/bin/llvm-tblgen + +# BUILD_SHARED_LIBS has a misleading name. It is in fact an option for +# LLVM developers to build all LLVM libraries as separate shared libraries. +# For normal use of LLVM, it is recommended to build a single +# shared library, which is achieved by BUILD_SHARED_LIBS=OFF and +# LLVM_BUILD_LLVM_DYLIB=ON. +HOST_LLVM_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF +LLVM_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + +# Generate libLLVM.so. This library contains a default set of LLVM components +# that can be overwritten with "LLVM_DYLIB_COMPONENTS". The default contains +# most of LLVM and is defined in "tools/llvm-shlib/CMakelists.txt". +HOST_LLVM_CONF_OPTS += -DLLVM_BUILD_LLVM_DYLIB=ON +LLVM_CONF_OPTS += -DLLVM_BUILD_LLVM_DYLIB=ON + +# LLVM_BUILD_LLVM_DYLIB to ON. We need to enable this option for the +# host as llvm-config for the host will be used in STAGING_DIR by packages +# linking against libLLVM and if this option is not selected, then llvm-config +# does not work properly. For example, it assumes that LLVM is built statically +# and cannot find libLLVM.so. +HOST_LLVM_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON +LLVM_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON + +LLVM_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 + +# Disabled for the host since no host-libedit. +# Fall back to "Simple fgets-based implementation" of llvm line editor. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBEDIT=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBEDIT=OFF + +# We want to install llvm libraries and modules. +HOST_LLVM_CONF_OPTS += -DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF +LLVM_CONF_OPTS += -DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF + +# We build from a release archive without vcs files. +HOST_LLVM_CONF_OPTS += -DLLVM_APPEND_VC_REV=OFF +LLVM_CONF_OPTS += -DLLVM_APPEND_VC_REV=OFF + +# No backtrace package in Buildroot. +# https://documentation.backtrace.io +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_BACKTRACES=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_BACKTRACES=OFF + +# Enable signal handlers overrides support. +HOST_LLVM_CONF_OPTS += -DENABLE_CRASH_OVERRIDES=ON +LLVM_CONF_OPTS += -DENABLE_CRASH_OVERRIDES=ON + +# Disable ffi for now. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_FFI=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_FFI=OFF + +# Disable terminfo database (needs ncurses libtinfo.so) +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_TERMINFO=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_TERMINFO=OFF + +# Enable thread support +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_THREADS=ON +LLVM_CONF_OPTS += -DLLVM_ENABLE_THREADS=ON + +# Enable optional host-zlib support for LLVM Machine Code (llvm-mc) to add +# compression/uncompression capabilities. +# Not needed on the target. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_ZLIB=ON +HOST_LLVM_DEPENDENCIES += host-zlib +LLVM_CONF_OPTS += -DLLVM_ENABLE_ZLIB=OFF + +# We don't use llvm for static only build, so enable PIC +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON +LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON + +# Default is Debug build, which requires considerably more disk space and +# build time. Release build is selected for host and target because the linker +# can run out of memory in Debug mode. +HOST_LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release + +# Disable C++1y (ISO C++ 2014 standard) +# Disable C++1z (ISO C++ 2017 standard) +# Compile llvm with the C++11 (ISO C++ 2011 standard) which is the fallback. +HOST_LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_CXX1Y=OFF \ + -DLLVM_ENABLE_CXX1Z=OFF +LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_CXX1Y=OFF \ + -DLLVM_ENABLE_CXX1Z=OFF + +# Disabled, requires sys/ndir.h header +# Disable debug in module +HOST_LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_MODULES=OFF \ + -DLLVM_ENABLE_MODULE_DEBUGGING=OFF +LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_MODULES=OFF \ + -DLLVM_ENABLE_MODULE_DEBUGGING=OFF + +# Don't change the standard library to libc++. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBCXX=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBCXX=OFF + +# Don't use lld as a linker. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_LLD=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_LLD=OFF + +# Generate code for the target. LLVM selects a target by looking at the +# toolchain tuple +HOST_LLVM_CONF_OPTS += -DLLVM_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) +LLVM_CONF_OPTS += -DLLVM_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) + +# LLVM_HOST_TRIPLE has a misleading name, it is in fact the triple of the +# system where llvm is going to run on. We need to specify triple for native +# code generation on the target. +# This solves "No available targets are compatible for this triple" with llvmpipe +LLVM_CONF_OPTS += -DLLVM_HOST_TRIPLE=$(GNU_TARGET_NAME) + +# The Go bindings have no CMake rules at the moment, but better remove the +# check preventively. Building the Go and OCaml bindings is yet unsupported. +HOST_LLVM_CONF_OPTS += \ + -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND \ + -DOCAMLFIND=OCAMLFIND-NOTFOUND + +# Builds a release host tablegen that gets used during the LLVM build. +HOST_LLVM_CONF_OPTS += -DLLVM_OPTIMIZED_TABLEGEN=ON + +# Keep llvm utility binaries for the host. llvm-tblgen is built anyway as +# CMakeLists.txt has add_subdirectory(utils/TableGen) unconditionally. +HOST_LLVM_CONF_OPTS += \ + -DLLVM_BUILD_UTILS=ON \ + -DLLVM_INCLUDE_UTILS=ON \ + -DLLVM_INSTALL_UTILS=ON +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_UTILS=OFF \ + -DLLVM_INCLUDE_UTILS=OFF \ + -DLLVM_INSTALL_UTILS=OFF + +HOST_LLVM_CONF_OPTS += \ + -DLLVM_INCLUDE_TOOLS=ON \ + -DLLVM_BUILD_TOOLS=ON + +# We need to activate LLVM_INCLUDE_TOOLS, otherwise it does not generate +# libLLVM.so +LLVM_CONF_OPTS += \ + -DLLVM_INCLUDE_TOOLS=ON \ + -DLLVM_BUILD_TOOLS=OFF + +# Compiler-rt not in the source tree. +# llvm runtime libraries are not in the source tree. +# Polly is not in the source tree. +HOST_LLVM_CONF_OPTS += \ + -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ + -DLLVM_BUILD_RUNTIME=OFF \ + -DLLVM_INCLUDE_RUNTIMES=OFF \ + -DLLVM_POLLY_BUILD=OFF +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ + -DLLVM_BUILD_RUNTIME=OFF \ + -DLLVM_INCLUDE_RUNTIMES=OFF \ + -DLLVM_POLLY_BUILD=OFF + +HOST_LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_WARNINGS=ON \ + -DLLVM_ENABLE_PEDANTIC=ON \ + -DLLVM_ENABLE_WERROR=OFF +LLVM_CONF_OPTS += \ + -DLLVM_ENABLE_WARNINGS=ON \ + -DLLVM_ENABLE_PEDANTIC=ON \ + -DLLVM_ENABLE_WERROR=OFF + +HOST_LLVM_CONF_OPTS += \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_OCAMLDOC=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_EXAMPLES=OFF \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_BUILD_TESTS=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_ENABLE_OCAMLDOC=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INCLUDE_DOCS=OFF \ + -DLLVM_INCLUDE_GO_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF + +# Copy llvm-config (host variant) to STAGING_DIR +# llvm-config (host variant) returns include and lib directories +# for the host if it's installed in host/bin: +# output/host/bin/llvm-config --includedir +# output/host/include +# When installed in STAGING_DIR, llvm-config returns include and lib +# directories from STAGING_DIR. +# output/staging/usr/bin/llvm-config --includedir +# output/staging/usr/include +define HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR + $(INSTALL) -D -m 0755 $(HOST_DIR)/bin/llvm-config \ + $(STAGING_DIR)/usr/bin/llvm-config +endef +HOST_LLVM_POST_INSTALL_HOOKS = HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR + +# By default llvm-tblgen is built and installed on the target but it is +# not necessary. +define LLVM_DELETE_LLVM_TBLGEN_TARGET + rm -f $(TARGET_DIR)/usr/bin/llvm-tblgen +endef +LLVM_POST_INSTALL_TARGET_HOOKS = LLVM_DELETE_LLVM_TBLGEN_TARGET + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 29f04d7934b46502f856bb84f91b74b0d8c066d3 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Wed, 4 Apr 2018 18:31:19 +0200 Subject: [PATCH 0673/2640] package/llvm: enable AMDGPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The AMDGPU backend provides ISA code generation for AMD GPU's, starting with the R600 family up until the current GCN families. It should not be confused with the AMDGPU Linux kernel DRM driver. For more info: https://llvm.org/docs/AMDGPUUsage.html Signed-off-by: Valentin Korenblit Tested-by: Jérôme Oufella Signed-off-by: Thomas Petazzoni --- package/llvm/Config.in | 10 ++++++++++ package/llvm/llvm.mk | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 408fde2e39..70f73f4858 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -24,6 +24,16 @@ config BR2_PACKAGE_LLVM http://llvm.org +if BR2_PACKAGE_LLVM + +config BR2_PACKAGE_LLVM_AMDGPU + bool "AMDGPU backend" + help + Build AMDGPU target. Select this option if you are going + to install mesa3d with llvm and use Gallium Radeon driver. + +endif + comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 525e0f98f8..9c8bf5c820 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -45,6 +45,15 @@ LLVM_CONF_OPTS = -DLLVM_TARGETS_TO_BUILD="$(subst $(space),;,$(LLVM_TARGETS_TO_B HOST_LLVM_CONF_OPTS += -DLLVM_TARGET_ARCH=$(LLVM_TARGET_ARCH) LLVM_CONF_OPTS += -DLLVM_TARGET_ARCH=$(LLVM_TARGET_ARCH) +# Build AMDGPU backend +# We need to build AMDGPU backend for both host and target because +# llvm-config --targets built (host variant installed in STAGING) will +# output only $(LLVM_TARGET_ARCH) if not, and mesa3d won't build as +# it thinks AMDGPU backend is not installed on the target. +ifeq ($(BR2_PACKAGE_LLVM_AMDGPU),y) +LLVM_TARGETS_TO_BUILD += AMDGPU +endif + # Use native llvm-tblgen from host-llvm (needed for cross-compilation) LLVM_CONF_OPTS += -DLLVM_TABLEGEN=$(HOST_DIR)/bin/llvm-tblgen From 3b5c24af38a53750af9f8d8dffb1a9523835e6e5 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Wed, 4 Apr 2018 18:31:20 +0200 Subject: [PATCH 0674/2640] package/mesa3d: enable llvm support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch provides LLVM support for Mesa3D, enabling llvmpipe software rasterizer if Gallium swrast is selected. In case Gallium r600 is selected, llvm AMDGPU backend is built. Having llvm installed also enables radeonsi Gallium driver, but it is not provided with this patch as it hasn't been tested. It uses llvm-config (host variant) installed in STAGING_DIR/usr/bin to get LLVM libraries. Assuming that LLVM version 5.0.1 is installed, llvm-config --libs will output -lLLVM-5.0. Signed-off-by: Valentin Korenblit Tested-by: Jérôme Oufella Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 6 ++++++ package/mesa3d/mesa3d.mk | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index f141587c4d..ffe0287ac5 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -25,6 +25,11 @@ menuconfig BR2_PACKAGE_MESA3D if BR2_PACKAGE_MESA3D +config BR2_PACKAGE_MESA3D_LLVM + bool "llvm support" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + select BR2_PACKAGE_LLVM + # inform the .mk file of gallium, dri or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool @@ -77,6 +82,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_RADEON + select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1d88fd8480..506f84274f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -32,6 +32,17 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) MESA3D_CONF_OPTS += --disable-static endif +ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) +MESA3D_DEPENDENCIES += host-llvm llvm +MESA3D_CONF_OPTS += \ + --with-llvm-prefix=$(STAGING_DIR)/usr \ + --enable-llvm-shared-libs \ + --enable-llvm +else +# Avoid automatic search of llvm-config +MESA3D_CONF_OPTS += --disable-llvm +endif + # The Sourcery MIPS toolchain has a special (non-upstream) feature to # have "compact exception handling", which unfortunately breaks with # mesa3d, so we disable it here by passing -mno-compact-eh. @@ -219,7 +230,4 @@ else MESA3D_CONF_OPTS += --disable-lmsensors endif -# Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin - $(eval $(autotools-package)) From 0edfa02eb720af980654f415f9ac165d0771eba1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 21:18:51 +0200 Subject: [PATCH 0675/2640] wolfssl: bump version to 3.14.0 Add upstream post-3.14.0 patch to fix build issue related to missing fips.h header. For more details, see: https://github.com/wolfSSL/wolfssl/issues/1415 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...-the-creation-of-dummy-fips.h-header.patch | 33 +++++++++++++++++++ package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch diff --git a/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch b/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch new file mode 100644 index 0000000000..0e9dec751d --- /dev/null +++ b/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch @@ -0,0 +1,33 @@ +From a7fe5e35025227e348eaef5a15fd55f591d77206 Mon Sep 17 00:00:00 2001 +From: John Safranek +Date: Tue, 6 Mar 2018 13:15:35 -0800 +Subject: [PATCH] Fix issue with the creation of dummy fips.h header. + +Signed-off-by: Peter Korsgaard +--- + wolfssl/wolfcrypt/include.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/wolfssl/wolfcrypt/include.am b/wolfssl/wolfcrypt/include.am +index c81bdd13..6e84ed9d 100644 +--- a/wolfssl/wolfcrypt/include.am ++++ b/wolfssl/wolfcrypt/include.am +@@ -20,7 +20,6 @@ nobase_include_HEADERS+= \ + wolfssl/wolfcrypt/fe_operations.h \ + wolfssl/wolfcrypt/ge_operations.h \ + wolfssl/wolfcrypt/error-crypt.h \ +- wolfssl/wolfcrypt/fips.h \ + wolfssl/wolfcrypt/fips_test.h \ + wolfssl/wolfcrypt/hash.h \ + wolfssl/wolfcrypt/hc128.h \ +@@ -99,3 +98,7 @@ if BUILD_SELFTEST + nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h + endif + ++if BUILD_FIPS_V2 ++nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h ++endif ++ +-- +2.11.0 + diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 204f2f0957..76c7db25a8 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 3bafeb0cb7eaff80002ba3f7cbb70023757bcc35fc4d82181945b143f1f927c6 v3.13.0-stable.tar.gz +sha256 4ab543c869a65a77dc5d0bc934b9d4852aa3d5834bd2f707a74a936602bd3687 v3.14.0-stable.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 84073f338e..ec83d7d1dd 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 3.13.0 +WOLFSSL_VERSION = 3.14.0 WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/archive WOLFSSL_SOURCE = v$(WOLFSSL_VERSION)-stable.tar.gz From 543b0d50fbbb552296749d0cf18443aacfc6e58d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 17:51:31 +0200 Subject: [PATCH 0676/2640] python-webpy: needs hashlib support in python webpy uses hashlib for session handling, so ensure it is available: web/session.py: import hashlib web/session.py: sha1 = hashlib.sha1 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/python-webpy/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in index 12dbe61723..5f4df7832b 100644 --- a/package/python-webpy/Config.in +++ b/package/python-webpy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_WEBPY bool "python-webpy" depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_HASHLIB help web.py is a web framework for Python that is as simple as it is powerful. From ce559162fca39c273583bea0dbed643229769d8c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 17:51:32 +0200 Subject: [PATCH 0677/2640] python-webpy: security bump to version 0.39 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit >From the changelog: 2018-02-28 0.39 * Fixed a security issue with the form module (tx Orange Tsai) * Fixed a security issue with the db module (tx Adrián Brav and Orange Tsai) 2016-07-08 0.38 .. * Fixed a potential remote exeution risk in `reparam` (tx Adrián Brav) License files are still not included on pypi, so continue to use the git repo. Upstream has unfortunately not tagged 0.39, so use the latest commit on the 0.39 branch. A request to fix this has been submitted: https://github.com/webpy/webpy/issues/449 0.39 now uses setuptools, so change the _SETUP_TYPE. Add hashes for the license files. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/python-webpy/python-webpy.hash | 4 +++- package/python-webpy/python-webpy.mk | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index 0e0a8d0fb8..30a14f4705 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 c3cb8930739294103b1ad109e5fd1d0efae67c06d5b6d59fce5b5a2ee6b21624 python-webpy-webpy-0.37.tar.gz +sha256 e17ac483846fb15629c76c43cf64c0b65eac3c870dca2251801b459b1e4e12b8 python-webpy-6df75fe581e0e838d28334d5c53f52421560d38b.tar.gz +sha256 3826fd531a9b904841f5e3560fcda7e93f2ab8d11ef124ec65e10625efa26c34 LICENSE.txt +sha256 7347fd17bfd33c4093c31dc77076733e1e0150ce8c13296c56dc042bbecede84 web/wsgiserver/LICENSE.txt diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 8bcc8ec37f..1e67cd6fd8 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = webpy-0.37 +# corresponds to 0.39 +PYTHON_WEBPY_VERSION = 6df75fe581e0e838d28334d5c53f52421560d38b PYTHON_WEBPY_SITE = $(call github,webpy,webpy,$(PYTHON_WEBPY_VERSION)) -PYTHON_WEBPY_SETUP_TYPE = distutils +PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt web/wsgiserver/LICENSE.txt From fafb5bf52c7e1ebcad1bfbdb29a9c22fe2aa07a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Apr 2018 19:07:53 +0200 Subject: [PATCH 0678/2640] tinycbor: bump to version 0.5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinycbor/tinycbor.hash | 2 +- package/tinycbor/tinycbor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index 73ab82f528..db9c595733 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5826a284e7f120a8d2c49cb581702be3e851acb4083a4f5af6112975a8b22209 tinycbor-v0.5.0.tar.gz +sha256 f9d2ec366a38382c1b7bb989c45620dca168ad28107b4ef9a306ee93c3dbb832 tinycbor-v0.5.1.tar.gz sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index a9afbb6e46..2aec68be77 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCBOR_VERSION = v0.5.0 +TINYCBOR_VERSION = v0.5.1 TINYCBOR_SITE = $(call github,intel,tinycbor,$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE From e42cc183c5471150b1f130f172a30dc95453bb04 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Tue, 3 Apr 2018 09:52:03 +0300 Subject: [PATCH 0679/2640] libuv: bump to version v1.20.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1a2833e786..c14b2d4971 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ccc5f3b43ed171640513786e5e809508cb6308279b4d71a016e4550ad62f1686 libuv-v1.19.2.tar.gz +sha256 6d36f18f556cc288813032a168fd9181b45d9e66e3e18e54a8dbdfd8ea3c3dba libuv-v1.20.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 2e07d3a0fa..54ce6bdaa6 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.19.2 +LIBUV_VERSION = v1.20.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 8193cd84a56f5c8fe925c2c74271e474c191b6f5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 12 Mar 2018 06:12:30 -0400 Subject: [PATCH 0680/2640] postgresql: add version output to pg_config Some external packages call pg_config to determine the installed PostgreSQL version. Add this output to Buildroots own pg_config, so these packages correctly compile. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/postgresql/pg_config | 5 ++++- package/postgresql/postgresql.mk | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/postgresql/pg_config b/package/postgresql/pg_config index 85c0e63ddb..642252f27f 100644 --- a/package/postgresql/pg_config +++ b/package/postgresql/pg_config @@ -14,6 +14,9 @@ case "$1" in --libdir) echo "$prefix/lib" ;; + --version) + echo "PostgreSQL @POSTGRESQL_VERSION@" + ;; *) - echo "Usage: $0 {--includedir|--libdir}" + echo "Usage: $0 {--includedir|--libdir|--version}" esac diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index c6b689a146..94b3e60e59 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -84,6 +84,7 @@ POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG $(INSTALL) -m 0755 -D package/postgresql/pg_config \ $(STAGING_DIR)/usr/bin/pg_config + $(SED) "s|@POSTGRESQL_VERSION@|$(POSTGRESQL_VERSION)|g" $(STAGING_DIR)/usr/bin/pg_config endef POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG From 81fb33af2a6e4f4d379da3372b2a607b7ae1a21f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 13 Nov 2017 19:41:54 +0100 Subject: [PATCH 0681/2640] qt5base: correct eglfs support in qmake.conf.in Setting EGLFS_DEVICE_INTEGRATION at the end of qmake.conf like is done by commit 0c219ddb8a doesn't work correctly: it has to be set before the include(../common/linux_device_post.conf) Instead of appending to the file, change it into a qmake.conf.in template file that contains a placeholder for the EGLFS_DEVICE_INTEGRATION assignment and update it with sed. Since the sed always has to be executed, this removes the need for a separate QT5BASE_CONFIGURE_QMAKE_CONFIG definition. Signed-off-by: Giulio Benetti [Arnout: simplify the replacement, move sunxi-mali support to a separate patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/{qmake.conf => qmake.conf.in} | 2 ++ package/qt5/qt5base/qt5base.mk | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) rename package/qt5/qt5base/{qmake.conf => qmake.conf.in} (98%) diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in similarity index 98% rename from package/qt5/qt5base/qmake.conf rename to package/qt5/qt5base/qmake.conf.in index 8b6debe583..d62ee7cebe 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf.in @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = # Architecturespecific configuration include(arch.conf) +@EGLFS_DEVICE@ + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 76c129d2e4..a9a79ba087 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -242,10 +242,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) # use vivante backend -define QT5BASE_CONFIGURE_QMAKE_CONFIG - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf -endef +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv endif ifneq ($(QT5BASE_CONFIG_FILE),) @@ -263,7 +260,9 @@ endef endif define QT5BASE_CONFIGURE_CMDS - $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \ + $(QT5BASE_PKGDIR)/qmake.conf.in > \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ From 8252118c5a1e208e3a62b47647bad78833a7b94c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 13 Nov 2017 19:41:55 +0100 Subject: [PATCH 0682/2640] qt5base: add support for sunxi-mali{,-mainline} eglfs backend Only one of the two can be selected (they are conflicting virtual packages) so testing against a single 'y' is enough. Signed-off-by: Giulio Benetti [Arnout: add sunxi-mali and sunxi-mali-mainline in a single patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a9a79ba087..e6307fb3fe 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -240,9 +240,14 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv +else ifeq ($(BR2_PACKAGE_SUNXI_MALI)$(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +# use mali backend +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali +endif endif ifneq ($(QT5BASE_CONFIG_FILE),) From 573ea2c7d4a69626155ef099fe767f9098869e49 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Thu, 5 Apr 2018 00:16:00 -0300 Subject: [PATCH 0683/2640] download/git: fix basename for files inside tarballs Commit "6d938bcb52 download: git: introduce cache feature" introduced a typo that makes the tarball to contain files without the package basename: $ tar -tvf good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz -rw-r--r-- 0/0 8 2017-10-14 02:10 ./file Historically, all tarballs are generated with the basename: $ tar -tvf good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz -rw-r--r-- 0/0 8 2017-10-14 02:10 good-a238b1dfcd825d47d834af3c5223417c8411d90d/file The hashes in the tree were calculated with the basename. In the most common scenario, after the download ends the tarball is generated, the hash mismatches and the download mechanism falls back to use the tarball from http://sources.buildroot.net . The problem can be reproduced by forcing the download of any git package PKG that has a hash file to check against: $ make defconfig $ ./utils/config --set-str BR2_BACKUP_SITE "" $ BR2_DL_DIR=$(mktemp -d) make PKG-dirclean PKG-source Fix the typo so the basename is really added to the files, that was clearly the intention of the code. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Maxime Hadjinlian Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/download/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index 58dbcd211c..f07195b0d1 100755 --- a/support/download/git +++ b/support/download/git @@ -111,7 +111,7 @@ LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" # Create GNU-format tarballs, since that's the format of the tarballs on # sources.buildroot.org and used in the *.hash files -tar cf - --transform="s/^\.$/${basename}/" \ +tar cf - --transform="s/^\./${basename}/" \ --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ -T "${output}.list.sorted" >"${output}.tar" gzip -6 -n <"${output}.tar" >"${output}" From fc49c92afc8478ed32ff4770d88b97081c7193d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 08:30:51 +0200 Subject: [PATCH 0684/2640] pkg-download.mk: do not add a trailing slash to _SITE Fixes http://autobuild.buildroot.net/results/734/7342b25f01d60cafc4a5422a5a1c282629f361c5/ $(dir does not strip last path separator and the wget wrapper adds a '/' between the -u argument and the filename when it reconstructs the URL, leading us to have two slashes before the filename when accessing the upstream location. Most upstream servers ignores this, but not all - Leading to download issues from pypi. Notice: As pointed out by Arnout, we cannot simply use $(PKG)_SITE here as _PATCH and _EXTRA_DOWNLOADS may contain full URLs. Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7ed95f2b2c..2c4ad3ba2c 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -82,7 +82,7 @@ endif ifeq ($(BR2_PRIMARY_SITE_ONLY),) DOWNLOAD_URIS += \ - -u $($(PKG)_SITE_METHOD)+$(dir $(call qstrip,$(1))) + -u $($(PKG)_SITE_METHOD)+$(patsubst %/,%,$(dir $(call qstrip,$(1)))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ From 9fec3eb9131dba46cbf8474a7def05a076990079 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Apr 2018 09:34:35 +0200 Subject: [PATCH 0685/2640] postgresql: propagate BR2_USE_MMU dependency to Config.in comment The BR2_PACKAGE_POSTGRESQL option depends on BR2_USE_MMU, so the Config.in comment about the dynamic library dependency should only be displayed if the BR2_USE_MMU requirement is met. Signed-off-by: Thomas Petazzoni --- package/postgresql/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index e9b8f48d4a..9dda54bf9f 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -19,4 +19,5 @@ config BR2_PACKAGE_POSTGRESQL http://www.postgresql.org comment "postgresql needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU depends on BR2_STATIC_LIBS From 88f3cdb8dc0f23cd9bcd656404350d649b01ba6e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 12 Mar 2018 06:12:31 -0400 Subject: [PATCH 0686/2640] python-psycopg2: new package Psycopg is the most popular PostgreSQL database adapter for the Python programming language. Its main features are the complete implementation of the Python DB API 2.0 specification and the thread safety (several threads can share the same connection). It was designed for heavily multi-threaded applications that create and destroy lots of cursors and make a large number of concurrent INSERTs or UPDATEs. Signed-off-by: Adam Duskett Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-psycopg2/Config.in | 22 ++++++++++++++++++++ package/python-psycopg2/python-psycopg2.hash | 4 ++++ package/python-psycopg2/python-psycopg2.mk | 20 ++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/python-psycopg2/Config.in create mode 100644 package/python-psycopg2/python-psycopg2.hash create mode 100644 package/python-psycopg2/python-psycopg2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 68374efd01..9d23fa51b8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -53,6 +53,7 @@ F: package/nginx-naxsi/ F: package/policycoreutils/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ +F: package/python-psycopg2/ F: package/python-sqlalchemy/ F: package/restorecond/ F: package/refpolicy/ diff --git a/package/Config.in b/package/Config.in index 82c5c40531..53d7cb2cfa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -859,6 +859,7 @@ menu "External python modules" source "package/python-prompt-toolkit/Config.in" source "package/python-protobuf/Config.in" source "package/python-psutil/Config.in" + source "package/python-psycopg2/Config.in" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" source "package/python-pyasn/Config.in" diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in new file mode 100644 index 0000000000..ec852bb49e --- /dev/null +++ b/package/python-psycopg2/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_PYTHON_PSYCOPG2 + bool "python-psycopg2" + select BR2_PACKAGE_POSTGRESQL + help + Psycopg is the most popular PostgreSQL database adapter for + the Python programming language. Its main features are the + complete implementation of the Python DB API 2.0 specification + and the thread safety (several threads can share the same + connection). It was designed for heavily multi-threaded + applications that create and destroy lots of cursors and make + a large number of concurrent INSERTs or UPDATEs. + + Psycopg 2 is mostly implemented in C as a libpq wrapper, + resulting in being both efficient and secure. It features + client-side and server-side cursors, asynchronous + communication and notifications, COPY support. Many Python + types are supported out-of-the-box and adapted to matching + PostgreSQL data types; adaptation can be extended and + customized thanks to a flexible objects adaptation system. + Psycopg 2 is both Unicode and Python 3 friendly. + + http://initd.org/psycopg/ diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash new file mode 100644 index 0000000000..ea4a07697b --- /dev/null +++ b/package/python-psycopg2/python-psycopg2.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/psycopg2/json, sha256 locally computed +md5 70fc57072e084565a42689d416cf2c5c psycopg2-2.7.4.tar.gz +sha256 8bf51191d60f6987482ef0cfe8511bbf4877a5aa7f313d7b488b53189cf26209 psycopg2-2.7.4.tar.gz +sha256 1752db3c786e12b62ca804178dca033adce8bff4c4b3d98d3449d407fe45210d LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk new file mode 100644 index 0000000000..e9327f4607 --- /dev/null +++ b/package/python-psycopg2/python-psycopg2.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-psycopg2 +# +################################################################################ + +PYTHON_PSYCOPG2_VERSION = 2.7.4 +PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz +PYTHON_PSYCOPG2_SITE = https://pypi.python.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462 +PYTHON_PSYCOPG2_SETUP_TYPE = setuptools +PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ +PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE +PYTHON_PSYCOPG2_DEPENDENCIES = postgresql + +# Force psycopg2 to use the Buildroot provided postgresql version +# instead of the one from the host machine +PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config + +$(eval $(python-package)) From caeef1fc1ba699ac387717a7e9a16190565a3689 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 5 Apr 2018 16:43:54 +0300 Subject: [PATCH 0687/2640] kexec: allow selection on aarch64 kexec works fine on aarch64, so allow selecting it on that architecture. Signed-off-by: Anssi Hannula Signed-off-by: Peter Korsgaard --- package/kexec/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kexec/Config.in b/package/kexec/Config.in index c24dff38ec..c8cdea5663 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_KEXEC bool "kexec" depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ - BR2_powerpc || BR2_sh4 || BR2_sh4a + BR2_powerpc || BR2_sh4 || BR2_sh4a || BR2_aarch64 help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with From e85961f41560a8c5c1043d6cba9430b943184882 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 5 Apr 2018 23:53:32 +0530 Subject: [PATCH 0688/2640] gstreamer1-editing-services: use SPDX short identifier for license Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a126ac471c..9b5a93eb75 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -7,7 +7,7 @@ GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.4 GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services -GSTREAMER1_EDITING_SERVICES_LICENSE = LGPLv2+ +GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ GSTREAMER1_EDITING_SERVICES_LICENSE_FILES = COPYING COPYING.LIB GSTREAMER1_EDITING_SERVICES_INSTALL_STAGING = YES GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \ From 08bbbe73af0d60ffac4f4476d0583764b81fdfac Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 5 Apr 2018 23:43:24 +0530 Subject: [PATCH 0689/2640] docs/manual: use SPDX short identifier for license Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-cargo.txt | 2 +- docs/manual/adding-packages-meson.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index b78163e6a1..b7fc09acfe 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -41,7 +41,7 @@ package. Let's start with an example: 07: FOO_VERSION = 1.0 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz 09: FOO_SITE = http://www.foosoftware.org/download -10: FOO_LICENSE = GPLv3+ +10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: 13: FOO_DEPENDENCIES = host-cargo diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt index f3b4b30e48..f8aa08fa91 100644 --- a/docs/manual/adding-packages-meson.txt +++ b/docs/manual/adding-packages-meson.txt @@ -24,7 +24,7 @@ package. Let's start with an example: 07: FOO_VERSION = 1.0 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz 09: FOO_SITE = http://www.foosoftware.org/download -10: FOO_LICENSE = GPLv3+ +10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: FOO_INSTALL_STAGING = YES 13: From 7d6ed21396ed251aac7be030bae4bddfcb849e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 5 Apr 2018 10:22:48 +0200 Subject: [PATCH 0690/2640] configs/bananapro: bump Linux to version 4.14.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- configs/bananapro_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index 5a71d757e4..c6473be3ae 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.32" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment" From 0dcbe1b7bf85825be6a84f595e2ce190d5c9c427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 5 Apr 2018 10:22:49 +0200 Subject: [PATCH 0691/2640] configs/bananapro: bump U-Boot to version 2018.03 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- configs/bananapro_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index c6473be3ae..b4141e3608 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 01320bb9ff297bac38a4c9bc32ae505ac79d600f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 5 Apr 2018 08:42:15 +0200 Subject: [PATCH 0692/2640] python-webpy: use webpy-0.39 tag No functional change, but upstream has now tagged the release, so use the tag instead of the sha1. https://github.com/webpy/webpy/issues/449 Signed-off-by: Peter Korsgaard --- package/python-webpy/python-webpy.hash | 2 +- package/python-webpy/python-webpy.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index 30a14f4705..70981e0cb4 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 e17ac483846fb15629c76c43cf64c0b65eac3c870dca2251801b459b1e4e12b8 python-webpy-6df75fe581e0e838d28334d5c53f52421560d38b.tar.gz +sha256 f074241a0b839408a0b9840ade1198e16fbd6aa6393a48a0e84f73b545baab9a python-webpy-webpy-0.39.tar.gz sha256 3826fd531a9b904841f5e3560fcda7e93f2ab8d11ef124ec65e10625efa26c34 LICENSE.txt sha256 7347fd17bfd33c4093c31dc77076733e1e0150ce8c13296c56dc042bbecede84 web/wsgiserver/LICENSE.txt diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 1e67cd6fd8..192ba5727f 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,8 +4,7 @@ # ################################################################################ -# corresponds to 0.39 -PYTHON_WEBPY_VERSION = 6df75fe581e0e838d28334d5c53f52421560d38b +PYTHON_WEBPY_VERSION = webpy-0.39 PYTHON_WEBPY_SITE = $(call github,webpy,webpy,$(PYTHON_WEBPY_VERSION)) PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License From 7e4d2194952c46667cbd40aad01d9667c2c7a3d4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 22:42:45 +0200 Subject: [PATCH 0693/2640] keepalived: bump to 1.4.2 We can drop 0001-Fix-build-with-Linux-kernel-headers-v4.15.patch as it has been merged upstream, as of commit https://github.com/acassen/keepalived/commit/a5457d3a1f579fef5825ffe841f1613b0014ff19. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...uild-with-Linux-kernel-headers-v4.15.patch | 59 ------------------- package/keepalived/keepalived.hash | 2 +- package/keepalived/keepalived.mk | 2 +- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch diff --git a/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch b/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch deleted file mode 100644 index b5f21cb40a..0000000000 --- a/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 15f93dd90484532e25c8f3e43fb34a361a79d7f2 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 9 Feb 2018 11:55:19 +0200 -Subject: [PATCH] Fix build with Linux kernel headers v4.15 - -Linux kernel version 4.15 changed the libc/kernel headers suppression -logic in a way that introduces collisions: - -In file included from ./../include/vrrp_ipaddress.h:32:0, - from ./../include/vrrp_arp.h:31, - from vrrp.c:29: -/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP' - IPPROTO_IP = 0, /* Dummy protocol for TCP */ - ^ -/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here - IPPROTO_IP = 0, /* Dummy protocol for TCP. */ - ^~~~~~~~~~ - -Include the libc netinet/in.h header first to suppress the kernel -header. - -In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo -definition. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/acassen/keepalived/pull/777 - - keepalived/include/vrrp_arp.h | 1 + - keepalived/vrrp/vrrp.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h -index 77a26c450b12..a103ab075c1d 100644 ---- a/keepalived/include/vrrp_arp.h -+++ b/keepalived/include/vrrp_arp.h -@@ -24,6 +24,7 @@ - #define _VRRP_ARP_H - - /* system includes */ -+#include - #include - #include - -diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c -index 3d2bfe41ab4f..435a4b54b2a9 100644 ---- a/keepalived/vrrp/vrrp.c -+++ b/keepalived/vrrp/vrrp.c -@@ -26,6 +26,7 @@ - #include "config.h" - - /* local include */ -+#define _GNU_SOURCE - #include "vrrp_arp.h" - #include "vrrp_ndisc.h" - #include "vrrp_scheduler.h" --- -2.15.1 - diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 4590c33ef9..ed7d2fb0a0 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 220407517ccad822d1ffa80f7bc37582abaf97da6f7bda2326fa6904b1855bd0 keepalived-1.4.1.tar.gz +sha256 4e2d7cc01a6ee29a3955f5c622d47704ba7d9dd758189f15e9def016a2d1faa3 keepalived-1.4.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 6d3d8e7cc6..0fa1b79e3a 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 1.4.1 +KEEPALIVED_VERSION = 1.4.2 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt KEEPALIVED_LICENSE = GPL-2.0+ From e509e04dedd02f672fc17662a27f80dddb58dbd9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 22:42:46 +0200 Subject: [PATCH 0694/2640] keepalived: add patch to disable PIE PIE breaks the build on m68k and Microblaze, so let's add a patch that disables using PIE by default in keepalived. Obviously, when we start seriously testing the BR2_RELRO_FULL option, we will realize that it is broken on some architectures, and will probably disable it on m68k and Microblaze. Fixes: http://autobuild.buildroot.net/results/a536f5947b3b70fdaecad1af5542572c504ad046/ http://autobuild.buildroot.net/results/0ffbf1e8d181c9463847a5b2be6f9baa18face24/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../0001-configure.ac-do-not-force-PIE.patch | 38 +++++++++++++++++++ package/keepalived/keepalived.mk | 2 + 2 files changed, 40 insertions(+) create mode 100644 package/keepalived/0001-configure.ac-do-not-force-PIE.patch diff --git a/package/keepalived/0001-configure.ac-do-not-force-PIE.patch b/package/keepalived/0001-configure.ac-do-not-force-PIE.patch new file mode 100644 index 0000000000..b51a4e334b --- /dev/null +++ b/package/keepalived/0001-configure.ac-do-not-force-PIE.patch @@ -0,0 +1,38 @@ +From 4da31a615412e15f7658d21770708e8084be149c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 4 Apr 2018 22:29:45 +0200 +Subject: [PATCH] configure.ac: do not force PIE + +PIE is not necessarily supported on all architectures, so leave it up +to the user to pass the appropriate CFLAGS/LDFLAGS if he wants to use +PIE. + +This fixes the build on the m68k and Microblaze architecture: + + http://autobuild.buildroot.net/results/a536f5947b3b70fdaecad1af5542572c504ad046/ + http://autobuild.buildroot.net/results/0ffbf1e8d181c9463847a5b2be6f9baa18face24/ + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/acassen/keepalived/pull/830 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c344f07e..06545c91 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -233,8 +233,8 @@ AC_SUBST(ARFLAGS) + # AC_PROG_LIBTOOL + + KA_CPPFLAGS="$kernelinc" +-KA_CFLAGS="-Wall -Wunused -Wstrict-prototypes -Wextra -g -O2 -fPIE -D_GNU_SOURCE" +-KA_LDFLAGS="-pie" ++KA_CFLAGS="-Wall -Wunused -Wstrict-prototypes -Wextra -g -O2 -D_GNU_SOURCE" ++KA_LDFLAGS="" + KA_LIBS= + NEED_LIBDL=No + #KA_LIBTOOLFLAGS = +-- +2.14.3 + diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 0fa1b79e3a..e8a280a19c 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -9,6 +9,8 @@ KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING +# 0001-configure.ac-do-not-force-PIE.patch +KEEPALIVED_AUTORECONF = YES KEEPALIVED_CONF_OPTS += --disable-dbus ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy) From c261f44b953535c0eb0cbd907f0b079205e81d88 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 6 Apr 2018 13:20:03 +0300 Subject: [PATCH 0695/2640] python-yieldfrom: fix wrong package name in license Fix the _LICENSE and _LICENSE_FILES variables, that were mistakenly created with PYTHON_JSONMODELS instead of PYTHON_YIELDFROM Signed-off-by: Asaf Kahlon Signed-off-by: Peter Korsgaard --- package/python-yieldfrom/python-yieldfrom.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk index 2e775b3133..cb4a05d83a 100644 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ b/package/python-yieldfrom/python-yieldfrom.mk @@ -8,8 +8,8 @@ PYTHON_YIELDFROM_VERSION = 1.0.3 PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz PYTHON_YIELDFROM_SITE = https://pypi.python.org/packages/de/2d/05524f368e691846824d962b64f983e3fde9b8c10839e7efbc1b51d42de3 PYTHON_YIELDFROM_SETUP_TYPE = setuptools -PYTHON_JSONMODELS_LICENSE = MIT -PYTHON_JSONMODELS_LICENSE_FILES = LICENSE +PYTHON_YIELDFROM_LICENSE = MIT +PYTHON_YIELDFROM_LICENSE_FILES = LICENSE $(eval $(python-package)) $(eval $(host-python-package)) From 585c5dc35a0354452b7836c5449fa43715a5d0cc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 4 Apr 2018 18:22:39 +0200 Subject: [PATCH 0696/2640] core/download fix local backend Since c8ef0c03b0b (download: put most of the infra in dl-wrapper), the backend for local files is now named after the scheme, which is 'file' for a local file. >From the same commit on, the directory part and the basename are now passed separately, to let the backend reconstruct the full path when it needs to do so, which is the case for the 'file' backend too. Finaly, ff559846fdc1 (support/download: Add support to pass options directly to downloaders) introduced a nasty error, as it made use of "${@}" when calling its internal function. Revert that mess now... Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- support/download/{cp => file} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename support/download/{cp => file} (83%) diff --git a/support/download/cp b/support/download/file similarity index 83% rename from support/download/cp rename to support/download/file index 52fe2de83d..fefd6d271c 100755 --- a/support/download/cp +++ b/support/download/file @@ -2,13 +2,15 @@ # We want to catch any unexpected failure, and exit immediately set -e +set -x # Download helper for cp, to be called from the download wrapper script # # Options: # -q Be quiet. # -o FILE Copy to file FILE. -# -u FILE Copy from file FILE. +# -f FILE Copy from basename file FILE. +# -u DIR Copy from FILE in DIR. # # Environment: # LOCALFILES: the cp command to call @@ -23,7 +25,8 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) verbose=;; o) output="${OPTARG}";; - u) source="${OPTARG}";; + f) file="${OPTARG}";; + u) dir="${OPTARG}";; :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; esac @@ -37,4 +40,4 @@ _localfiles() { eval ${LOCALFILES} "${@}" } -_localfiles ${verbose} "${@}""'${source}'" "'${output}'" +_localfiles ${verbose} "'${dir}${file}'" "'${output}'" From 93dcfc0df795c4a9ca0d2a735c3e6632e75d2b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Wed, 4 Apr 2018 18:43:58 +0200 Subject: [PATCH 0697/2640] azure-iot-sdk-c: Bump to version 2018-03-16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 18c3e2498a..504929aee6 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = 2017-06-30 +AZURE_IOT_SDK_C_VERSION = 2018-03-16 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From 9850612ea5e9fc9c377d11ec9c2930bfd812754a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 6 Apr 2018 10:54:03 +0200 Subject: [PATCH 0698/2640] php: fix how PCRE JIT is disabled When the internal PCRE library of PHP is used, it tries to use a JIT engine, which is only available on some architectures. However, the mechanism used to disable JIT has changed in recent PHP versions, and it now has a proper --without-pcre-jit option. Switch over to that to properly disable JIT on unsupported platforms. It has been tested to fix the build of PHP on ARC and Microblaze. Fixes: http://autobuild.buildroot.net/results/e1359fcad7bc57e3c5a7ecc37abaa2cf6a6a9ffa/ Signed-off-by: Thomas Petazzoni --- package/php/php.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/php/php.mk b/package/php/php.mk index bfd25de875..91756794ee 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -228,10 +228,6 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),) PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET) endif -define PHP_DISABLE_PCRE_JIT - $(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h -endef - define PHP_DISABLE_VALGRIND $(SED) '/^#define HAVE_VALGRIND/d' $(@D)/main/php_config.h endef @@ -249,8 +245,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1 endif # check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),) -PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_PCRE_JIT +ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y) +PHP_CONF_OPTS += --with-pcre-jit +else +PHP_CONF_OPTS += --without-pcre-jit endif endif From 8f921700b7b16393ae8d6d15990974c26a168c37 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 6 Apr 2018 11:00:12 +0200 Subject: [PATCH 0699/2640] llvm: add dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 LLVM uses std::shared_future, which until gcc 7.x isn't available on architectures that don't provide lock-free atomics, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735. Buildroot already has a BR2_TOOLCHAIN_HAS_GCC_BUG_64735 option to handle such a case, so simply add this new dependency to LLVM. It will make sure LLVM doesn't get built on ARMv5 platforms using a gcc older than 7.x. Fixes: http://autobuild.buildroot.net/results/ada497f6a8d20fa1a9adb2b17a138d7b726a6cdc/ Signed-off-by: Thomas Petazzoni Acked-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/llvm/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 70f73f4858..15f2507ef2 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -38,3 +39,7 @@ comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "llvm needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From e841af11085a55b4785b2b67e8509f5fa0987e1b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 6 Apr 2018 11:00:13 +0200 Subject: [PATCH 0700/2640] mesa3d: properly propagate the dependencies of BR2_PACKAGE_LLVM We cannot simply select BR2_PACKAGE_LLVM, we need to take into account all its dependencies. BR2_PACKAGE_LLVM_ARCH_SUPPORTS was already taken into account, but not the other dependencies. Signed-off-by: Thomas Petazzoni Acked-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index ffe0287ac5..8f347ffe0c 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -28,8 +28,22 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LLVM +comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "llvm support needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + # inform the .mk file of gallium, dri or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool From 597136c2be37874de9c670d9ce7a439d6196d323 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 5 Apr 2018 14:19:28 -0700 Subject: [PATCH 0701/2640] configs/atmel_sama5d3xek: bump to linux4sam_5.8 Bump sama5d3xek to linux4sam_5.8. The 3 foundation components have their tags changed (AT91Bootstrap, U-Boot, Linux kernel). This requires bumping the kernel header version and u-boot dtc as well. at91bootstrap 3.8.10 is required to support gcc7. Signed-off-by: Joshua Henderson Cc: Nicolas Ferre Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d3xek_defconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index 4fa4d79282..95deb6f232 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -5,12 +5,12 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.5)/linux-linux4sam_5.5.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d33ek sama5d34ek sama5d35ek sama5d36ek" @@ -25,14 +25,15 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3xek_nandflash" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y # Host packages From 9f1f27827f5569500c6d79f2d1e9417c9db23d33 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 5 Apr 2018 14:20:15 -0700 Subject: [PATCH 0702/2640] configs/atmel: bump at91 defconfigs to at91bootstrap 3.8.10 Bump at91sam9260ek, at91sam9g20, at91sam9g45m10ek, and at91sam9rlek to at91bootstrap 3.8.10. at91bootstrap 3.8.10 is required to support gcc7. Signed-off-by: Joshua Henderson Cc: Nicolas Ferre Signed-off-by: Thomas Petazzoni --- configs/at91sam9260eknf_defconfig | 2 +- configs/at91sam9g20dfc_defconfig | 2 +- configs/at91sam9g45m10ek_defconfig | 2 +- configs/at91sam9rlek_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig index d91fcb0549..807d0294e8 100644 --- a/configs/at91sam9260eknf_defconfig +++ b/configs/at91sam9260eknf_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9260eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 15a8d879b7..0824868f1c 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_TAR=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9g20eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig index 2bf7179980..c598527f96 100644 --- a/configs/at91sam9g45m10ek_defconfig +++ b/configs/at91sam9g45m10ek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9m10g45eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9rlek_defconfig b/configs/at91sam9rlek_defconfig index bc1be16421..ba3a94c08c 100644 --- a/configs/at91sam9rlek_defconfig +++ b/configs/at91sam9rlek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9rleknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From e1452fe8434c4613d1727034db525c0a9bbc6dfd Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 5 Apr 2018 14:34:41 -0700 Subject: [PATCH 0703/2640] board/atmel: use correct sam-ba binary in flasher.sh script Instead of using the install of sam-ba under host/opt directly, use the symlink created in host/bin. The side effect of doing this instead allows the correct sam-ba binary to be used based on the host arch being 32 bit or 64 bit. Signed-off-by: Joshua Henderson Signed-off-by: Thomas Petazzoni --- board/atmel/flasher.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board/atmel/flasher.sh b/board/atmel/flasher.sh index bbdb199b97..c122760952 100755 --- a/board/atmel/flasher.sh +++ b/board/atmel/flasher.sh @@ -130,7 +130,6 @@ if [[ $BOARD == "*pda4" ]]; then video_mode="video=LVDS-1:480x272-16" fi -echo "Executing: ${!F} O=$1/images $1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode" +echo "Executing: ${!F} O=$1/images $1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode" export O=$1/images -$1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode - +$1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode From 46444ba0292f0519395f74ad8cb8bff1f3b57980 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 18:00:09 +0200 Subject: [PATCH 0704/2640] iqvlinux: remove package This package contains a kernel module from Intel, which could only be used together with Intel userspace tools provided under NDA, which also come with the same kernel module. The copy of the kernel module available on SourceForge is only provided to comply with the GPLv2 requirement. Intel engineers were even surprised it even built and were not willing to make any effort to fix their tarball naming to contain a version number. Therefore, it does not make sense for Buildroot to provide such a package. See https://sourceforge.net/p/e1000/bugs/589/ for the discussion. Signed-off-by: Thomas Petazzoni Acked-by: Carlos Santos Acked-by: Romain Naour [Thomas: - remove double "only" noticed by Carlos - fix typo packaged -> package noticed by Romain - fix check-package warning noticed by Ricardo] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 17 +++++ DEVELOPERS | 1 - package/Config.in | 1 - ...-Support-Linux-kernel-4.12-and-later.patch | 66 ------------------- package/iqvlinux/Config.in | 21 ------ package/iqvlinux/iqvlinux.hash | 6 -- package/iqvlinux/iqvlinux.mk | 25 ------- 7 files changed, 17 insertions(+), 120 deletions(-) delete mode 100644 package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch delete mode 100644 package/iqvlinux/Config.in delete mode 100644 package/iqvlinux/iqvlinux.hash delete mode 100644 package/iqvlinux/iqvlinux.mk diff --git a/Config.in.legacy b/Config.in.legacy index 2e3b1b6001..22e23433ea 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,23 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_IQVLINUX + bool "iqvlinux package removed" + select BR2_LEGACY + help + This package contained a kernel module from Intel, which + could only be used together with Intel userspace tools + provided under NDA, which also come with the same kernel + module. The copy of the kernel module available on + SourceForge is provided only to comply with the GPLv2 + requirement. Intel engineers were even surprised it even + built and were not willing to make any effort to fix their + tarball naming to contain a version number. Therefore, it + does not make sense for Buildroot to provide such a package. + + See https://sourceforge.net/p/e1000/bugs/589/ for the + discussion. + config BR2_PACKAGE_KODI_ADSP_BASIC bool "kodi-adsp-basic package removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9d23fa51b8..53abcf82d6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1583,7 +1583,6 @@ F: package/bullet/ F: package/efl/ F: package/enlightenment/ F: package/expedite/ -F: package/iqvlinux/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ diff --git a/package/Config.in b/package/Config.in index 53d7cb2cfa..5e798a4f14 100644 --- a/package/Config.in +++ b/package/Config.in @@ -437,7 +437,6 @@ endmenu source "package/iostat/Config.in" source "package/ipmitool/Config.in" source "package/ipmiutil/Config.in" - source "package/iqvlinux/Config.in" source "package/irda-utils/Config.in" source "package/iucode-tool/Config.in" source "package/kbd/Config.in" diff --git a/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch b/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch deleted file mode 100644 index 22ee03cdc9..0000000000 --- a/package/iqvlinux/0001-Support-Linux-kernel-4.12-and-later.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 517d70780b903caa41ee93adbbb9bb985da23a29 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Tue, 12 Dec 2017 13:40:44 -0200 -Subject: [PATCH] Support Linux kernel 4.12 and later - -Signed-off-by: Carlos Santos ---- - src/linux/driver/linuxdrivermemory_i.c | 5 +++++ - src/linux/driver/linuxdriveros_i.c | 5 +++++ - src/linux/driver/linuxnaldriver.c | 5 +++++ - 3 files changed, 15 insertions(+) - -diff --git a/src/linux/driver/linuxdrivermemory_i.c b/src/linux/driver/linuxdrivermemory_i.c -index bdf1d42..53366d7 100644 ---- a/src/linux/driver/linuxdrivermemory_i.c -+++ b/src/linux/driver/linuxdrivermemory_i.c -@@ -49,7 +49,12 @@ - #include - #include - #include -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+#include -+#else - #include -+#endif - #include - #include - -diff --git a/src/linux/driver/linuxdriveros_i.c b/src/linux/driver/linuxdriveros_i.c -index 653bec9..43df25e 100644 ---- a/src/linux/driver/linuxdriveros_i.c -+++ b/src/linux/driver/linuxdriveros_i.c -@@ -49,7 +49,12 @@ - #include - #include - #include -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+#include -+#else - #include -+#endif - #include - #include - -diff --git a/src/linux/driver/linuxnaldriver.c b/src/linux/driver/linuxnaldriver.c -index 93c2f80..c1ddbcf 100644 ---- a/src/linux/driver/linuxnaldriver.c -+++ b/src/linux/driver/linuxnaldriver.c -@@ -39,7 +39,12 @@ - #include - #include - #include -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+#include -+#else - #include -+#endif - #include "naltypes.h" - #include "nalioctl.h" - #include "linuxnaldriver.h" --- -2.14.3 - diff --git a/package/iqvlinux/Config.in b/package/iqvlinux/Config.in deleted file mode 100644 index 73804ac02a..0000000000 --- a/package/iqvlinux/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_IQVLINUX - bool "iqvlinux" - depends on BR2_LINUX_KERNEL - help - Intel Ethernet Adapter Debug Driver for Linux (iqvlinux). - - Officially supports kernel versions 2.6.x up through 4.0.x but - the Buildroot package contains a patch to allow it to be built - on newer kernel versions. - - This debug driver supports all Intel's networking Tools based - on the SDK version 2.19.36.0 or higher which support Intel - Ethernet chip including e1000, e1000e, i210... - - Note: This driver requires PCI support to be enabled - (i.e. CONFIG_PCI). - - https://sourceforge.net/projects/e1000/files/iqvlinux/ - -comment "iqvlinux needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/iqvlinux/iqvlinux.hash b/package/iqvlinux/iqvlinux.hash deleted file mode 100644 index 20d612ddc5..0000000000 --- a/package/iqvlinux/iqvlinux.hash +++ /dev/null @@ -1,6 +0,0 @@ -# locally computed -sha256 4020a661940ba6d50f24654b90a41280eb8eccf00061fe6d105c654d3d97d551 iqvlinux-1.2.0.3.tar.gz -sha256 386086e232db4708770f717595d4f83188f776aa6e7313cd12fb039e869f494b COPYING -sha256 beded926a8f18aad5d911daf581759e2b25697588034d2b29033ae1a929506ff src/linux/driver/files.txt -sha256 ecf93b9b739fc82f7b87b34f8c6411dfdd271234af2fe45212293d9df2b654b3 inc/linux/files.txt -sha256 0a309350c1b32be72479e8fe08f7f6bbbad2e8c3d9a1cbcad3d482ea48a236ad inc/files.txt diff --git a/package/iqvlinux/iqvlinux.mk b/package/iqvlinux/iqvlinux.mk deleted file mode 100644 index d6d445e666..0000000000 --- a/package/iqvlinux/iqvlinux.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# iqvlinux -# -################################################################################ - -# The upstream tarball is just named iqvlinux.tar.gz, which we cannot -# use because it doesn't contain a version number. Therefore, the -# download from the upstream site will fail, and fallback to the -# backup mirror, where we have added an iqvlinux-1.2.0.3.tar.gz -# tarball. -IQVLINUX_VERSION = 1.2.0.3 -IQVLINUX_SITE = https://downloads.sourceforge.net/project/e1000/iqvlinux/$(IQVLINUX_VERSION) - -IQVLINUX_LICENSE = GPL-2.0, BSD-3-Clause -IQVLINUX_LICENSE_FILES = \ - COPYING src/linux/driver/files.txt \ - inc/linux/files.txt inc/files.txt - -IQVLINUX_MODULE_MAKE_OPTS = NALDIR=$(@D) KSRC=$(LINUX_DIR) CC=$(TARGET_CC) - -IQVLINUX_MODULE_SUBDIRS = src/linux/driver - -$(eval $(kernel-module)) -$(eval $(generic-package)) From c90e76734a97a6ff31a29e4955c9f668b20c0a1b Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:11 +0000 Subject: [PATCH 0705/2640] package/rpi-firmware: bump version Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 833a7fbe37..4854deae03 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0451e1a843bf02df81126a1625d9a15dfdf19dcb2f9e95b0613a63e59fd31ca8 rpi-firmware-2067241bc7cdf238fdeab7f5a3c22faa57dd5617.tar.gz +sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 22eaaa2886..1f4a168996 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 2067241bc7cdf238fdeab7f5a3c22faa57dd5617 +RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 6a34050201444c68278b356ada730fd04e5c4162 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:12 +0000 Subject: [PATCH 0706/2640] configs/raspberrypi*: bump kernel version Now based on 4.14.29 (from 4.9.79) Signed-off-by: Martin Bark [Thomas: adjusted on top of Yann E. Morin changes to use a tarball instead of a git clone.] Signed-off-by: Thomas Petazzoni --- configs/raspberrypi0_defconfig | 6 +++--- configs/raspberrypi0w_defconfig | 6 +++--- configs/raspberrypi2_defconfig | 6 +++--- configs/raspberrypi3_64_defconfig | 6 +++--- configs/raspberrypi3_defconfig | 6 +++--- configs/raspberrypi3_qt5we_defconfig | 6 +++--- configs/raspberrypi_defconfig | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 749189b1d5..62c55fee20 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index b014a5674f..95195bd5e8 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 724e0568a1..bbb3900e41 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 9dfa3f35be..df9f89927f 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 01c5198fca..88e78a98b5 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 5ceb53c7a6..bbf5f210d7 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 2be84b07c6..0460117eb8 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,33ee56d5927ceff630fbc87e3f5caa409b6ae114)/linux-33ee56d5927ceff630fbc87e3f5caa409b6ae114.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources From 012c400f9d5eef2fb04dcde931d08852cc19ffdc Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:13 +0000 Subject: [PATCH 0707/2640] board/raspberrypi: add support for rpi3 b+ Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- board/raspberrypi/genimage-raspberrypi3.cfg | 1 + board/raspberrypi/readme.txt | 3 ++- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/board/raspberrypi/genimage-raspberrypi3.cfg b/board/raspberrypi/genimage-raspberrypi3.cfg index 98ff709035..0a547241f4 100644 --- a/board/raspberrypi/genimage-raspberrypi3.cfg +++ b/board/raspberrypi/genimage-raspberrypi3.cfg @@ -2,6 +2,7 @@ image boot.vfat { vfat { files = { "bcm2710-rpi-3-b.dtb", + "bcm2710-rpi-3-b-plus.dtb", "bcm2710-rpi-cm3.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 948269347b..9f91581054 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -30,7 +30,7 @@ For model 2 B: $ make raspberrypi2_defconfig -For model 3 B: +For model 3 B and B+: $ make raspberrypi3_defconfig @@ -56,6 +56,7 @@ After building, you should obtain this tree: +-- bcm2708-rpi-b-plus.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] + +-- bcm2710-rpi-3-b-plus.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 88e78a98b5..45a76beb6a 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -16,7 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" BR2_PACKAGE_RPI_FIRMWARE=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index bbf5f210d7..ee76f2b682 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -17,7 +17,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" # Build Qt5 WebEngine BR2_PACKAGE_LIBERATION=y From 93c1e3168797f81880385a8187ba11a815def156 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:14 +0000 Subject: [PATCH 0708/2640] package/rpi-firmware: improve installation of dtb files Don't list specific dtb files, instead install all dtb files in the same way as dtbo files are currently done. Signed-off-by: Martin Bark [Thomas: use make foreach loop instead of shell for loop.] Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 1f4a168996..eab4c5d307 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -12,10 +12,9 @@ RPI_FIRMWARE_INSTALL_IMAGES = YES ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) define RPI_FIRMWARE_INSTALL_DTB - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2710-rpi-3-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2710-rpi-3-b.dtb + $(foreach dtb,$(wildcard $(@D)/boot/*.dtb), \ + $(INSTALL) -D -m 0644 $(dtb) $(BINARIES_DIR)/rpi-firmware/$(notdir $(dtb)) + ) endef endif From 0f49bd05ea91d89fd511fd8e721743f8319e9e6f Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:15 +0000 Subject: [PATCH 0709/2640] package/rpi-bt-firmware: change to LibreELEC github repo Include BCM4345C0.hcd for the rpi3 b+ Signed-off-by: Martin Bark [Thomas: rebase on master, use make foreach loop instead of shell for loop.] Signed-off-by: Thomas Petazzoni --- package/rpi-bt-firmware/Config.in | 5 +++-- package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 ++- package/rpi-bt-firmware/rpi-bt-firmware.mk | 12 +++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in index dfc1cee06c..45643d6a52 100644 --- a/package/rpi-bt-firmware/Config.in +++ b/package/rpi-bt-firmware/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_RPI_BT_FIRMWARE depends on BR2_arm || BR2_aarch64 help Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module - firmware. + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 + Bluetooth module firmware. - https://aur.archlinux.org/packages/pi-bluetooth + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index f1d06e8ca8..553a7e4298 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5d9c9364277414ffd67b4a266cdf88e92f28eb937e5a413750e87b7a94161bef rpi-bt-firmware-a439f892bf549ddfefa9ba7ad1999cc515f233bf.tar.gz +sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30 rpi-bt-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 644fdc6d5f..bbb40854e8 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,15 +4,17 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = a439f892bf549ddfefa9ba7ad1999cc515f233bf -RPI_BT_FIRMWARE_SITE = https://aur.archlinux.org/pi-bluetooth.git -RPI_BT_FIRMWARE_SITE_METHOD = git +RPI_BT_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907 +RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +RPI_BT_FIRMWARE_FILES = brcm/BCM43430A1.hcd BCM4345C0.hcd + define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/BCM43430A1.hcd \ - $(TARGET_DIR)/lib/firmware/BCM43430A1.hcd + $(foreach file,$(RPI_BT_FIRMWARE_FILES),\ + $(INSTALL) -D -m 0644 $(@D)/firmware/$(file) $(TARGET_DIR)/lib/firmware/$(notdir $(file)) + ) endef $(eval $(generic-package)) From 5a10ffcdcbf208ab09b49c25a77cafc8cece2e3a Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:16 +0000 Subject: [PATCH 0710/2640] package/rpi-wifi-firmware: change to LibreELEC github repo Include brcmfmac43455 firmware for the rpi3 b+ Signed-off-by: Martin Bark Cc: Jens Maus Signed-off-by: Thomas Petazzoni --- package/rpi-wifi-firmware/Config.in | 11 +++++++---- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 3 ++- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 16 +++++----------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in index 2c87c75842..7e81b286c0 100644 --- a/package/rpi-wifi-firmware/Config.in +++ b/package/rpi-wifi-firmware/Config.in @@ -1,10 +1,13 @@ config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware" depends on BR2_arm || BR2_aarch64 - select BR2_PACKAGE_LINUX_FIRMWARE - select BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX # runtime + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX help Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module - NVRAM data. + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 + wifi module NVRAM data. - https://github.com/RPi-Distro/firmware-nonfree/ + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi + +comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index c20506536f..bc0d7c8b02 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 872fde4f9942d9aba805880d6eaddfe050305626fd58ad955bfe77c04f6b75a5 brcmfmac43430-sdio.txt +sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30 rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 83473d5bb9..32dd3e519b 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,20 +4,14 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7 -# brcmfmac43430-sdio.bin comes from linux-firmware -RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt -# git repo contains a lot of unrelated files -RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm +RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907 +RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY - -define RPI_WIFI_FIRMWARE_EXTRACT_CMDS - cp $(RPI_WIFI_FIRMWARE_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ -endef +RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/$(RPI_WIFI_FIRMWARE_SOURCE) \ - $(TARGET_DIR)/lib/firmware/brcm/$(RPI_WIFI_FIRMWARE_SOURCE) + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm endef $(eval $(generic-package)) From ec000dfdd3aeb8a7f6f92bc4d066d92748e8b15e Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 24 Mar 2018 14:10:17 +0000 Subject: [PATCH 0711/2640] DEVELOPERS: add myself for rpi packages Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 53abcf82d6..10b20c259b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1155,9 +1155,14 @@ F: package/harfbuzz/ F: package/libsecret/ N: Martin Bark +F: board/raspberrypi/ +F: configs/raspberrypi3_defconfig F: package/ca-certificates/ F: package/connman/ F: package/nodejs/ +F: package/rpi-bt-firmware/ +F: package/rpi-firmware/ +F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ From f73d2162855877624ef592fe02a42121b1f00b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 6 Apr 2018 22:06:24 +0200 Subject: [PATCH 0712/2640] libupnpp: bump to version 0.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/libupnpp/libupnpp.hash | 4 ++-- package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index fe67987c4e..742a0c7f62 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,5 +1,5 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.0.tar.gz.sha256 -sha256 b34b179e69c46993cf360da9e85db646b03c15ab2927b19eb70e27bf3c359017 libupnpp-0.16.0.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.1.tar.gz.sha256 +sha256 d2ab5a4bb6df035ddddd11542bd4631ab7031354259145f07fbc3c56a8f50fac libupnpp-0.16.1.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 98cb515fe2..b4e9e88fa9 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.16.0 +LIBUPNPP_VERSION = 0.16.1 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING From 0b976343e2f8e47648a09c945c18a626b377a66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 6 Apr 2018 22:07:21 +0200 Subject: [PATCH 0713/2640] upmpdcli: bump to version 1.2.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/upmpdcli/upmpdcli.hash | 4 ++-- package/upmpdcli/upmpdcli.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index e497352682..c59655c9fe 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz.sha256: -sha256 93d2b9cfd6cb8643c5a23d4115b44622d76c71abe15db9bb8d5b4d83f4d9b49c upmpdcli-1.2.15.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.16.tar.gz.sha256: +sha256 b0dfd33cd5c1c2e4f770660c12d7303b6d8b3fdca4f63530c6a235ce279a9d98 upmpdcli-1.2.16.tar.gz # Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index ad41f85c8d..069b143998 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.2.15 +UPMPDCLI_VERSION = 1.2.16 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPL-2.0+ UPMPDCLI_LICENSE_FILES = COPYING From 6637ee635ead33c4672551be843d35464bc9e544 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 07:02:24 -0400 Subject: [PATCH 0714/2640] libglib2: bump to 2.56.0 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index cf1c9557f8..b957bf4b10 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.54/glib-2.54.2.sha256sum -sha256 bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c glib-2.54.2.tar.xz +# https://download.gnome.org/sources/glib/2.56/glib-2.56.0.sha256sum +sha256 ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7 glib-2.56.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 097c980393..41ec7ee377 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.54 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_VERSION_MAJOR = 2.56 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.0+ From 0577bcb06fc9fdc9e72e7300ee57ad4669ab4ce6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 25 Feb 2018 19:34:14 +0100 Subject: [PATCH 0715/2640] package/strace: add missing libunwind optional dependency This improve the reproducible build. Signed-off-by: Romain Naour [Thomas: mention the libunwind dependency as being needed for 'strace -k' in the Config.in help text, as suggested by Thomas De Schampheleire.] Signed-off-by: Thomas Petazzoni --- package/strace/Config.in | 3 +++ package/strace/strace.mk | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/package/strace/Config.in b/package/strace/Config.in index b84b3fd179..c7649e5789 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -7,6 +7,9 @@ config BR2_PACKAGE_STRACE Allows you to track what system calls a program makes while it is running. + If you want 'strace -k' to work, make sure to enable the + 'libunwind' package. + https://strace.io comment "strace needs a toolchain w/ headers >= 4.0 on nios2" diff --git a/package/strace/strace.mk b/package/strace/strace.mk index f27dc4155b..0529d79af6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -11,6 +11,13 @@ STRACE_LICENSE = BSD-3-Clause STRACE_LICENSE_FILES = COPYING STRACE_CONF_OPTS = --enable-mpers=check +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +STRACE_DEPENDENCIES += libunwind +STRACE_CONF_OPTS += --with-libunwind +else +STRACE_CONF_OPTS += --without-libunwind +endif + define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph endef From 3f76d07548f707cbaa2231007f7b77d52a2f998d Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Fri, 6 Apr 2018 13:55:04 -0700 Subject: [PATCH 0716/2640] board/atmel: add flasher.sh support for at91sam9260ek Add support to the flasher.sh script for the at91sam9260-ek board which complements the existing at91sam9260eknf_defconfig. Signed-off-by: Joshua Henderson Signed-off-by: Thomas Petazzoni --- board/atmel/flasher.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/atmel/flasher.sh b/board/atmel/flasher.sh index c122760952..8cae6af906 100755 --- a/board/atmel/flasher.sh +++ b/board/atmel/flasher.sh @@ -4,6 +4,10 @@ BUILDIR=$1 TTY=$2 BOARD=$3 +family_at91sam9260ek="at91sam9260ek" +mach_at91sam9260ek="at91sam9260-ek" +dtb_at91sam9260ek="at91sam9260ek.dtb" + family_at91sam9g45m10ek="at91sam9m10g45ek" mach_at91sam9g45m10ek="at91sam9m10-g45-ek" dtb_at91sam9g45m10ek="at91sam9m10g45ek.dtb" @@ -90,6 +94,7 @@ Usage: $0 Available boards: + at91sam9260ek at91sam9g45m10ek at91sam9rlek at91sam9g15ek From c15873e020dd48ea71f55ac36a0e6639add223b5 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Fri, 6 Apr 2018 13:57:45 -0700 Subject: [PATCH 0717/2640] configs/at91sam9g20dfc: add ubifs target filesystem This is a required component to complete the configuration. It also makes sense to add ubifs so that this board can be flashed with the board/atmel/flasher.sh script. Signed-off-by: Joshua Henderson Signed-off-by: Thomas Petazzoni --- configs/at91sam9g20dfc_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 0824868f1c..7511c96fe9 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -15,6 +15,13 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g20ek" # Filesystem BR2_TARGET_ROOTFS_TAR=y +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000 +BR2_TARGET_ROOTFS_UBI_SUBSIZE=512 +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y From b7c885ea3ff4883a7e33d4604b2d057814d0ca32 Mon Sep 17 00:00:00 2001 From: Prasanthi Chellakumar Date: Fri, 6 Apr 2018 13:57:46 -0700 Subject: [PATCH 0718/2640] atmel: add support for at91sam9g20ek to flasher.sh Adds support for the at91sam9g20-ek board to the flasher.sh script. Signed-off-by: Prasanthi Chellakumar Signed-off-by: Joshua Henderson Signed-off-by: Thomas Petazzoni --- board/atmel/flasher.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/atmel/flasher.sh b/board/atmel/flasher.sh index 8cae6af906..a7409ce880 100755 --- a/board/atmel/flasher.sh +++ b/board/atmel/flasher.sh @@ -20,6 +20,10 @@ family_at91sam9g15ek="at91sam9x5ek" mach_at91sam9g15ek="at91sam9g15-ek" dtb_at91sam9g15ek="at91sam9g15ek.dtb" +family_at91sam9g20ek="at91sam9g20ek" +mach_at91sam9g20ek="at91sam9g20-ek" +dtb_at91sam9g20ek="at91sam9g20ek.dtb" + family_at91sam9g25ek="at91sam9x5ek" mach_at91sam9g25ek="at91sam9g25-ek" dtb_at91sam9g25ek="at91sam9g25ek.dtb" @@ -98,6 +102,7 @@ Available boards: at91sam9g45m10ek at91sam9rlek at91sam9g15ek + at91sam9g20ek at91sam9g25ek at91sam9x25ek at91sam9g35ek From bd90def0ded4b71dbc40b78b8b4dacba32687885 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 7 Apr 2018 13:30:40 +0200 Subject: [PATCH 0719/2640] libglib2: add upstream patch to fix build issue Since the bump of libglib2 to 2.56.0, it fails to build on uClibc with: gthreadedresolver.c: In function 'do_lookup_records': gthreadedresolver.c:875:16: error: 'res' undeclared (first use in this function); did you mean '_res'? res_nclose (&res); ^~~ _res This commit adds an upstream patch that fixes this problem. Fixes: http://autobuild.buildroot.net/results/990e19e3500986263f99354215e33214a2e89116/ Signed-off-by: Thomas Petazzoni --- ...r-Fix-compilation-with-res_nclose-bu.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch diff --git a/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch b/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch new file mode 100644 index 0000000000..a195b8fda1 --- /dev/null +++ b/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch @@ -0,0 +1,42 @@ +From fe939d2b704c0b7ea3f0c429528d29441f780fb8 Mon Sep 17 00:00:00 2001 +From: Sebastian +Date: Thu, 22 Mar 2018 19:41:00 +0000 +Subject: [PATCH] gthreadedresolver: Fix compilation with res_nclose() but no + res_nquery() + +Some very odd systems have the functions to initialise and destroy a +struct __res_state, but apparently not to do a DNS query using it. Fix +the compilation on those systems. + +https://bugzilla.gnome.org/show_bug.cgi?id=794606 + +Signed-off-by: Thomas Petazzoni +--- + gio/gthreadedresolver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c +index fc5c1bb77..e89dc156c 100644 +--- a/gio/gthreadedresolver.c ++++ b/gio/gthreadedresolver.c +@@ -869,6 +869,8 @@ do_lookup_records (GTask *task, + records = g_resolver_records_from_res_query (lrd->rrname, rrtype, answer->data, len, herr, &error); + g_byte_array_free (answer, TRUE); + ++#ifdef HAVE_RES_NQUERY ++ + #if defined(HAVE_RES_NDESTROY) + res_ndestroy (&res); + #elif defined(HAVE_RES_NCLOSE) +@@ -877,6 +879,8 @@ do_lookup_records (GTask *task, + #error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://bugzilla.gnome.org/enter_bug.cgi?product=glib" + #endif + ++#endif /* HAVE_RES_NQUERY */ ++ + #else + + DNS_STATUS status; +-- +2.14.3 + From d3a8177e175e035ca3b19dca7868859f7cb238a1 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 7 Apr 2018 10:29:09 +0300 Subject: [PATCH 0720/2640] zeromq: bump to version 4.2.5 Update the ZEROMQ_SITE with the active repository. Remove the two patches because they were both applied on zeromq. As a result, the ZEROMQ_AUTORECONF was removed. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- ...make-kernel-specific-flags-cacheable.patch | 199 ------------------ ...-pkg-config-files-for-static-linking.patch | 29 --- package/zeromq/zeromq.hash | 9 +- package/zeromq/zeromq.mk | 6 +- 4 files changed, 7 insertions(+), 236 deletions(-) delete mode 100644 package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch delete mode 100644 package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch diff --git a/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch b/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch deleted file mode 100644 index ff225d3592..0000000000 --- a/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch +++ /dev/null @@ -1,199 +0,0 @@ -commit 9daf6dd7c4947ce74ca729de5c3cfe8cbc304702 -Author: Lionel Orry -Date: Fri Feb 6 15:11:07 2015 +0100 - - acinclude.m4: make kernel-specific flags cacheable - - Specifically when cross-compiling, one can be willing to force these - variable values using the environment of a config.cache file. This - commit makes this possible. - - The affected variables are: - - * libzmq_cv_sock_cloexec - * libzmq_cv_so_keepalive - * libzmq_cv_tcp_keepcnt - * libzmq_cv_tcp_keepidle - * libzmq_cv_tcp_keepintvl - * libzmq_cv_tcp_keepalive - - Signed-off-by: Lionel Orry - -diff --git a/acinclude.m4 b/acinclude.m4 -index 4bbd19e..456740d 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) - dnl # Check if SOCK_CLOEXEC is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{ -- AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) -- AC_TRY_RUN([/* SOCK_CLOEXEC test */ -+ AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec], -+ [AC_TRY_RUN([/* SOCK_CLOEXEC test */ - #include - #include - -@@ -596,11 +596,13 @@ int main (int argc, char *argv []) - int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); - return (s == -1); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"] -+ ], -+ [libzmq_cv_sock_cloexec="yes"], -+ [libzmq_cv_sock_cloexec="no"], -+ [libzmq_cv_sock_cloexec="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if SO_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether SO_KEEPALIVE is supported) -- AC_TRY_RUN([/* SO_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive], -+ [AC_TRY_RUN([/* SO_KEEPALIVE test */ - #include - #include - -@@ -641,11 +643,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_so_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_so_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_so_keepalive="no"] -+ ], -+ [libzmq_cv_so_keepalive="yes"], -+ [libzmq_cv_so_keepalive="no"], -+ [libzmq_cv_so_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPCNT is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{ -- AC_MSG_CHECKING(whether TCP_KEEPCNT is supported) -- AC_TRY_RUN([/* TCP_KEEPCNT test */ -+ AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt], -+ [AC_TRY_RUN([/* TCP_KEEPCNT test */ - #include - #include - #include -@@ -669,11 +673,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepcnt="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepcnt="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepcnt="no"] -+ ], -+ [libzmq_cv_tcp_keepcnt="yes"], -+ [libzmq_cv_tcp_keepcnt="no"], -+ [libzmq_cv_tcp_keepcnt="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPIDLE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPIDLE is supported) -- AC_TRY_RUN([/* TCP_KEEPIDLE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle], -+ [AC_TRY_RUN([/* TCP_KEEPIDLE test */ - #include - #include - #include -@@ -697,11 +703,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepidle="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepidle="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepidle="no"] -+ ], -+ [libzmq_cv_tcp_keepidle="yes"], -+ [libzmq_cv_tcp_keepidle="no"], -+ [libzmq_cv_tcp_keepidle="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPINTVL is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{ -- AC_MSG_CHECKING(whether TCP_KEEPINTVL is supported) -- AC_TRY_RUN([/* TCP_KEEPINTVL test */ -+ AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl], -+ [AC_TRY_RUN([/* TCP_KEEPINTVL test */ - #include - #include - #include -@@ -725,11 +733,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepintvl="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepintvl="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepintvl="no"] -+ ], -+ [libzmq_cv_tcp_keepintvl="yes"], -+ [libzmq_cv_tcp_keepintvl="no"], -+ [libzmq_cv_tcp_keepintvl="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPALIVE is supported) -- AC_TRY_RUN([/* TCP_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive], -+ [AC_TRY_RUN([/* TCP_KEEPALIVE test */ - #include - #include - #include -@@ -753,11 +763,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepalive="no"] -+ ], -+ [libzmq_cv_tcp_keepalive="yes"], -+ [libzmq_cv_tcp_keepalive="no"], -+ [libzmq_cv_tcp_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ diff --git a/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch b/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch deleted file mode 100644 index 11acec26ae..0000000000 --- a/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e89577d30c278fba0f9e40266ceb6fb2821907d5 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 13 May 2015 08:01:34 +0200 -Subject: [PATCH] libzmq: Fix pkg-config files for static linking - -Libzmq uses C++ standard library features, so users of it should link -against that as well when statically linking. - -Add it to Libs.private so users using pkg-config automatically gets the -correct linker flags. - -Signed-off-by: Peter Korsgaard ---- - src/libzmq.pc.in | 1 + - 1 file changed, 1 insertions(+) - -diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in -index ba155a3..52a39f7 100644 ---- a/src/libzmq.pc.in -+++ b/src/libzmq.pc.in -@@ -7,4 +7,5 @@ Name: libzmq - Description: 0MQ c++ library - Version: @VERSION@ - Libs: -L${libdir} -lzmq -+Libs.private: -lstdc++ - Cflags: -I${includedir} --- -2.1.4 - diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash index 486656e429..86380c0295 100644 --- a/package/zeromq/zeromq.hash +++ b/package/zeromq/zeromq.hash @@ -1,4 +1,5 @@ -# From https://github.com/zeromq/zeromq4-1/releases -sha1 b956df8c6f77c174683b51fbee67f99c94945651 zeromq-4.1.6.tar.gz -# Calculated based on the hash above -sha256 02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a zeromq-4.1.6.tar.gz +# From https://github.com/zeromq/libzmq/releases +md5 a1c95b34384257e986842f4d006957b8 zeromq-4.2.5.tar.gz +sha1 1132f839d703486c4ee1cf22f056585dfbb329c2 zeromq-4.2.5.tar.gz +# Locally computed +sha256 cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f zeromq-4.2.5.tar.gz diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index caf5643718..debaf413b4 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -4,15 +4,13 @@ # ################################################################################ -ZEROMQ_VERSION = 4.1.6 -ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VERSION) +ZEROMQ_VERSION = 4.2.5 +ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch -ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27. From 54785851eeb775720aac8a0b6b423fda26ac8f27 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 7 Apr 2018 23:26:14 +0200 Subject: [PATCH 0721/2640] download/git: fix transform-name When a package contains a relative symlink which first component is '..' (thus pointing one directory higher), for example package 'meh' contains this symlink: foo/bar -> ../buz then it would be stored as 'meh-version./buz' because of the transform-name pattern replacement. Fix it to only match the leading './'. Reported-by: Ricardo Martincoski Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Cc: Peter Korsgaard Cc: Maxime Hadjinlian Reviewed-by: Ricardo Martincoski Tested-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- support/download/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index f07195b0d1..787b6bcca0 100755 --- a/support/download/git +++ b/support/download/git @@ -111,7 +111,7 @@ LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" # Create GNU-format tarballs, since that's the format of the tarballs on # sources.buildroot.org and used in the *.hash files -tar cf - --transform="s/^\./${basename}/" \ +tar cf - --transform="s/^\.\//${basename}\//" \ --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ -T "${output}.list.sorted" >"${output}.tar" gzip -6 -n <"${output}.tar" >"${output}" From 2661d47425f866cf56617d2928b6b96566db8de4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Apr 2018 11:00:51 -0300 Subject: [PATCH 0722/2640] linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 2a59e2902a..3bd3e779b0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -242,12 +242,12 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 - default "4.4.126" if BR2_KERNEL_HEADERS_4_4 - default "4.9.92" if BR2_KERNEL_HEADERS_4_9 + default "4.4.127" if BR2_KERNEL_HEADERS_4_4 + default "4.9.93" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.32" if BR2_KERNEL_HEADERS_4_14 - default "4.15.15" if BR2_KERNEL_HEADERS_4_15 + default "4.14.33" if BR2_KERNEL_HEADERS_4_14 + default "4.15.16" if BR2_KERNEL_HEADERS_4_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From bbbcfa57f80d239f94669586cadad4e14f073a5f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Apr 2018 11:04:04 -0300 Subject: [PATCH 0723/2640] linux: bump default to version 4.15.16 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index d9c5b62863..43bff6fa09 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.15.16" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From e17719264b5df0400442f02366cc16201ab3a25c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Apr 2018 17:48:11 +0200 Subject: [PATCH 0724/2640] download/git: don't require too-recent git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git has supported -C only since 1.8.5, and some distros have not yet caught up after more than 4 years... Fall back to entering the directory. Fixes: http://autobuild.buildroot.net/results/35f9f7a4adc6c2cad741079e4afdf1408c94703b Reported-by: André Hentschel Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: André Hentschel Signed-off-by: Peter Korsgaard --- support/download/git | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index 787b6bcca0..868dfad0dd 100755 --- a/support/download/git +++ b/support/download/git @@ -47,7 +47,9 @@ git_cache="${dl_dir}/git" # fetch'ed later. if [ ! -d "${git_cache}" ]; then _git init "'${git_cache}'" - _git -C "'${git_cache}'" remote add origin "'${uri}'" + pushd "${git_cache}" >/dev/null + _git remote add origin "'${uri}'" + popd >/dev/null fi pushd "${git_cache}" >/dev/null From c5c87c2bb61efb31421b345bdbf6931b882ff6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sat, 7 Apr 2018 14:59:03 +0200 Subject: [PATCH 0725/2640] wireshark: bump version to 2.2.14 (security) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes since 2.2.12: - wnpa-sec-2018-15 The MP4 dissector could crash. (Bug 13777) - wnpa-sec-2018-16 The ADB dissector could crash. (Bug 14460) - wnpa-sec-2018-17 The IEEE 802.15.4 dissector could crash. (Bug 14468) - wnpa-sec-2018-18 The NBAP dissector could crash. (Bug 14471) - wnpa-sec-2018-19 The VLAN dissector could crash. (Bug 14469) - wnpa-sec-2018-20 The LWAPP dissector could crash. (Bug 14467) - wnpa-sec-2018-23 The Kerberos dissector could crash. (Bug 14576) - wnpa-sec-2018-05 The IEEE 802.11 dissector could crash. Bug 14442, CVE-2018-7335 - wnpa-sec-2018-06 Multiple dissectors could go into large infinite loops. All ASN.1 BER dissectors (Bug 14444), along with the DICOM (Bug 14411), DMP (Bug 14408), LLTD (Bug 14419), OpenFlow (Bug 14420), RELOAD (Bug 14445), RPCoRDMA (Bug 14449), RPKI-Router (Bug 14414), S7COMM (Bug 14423), SCCP (Bug 14413), Thread (Bug 14428), Thrift (Bug 14379), USB (Bug 14421), and WCCP (Bug 14412) dissectors were susceptible. - wnpa-sec-2018-07 The UMTS MAC dissector could crash. Bug 14339, CVE-2018-7334 - wnpa-sec-2018-09 The FCP dissector could crash. Bug 14374, CVE-2018-7336 - wnpa-sec-2018-10 The SIGCOMP dissector could crash. Bug 14398, CVE-2018-7320 - wnpa-sec-2018-11 The pcapng file parser could crash. Bug 14403, CVE-2018-7420 - wnpa-sec-2018-12 The IPMI dissector could crash. Bug 14409, CVE-2018-7417 - wnpa-sec-2018-13 The SIGCOMP dissector could crash. Bug 14410, CVE-2018-7418 - wnpa-sec-2018-14 The NBAP disssector could crash. Bug 14443, CVE-2018-7419 Full release notes: https://www.wireshark.org/docs/relnotes/wireshark-2.2.14.html Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 93421c6498..2b44cc0757 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.12.txt -sha256 3274458d1bb1658a5001465ecb07c7cbfc709571ef36bd062897570d4bab3ebc wireshark-2.2.12.tar.bz2 +# 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 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 93c6da0398..ad475803b7 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.12 +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 From 8aaf954ab924c3354b8e93478c8cba53a9d9b3d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Apr 2018 13:41:56 +0200 Subject: [PATCH 0726/2640] libmms: bump to version 0.6.4 Add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmms/libmms.hash | 3 ++- package/libmms/libmms.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libmms/libmms.hash b/package/libmms/libmms.hash index 69865f7c3e..f424e3afbb 100644 --- a/package/libmms/libmms.hash +++ b/package/libmms/libmms.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 01931b62172d7d7050fc9ef9b1b64162f3b6e9f6cc4415170192a32a0b7ea432 libmms-0.6.2.tar.gz +sha256 3c05e05aebcbfcc044d9e8c2d4646cd8359be39a3f0ba8ce4e72a9094bee704f libmms-0.6.4.tar.gz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING.LIB diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk index dd0b1df538..236fe1376e 100644 --- a/package/libmms/libmms.mk +++ b/package/libmms/libmms.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMMS_VERSION = 0.6.2 +LIBMMS_VERSION = 0.6.4 LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION) LIBMMS_INSTALL_STAGING = YES LIBMMS_DEPENDENCIES = host-pkgconf libglib2 From 93481c4f287b6578bc2685803937628785dafa9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sat, 7 Apr 2018 13:57:52 +0200 Subject: [PATCH 0727/2640] wine: add optional dependency on libkrb5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wine/wine.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 02c4c0f155..b6b3aae504 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -23,7 +23,6 @@ WINE_CONF_OPTS = \ --without-gphoto \ --without-gsm \ --without-hal \ - --without-krb5 \ --without-opencl \ --without-oss @@ -121,6 +120,13 @@ else WINE_CONF_OPTS += --without-glu endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +WINE_CONF_OPTS += --with-krb5 +WINE_DEPENDENCIES += libkrb5 +else +WINE_CONF_OPTS += --without-krb5 +endif + ifeq ($(BR2_PACKAGE_LIBPCAP),y) WINE_CONF_OPTS += --with-pcap WINE_DEPENDENCIES += libpcap From dee9ff010834555f88d079f188ac102f5b3cef6d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Apr 2018 14:04:21 +0200 Subject: [PATCH 0728/2640] DEVELOPERS: add myself for libglib2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 10b20c259b..b797087191 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -669,6 +669,7 @@ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ F: package/libcdio-paranoia/ +F: package/libglib2/ F: package/libmpdclient/ F: package/libupnp/ F: package/libupnp18/ From 2a05731aa5213879bd0a90ac076521f3cbeb28d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Apr 2018 18:49:37 +0200 Subject: [PATCH 0729/2640] libcap: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index a1dcd62b3c..2d3aee591d 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,2 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc sha256 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 libcap-2.25.tar.xz + +# Hash for license file: +sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License From 9269d9984ad39e1b2e47b506bb70e68abd89ed5a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Apr 2018 19:55:45 +0200 Subject: [PATCH 0730/2640] libcap-ng: bump to version 0.7.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap-ng/libcap-ng.hash | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index b433b75063..8058ed9e97 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f libcap-ng-0.7.8.tar.gz +sha256 4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328 libcap-ng-0.7.9.tar.gz diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 568f167b48..990c675018 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.7.8 +LIBCAP_NG_VERSION = 0.7.9 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB From dac25351e6453b35ded611ff367b95bb4b10a9cf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Apr 2018 10:11:51 +0200 Subject: [PATCH 0731/2640] package/kmod: fix host install The host directory no longer uses /usr. This currently works because we still have the legacy /usr symlink, but for correctness it is better that we just fix it. Signed-off-by: "Yann E. MORIN" Cc: Yegor Yefremov Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/kmod/kmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index bd676108aa..e1149b7b65 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -74,7 +74,7 @@ endif # host. define HOST_KMOD_INSTALL_TOOLS mkdir -p $(HOST_DIR)/sbin/ - ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod + ln -sf ../bin/kmod $(HOST_DIR)/sbin/depmod endef HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS From 5dd1fce283fc6a7284b6dc7637398f23f5c78d51 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Apr 2018 10:40:00 +0200 Subject: [PATCH 0732/2640] package/python-yieldfrom: fix licensing info There is no file containing the license text. The closest we can use is the PKG-INFO file, which contains the license name... Fixes: http://autobuild.buildroot.net/results/dff21d63845d3d6a5f78c1000301cdd2104595f4 http://autobuild.buildroot.net/results/220e82f555ce6c98b89605bab72c7ea3eea61c66 ... Signed-off-by: "Yann E. MORIN" Cc: Asaf Kahlon Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-yieldfrom/python-yieldfrom.hash | 2 +- package/python-yieldfrom/python-yieldfrom.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-yieldfrom/python-yieldfrom.hash b/package/python-yieldfrom/python-yieldfrom.hash index cee4aaf96b..2df8085327 100644 --- a/package/python-yieldfrom/python-yieldfrom.hash +++ b/package/python-yieldfrom/python-yieldfrom.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/yieldfrom/json, sha256 locally computed md5 1a1c6fd152032d49ccd4ac250aad7746 yieldfrom-1.0.3.tar.gz sha256 388004d0ee8854c2ed7a2c87e664aad13acd70c9b33d7f3c441182d37357739b yieldfrom-1.0.3.tar.gz -sha256 99da56b23b254ccd2ec6f2e82aea731a86d29a916002b3b3bcd801453edab74e LICENSE +sha256 3695faeb17a2507f445b7e0a454043671f646591795477ced20e29de2359d666 PKG-INFO diff --git a/package/python-yieldfrom/python-yieldfrom.mk b/package/python-yieldfrom/python-yieldfrom.mk index cb4a05d83a..b1137cdbb4 100644 --- a/package/python-yieldfrom/python-yieldfrom.mk +++ b/package/python-yieldfrom/python-yieldfrom.mk @@ -9,7 +9,7 @@ PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz PYTHON_YIELDFROM_SITE = https://pypi.python.org/packages/de/2d/05524f368e691846824d962b64f983e3fde9b8c10839e7efbc1b51d42de3 PYTHON_YIELDFROM_SETUP_TYPE = setuptools PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = LICENSE +PYTHON_YIELDFROM_LICENSE_FILES = PKG-INFO $(eval $(python-package)) $(eval $(host-python-package)) From 4dcfcd17c09b5684e95943de119b95a34c93ad63 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Apr 2018 14:08:44 +0200 Subject: [PATCH 0733/2640] libglib2: bump to version 2.56.1 Remove patch (applied upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...r-Fix-compilation-with-res_nclose-bu.patch | 42 ------------------- package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch diff --git a/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch b/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch deleted file mode 100644 index a195b8fda1..0000000000 --- a/package/libglib2/0003-gthreadedresolver-Fix-compilation-with-res_nclose-bu.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fe939d2b704c0b7ea3f0c429528d29441f780fb8 Mon Sep 17 00:00:00 2001 -From: Sebastian -Date: Thu, 22 Mar 2018 19:41:00 +0000 -Subject: [PATCH] gthreadedresolver: Fix compilation with res_nclose() but no - res_nquery() - -Some very odd systems have the functions to initialise and destroy a -struct __res_state, but apparently not to do a DNS query using it. Fix -the compilation on those systems. - -https://bugzilla.gnome.org/show_bug.cgi?id=794606 - -Signed-off-by: Thomas Petazzoni ---- - gio/gthreadedresolver.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c -index fc5c1bb77..e89dc156c 100644 ---- a/gio/gthreadedresolver.c -+++ b/gio/gthreadedresolver.c -@@ -869,6 +869,8 @@ do_lookup_records (GTask *task, - records = g_resolver_records_from_res_query (lrd->rrname, rrtype, answer->data, len, herr, &error); - g_byte_array_free (answer, TRUE); - -+#ifdef HAVE_RES_NQUERY -+ - #if defined(HAVE_RES_NDESTROY) - res_ndestroy (&res); - #elif defined(HAVE_RES_NCLOSE) -@@ -877,6 +879,8 @@ do_lookup_records (GTask *task, - #error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://bugzilla.gnome.org/enter_bug.cgi?product=glib" - #endif - -+#endif /* HAVE_RES_NQUERY */ -+ - #else - - DNS_STATUS status; --- -2.14.3 - diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index b957bf4b10..7ce031aa89 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.56/glib-2.56.0.sha256sum -sha256 ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7 glib-2.56.0.tar.xz +# https://download.gnome.org/sources/glib/2.56/glib-2.56.1.sha256sum +sha256 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d glib-2.56.1.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 41ec7ee377..a32a9bab52 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.56 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.0+ From 6d1060d2610cc07f9f2cac61f9ec2276afc102d5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sun, 8 Apr 2018 11:25:15 -0700 Subject: [PATCH 0734/2640] package/xen: fix qemu-xen memfd build failure Fix the QEMU memfd compile error: tools/qemu-xen/util/memfd.c:40:12: error: static declaration of 'memfd_create' follows non-static declaration static int memfd_create(const char *name, unsigned int flags) ^~~~~~~~~~~~ that has been introduced since the Glibc 2.27 upgrade. This just involves porting the upstream QEMU patch to the Xen QEMU tree. This fixes: http://autobuild.buildroot.net/results/ec7cda00e07b0c98a9a366244b67611e042e0d4b/ Signed-off-by: Alistair Francis Tested-by: Matt Weber Signed-off-by: Thomas Petazzoni --- .../xen/0003-memfd-fix-configure-test.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/xen/0003-memfd-fix-configure-test.patch diff --git a/package/xen/0003-memfd-fix-configure-test.patch b/package/xen/0003-memfd-fix-configure-test.patch new file mode 100644 index 0000000000..95cb49bcf7 --- /dev/null +++ b/package/xen/0003-memfd-fix-configure-test.patch @@ -0,0 +1,62 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau +Signed-off-by: Paolo Bonzini +Signed-off-by: Baruch Siach +[ Changes by AF: + - Port the patch to the qemu-xen tree +] +Signed-off-by: Alistair Francis +--- +Upstream status: commit 75e5b70e6b5 + + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a98bd4..99ccc1725ace 100755 +--- a/tools/qemu-xen/configure ++++ b/tools/qemu-xen/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba866..412e94a405fc 100644 +--- a/tools/qemu-xen/util/memfd.c ++++ b/tools/qemu-xen/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +2.16.2 + From b07245e5b748f73d17b2d612148f792f5d248106 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Apr 2018 11:37:06 +0200 Subject: [PATCH 0735/2640] package/liblo: fix build with musl Commit 2759ba03979 (liblo: disable werror to fix build issues) tried to fix the issue by passing --disable-werror, but this is not a recognised option. Instead, just fix the code for good. Fixes: http://autobuild.buildroot.org/results/000a46954d0c6d3dbc4b4634a0d3a3c955fac679 http://autobuild.buildroot.org/results/58cb834bbd69bafc5cb0f23c236919c609648c05 http://autobuild.buildroot.org/results/9de1c2007818082e88d77572abf8ff8a72e01930 ... Signed-off-by: "Yann E. MORIN" Cc: Alex Baldwin Signed-off-by: Thomas Petazzoni --- ...001-server-use-correct-poll.h-header.patch | 32 +++++++++++++++++++ package/liblo/liblo.mk | 5 +-- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 package/liblo/0001-server-use-correct-poll.h-header.patch diff --git a/package/liblo/0001-server-use-correct-poll.h-header.patch b/package/liblo/0001-server-use-correct-poll.h-header.patch new file mode 100644 index 0000000000..04c0445534 --- /dev/null +++ b/package/liblo/0001-server-use-correct-poll.h-header.patch @@ -0,0 +1,32 @@ +From d59f2e6f42a9e4f8a9184d7ed75546f47dc50123 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 8 Apr 2018 11:09:02 +0200 +Subject: [PATCH] server: use correct poll.h header + +Fixes build with the musl C library: + http://autobuild.buildroot.net/results/000a46954d0c6d3dbc4b4634a0d3a3c955fac679 + +Signed-off-by: "Yann E. MORIN" +--- +Upstream status: + PR sent: https://github.com/radarsat1/liblo/pull/66 +--- + src/server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server.c b/src/server.c +index 01fa08f..11c62d2 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -51,7 +51,7 @@ + #include + #include + #ifdef HAVE_POLL +-#include ++#include + #endif + #include + #include +-- +2.14.1 + diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 7845c68ff2..e28e52803a 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -12,10 +12,7 @@ LIBLO_LICENSE_FILES = COPYING LIBLO_INSTALL_STAGING = YES # IPv6 support broken, issue known upstream -# werror - not needed for release. -LIBLO_CONF_OPTS += \ - --disable-ipv6 \ - --disable-werror +LIBLO_CONF_OPTS = --disable-ipv6 # Liblo uses atomic builtins, so we need to link with libatomic for # the architectures who explicitly need libatomic. From fc4b66dbc1b71e871129ce14b289fcda6eb3ea10 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Apr 2018 23:06:22 +0200 Subject: [PATCH 0736/2640] php: fix emalloc/efree/estrdup/... undefined references zend_alloc.h defines some macros such as: Where _estrdup is the actual function implemented by the PHP core. If this header file is not included, and some code uses estrdup, one ends up with an undefined reference. This happens when libexpat support is enabled. This commit adds a PHP patch that fixes this issue. The patch has been submitted upstream through a Github pull request. Fixes: http://autobuild.buildroot.net/results/889d2c1f509c035cd506e36061939bfddc8f1500/ Signed-off-by: Thomas Petazzoni --- ...t_compat.h-add-missing-php.h-include.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch diff --git a/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch b/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch new file mode 100644 index 0000000000..daf004dcf7 --- /dev/null +++ b/package/php/0009-ext-xml-expat_compat.h-add-missing-php.h-include.patch @@ -0,0 +1,71 @@ +From fb1f0e17eed729204a6d5caf590715d6257dceb3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 5 Apr 2018 22:50:00 +0200 +Subject: [PATCH] ext/xml/expat_compat.h: add missing php.h include + +When expat support is disabled and libxml support is enabled, the +following part of the code in expat_compat.h gets used: + +and therefore "php".h" is included. However, when libexpat support is +enabled, HAVE_LIBEXPAT is defined, and therefore the following part of +the code is used: + +In this case, "php.h" is not included. Due to this, zend_alloc.h is +never included when building the ext/xmlrpc/libxmlrpc/xml_element.c +file, and therefore the estrdup -> _estrdup macros are never defined, +causing the following link time failure: + +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_element_serialize': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:462: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_entity_escape': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:347: undefined reference to `emalloc' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_charHandler': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:646: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:198: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:199: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:200: undefined reference to `efree' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:207: undefined reference to `efree' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_new': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:263: undefined reference to `ecalloc' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_startElement': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:602: undefined reference to `estrdup' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:607: undefined reference to `emalloc' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:609: undefined reference to `estrdup' +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:610: undefined reference to `estrdup' +ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse': +/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:211: undefined reference to `efree' +collect2: error: ld returned 1 exit status +make: *** [Makefile:248: sapi/cgi/php-cgi] Error 1 + +This link time failure can be produced with: + +./configure --prefix=/usr --with-libdir=/usr/lib64 --disable-all \ + --without-pear --with-config-file-path=/etc --disable-phpdbg \ + --disable-cli --enable-cgi --disable-fpm --enable-xmlreader \ + --enable-xmlwriter --enable-libxml --enable-wddx --with-xmlrpc \ + --with-libexpat-dir=/ + +We fix it by including "php.h" in the HAVE_LIBEXPAT case. + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/php/php-src/pull/3212 +--- + ext/xml/expat_compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h +index ed621ab53d..29fe48a7dd 100644 +--- a/ext/xml/expat_compat.h ++++ b/ext/xml/expat_compat.h +@@ -154,6 +154,7 @@ PHP_XML_API const XML_Char *XML_ExpatVersion(void); + PHP_XML_API void XML_ParserFree(XML_Parser); + + #elif defined(HAVE_LIBEXPAT) ++#include "php.h" + #include + #endif /* HAVE_LIBEXPAT */ + +-- +2.14.3 + From cce98cbbb031c0e9960b9e98df413e87b15ca1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 6 Apr 2018 10:18:35 +0200 Subject: [PATCH 0737/2640] libbsd: add upstream patch to fix musl build issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d879be3049598f35d7b959784e1a6c2811ba2036 enabled the build for non-glibc toolchains and added a patch from upstream to fix one remaining build issue with musl. The upstream patch defines the glibc specific macro `__GLIBC_PREREQ` in `include/bsd/sys/cdefs.h`, but the patch does not include this header file in `include/bsd/stdlib.h` which uses the macro. Upstream did committed an earlier patch which adds this header inclusion to `include/bsd/stdlib.h`. So, add this upstream patch as well to fix a build error when building the hcitop tool from the not yet added package bluez-alsa. Note, that the upstream patch address the issue that `` is a non-portable header. However, this is not the issue which needs to be fixed by this patch, but solely the needed inclusion of the `include/bsd/stdlib.h` header file, to see the definition of `__GLIBC_PREREQ`. Backported from: 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...3-Handle-systems-missing-sys-cdefs.h.patch | 230 ++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch diff --git a/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch b/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch new file mode 100644 index 0000000000..2cf7a5f09f --- /dev/null +++ b/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch @@ -0,0 +1,230 @@ +From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:41:35 +0100 +Subject: [PATCH] Handle systems missing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a non-portable header, and we cannot expect it to be provided by +the system libc (e.g. musl). We just need and rely on declaration that +we have defined ourselves in our own . So we switch to +only ever assume that. + +Fixes: https://bugs.freedesktop.org/105281 + +Backported from: 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd + +Signed-off-by: Guillem Jover +Signed-off-by: Jörg Krause +--- + include/bsd/libutil.h | 4 ++++ + include/bsd/md5.h | 4 ++++ + include/bsd/nlist.h | 4 ++++ + include/bsd/readpassphrase.h | 4 ++++ + include/bsd/stdlib.h | 4 ++++ + include/bsd/string.h | 4 ++++ + include/bsd/stringlist.h | 5 +++++ + include/bsd/sys/queue.h | 4 ++++ + include/bsd/sys/tree.h | 4 ++++ + include/bsd/timeconv.h | 4 ++++ + include/bsd/vis.h | 4 ++++ + include/bsd/wchar.h | 4 ++++ + 12 files changed, 49 insertions(+) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..ccca29a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -40,7 +40,11 @@ + #define LIBBSD_LIBUTIL_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + #include +diff --git a/include/bsd/md5.h b/include/bsd/md5.h +index 5f3ae46..bf36a30 100644 +--- a/include/bsd/md5.h ++++ b/include/bsd/md5.h +@@ -27,7 +27,11 @@ typedef struct MD5Context { + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + } MD5_CTX; + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h +index cb297e8..8767117 100644 +--- a/include/bsd/nlist.h ++++ b/include/bsd/nlist.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_NLIST_H + #define LIBBSD_NLIST_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + struct nlist { + union { +diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h +index 14744b8..5eb8021 100644 +--- a/include/bsd/readpassphrase.h ++++ b/include/bsd/readpassphrase.h +@@ -31,7 +31,11 @@ + #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ + #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..8d33d1f 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -42,7 +42,11 @@ + #ifndef LIBBSD_STDLIB_H + #define LIBBSD_STDLIB_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..29097f6 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_STRING_H + #define LIBBSD_STRING_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h +index ff30cac..dd71496 100644 +--- a/include/bsd/stringlist.h ++++ b/include/bsd/stringlist.h +@@ -31,7 +31,12 @@ + + #ifndef LIBBSD_STRINGLIST_H + #define LIBBSD_STRINGLIST_H ++ ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + /* +diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h +index 4a94ea7..ac00026 100644 +--- a/include/bsd/sys/queue.h ++++ b/include/bsd/sys/queue.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_SYS_QUEUE_H + #define LIBBSD_SYS_QUEUE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, +diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h +index 628bec0..325b382 100644 +--- a/include/bsd/sys/tree.h ++++ b/include/bsd/sys/tree.h +@@ -30,7 +30,11 @@ + #ifndef LIBBSD_SYS_TREE_H + #define LIBBSD_SYS_TREE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines data structures for different types of trees: +diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h +index e2a2c55..a426bd3 100644 +--- a/include/bsd/timeconv.h ++++ b/include/bsd/timeconv.h +@@ -41,7 +41,11 @@ + #ifndef LIBBSD_TIMECONV_H + #define LIBBSD_TIMECONV_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/vis.h b/include/bsd/vis.h +index 970dfdd..ab5430c 100644 +--- a/include/bsd/vis.h ++++ b/include/bsd/vis.h +@@ -72,7 +72,11 @@ + */ + #define UNVIS_END 1 /* no more characters */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + __BEGIN_DECLS + char *vis(char *, int, int, int); +diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h +index 33a500e..7216503 100644 +--- a/include/bsd/wchar.h ++++ b/include/bsd/wchar.h +@@ -40,7 +40,11 @@ + #define LIBBSD_WCHAR_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +-- +2.17.0 + From d84edca974074467435891c0c81359db131ea239 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Wed, 4 Apr 2018 15:30:16 -0700 Subject: [PATCH 0738/2640] qt5base: remove use of QT5BASE_EXTRA_CFLAGS This variable was added as part of an EGL i.MX6 workaround in commit (7e9f459adf), but appears to currently be abandonded and unused. Remove the use of the variable. Signed-off-by: Joshua Henderson Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e6307fb3fe..1eabd7a15b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -293,8 +293,8 @@ define QT5BASE_CONFIGURE_CMDS -nomake tests \ -device buildroot \ -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ - -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ + -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \ + -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef From 9be2041fcfd765db0994c923d3148e948095254b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 17:54:50 +0200 Subject: [PATCH 0739/2640] gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos The HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI variable was incorrectly used as HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_, which would always be empty. In practice, this block of code is only used on Blackfin (which has BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS unset) and Blackfin doesn't use float-abi, so this block of code is in fact useless. But even if it's useless, it's better to have it without typos. Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index f42f36a967..5a1e3d5b0c 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -297,8 +297,8 @@ endif ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FPU),) HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FPU)"' endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_)"' +ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI),) +HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI)"' endif ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_MODE),) HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(HOST_GCC_COMMON_WRAPPER_TARGET_MODE)"' From 0908b8ecada61454bf8b223777ef4970d74a1370 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Apr 2018 17:54:51 +0200 Subject: [PATCH 0740/2640] uclibc: simplify UCLIBC_EXTRA_CFLAGS Since commit f66952197b41452b77dfa065adc7172137e4c243 ("package/gcc: remove gcc 4.8"), UCLIBC_EXTRA_CFLAGS no longer exists, and is therefore always empty. Passing the Buildroot make variable UCLIBC_EXTRA_CFLAGS into the UCLIBC_EXTRA_CFLAGS fed into uClibc's make environment therefore no longer makes sense. Therefore, just pass $(TARGET_ABI). Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 8d198f669a..25e86534fd 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -382,7 +382,7 @@ endif UCLIBC_MAKE_FLAGS = \ ARCH="$(UCLIBC_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS From 2cf4871808a820e48e265a5c91e6d0c51886e635 Mon Sep 17 00:00:00 2001 From: Chris Brandt Date: Sat, 7 Apr 2018 08:35:42 -0500 Subject: [PATCH 0741/2640] package/cramfs: change to new site location As of Linux-4.15, cramfs now has a official maintainer again. Additionally, that person is hosting and maintaining a new version of cramfs-tools. Patches 0001-endian.patch and 0003-fix-missing-types.patch are no longer needed because they have been upstreamed. However, since patch 0002-cygwin_IO.patch is so old, it is being removed until someone that needs it can reapply and test it. At that point, they should submit the changes to the new cramfs-tools maintainer instead of adding the patches back here. Please note that cross-endian support for cramfsck is not supported at this time. Cc: Nicolas Pitre Signed-off-by: Chris Brandt Reviewed-by: Matt Weber Signed-off-by: Thomas Petazzoni --- fs/cramfs/Config.in | 2 +- fs/cramfs/cramfs.mk | 4 +- package/cramfs/0001-endian.patch | 288 -------------------- package/cramfs/0002-cygwin_IO.patch | 15 - package/cramfs/0003-fix-missing-types.patch | 17 -- package/cramfs/Config.in | 2 +- package/cramfs/Config.in.host | 2 +- package/cramfs/cramfs.hash | 2 +- package/cramfs/cramfs.mk | 4 +- 9 files changed, 8 insertions(+), 328 deletions(-) delete mode 100644 package/cramfs/0001-endian.patch delete mode 100644 package/cramfs/0002-cygwin_IO.patch delete mode 100644 package/cramfs/0003-fix-missing-types.patch diff --git a/fs/cramfs/Config.in b/fs/cramfs/Config.in index 1a4e326472..b11885b4f4 100644 --- a/fs/cramfs/Config.in +++ b/fs/cramfs/Config.in @@ -3,4 +3,4 @@ config BR2_TARGET_ROOTFS_CRAMFS help Build a cramfs root filesystem - http://sourceforge.net/projects/cramfs/ + https://github.com/npitre/cramfs-tools diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk index f880871935..8745c78031 100644 --- a/fs/cramfs/cramfs.mk +++ b/fs/cramfs/cramfs.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_ENDIAN),"BIG") -CRAMFS_OPTS = -b +CRAMFS_OPTS = -B else -CRAMFS_OPTS = -l +CRAMFS_OPTS = -L endif define ROOTFS_CRAMFS_CMD diff --git a/package/cramfs/0001-endian.patch b/package/cramfs/0001-endian.patch deleted file mode 100644 index b2eda5a1db..0000000000 --- a/package/cramfs/0001-endian.patch +++ /dev/null @@ -1,288 +0,0 @@ -Index: cramfs-1.1/mkcramfs.c -=================================================================== ---- cramfs-1.1.orig/mkcramfs.c 2002-02-20 09:03:32.000000000 +0100 -+++ cramfs-1.1/mkcramfs.c 2011-09-09 15:11:00.980895119 +0200 -@@ -93,6 +93,7 @@ - static int opt_verbose = 0; - static char *opt_image = NULL; - static char *opt_name = NULL; -+static int swap_endian = 0; - - static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid; - -@@ -130,6 +131,8 @@ - " -i file insert a file image into the filesystem (requires >= 2.4.0)\n" - " -n name set name of cramfs filesystem\n" - " -p pad by %d bytes for boot code\n" -+ " -l litte endian filesystem\n" -+ " -b big endian filesystem\n" - " -s sort directory entries (old option, ignored)\n" - " -v be more verbose\n" - " -z make explicit holes (requires >= 2.3.39)\n" -@@ -372,6 +375,50 @@ - return totalsize; - } - -+/* routines to swap endianness/bitfields in inode/superblock block data */ -+static void fix_inode(struct cramfs_inode *inode) -+{ -+#define wswap(x) (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24)) -+ /* attempt #2 */ -+ inode->mode = (inode->mode >> 8) | ((inode->mode&0xff)<<8); -+ inode->uid = (inode->uid >> 8) | ((inode->uid&0xff)<<8); -+ inode->size = (inode->size >> 16) | (inode->size&0xff00) | -+ ((inode->size&0xff)<<16); -+ ((u32*)inode)[2] = wswap(inode->offset | (inode->namelen<<26)); -+} -+ -+static void fix_offset(struct cramfs_inode *inode, u32 offset) -+{ -+ u32 tmp = wswap(((u32*)inode)[2]); -+ ((u32*)inode)[2] = wswap((offset >> 2) | (tmp&0xfc000000)); -+} -+ -+static void fix_block_pointer(u32 *p) -+{ -+ *p = wswap(*p); -+} -+ -+static void fix_super(struct cramfs_super *super) -+{ -+ u32 *p = (u32*)super; -+ -+ /* fix superblock fields */ -+ p[0] = wswap(p[0]); /* magic */ -+ p[1] = wswap(p[1]); /* size */ -+ p[2] = wswap(p[2]); /* flags */ -+ p[3] = wswap(p[3]); /* future */ -+ -+ /* fix filesystem info fields */ -+ p = (u32*)&super->fsid; -+ p[0] = wswap(p[0]); /* crc */ -+ p[1] = wswap(p[1]); /* edition */ -+ p[2] = wswap(p[2]); /* blocks */ -+ p[3] = wswap(p[3]); /* files */ -+ -+ fix_inode(&super->root); -+#undef wswap -+} -+ - /* Returns sizeof(struct cramfs_super), which includes the root inode. */ - static unsigned int write_superblock(struct entry *root, char *base, int size) - { -@@ -405,6 +452,7 @@ - super->root.gid = root->gid; - super->root.size = root->size; - super->root.offset = offset >> 2; -+ if (swap_endian) fix_super(super); - - return offset; - } -@@ -419,7 +467,10 @@ - if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) { - die(MKFS_ERROR, 0, "filesystem too big"); - } -- inode->offset = (offset >> 2); -+ if (swap_endian) -+ fix_offset(inode, offset); -+ else -+ inode->offset = (offset >> 2); - } - - /* -@@ -515,6 +566,7 @@ - stack_entries++; - } - entry = entry->next; -+ if (swap_endian) fix_inode(inode); - } - - /* -@@ -609,6 +661,7 @@ - } - - *(u32 *) (base + offset) = curr; -+ if (swap_endian) fix_block_pointer((u32*)(base + offset)); - offset += 4; - } while (size); - -@@ -699,7 +752,7 @@ - progname = argv[0]; - - /* command line options */ -- while ((c = getopt(argc, argv, "hEe:i:n:psvz")) != EOF) { -+ while ((c = getopt(argc, argv, "hEe:i:n:psvzlb")) != EOF) { - switch (c) { - case 'h': - usage(MKFS_OK); -@@ -727,6 +780,18 @@ - opt_pad = PAD_SIZE; - fslen_ub += PAD_SIZE; - break; -+ case 'b': -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ swap_endian = 1; -+ printf("Swapping filesystem endian-ness\n"); -+#endif -+ break; -+ case 'l': -+#if __BYTE_ORDER == __BIG_ENDIAN -+ swap_endian = 1; -+ printf("Swapping filesystem endian-ness\n"); -+#endif -+ break; - case 's': - /* old option, ignored */ - break; -Index: cramfs-1.1/cramfsck.c -=================================================================== ---- cramfs-1.1.orig/cramfsck.c 2002-02-23 01:00:42.000000000 +0100 -+++ cramfs-1.1/cramfsck.c 2011-09-09 15:10:06.810894275 +0200 -@@ -30,6 +30,7 @@ - * 2000/07/15: Daniel Quinlan (initial support for block devices) - * 2002/01/10: Daniel Quinlan (additional checks, test more return codes, - * use read if mmap fails, standardize messages) -+ * 2004/09/01: Alfonso Acosta (Add swapping support) - */ - - /* compile-time options */ -@@ -53,6 +54,7 @@ - #define _LINUX_STRING_H_ - #include - #include -+#include - #include - - /* Exit codes used by fsck-type programs */ -@@ -73,6 +75,7 @@ - static char *filename; /* ROM image filename */ - struct cramfs_super super; /* just find the cramfs superblock once */ - static int opt_verbose = 0; /* 1 = verbose (-v), 2+ = very verbose (-vv) */ -+static int need_swapping = 0; /* fs and host dont have the same endianness */ - #ifdef INCLUDE_FS_TESTS - static int opt_extract = 0; /* extract cramfs (-x) */ - static char *extract_dir = "root"; /* extraction directory (-x) */ -@@ -84,6 +87,9 @@ - static unsigned long start_data = ~0UL; /* start of the data (256 MB = max) */ - static unsigned long end_data = 0; /* end of the data */ - -+/* access 32 byte variables */ -+#define CRAMFS_32(x) (need_swapping ? bswap_32(x) : x) -+ - /* Guarantee access to at least 8kB at a time */ - #define ROMBUFFER_BITS 13 - #define ROMBUFFERSIZE (1 << ROMBUFFER_BITS) -@@ -165,20 +171,34 @@ - if (super.magic == CRAMFS_MAGIC) { - *start = 0; - } -+ else if (super.magic == bswap_32(CRAMFS_MAGIC)) { -+ *start = 0; -+ need_swapping = 1; -+ } -+ - else if (*length >= (PAD_SIZE + sizeof(super))) { - lseek(fd, PAD_SIZE, SEEK_SET); - if (read(fd, &super, sizeof(super)) != sizeof(super)) { - die(FSCK_ERROR, 1, "read failed: %s", filename); - } -- if (super.magic == CRAMFS_MAGIC) { -+ if (super.magic == CRAMFS_32(CRAMFS_MAGIC)) { - *start = PAD_SIZE; - } - } - - /* superblock tests */ -- if (super.magic != CRAMFS_MAGIC) { -+ if (super.magic != CRAMFS_32(CRAMFS_MAGIC)) { - die(FSCK_UNCORRECTED, 0, "superblock magic not found"); - } -+ if (need_swapping){ -+ super.size = bswap_32(super.size); -+ super.flags = bswap_32(super.flags); -+ super.future = bswap_32(super.future); -+ super.fsid.crc = bswap_32(super.fsid.crc); -+ super.fsid.edition = bswap_32(super.fsid.edition); -+ super.fsid.blocks = bswap_32(super.fsid.blocks); -+ super.fsid.files = bswap_32(super.fsid.files); -+ } - if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) { - die(FSCK_ERROR, 0, "unsupported filesystem features"); - } -@@ -213,7 +233,10 @@ - die(FSCK_USAGE, 0, "unable to test CRC: old cramfs format"); - #endif /* not INCLUDE_FS_TESTS */ - } -- -+ else if (need_swapping) { -+ /* crc checking in this case would mean translating the whole file */ -+ return; -+ } - crc = crc32(0L, Z_NULL, 0); - - buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); -@@ -298,12 +321,23 @@ - - static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i) - { -+#define wswap(x) (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24)) - struct cramfs_inode *inode = malloc(sizeof(struct cramfs_inode)); - - if (!inode) { - die(FSCK_ERROR, 1, "malloc failed"); - } -- *inode = *i; -+ if(!need_swapping) { -+ *inode = *i; -+ } -+ else { -+ inode->mode=bswap_16(i->mode); -+ inode->uid=bswap_16(i->uid); -+ inode->size=bswap_32(i->size << 8); -+ inode->gid=i->gid; -+ inode->namelen = bswap_32(((u32*)i)[2]) >> 26; -+ inode->offset = bswap_32(((u32*)i)[2]) & 0x3FFFFFFF; -+ } - return inode; - } - -@@ -322,9 +356,9 @@ - */ - static struct cramfs_inode *read_super(void) - { -- unsigned long offset = super.root.offset << 2; -- -- if (!S_ISDIR(super.root.mode)) -+ struct cramfs_inode *root = cramfs_iget(&super.root); -+ unsigned long offset = root->offset << 2; -+ if (!S_ISDIR(root->mode)) - die(FSCK_UNCORRECTED, 0, "root inode is not directory"); - if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) && - ((offset != sizeof(struct cramfs_super)) && -@@ -332,7 +366,7 @@ - { - die(FSCK_UNCORRECTED, 0, "bad root offset (%lu)", offset); - } -- return cramfs_iget(&super.root); -+ return root; - } - - static int uncompress_block(void *src, int len) -@@ -364,7 +398,7 @@ - - do { - unsigned long out = PAGE_CACHE_SIZE; -- unsigned long next = *(u32 *) romfs_read(offset); -+ unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset)); - - if (next > end_data) { - end_data = next; -@@ -525,7 +559,7 @@ - { - unsigned long offset = i->offset << 2; - unsigned long curr = offset + 4; -- unsigned long next = *(u32 *) romfs_read(offset); -+ unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset)); - unsigned long size; - - if (offset == 0) { diff --git a/package/cramfs/0002-cygwin_IO.patch b/package/cramfs/0002-cygwin_IO.patch deleted file mode 100644 index 8be333f01b..0000000000 --- a/package/cramfs/0002-cygwin_IO.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: cramfs-1.1/cramfsck.c -=================================================================== ---- cramfs-1.1.orig/cramfsck.c 2011-09-09 15:10:06.000000000 +0200 -+++ cramfs-1.1/cramfsck.c 2011-09-09 15:13:49.950897747 +0200 -@@ -57,6 +57,10 @@ - #include - #include - -+#ifdef __CYGWIN__ -+#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) -+#endif /* __CYGWIN__ */ -+ - /* Exit codes used by fsck-type programs */ - #define FSCK_OK 0 /* No errors */ - #define FSCK_NONDESTRUCT 1 /* File system errors corrected */ diff --git a/package/cramfs/0003-fix-missing-types.patch b/package/cramfs/0003-fix-missing-types.patch deleted file mode 100644 index 896110011e..0000000000 --- a/package/cramfs/0003-fix-missing-types.patch +++ /dev/null @@ -1,17 +0,0 @@ -mkcramfs; loff_t is guarded by _GNU_SOURCE - -Although already properly done in cramfsck, it was missing in mkcramfs. - -Signed-off-by: "Yann E. MORIN" - -diff -durN cramfs-1.1.orig/mkcramfs.c cramfs-1.1/mkcramfs.c ---- cramfs-1.1.orig/mkcramfs.c 2015-08-05 22:31:16.830543096 +0200 -+++ cramfs-1.1/mkcramfs.c 2015-08-05 22:33:33.136289744 +0200 -@@ -22,6 +22,7 @@ - * If you change the disk format of cramfs, please update fs/cramfs/README. - */ - -+#define _GNU_SOURCE - #include - #include - #include diff --git a/package/cramfs/Config.in b/package/cramfs/Config.in index b2a0c6c516..a177004ca9 100644 --- a/package/cramfs/Config.in +++ b/package/cramfs/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_CRAMFS cramfs is a compressed read-only filesystem. This package contains the tools to generate and check a cramfs filesystem. - http://sourceforge.net/projects/cramfs/ + https://github.com/npitre/cramfs-tools diff --git a/package/cramfs/Config.in.host b/package/cramfs/Config.in.host index 53b43d4420..e594d5c820 100644 --- a/package/cramfs/Config.in.host +++ b/package/cramfs/Config.in.host @@ -4,4 +4,4 @@ config BR2_PACKAGE_HOST_CRAMFS cramfs is a compressed read-only filesystem. This package contains the tools to generate and check a cramfs filesystem. - http://sourceforge.net/projects/cramfs/ + https://github.com/npitre/cramfs-tools diff --git a/package/cramfs/cramfs.hash b/package/cramfs/cramfs.hash index b8c5f5fbcb..c6c18b073c 100644 --- a/package/cramfs/cramfs.hash +++ b/package/cramfs/cramfs.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368 cramfs-1.1.tar.gz +sha256 99d87aa5874f4a34c219275e0297b0f4c710895f9c87295267aeabe6a752add1 cramfs-1a1e65f2a049.tar.gz diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk index 70010e8e2f..18bef80bd2 100644 --- a/package/cramfs/cramfs.mk +++ b/package/cramfs/cramfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRAMFS_VERSION = 1.1 -CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION) +CRAMFS_VERSION = 1a1e65f2a049 +CRAMFS_SITE = $(call github,npitre,cramfs-tools,$(CRAMFS_VERSION)) CRAMFS_LICENSE = GPL-2.0+ CRAMFS_LICENSE_FILES = COPYING From 265aee8c51718fe7370a3dbc91048ff60eb5909c Mon Sep 17 00:00:00 2001 From: Chris Brandt Date: Sat, 7 Apr 2018 08:35:43 -0500 Subject: [PATCH 0742/2640] fs/cramfs: add xip option Cramfs now has the ability to XIP all ELF files. Cc: Nicolas Pitre Signed-off-by: Chris Brandt Signed-off-by: Thomas Petazzoni --- fs/cramfs/Config.in | 20 ++++++++++++++++++++ fs/cramfs/cramfs.mk | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/fs/cramfs/Config.in b/fs/cramfs/Config.in index b11885b4f4..89f8ad52b8 100644 --- a/fs/cramfs/Config.in +++ b/fs/cramfs/Config.in @@ -4,3 +4,23 @@ config BR2_TARGET_ROOTFS_CRAMFS Build a cramfs root filesystem https://github.com/npitre/cramfs-tools + +if BR2_TARGET_ROOTFS_CRAMFS + +config BR2_TARGET_ROOTFS_CRAMFS_XIP + bool "Support XIP of all ELF files" + help + For ELF files, uncompressed and properly aligned data blocks + will be automatically be mapped directly into user space + whenever possible providing eXecute-In-Place (XIP) from ROM + of read-only segments. Data segments mapped read-write + (hence they have to be copied to RAM) may still be + compressed in the cramfs image in the same file along with + non compressed read-only segments. Both MMU and no-MMU + systems are supported. This is particularly handy for tiny + embedded systems with very tight memory constraints. + + The CRAMFS_MTD Kconfig option must also be enabled in a + 4.15+ kernel. + +endif # BR2_TARGET_ROOTFS_CRAMFS diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk index 8745c78031..9250638887 100644 --- a/fs/cramfs/cramfs.mk +++ b/fs/cramfs/cramfs.mk @@ -10,6 +10,14 @@ else CRAMFS_OPTS = -L endif +ifeq ($(BR2_TARGET_ROOTFS_CRAMFS_XIP),y) +ifeq ($(BR2_USE_MMU),y) +CRAMFS_OPTS += -X -X +else +CRAMFS_OPTS += -X +endif +endif + define ROOTFS_CRAMFS_CMD $(HOST_DIR)/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@ endef From f4a4df2084b923f29eca2130976ca10a7aa6b719 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 9 Apr 2018 19:20:36 +0300 Subject: [PATCH 0743/2640] patch: add upstream security fix Fixes CVE-2018-1000156: arbitrary command execution in ed-style patches. Depend on MMU for now, because the patch adds a fork() call. Upstream later switched to gnulib provided execute(), so this dependency can be dropped on the next version bump. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...s-to-be-missing-for-ed-style-patches.patch | 37 +++++ ...mmand-execution-in-ed-style-patches-.patch | 157 ++++++++++++++++++ package/patch/Config.in | 2 + 3 files changed, 196 insertions(+) create mode 100644 package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch create mode 100644 package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch diff --git a/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch new file mode 100644 index 0000000000..7d5757d1af --- /dev/null +++ b/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch @@ -0,0 +1,37 @@ +From b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 11:34:51 +0200 +Subject: [PATCH] Allow input files to be missing for ed-style patches + +* src/pch.c (do_ed_script): Allow input files to be missing so that new +files will be created as with non-ed-style patches. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit b5a91a01e5d0 + + src/pch.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/pch.c b/src/pch.c +index bc6278c4032c..0c5cc2623079 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char const *outname, + + if (! dry_run && ! skip_rest_of_patch) { + int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- assert (! inerrno); +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ if (inerrno != ENOENT) ++ { ++ *outname_needs_removal = true; ++ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ } + sprintf (buf, "%s %s%s", editor_program, + verbosity == VERBOSE ? "" : "- ", + outname); +-- +2.16.3 + diff --git a/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch new file mode 100644 index 0000000000..b44bdd0fac --- /dev/null +++ b/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch @@ -0,0 +1,157 @@ +From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: [PATCH] Fix arbitrary command execution in ed-style patches + (CVE-2018-1000156) + +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. + +[baruch: drop test hunks to avoid autoreconf] +Signed-off-by: Baruch Siach +--- +Upstream status: commit 123eaff0d5d1 + + src/pch.c | 91 ++++++++++++++++++++++++++++++++++++++++--------------- + tests/Makefile.am | 1 + + tests/ed-style | 41 +++++++++++++++++++++++++ + 3 files changed, 108 insertions(+), 25 deletions(-) + create mode 100644 tests/ed-style + +diff --git a/src/pch.c b/src/pch.c +index 0c5cc2623079..4fd5a05a6f5c 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -33,6 +33,7 @@ + # include + #endif + #include ++#include + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; + + file_offset beginning_of_this_line; +- FILE *pipefp = 0; + size_t chars_read; ++ FILE *tmpfp = 0; ++ char const *tmpname; ++ int tmpfd; ++ pid_t pid; ++ ++ if (! dry_run && ! skip_rest_of_patch) ++ { ++ /* Write ed script to a temporary file. This causes ed to abort on ++ invalid commands such as when line numbers or ranges exceed the ++ number of available lines. When ed reads from a pipe, it rejects ++ invalid commands and treats the next line as a new command, which ++ can lead to arbitrary command execution. */ ++ ++ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0); ++ if (tmpfd == -1) ++ pfatal ("Can't create temporary file %s", quotearg (tmpname)); ++ tmpfp = fdopen (tmpfd, "w+b"); ++ if (! tmpfp) ++ pfatal ("Can't open stream for file %s", quotearg (tmpname)); ++ } + +- if (! dry_run && ! skip_rest_of_patch) { +- int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- if (inerrno != ENOENT) +- { +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); +- } +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); +- fflush (stdout); +- pipefp = popen(buf, binary_transput ? "wb" : "w"); +- if (!pipefp) +- pfatal ("Can't open pipe to %s", quotearg (buf)); +- } + for (;;) { + char ed_command_letter; + beginning_of_this_line = file_tell (pfp); +@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, + } + ed_command_letter = get_ed_command_letter (buf); + if (ed_command_letter) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (ed_command_letter != 'd' && ed_command_letter != 's') { + p_pass_comments_through = true; + while ((chars_read = get_line ()) != 0) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (chars_read == 2 && strEQ (buf, ".\n")) + break; +@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, + break; + } + } +- if (!pipefp) ++ if (!tmpfp) + return; +- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0 +- || fflush (pipefp) != 0) ++ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0 ++ || fflush (tmpfp) != 0) + write_fatal (); +- if (pclose (pipefp) != 0) +- fatal ("%s FAILED", editor_program); ++ ++ if (lseek (tmpfd, 0, SEEK_SET) == -1) ++ pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname)); ++ ++ if (! dry_run && ! skip_rest_of_patch) { ++ int exclusive = *outname_needs_removal ? 0 : O_EXCL; ++ *outname_needs_removal = true; ++ if (inerrno != ENOENT) ++ { ++ *outname_needs_removal = true; ++ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ } ++ sprintf (buf, "%s %s%s", editor_program, ++ verbosity == VERBOSE ? "" : "- ", ++ outname); ++ fflush (stdout); ++ ++ pid = fork(); ++ if (pid == -1) ++ pfatal ("Can't fork"); ++ else if (pid == 0) ++ { ++ dup2 (tmpfd, 0); ++ execl ("/bin/sh", "sh", "-c", buf, (char *) 0); ++ _exit (2); ++ } ++ else ++ { ++ int wstatus; ++ if (waitpid (pid, &wstatus, 0) == -1 ++ || ! WIFEXITED (wstatus) ++ || WEXITSTATUS (wstatus) != 0) ++ fatal ("%s FAILED", editor_program); ++ } ++ } ++ ++ fclose (tmpfp); ++ safe_unlink (tmpname); + + if (ofp) + { +-- +2.16.3 + diff --git a/package/patch/Config.in b/package/patch/Config.in index 0c2425823a..13fa7bfc52 100644 --- a/package/patch/Config.in +++ b/package/patch/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PATCH bool "patch" + depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help @@ -10,4 +11,5 @@ config BR2_PACKAGE_PATCH comment "patch needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR + depends on BR2_USE_MMU depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS From 9b47146eb2c33bd83d494a76b1186c3948e0d3ff Mon Sep 17 00:00:00 2001 From: James Byrne Date: Mon, 9 Apr 2018 17:08:01 +0100 Subject: [PATCH 0744/2640] Makefile: avoid executing 'git log' each time SOURCE_DATE_EPOCH is used If SOURCE_DATE_EPOCH is not defined it was given a definition that caused 'git log' to be executed each time the variable is referenced, which is not very efficient given that the answer cannot change. This commit moves the definition of BR2_VERSION_GIT_EPOCH after the inclusion of Makefile.in (so that GIT is defined) and makes it a simply expanded variable so that it is only evaluated once. Signed-off-by: James Byrne Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0724f28f45..cd533624ec 100644 --- a/Makefile +++ b/Makefile @@ -247,8 +247,6 @@ export TZ = UTC export LANG = C export LC_ALL = C export GZIP = -n -BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) -export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) endif # To put more focus on warnings, be less verbose as default @@ -504,6 +502,14 @@ include support/dependencies/dependencies.mk include $(sort $(wildcard toolchain/*.mk)) include $(sort $(wildcard toolchain/*/*.mk)) +ifeq ($(BR2_REPRODUCIBLE),y) +# If SOURCE_DATE_EPOCH has not been set then use the commit date, or the last +# release date if the source tree is not within a Git repository. +# See: https://reproducible-builds.org/specs/source-date-epoch/ +BR2_VERSION_GIT_EPOCH := $(shell $(GIT) --git-dir=$(TOPDIR)/.git log -1 --format=%at 2> /dev/null) +export SOURCE_DATE_EPOCH ?= $(or $(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) +endif + # Include the package override file if one has been provided in the # configuration. PACKAGE_OVERRIDE_FILE = $(call qstrip,$(BR2_PACKAGE_OVERRIDE_FILE)) From cf1139a5644a79d3768ad8d0ab9ff7890c42ab63 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Mon, 9 Apr 2018 11:46:06 +0200 Subject: [PATCH 0745/2640] package/llvm: add dependency on shared libraries llvm generates libLLVM.so, so it won't work if BR2_STATIC_LIBS is set Also propagate llvm dependency to mesa3d. Link to report from autobuilders: http://lists.busybox.net/pipermail/buildroot/2018-April/218296.html Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/llvm/Config.in | 6 ++++-- package/mesa3d/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 15f2507ef2..e007397fa7 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + depends on !BR2_STATIC_LIBS help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -35,10 +36,11 @@ config BR2_PACKAGE_LLVM_AMDGPU endif -comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" +comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || BR2_STATIC_LIBS comment "llvm needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 8f347ffe0c..7dab883aad 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -33,12 +33,14 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" +comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || BR2_STATIC_LIBS comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS From 4bed9dcd7ba408120606eddd40e905bfc9a5787c Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Mon, 9 Apr 2018 11:46:07 +0200 Subject: [PATCH 0746/2640] package/llvm: add dependency on wchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extract from log: output/build/llvm-5.0.1/include/llvm/Support/ConvertUTF.h:203:53: error: ‘std::wstring’ has not been declared bool ConvertUTF8toWide(llvm::StringRef Source, std::wstring &Result); Also propagate dependency to mesa3d Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/llvm/Config.in | 5 +++-- package/mesa3d/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/llvm/Config.in b/package/llvm/Config.in index e007397fa7..83e94660eb 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_LLVM depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # std::wstring help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -36,11 +37,11 @@ config BR2_PACKAGE_LLVM_AMDGPU endif -comment "llvm needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_STATIC_LIBS + || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7dab883aad..1476b39acc 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -34,13 +34,14 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # std::wstring select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_STATIC_LIBS + || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS From 792ead7996b125f912028201abfc7f8c4df1c762 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 8 Apr 2018 20:26:43 +0200 Subject: [PATCH 0747/2640] toolchain: add 4.16.x choice for headers Signed-off-by: Bernd Kuhls Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index b33eaffd52..e2ef1e7ef3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -323,10 +323,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 6c12b1619c..8cc9db6841 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -108,6 +108,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16 + bool "4.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_15 bool "4.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 From 7a813d7cc6b4c15f0f1e463943ed8679c90c7f34 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 8 Apr 2018 20:26:44 +0200 Subject: [PATCH 0748/2640] linux-headers: bump to 4.16 kernel version Signed-off-by: Bernd Kuhls Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3bd3e779b0..3dcc401eb4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_15 + default BR2_KERNEL_HEADERS_4_16 help Select the kernel version to get headers from. @@ -67,6 +67,10 @@ config BR2_KERNEL_HEADERS_4_15 bool "Linux 4.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 +config BR2_KERNEL_HEADERS_4_16 + bool "Linux 4.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -89,6 +93,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 + bool "4.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15 bool "4.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 @@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.13.16" if BR2_KERNEL_HEADERS_4_13 default "4.14.33" if BR2_KERNEL_HEADERS_4_14 default "4.15.16" if BR2_KERNEL_HEADERS_4_15 + default "4.16" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 1b9faedf32be26d9c983c573ccd98f57fc6f6569 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 8 Apr 2018 20:26:45 +0200 Subject: [PATCH 0749/2640] linux: bump default to version 4.16 Added host-bison and host-flex as dependencies after upstream removed pre-generated files and switched over to build-time generation, for details see: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=033dba2ec06c47a9fe1b190bc3281058fb20738d https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29c833061c1d8c2d1d23a62e7061561eadd76cdb Signed-off-by: Bernd Kuhls Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- linux/linux.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 43bff6fa09..d52af66e5c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.15)" + bool "Latest version (4.16)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (v4.4.112-cip18)" @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.15.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.mk b/linux/linux.mk index 7609a15f23..9e646baffc 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -62,7 +62,7 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) LINUX_INSTALL_IMAGES = YES -LINUX_DEPENDENCIES += host-kmod +LINUX_DEPENDENCIES += host-bison host-flex host-kmod # host tools needed for kernel compression ifeq ($(BR2_LINUX_KERNEL_LZ4),y) From 2ae0780ffee50e99ba4ec11e27ffb2e3459bc3d6 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 9 Apr 2018 16:47:07 +0200 Subject: [PATCH 0750/2640] configs/zynq_zed: linux: bump to latest mainline kernel The Zynq SoCs are now well supported in the mainline kernel, thus stop using the Xilinx fork. As there is not xilinx_zynq defconfig in mainline, use the default arch config. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/zynq_zed_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 26ff245169..676366bc5c 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y From c24274aa74d7cb480bfd2d44016028428f4e6d28 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 9 Apr 2018 16:47:08 +0200 Subject: [PATCH 0751/2640] DEVELOPERS: add myself for zynq_zed Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b797087191..8a6793b5a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1071,7 +1071,9 @@ F: package/ti-sgx-um/ N: Luca Ceresoli F: board/olimex/a20_olinuxino/ +F: board/zynq/ F: configs/olimex_a20_olinuxino_* +F: configs/zynq_zed_defconfig F: package/agentpp/ F: package/exim/ F: package/libpjsip/ From dd911de4edca19f97c1e3cdbb5271d4416bf9b40 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 4 Apr 2018 12:34:28 -0300 Subject: [PATCH 0752/2640] configs/wandboard: bump to kernel 4.16 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index a53ae3a7f4..406bd113ff 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" @@ -19,7 +19,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" From 419b68eef5bc98b53514eff41b56a11f66e3898a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 19 Mar 2018 22:19:02 +0100 Subject: [PATCH 0753/2640] package/flare-engine: new package Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/flare-engine/Config.in | 19 +++++++++++++++++++ package/flare-engine/flare-engine.hash | 3 +++ package/flare-engine/flare-engine.mk | 17 +++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/flare-engine/Config.in create mode 100644 package/flare-engine/flare-engine.hash create mode 100644 package/flare-engine/flare-engine.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8a6793b5a9..3353ee0f89 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1591,6 +1591,7 @@ F: package/bullet/ F: package/efl/ F: package/enlightenment/ F: package/expedite/ +F: package/flare-engine/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ diff --git a/package/Config.in b/package/Config.in index 5e798a4f14..71c186613e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -234,6 +234,7 @@ endmenu menu "Games" source "package/chocolate-doom/Config.in" source "package/doom-wad/Config.in" + source "package/flare-engine/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in new file mode 100644 index 0000000000..cdcb018948 --- /dev/null +++ b/package/flare-engine/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_FLARE_ENGINE + bool "flare-engine" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_IMAGE + select BR2_PACKAGE_SDL2_MIXER + select BR2_PACKAGE_SDL2_TTF + help + Flare (Free Libre Action Roleplaying Engine) is a simple game + engine built to handle a very specific kind of game: + single-player 2D action RPGs. + Flare is not a reimplementation of an existing game or engine. + It is a tribute to and exploration of the action RPG genre. + + http://flarerpg.org + +comment "flare-engine needs a toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash new file mode 100644 index 0000000000..8c6fc3ab1b --- /dev/null +++ b/package/flare-engine/flare-engine.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4bbd4674513b643be6294188904665c53f0ef2912e803212c05e8fd22a44d74d flare-engine-v1.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk new file mode 100644 index 0000000000..394ddcfa5d --- /dev/null +++ b/package/flare-engine/flare-engine.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# flare-engine +# +################################################################################ + +FLARE_ENGINE_VERSION = v1.0 +FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,$(FLARE_ENGINE_VERSION)) +FLARE_ENGINE_LICENSE = GPL-3.0 +FLARE_ENGINE_LICENSE_FILES = COPYING + +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf + +# Don't use /usr/games and /usr/share/games +FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare + +$(eval $(cmake-package)) From 4316cad63dc971535160388f040d551536cabd17 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 9 Apr 2018 21:42:53 +0200 Subject: [PATCH 0754/2640] package/flare-engine: fix license The license is GPL-3.0+, not GPL-3.0. Indeed all source files have the mention: "either version 3 of the License, or (at your option) any later version" Signed-off-by: Thomas Petazzoni --- package/flare-engine/flare-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index 394ddcfa5d..0aac3bd33c 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -6,7 +6,7 @@ FLARE_ENGINE_VERSION = v1.0 FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,$(FLARE_ENGINE_VERSION)) -FLARE_ENGINE_LICENSE = GPL-3.0 +FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf From e930a61c21f4d7e4fd0c648c382c54ff3b02a03f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 19 Mar 2018 22:19:03 +0100 Subject: [PATCH 0755/2640] package/flare-game: new package Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/flare-game/Config.in | 13 +++++++++++++ package/flare-game/flare-game.hash | 3 +++ package/flare-game/flare-game.mk | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/flare-game/Config.in create mode 100644 package/flare-game/flare-game.hash create mode 100644 package/flare-game/flare-game.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3353ee0f89..14d872996b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1592,6 +1592,7 @@ F: package/efl/ F: package/enlightenment/ F: package/expedite/ F: package/flare-engine/ +F: package/flare-game/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ diff --git a/package/Config.in b/package/Config.in index 71c186613e..e48d0b4c64 100644 --- a/package/Config.in +++ b/package/Config.in @@ -235,6 +235,7 @@ menu "Games" source "package/chocolate-doom/Config.in" source "package/doom-wad/Config.in" source "package/flare-engine/Config.in" + source "package/flare-game/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" diff --git a/package/flare-game/Config.in b/package/flare-game/Config.in new file mode 100644 index 0000000000..ca68d19a69 --- /dev/null +++ b/package/flare-game/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_FLARE_GAME + bool "flare-game" + depends on BR2_PACKAGE_FLARE_ENGINE + help + Flare is an open source, 2D action RPG licensed under the + GPL3 license. Its game play can be likened to the games in + the Diablo series. + + This package, flare-game, only contains the game data. The + game engine itself is part of a separate package, + flame-engine. + + http://flarerpg.org diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash new file mode 100644 index 0000000000..a27c66d9e3 --- /dev/null +++ b/package/flare-game/flare-game.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5c8e9d72fcbe59f1861f79ac7b76ceffe3ec61d1df241c32d9133fe158fba4c1 flare-game-v1.0.tar.gz +sha256 9fce5eb663f136449e11293a871ed96db5ba579116a927fc6a70dd20a4a5b9e6 README diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk new file mode 100644 index 0000000000..89750d99b1 --- /dev/null +++ b/package/flare-game/flare-game.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# flare-game +# +################################################################################ + +FLARE_GAME_VERSION = v1.0 +FLARE_GAME_SITE = $(call github,clintbellanger,flare-game,$(FLARE_GAME_VERSION)) +FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ + OFL-1.1 (Liberation Sans) +FLARE_GAME_LICENSE_FILES = README + +FLARE_GAME_DEPENDENCIES = flare-engine + +# Don't use /usr/share/games +FLARE_GAME_CONF_OPTS += -DDATADIR=share/flare + +$(eval $(cmake-package)) From a2436a24f8ee1a87ed1967dcf2c41b323a6e9502 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Sat, 10 Mar 2018 12:51:39 +0100 Subject: [PATCH 0756/2640] imx-mkimage: new package This package add support for imx-mkimage for iMX8M. Currently the only hardware it's tested for. Signed-off-by: Erik Larsson Signed-off-by: Christopher Dahlberg Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + package/Config.in.host | 1 + ...overriding-bl32-and-bl33-not-only-bl.patch | 58 +++++++++++++++++++ .../0002-add-ldflags-to-link-step.patch | 26 +++++++++ package/imx-mkimage/Config.in.host | 7 +++ package/imx-mkimage/imx-mkimage.hash | 3 + package/imx-mkimage/imx-mkimage.mk | 24 ++++++++ 7 files changed, 122 insertions(+) create mode 100644 package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch create mode 100644 package/imx-mkimage/0002-add-ldflags-to-link-step.patch create mode 100644 package/imx-mkimage/Config.in.host create mode 100644 package/imx-mkimage/imx-mkimage.hash create mode 100644 package/imx-mkimage/imx-mkimage.mk diff --git a/DEVELOPERS b/DEVELOPERS index 14d872996b..a942b77939 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -601,6 +601,9 @@ F: package/spi-tools/ F: package/xdotool/ F: configs/pc_x86_64_* +N: Erik Larsson +F: package/imx-mkimage/ + N: Erik Stromdahl F: package/mxsldr/ diff --git a/package/Config.in.host b/package/Config.in.host index 563a277795..a8a4c1f802 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -24,6 +24,7 @@ menu "Host utilities" source "package/go-bootstrap/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" + source "package/imx-mkimage/Config.in.host" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" diff --git a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch new file mode 100644 index 0000000000..430122f7ed --- /dev/null +++ b/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch @@ -0,0 +1,58 @@ +From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Thu, 8 Mar 2018 19:04:37 +0100 +Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31 + +Signed-off-by: Erik Larsson +Signed-off-by: Christopher Dahlberg +Signed-off-by: Marcus Folkesson +--- + iMX8M/mkimage_fit_atf.sh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh +index 3a3bd10..727f746 100755 +--- a/iMX8M/mkimage_fit_atf.sh ++++ b/iMX8M/mkimage_fit_atf.sh +@@ -11,29 +11,29 @@ if [ ! -f $BL31 ]; then + echo "ERROR: BL31 file $BL31 NOT found" >&2 + exit 0 + else +- echo "bl31.bin size: " >&2 +- ls -lct bl31.bin | awk '{print $5}' >&2 ++ echo "$BL31 size: " >&2 ++ ls -lct $BL31 | awk '{print $5}' >&2 + fi + +-BL32="tee.bin" ++[ -z "$BL32" ] && BL32="tee.bin" + + if [ ! -f $BL32 ]; then + BL32=/dev/null + else +- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 +- echo "tee.bin size: " >&2 +- ls -lct tee.bin | awk '{print $5}' >&2 ++ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete $BL32" >&2 ++ echo "$BL32 size: " >&2 ++ ls -lct $BL32 | awk '{print $5}' >&2 + fi + +-BL33="u-boot-nodtb.bin" ++[ -z "$BL33" ] && BL33="u-boot-nodtb.bin" + + if [ ! -f $BL33 ]; then + echo "ERROR: $BL33 file NOT found" >&2 + exit 0 + else + +- echo "u-boot-nodtb.bin size: " >&2 +- ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2 ++ echo "$BL33: " >&2 ++ ls -lct $BL33 | awk '{print $5}' >&2 + fi + + for dtname in $* +-- +2.7.4 + diff --git a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/package/imx-mkimage/0002-add-ldflags-to-link-step.patch new file mode 100644 index 0000000000..1d5fe77596 --- /dev/null +++ b/package/imx-mkimage/0002-add-ldflags-to-link-step.patch @@ -0,0 +1,26 @@ +From a73f20fbe921c7ecff3efda23bc506fdd935ee4d Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Tue, 6 Mar 2018 12:28:39 +0100 +Subject: [PATCH] Add LDFLAGS to link step + +Signed-off-by: Erik Larsson +--- + iMX8M/soc.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak +index 8346769..38a14bb 100644 +--- a/iMX8M/soc.mak ++++ b/iMX8M/soc.mak +@@ -15,7 +15,7 @@ FW_DIR = imx-boot/imx-boot-tools/imx8mq + + $(MKIMG): mkimage_imx8.c + @echo "Compiling mkimage_imx8" +- $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz ++ $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz + + $(DCD_CFG): $(DCD_CFG_SRC) + @echo "Converting iMX8M DCD file" +-- +2.7.4 + diff --git a/package/imx-mkimage/Config.in.host b/package/imx-mkimage/Config.in.host new file mode 100644 index 0000000000..8d273557a1 --- /dev/null +++ b/package/imx-mkimage/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_IMX_MKIMAGE + bool "host imx-mkimage" + help + imx-mkimage is used to combine input images and generate + final boot image with appropriate IVT set. + + https://source.codeaurora.org/external/imx/imx-mkimage diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash new file mode 100644 index 0000000000..08d31ce461 --- /dev/null +++ b/package/imx-mkimage/imx-mkimage.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4ddb144520001c33baa24493f68ef2ea9434ac36bf3ae223f78d7ec581aa484c imx-mkimage-imx_4.9.51_imx8m_beta.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk new file mode 100644 index 0000000000..fd1d90b597 --- /dev/null +++ b/package/imx-mkimage/imx-mkimage.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# imx-mkimage +# +################################################################################ + +IMX_MKIMAGE_VERSION = imx_4.9.51_imx8m_beta +IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage +IMX_MKIMAGE_SITE_METHOD = git +IMX_MKIMAGE_LICENSE = GPL-2.0+ +IMX_MKIMAGE_LICENSE_FILES = iMX8dv/COPYING + +define HOST_IMX_MKIMAGE_BUILD_CMDS + # Currently this only supports iMX8M. When more hardware is available + # this needs to be selectable based on iMX8-version (iMX8M,iMXQ etc). + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/iMX8M -f soc.mak mkimage_imx8 +endef + +define HOST_IMX_MKIMAGE_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 + $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_fit_atf.sh $(HOST_DIR)/bin/mkimage_fit_atf.sh +endef + +$(eval $(host-generic-package)) From 6cc9a5c234902bef75d010ceed7dff5d16602648 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Sat, 10 Mar 2018 12:51:40 +0100 Subject: [PATCH 0757/2640] freescale-imx: add config option for i.MX8M Signed-off-by: Erik Larsson Signed-off-by: Christopher Dahlberg Signed-off-by: Thomas Petazzoni --- package/freescale-imx/Config.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index e33a90d912..d7f260dd7a 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -1,6 +1,6 @@ menuconfig BR2_PACKAGE_FREESCALE_IMX bool "Freescale i.MX libraries" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help Those packages provide hardware acceleration for GPU or VPU, hardware optimization or some hardware tools for Freescale @@ -40,6 +40,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 bool "imx7d/imx7ulp" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + bool "imx8m" endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -54,6 +56,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX6S" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool From 8df2c47b9c9def06e76b0291b57b294135a040b1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 9 Apr 2018 17:39:27 -0300 Subject: [PATCH 0758/2640] linux: bump default to version 4.16.1 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index d52af66e5c..81bc651ad2 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From b147237baae762915674078850f09b939efad1d4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 9 Apr 2018 17:39:28 -0300 Subject: [PATCH 0759/2640] linux-headers: bump 4.16.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3dcc401eb4..40faef2281 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,5 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.13.16" if BR2_KERNEL_HEADERS_4_13 default "4.14.33" if BR2_KERNEL_HEADERS_4_14 default "4.15.16" if BR2_KERNEL_HEADERS_4_15 - default "4.16" if BR2_KERNEL_HEADERS_4_16 + default "4.16.1" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 68e7a2a7dcf822018531b3520fc34a3da12bc496 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Apr 2018 22:18:45 +0200 Subject: [PATCH 0760/2640] DEVELOPERS: add myself for libcap-ng Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index a942b77939..85e22c2e71 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -671,6 +671,7 @@ F: package/gupnp-tools/ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ +F: package/libcap-ng/ F: package/libcdio-paranoia/ F: package/libglib2/ F: package/libmpdclient/ From a31aa66e6e1e13b31bc112b50fb2b2df640839ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Apr 2018 22:17:49 +0200 Subject: [PATCH 0761/2640] libcap-ng: add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap-ng/libcap-ng.hash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index 8058ed9e97..f8342ea928 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,2 +1,4 @@ # Locally calculated sha256 4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328 libcap-ng-0.7.9.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB From fbd809c5f2c826b13d99843bf6fd003f8a5a128f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Apr 2018 22:21:59 +0200 Subject: [PATCH 0762/2640] libglib2: fix license libglib2 is licensed under LGPL-2.1+ and not LGPL-2.0+ since release 2.53.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index a32a9bab52..67db5ac359 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -8,7 +8,7 @@ LIBGLIB2_VERSION_MAJOR = 2.56 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) -LIBGLIB2_LICENSE = LGPL-2.0+ +LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING # 0002-disable-tests.patch LIBGLIB2_AUTORECONF = YES From 3f12545c11ca9927975a4d96f20afaf474913314 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Apr 2018 23:03:29 +0200 Subject: [PATCH 0763/2640] cryptopp: bump to version 7.0.0 Remove patch (applied upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Fix-GCC-version-for-RDSEED-intrinsic.patch | 49 ------------------- package/cryptopp/cryptopp.hash | 4 +- package/cryptopp/cryptopp.mk | 2 +- 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch diff --git a/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch b/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch deleted file mode 100644 index e0596017ad..0000000000 --- a/package/cryptopp/0001-Fix-GCC-version-for-RDSEED-intrinsic.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 31465400675c75d8ea0556d708a7efbf915bc366 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 10 Mar 2018 12:14:23 +0100 -Subject: [PATCH] Fix GCC version for RDSEED intrinsic - -rdseed is only available on gcc 4.8.x, not on gcc 4.7.x - -Fixes: - - http://autobuild.buildroot.org/results/9ab386124e4a09b50598c6f95ad40b25a83d227e - -Signed-off-by: Fabrice Fontaine ---- - rdrand.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rdrand.cpp b/rdrand.cpp -index 900fcd96..64b12208 100644 ---- a/rdrand.cpp -+++ b/rdrand.cpp -@@ -74,7 +74,7 @@ - # else - # define GCC_RDRAND_ASM_AVAILABLE 1 - # endif --# if defined(__RDSEED__) && (CRYPTOPP_GCC_VERSION >= 40700) && !defined(__OPTIMIZE__) -+# if defined(__RDSEED__) && (CRYPTOPP_GCC_VERSION >= 40800) && !defined(__OPTIMIZE__) - # define ALL_RDSEED_INTRIN_AVAILABLE 1 - # else - # define GCC_RDSEED_ASM_AVAILABLE 1 -@@ -291,7 +291,7 @@ inline void RDSEED32(void* output) - : "=a" (*reinterpret_cast(output)) - : : "cc" - ); --#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40700) -+#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40800) - __asm__ __volatile__ - ( - INTEL_NOPREFIX -@@ -333,7 +333,7 @@ inline void RDSEED64(void* output) - : "=a" (*reinterpret_cast(output)) - : : "cc" - ); --#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40700) -+#elif defined(GCC_RDSEED_ASM_AVAILABLE) && (CRYPTOPP_GCC_VERSION >= 40800) - __asm__ __volatile__ - ( - INTEL_NOPREFIX --- -2.11.0 - diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index d124e11a81..389f05f654 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release610.html: -sha256 21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7 cryptopp610.zip +# Hash from: https://www.cryptopp.com/release700.html: +sha256 a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0 cryptopp700.zip # Hash for license file: sha256 fe5f5f187e6e38ac2f833956fc5c4cab2df08797cff07f540e4ee74f12f7ee5b License.txt diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index b4997aba9d..08b18f2fbc 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTOPP_VERSION = 6.1.0 +CRYPTOPP_VERSION = 7.0.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = http://cryptopp.com/ CRYPTOPP_LICENSE = BSL-1.0 From 6dfaa33d131ca9d8b056956f16f94e8370bd7289 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 9 Apr 2018 23:56:51 +0200 Subject: [PATCH 0764/2640] download/git: more resilient in case of kill In case the git backend gets killed right in-between it finished initialising the repository, but before it could add the remote, we'd end up with a repository without the 'origin' remote, so we would not be able to change its URL. Another case that may happen (like in the build failure, below), is that the repository was initialised with a previous version of Buildroot, before the commit e17719264b (download/git: don't require too-recent git) was applied, and that trepository was still lying around... Fixes: http://autobuild.buildroot.org/results/25a/25aae054634368fadb265b97ebe4dda809deff6f/ Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- support/download/git | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/support/download/git b/support/download/git index 868dfad0dd..381f3ceeb3 100755 --- a/support/download/git +++ b/support/download/git @@ -47,13 +47,15 @@ git_cache="${dl_dir}/git" # fetch'ed later. if [ ! -d "${git_cache}" ]; then _git init "'${git_cache}'" - pushd "${git_cache}" >/dev/null - _git remote add origin "'${uri}'" - popd >/dev/null fi pushd "${git_cache}" >/dev/null +# Ensure the repo has an origin (in case a previous run was killed). +if ! git remote |grep -q -E '^origin$'; then + _git remote add origin "'${uri}'" +fi + _git remote set-url origin "'${uri}'" # Try to fetch with limited depth, since it is faster than a full clone - but From 22a6e5da27888b8af76410aef287c33263e743f5 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Tue, 10 Apr 2018 07:34:32 +0200 Subject: [PATCH 0765/2640] imx-mkimage: bump to version rel_imx_4.9.51_8mq_ga Signed-off-by: Erik Larsson Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 08d31ce461..5ecb92d22e 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4ddb144520001c33baa24493f68ef2ea9434ac36bf3ae223f78d7ec581aa484c imx-mkimage-imx_4.9.51_imx8m_beta.tar.gz +sha256 17e8285a346eb19d00780b13916dc281421c5b955707b9f2a662a6734142f1fb imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index fd1d90b597..cfb9e1ae8c 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = imx_4.9.51_imx8m_beta +IMX_MKIMAGE_VERSION = rel_imx_4.9.51_8mq_ga IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ From a08cd50e98107b8f79d133c85a65187459614649 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Apr 2018 08:44:42 +0300 Subject: [PATCH 0766/2640] openssh: bump to version 7.7p1 Drop upstream patches, renumber the rest. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../0001-configure-ac-detect-mips-abi.patch | 44 ------------- ... 0001-fix-pam-uclibc-pthreads-clash.patch} | 0 ...ly-set-seccomp-audit-arch-for-mips64.patch | 63 ------------------- ...e.patch => 0002-fix-howmany-include.patch} | 0 ...sd-getpagesize.c-include-includes.h-.patch | 35 ----------- package/openssh/openssh.hash | 4 +- package/openssh/openssh.mk | 6 +- 7 files changed, 3 insertions(+), 149 deletions(-) delete mode 100644 package/openssh/0001-configure-ac-detect-mips-abi.patch rename package/openssh/{0003-fix-pam-uclibc-pthreads-clash.patch => 0001-fix-pam-uclibc-pthreads-clash.patch} (100%) delete mode 100644 package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch rename package/openssh/{0004-fix-howmany-include.patch => 0002-fix-howmany-include.patch} (100%) delete mode 100644 package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch diff --git a/package/openssh/0001-configure-ac-detect-mips-abi.patch b/package/openssh/0001-configure-ac-detect-mips-abi.patch deleted file mode 100644 index 0d43e6baf0..0000000000 --- a/package/openssh/0001-configure-ac-detect-mips-abi.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f4fcd8c788a4854d4ebae400cf55e3957f906835 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Tue, 20 Jun 2017 16:42:11 +0100 -Subject: [PATCH] configure.ac: detect MIPS ABI - -Signed-off-by: Vicente Olivert Riera -[Upstream commit: ttps://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 18079acba..f990cfe08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -746,6 +746,27 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) - fi - AC_CHECK_HEADERS([linux/seccomp.h linux/filter.h linux/audit.h], [], - [], [#include ]) -+ # Obtain MIPS ABI -+ case "$host" in -+ mips*) -+ AC_COMPILE_IFELSE([ -+#if _MIPS_SIM != _ABIO32 -+#error -+#endif -+ ],[mips_abi="o32"],[AC_COMPILE_IFELSE([ -+#if _MIPS_SIM != _ABIN32 -+#error -+#endif -+ ],[mips_abi="n32"],[AC_COMPILE_IFELSE([ -+#if _MIPS_SIM != _ABI64 -+#error -+#endif -+ ],[mips_abi="n64"],[AC_MSG_ERROR([unknown MIPS ABI]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac - AC_MSG_CHECKING([for seccomp architecture]) - seccomp_audit_arch= - case "$host" in diff --git a/package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch b/package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch similarity index 100% rename from package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch rename to package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch diff --git a/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch b/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch deleted file mode 100644 index 879af5e3d5..0000000000 --- a/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch +++ /dev/null @@ -1,63 +0,0 @@ -From afc3e31b637db9dae106d4fad78f7b481c8c24e3 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Tue, 20 Jun 2017 16:42:28 +0100 -Subject: [PATCH] configure.ac: properly set seccomp_audit_arch for MIPS64 - -Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or -AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built -for MIPS64. However, that's only valid for n64 ABI. The right macros for -n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and -AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively. - -Because of that an sshd built for MIPS64 n32 rejects connection attempts -and the output of strace reveals that the problem is related to seccomp -audit: - -[pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57, -filter=0x555d5da0}) = 0 -[pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ? -[pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP}, -{fd=6, revents=POLLHUP}]) -[pid 194] +++ killed by SIGSYS +++ - -This patch fixes that problem by setting the right value to -seccomp_audit_arch taking into account the MIPS64 ABI. - -Signed-off-by: Vicente Olivert Riera -[Upstream commit: https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f990cfe08..5d640f679 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -801,10 +801,24 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) - seccomp_audit_arch=AUDIT_ARCH_MIPSEL - ;; - mips64-*) -- seccomp_audit_arch=AUDIT_ARCH_MIPS64 -+ case "$mips_abi" in -+ "n32") -+ seccomp_audit_arch=AUDIT_ARCH_MIPS64N32 -+ ;; -+ "n64") -+ seccomp_audit_arch=AUDIT_ARCH_MIPS64 -+ ;; -+ esac - ;; - mips64el-*) -- seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 -+ case "$mips_abi" in -+ "n32") -+ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32 -+ ;; -+ "n64") -+ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 -+ ;; -+ esac - ;; - esac - if test "x$seccomp_audit_arch" != "x" ; then diff --git a/package/openssh/0004-fix-howmany-include.patch b/package/openssh/0002-fix-howmany-include.patch similarity index 100% rename from package/openssh/0004-fix-howmany-include.patch rename to package/openssh/0002-fix-howmany-include.patch diff --git a/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch b/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch deleted file mode 100644 index ce60072934..0000000000 --- a/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9a43657a3dcb868b4f36ade3aba5dcf0871fb412 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 30 Oct 2017 23:36:56 +0100 -Subject: [PATCH] openbsd-compat/bsd-getpagesize.c: include includes.h for - config.h defines - -The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in -config.h, but bsd-getpagesize.c forgot to include includes.h (which -indirectly includes config.h) so the checks always fails, causing linker -issues when linking statically on systems with getpagesize(): - -http://autobuild.buildroot.net/results/8cc/8cc30818a400c7a392a3de787cabc9cd8425495f/build-end.log - -Fix it by including includes.h - -Signed-off-by: Peter Korsgaard ---- - openbsd-compat/bsd-getpagesize.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/openbsd-compat/bsd-getpagesize.c b/openbsd-compat/bsd-getpagesize.c -index 9daddfbd..416a8d4c 100644 ---- a/openbsd-compat/bsd-getpagesize.c -+++ b/openbsd-compat/bsd-getpagesize.c -@@ -1,5 +1,7 @@ - /* Placed in the public domain */ - -+#include "includes.h" -+ - #ifndef HAVE_GETPAGESIZE - - #include --- -2.11.0 - diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index d8a4da32ad..69d34ba65e 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From http://www.openssh.com/txt/release-7.6 (base64 encoded) -sha256 a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723 openssh-7.6p1.tar.gz +# From http://www.openssh.com/txt/release-7.7 (base64 encoded) +sha256 d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f openssh-7.7p1.tar.gz # Locally calculated sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 986bab413d..b28429e1bb 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,14 +4,10 @@ # ################################################################################ -OPENSSH_VERSION = 7.6p1 +OPENSSH_VERSION = 7.7p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -# Autoreconf needed due to the following patches modifying configure.ac: -# 0001-configure-ac-detect-mips-abi.patch -# 0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch -OPENSSH_AUTORECONF = YES OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ From 02fe101688132e0dd8d3ad6bc152db066880653f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Apr 2018 13:55:21 +0300 Subject: [PATCH 0767/2640] zsh: bump to version 5.5 We now have tar.xz archive again, use that. Cc: Phil Eichinger Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/zsh/zsh.hash | 6 +++--- package/zsh/zsh.mk | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 0770d8e247..5931e4d465 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,7 @@ # From http://www.zsh.org/pub/MD5SUM -md5 dfe156fd69b0d8d1745ecf6d6e02e047 zsh-5.4.2.tar.gz +md5 5c3b294e63b6cc8da8bcc364c72d954b zsh-5.5.tar.xz # Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.4.2.tar.gz.asc -sha256 957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9 zsh-5.4.2.tar.gz +# http://www.zsh.org/pub/zsh-5.5.tar.xz.asc +sha256 a8359b81d090425d497c6f3c724a7c21a81c614b03e7662ed347705d86958e53 zsh-5.5.tar.xz # Locally calculated sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index bfd0a1a30f..a45c61b931 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,8 +4,9 @@ # ################################################################################ -ZSH_VERSION = 5.4.2 +ZSH_VERSION = 5.5 ZSH_SITE = http://www.zsh.org/pub +ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses ZSH_CONF_OPTS = --bindir=/bin ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no From 0bad8db32b4acf659f3d4f6d4fe8effe9564871a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Apr 2018 14:42:25 +0300 Subject: [PATCH 0768/2640] nmap: bump to version 7.70 Drop libssh2 configure test fix; the issue is fixed upstream. Add license file hash. Cc: Carlos Santos Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...-AC_CHECK_HEADER-call-to-test-for-li.patch | 30 ------------------- package/nmap/nmap.hash | 6 ++-- package/nmap/nmap.mk | 12 ++------ 3 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch diff --git a/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch b/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch deleted file mode 100644 index ed5cae259e..0000000000 --- a/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ff629766dbd3b5e179330ba4f07fd7e3d8384ec0 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 1 Nov 2017 15:30:40 +0100 -Subject: [PATCH] configure.ac: fix AC_CHECK_HEADER call to test for libssh2 - -The -lm argument is passed as an argument to AC_CHECK_HEADER(), which -doesn't make sense. The intention was to pass it as the fifth -argument of AC_CHECK_LIB(). - -Signed-off-by: Max Filippov ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3d00e164e..67db42e08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -674,7 +674,7 @@ AC_HELP_STRING([--without-libssh2], [Compile without libssh2]), - AC_CHECK_LIB(ssh2, libssh2_version, - [have_libssh2=yes - LIBSSH2_INC=$with_libssh2/include -- LIBSSH2_LIB=$with_libssh2/lib])],,[-lm]) -+ LIBSSH2_LIB=$with_libssh2/lib],,[-lm])]) - - LDFLAGS=$_ldflags - CPPFLAGS=$_cppflags --- -2.13.6 - diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 740ec7a001..349f98d48b 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,2 +1,4 @@ -# From https://nmap.org/dist/sigs/nmap-7.60.tar.bz2.digest.txt -sha256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 nmap-7.60.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.70.tar.bz2.digest.txt +sha256 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18 nmap-7.70.tar.bz2 +# Locally calculated +sha256 e013006fbdb7a7923e456e72272b115a5d722a3c6a372f27b5e8fcd282104651 COPYING diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 92a2be1b54..391215dbf4 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,23 +4,15 @@ # ################################################################################ -NMAP_VERSION = 7.60 +NMAP_VERSION = 7.70 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 -NMAP_DEPENDENCIES = libpcap host-autoconf +NMAP_DEPENDENCIES = libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ --with-libdnet=included --with-liblinear=included NMAP_LICENSE = GPL-2.0 NMAP_LICENSE_FILES = COPYING -# nmap doesn't autoreconf properly, so we just re-generate the -# top-level configure script, since we are patching configure.ac. -define NMAP_DO_AUTOCONF - (cd $(@D); $(HOST_DIR)/bin/autoconf) -endef - -NMAP_PRE_CONFIGURE_HOOKS += NMAP_DO_AUTOCONF - # needed by libpcap NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` From f3cea9d8685cf3ec2e8223adca08147ea815f338 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Apr 2018 23:51:05 +0200 Subject: [PATCH 0769/2640] Update for 2018.02.1 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit 9565a37e0d2aa3c5fb9a4148760c490f2e5226d4) Signed-off-by: Peter Korsgaard --- CHANGES | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/CHANGES b/CHANGES index c7925bdedc..09cf7c3f85 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,66 @@ +2018.02.1, Released April 9th, 2018 + + Important / security related fixes. + + Removed unmaintained defconfigs: Creator Ci40, Firefly rk3288, + Freescale mpc8315erdb / p1010rdb_pa, Riotboard, Teliv EVK + Pro3. + + Infrastructure: Speed up instrumentation for package size by + comparing timestamps instead of md5 checksums, as doing + checksums could lead to up to 25% longer build time for big + configurations. + + Rename the internal _BASE_NAME variable to _NASENAME + to avoid name clashes with packages ending on '-base'. + + Add a better fix for build issues for autotools based packages + checking for C++ support on toolchains without C++ support. + + Build host-tar if tar is older than 1.27 on the build machine + to work around reproducibility issues with git archives + containing long paths. + + check-unique-files: Fix for filenames not representable in the + users' locale. + + Check-bin-arch: Add support for per-package ignore paths + (_BIN_ARCH_EXCLUDE). + + Toolchain: Fix SSP support detection for external toolchains. + + linux: Add _NEEDS_HOST_OPENSSL / LIBELF options to ensure + these dependencies are available for Linux configurations + needed these dependencies, similar to how it is done for + U-Boot. + + Support custom (not in tree) device tree files in addition to + in-tree ones. + + U-Boot / uboot-tools: Fix header conflict with libfdt-devel + installed on host. + + Updated/fixed packages: apache, busybox, c-ares, cmake, + docker-engine, enlightenment, eudev, fbgrab, freescale-imx, + gtest, imagemagick, intel-microcode, irssi, jimtcl, kmod, + kodi, ktap, libcoap, libcurl, libfcgi, libhttpparser, + libminiupnpc, libopenssl, libpjsip, libss7, libssh2, libupnp + libupnpp, libuv, libvorbis, memcached, motion, musl, nodejs, + ntp, openblas, opencv3, openocd, opus-tools, patch, php, + pkgconf, postgresql, powerpc-utils, python-jsonschema, + python-webpy, qemu, qt5bsae, qt5script, qt5webkit, rapidjson, + rauc, sam-ba, samba4, sngrep, systemd, tremor, uboot-tools, + uclibc-ng-test, upmpdcli, wireshark, xerces, xterm, zstd + + New packages: docker-proxy, python-functools32 + + Issues resolved (http://bugs.uclibc.org): + + #10766: upmpdcli: Segmentation fault + #10776: ktap fails to build + #10846: error in compiling gnutls + #10856: openblas on qemu_x86_64_defconfig fails with "sgemm_.. + 2018.02, Released March 4th, 2018 Fixes all over the tree. From f682bcb145ce7e0952ff49087879fee1933e1356 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Apr 2018 15:36:32 +0200 Subject: [PATCH 0770/2640] docs/website: update for 2018.02.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index cf99b22cd1..a34b799b01 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
Download
-

Latest stable / long term support release: 2018.02

+

Latest stable / long term support release: 2018.02.1

- +
- +
-

buildroot-2018.02.tar.gz

-

PGP signature

+

buildroot-2018.02.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2018.02.tar.bz2

-

PGP signature

+

buildroot-2018.02.1.tar.bz2

+

PGP signature

-

Latest release candidate: 2018.02-rc3

+

Latest release candidate: 2018.05-rc1

- +
- +
-

buildroot-2018.02-rc3.tar.gz

-

PGP signature

+

buildroot-2018.05-rc1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2018.02-rc3.tar.bz2

-

PGP signature

+

buildroot-2018.05-rc1.tar.bz2

+

PGP signature

---> + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
From b73e9e3d21426d5029044a4c53665917c2342c41 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 9 May 2018 23:18:26 +0200 Subject: [PATCH 1267/2640] docs/website: update news.html for 2018.05-rc1 Signed-off-by: Thomas Petazzoni --- docs/website/news.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 90305f5cc3..cb70b7119b 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,30 @@

News

    +
  • +
    +
    +
    +

    2018.05-rc1 released

    +

    9 May 2018

    +
    +
    +

    We have a new release candidate! Lots of changes all over the + tree, see the + CHANGES + file for details and read the + announcement. +

    + +

    Head to the downloads page to pick up the + 2018.05-rc1 + release candidate, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From 72703d02b96bb1f7f94f705d3a7199599b1bc980 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 9 May 2018 19:59:24 +0200 Subject: [PATCH 1268/2640] support/dependencies: check that PATH does not contain CWD A person on IRC reported a build failure with the util-linux package, looking like this: for I in uname26 linux32 linux64 ; do \ cd /home/aep/consulting/chargery/tracker/output/target/usr/bin && ln -sf setarch $I ; \ done [...] /bin/sh: line 1: ./ln: cannot execute binary file: Exec format error /bin/sh: line 1: ./ln: cannot execute binary file: Exec format error /bin/sh: line 1: ./ln: cannot execute binary file: Exec format error The issue was an empty path in the PATH variable, which means "current working directory", causing a "ln" binary built by util-linux for the target to be used instead of the system-provided "ln". We already check a number of things in the PATH and LD_LIBRARY_PATH variables in support/dependencies/dependencies.sh, but we were not checking that PATH did not contain an empty path. This commit fixes that and takes this opportunity to simplify the test code for PATH and LD_LIBRARY_PATH. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni [Thomas: improve commit log.] Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 59 +++++++++++----------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 985b1d863b..f98678973b 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -11,27 +11,30 @@ if test $? != 0 ; then exit 1 fi -# sanity check for CWD in LD_LIBRARY_PATH -# try not to rely on egrep.. -if test -n "$LD_LIBRARY_PATH" ; then - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep '::' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start:' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':TRiGGER_end' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || - echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 - if test $? = 0; then - echo - echo "You seem to have the current working directory in your" - echo "LD_LIBRARY_PATH environment variable. This doesn't work." - exit 1; - fi -fi; +# Sanity check for CWD in LD_LIBRARY_PATH +case ":${LD_LIBRARY_PATH:-unset}:" in +(*::*|*:.:*) + echo + echo "You seem to have the current working directory in your" + echo "LD_LIBRARY_PATH environment variable. This doesn't work." + exit 1 + ;; +esac -# PATH should not contain a newline, otherwise it fails in spectacular ways -# as soon as PATH is referenced in a package rule -case "${PATH}" in +# Sanity check for CWD in PATH. Having the current working directory +# in the PATH makes various packages (e.g. toolchain, coreutils...) +# build process break. +# PATH should not contain a newline, otherwise it fails in spectacular +# ways as soon as PATH is referenced in a package rule +# An empty PATH is technically possible, but in practice we would not +# even arrive here if that was the case. +case ":${PATH:-unset}:" in +(*::*|*:.:*) + echo + echo "You seem to have the current working directory in your" + echo "PATH environment variable. This doesn't work." + exit 1 + ;; (*" "*) printf "\n" # Break the '\n' sequence, or a \n is printed (which is not what we want). @@ -41,22 +44,6 @@ case "${PATH}" in ;; esac -# sanity check for CWD in PATH. Having the current working directory -# in the PATH makes the toolchain build process break. -# try not to rely on egrep.. -if test -n "$PATH" ; then - echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || - echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || - echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 - if test $? = 0; then - echo - echo "You seem to have the current working directory in your" - echo "PATH environment variable. This doesn't work." - exit 1; - fi -fi; - if test -n "$PERL_MM_OPT" ; then echo echo "You have PERL_MM_OPT defined because Perl local::lib" From 0c08451a4ae8dc33dfbe463ce959bf2108bdecdd Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 9 May 2018 17:47:15 +0200 Subject: [PATCH 1269/2640] dbus-glib: Bump to version 0.110 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/dbus-glib/dbus-glib.hash | 2 +- package/dbus-glib/dbus-glib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-glib/dbus-glib.hash b/package/dbus-glib/dbus-glib.hash index 732ae97c86..8a80b71b45 100644 --- a/package/dbus-glib/dbus-glib.hash +++ b/package/dbus-glib/dbus-glib.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c dbus-glib-0.108.tar.gz +sha256 7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 dbus-glib-0.110.tar.gz diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 2257c8e4f9..372942e1c3 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_GLIB_VERSION = 0.108 +DBUS_GLIB_VERSION = 0.110 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+ From 9c5f17a928ecfcad0d253b0db601fd94046d34f4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 11 May 2018 18:29:56 +0200 Subject: [PATCH 1270/2640] package/asterisk: use package's DL_DIR Since we reworked the download infra, the location for packages to look for their files has moved to a per-package directory. For systems where a download of the asterisk sound files was already done in a version prior to the rework, all was working fine so far, because the files were indeed in the main DL directory. But for systems where the download is first attempted after the rework, the files are not found (even though they are properly downloaded). Fix the location where asterisk looks for its extra files. Reported-by: ***** ***** Signed-off-by: "Yann E. MORIN" Cc: ***** ***** Cc: Carlos Santos Cc: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/asterisk/asterisk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 28b85da562..f2f210b524 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -102,7 +102,7 @@ ASTERISK_CONF_OPTS = \ --with-libxml2 \ --with-ncurses="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \ - --with-sounds-cache=$(BR2_DL_DIR) + --with-sounds-cache=$(ASTERISK_DL_DIR) # avcodec are from ffmpeg. There is virtually zero chance this could # even work; asterisk is looking for ffmpeg/avcodec.h which has not From 1a06b3d34c32bfad087d949603062bafce415ad7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 11 May 2018 18:29:57 +0200 Subject: [PATCH 1271/2640] package/dahdi-linux: use package's DL_DIR Since we reworked the download infra, the location for packages to look for their files has moved to a per-package directory. For systems where a download of the dahdi firmware files was already done in a version prior to the rework, all was working fine so far, because the files were indeed in the main DL directory. But for systems where the download is first attempted after the rework, the files are not found (even though they are properly downloaded). Fix the location where dahdi-linux looks for its extra files. Reported-by: ***** ***** Signed-off-by: "Yann E. MORIN" Cc: ***** ***** Cc: Carlos Santos Cc: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/dahdi-linux/dahdi-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/dahdi-linux.mk b/package/dahdi-linux/dahdi-linux.mk index c042a14e53..6ac1e88943 100644 --- a/package/dahdi-linux/dahdi-linux.mk +++ b/package/dahdi-linux/dahdi-linux.mk @@ -56,7 +56,7 @@ DAHDI_LINUX_MODULE_MAKE_OPTS = \ define DAHDI_LINUX_EXTRACT_FW $(foreach f,$(DAHDI_LINUX_FW_FILES),\ - cp $(BR2_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep)) + cp $(DAHDI_LINUX_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep)) endef DAHDI_LINUX_POST_EXTRACT_HOOKS += DAHDI_LINUX_EXTRACT_FW From 901f7250f473fa08d2fae733a07b006ab329a0ea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:04 +0200 Subject: [PATCH 1272/2640] package/perl-libwww-perl: bump version to 6.33 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 ++++-- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 7ce0853049..59164a83f2 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 688284bc6282562948c6916f9e8563b0 libwww-perl-6.31.tar.gz -sha256 525d5386d39d1c1d7da8a0e9dd0cbab95cba2a4bfcfd9b83b257f49be4eecae3 libwww-perl-6.31.tar.gz +md5 2e15c1c789ac9036c99d094e47e3da23 libwww-perl-6.33.tar.gz +sha256 97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99 libwww-perl-6.33.tar.gz +# Locally computed +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index cdff6b41b4..9624929a92 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.31 +PERL_LIBWWW_PERL_VERSION = 6.33 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_LIBWWW_PERL_DEPENDENCIES = \ From 27eff884fa822bf96897c0e5b1118a6daa541188 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:05 +0200 Subject: [PATCH 1273/2640] package/perl-net-http: bump version to 6.18 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-net-http/perl-net-http.hash | 6 ++++-- package/perl-net-http/perl-net-http.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-net-http/perl-net-http.hash b/package/perl-net-http/perl-net-http.hash index ff59a0d9d3..21cd6308f2 100644 --- a/package/perl-net-http/perl-net-http.hash +++ b/package/perl-net-http/perl-net-http.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 068fa02fd3c8a5b63316025b5a24844c Net-HTTP-6.17.tar.gz -sha256 1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611 Net-HTTP-6.17.tar.gz +md5 6da11a7db0e933b7684148e1fb32006a Net-HTTP-6.18.tar.gz +sha256 7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c Net-HTTP-6.18.tar.gz +# Locally computed +sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE diff --git a/package/perl-net-http/perl-net-http.mk b/package/perl-net-http/perl-net-http.mk index f13614e346..12bd50f848 100644 --- a/package/perl-net-http/perl-net-http.mk +++ b/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.17 +PERL_NET_HTTP_VERSION = 6.18 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_DEPENDENCIES = perl-uri From e025497175b3ef36b738601b017bb0706e5c134c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:06 +0200 Subject: [PATCH 1274/2640] package/perl-uri: bump version to 1.74 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-uri/perl-uri.hash | 6 ++++-- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 5f27230e5e..c8bf47d437 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 37d44a08e599aa945b32a9434ffe00a5 URI-1.73.tar.gz -sha256 cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413 URI-1.73.tar.gz +md5 892f7183b178af40f205ba37128225db URI-1.74.tar.gz +sha256 a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d URI-1.74.tar.gz +# Locally computed +sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index 690a0eb8c7..10a5bb8bda 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 1.73 +PERL_URI_VERSION = 1.74 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_URI_LICENSE = Artistic or GPL-1.0+ From e5cc3b65820ae5a3247043c863d7921302c5c828 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:07 +0200 Subject: [PATCH 1275/2640] package/perl-mail-dkim: bump version to 0.52 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 4 ++-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index c40e66e995..99b3e7cce3 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,3 +1,3 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 60ebe54760f6633f07b25228272b9473 Mail-DKIM-0.42.tar.gz -sha256 f4e3a6344517aeee9a7516c0f58197f41dce81461f74ce9ba8401a143aa2577c Mail-DKIM-0.42.tar.gz +md5 f366863f09905bbe5faa1f986133759c Mail-DKIM-0.52.tar.gz +sha256 9eaf0b212af1883b9c3f709dcf4811e46122546a38ae979a08756fbfcffb6cb5 Mail-DKIM-0.52.tar.gz diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e088ecf1a5..e6bfd7bd83 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 0.42 +PERL_MAIL_DKIM_VERSION = 0.52 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_DEPENDENCIES = perl-crypt-openssl-rsa perl-mailtools perl-net-dns From 1dc663fd875aa96262a8f2a3a3850a2035b2fd52 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:08 +0200 Subject: [PATCH 1276/2640] package/perl-mailtools: bump version to 2.20 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mailtools/perl-mailtools.hash | 6 ++++-- package/perl-mailtools/perl-mailtools.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-mailtools/perl-mailtools.hash b/package/perl-mailtools/perl-mailtools.hash index cb33453ecd..9fb91cbd26 100644 --- a/package/perl-mailtools/perl-mailtools.hash +++ b/package/perl-mailtools/perl-mailtools.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a00b9d3c3dec64bd15de8c50f1b73d05 MailTools-2.19.tar.gz -sha256 c17ed702efea8eab56fe92961c07cd4980cee26ca6f13aff2688dc8af69c5e1a MailTools-2.19.tar.gz +md5 53e9d35256c3fd7cef0e4a24b15e9512 MailTools-2.20.tar.gz +sha256 f55606f7a9cc342ee9d5f996e2b6a4c0047e2ee47cd88c3250ecf0d0c5fb3196 MailTools-2.20.tar.gz +# Locally computed +sha256 734d5b1bd212de832aea99e94c98d56217ea9519d900a29c0547538f596a9b26 README diff --git a/package/perl-mailtools/perl-mailtools.mk b/package/perl-mailtools/perl-mailtools.mk index 75079f9e8b..ae595bbfcf 100644 --- a/package/perl-mailtools/perl-mailtools.mk +++ b/package/perl-mailtools/perl-mailtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAILTOOLS_VERSION = 2.19 +PERL_MAILTOOLS_VERSION = 2.20 PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV PERL_MAILTOOLS_DEPENDENCIES = perl-timedate From dcae6a8c84f1a83729d4f2fd86dfd22284bb6d8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 May 2018 13:58:09 +0200 Subject: [PATCH 1277/2640] package/perl-net-dns: bump version to 1.15 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-net-dns/perl-net-dns.hash | 6 ++++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 1572a9f3c2..44cad68764 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 0da1099c0a3548d36ea9e31d5bb9e122 Net-DNS-1.14.tar.gz -sha256 83c38a594eeb2c85d66e60047a0f5b403f34bd92a5d13606f02e828d450299fc Net-DNS-1.14.tar.gz +md5 daaf39133bb89a31c093510169c228e1 Net-DNS-1.15.tar.gz +sha256 1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0 Net-DNS-1.15.tar.gz +# Locally computed +sha256 ab10a05c33f412e00f71a828aa7521288309cfac74b1f075daef8560e86a9b94 README diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index 0066a31ba3..f9d22c240d 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.14 +PERL_NET_DNS_VERSION = 1.15 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_DEPENDENCIES = perl-digest-hmac From ced4daef825d2c763fab78a4c5bdaa5a2fe12886 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 11 May 2018 07:31:33 +0300 Subject: [PATCH 1278/2640] libusb: bump to version 1.0.22 Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libusb/libusb.hash | 3 ++- package/libusb/libusb.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 0415aab509..7e9d2a2ad2 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b libusb-1.0.21.tar.bz2 +sha256 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 libusb-1.0.22.tar.bz2 +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index f0bb9e3335..8d7aed1619 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).21 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).22 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ From 4d25bdbeec96a8d064de72a0cd8db62b97f426ff Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 11 May 2018 07:45:08 +0300 Subject: [PATCH 1279/2640] dbus: bump to version 1.12.8 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 66fce31461..91d270eb13 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.6.tar.gz.asc -sha256 621b902a07badec16c9e43eda43903cd0e1e69e11b13143da71c1889b062f116 dbus-1.12.6.tar.gz +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz.asc +sha256 e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3 dbus-1.12.8.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 8771412be4..8cf4367bf2 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.6 +DBUS_VERSION = 1.12.8 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From eb790df07ec490b2083abc346f381bc7f8c605b0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 11 May 2018 08:27:19 +0300 Subject: [PATCH 1280/2640] tmux: bump to version 2.7 Add COPYING to license files. Update README hash; contest change unrelated to license. Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/tmux/tmux.hash | 5 +++-- package/tmux/tmux.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 752bbb4516..27a3ccaaeb 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8 tmux-2.6.tar.gz -sha256 94e2b1feb1202d3308cc7ab7ec42278d24f10562394bdf269f44649327c8198f README +sha256 9ded7d100313f6bc5a87404a4048b3745d61f2332f99ec1400a7c4ed9485d452 tmux-2.7.tar.gz +sha256 59ad3f5d323cb6b97bb3882c454e6176519cd580b2d4db43c5161517385569f1 README +sha256 ce75f1345a76c93bd0f413d1b93ff1baa0669f34a7242779a00c1b862b4f813a COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index e380227475..deae99717b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,10 +4,10 @@ # ################################################################################ -TMUX_VERSION = 2.6 +TMUX_VERSION = 2.7 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC -TMUX_LICENSE_FILES = README +TMUX_LICENSE_FILES = README COPYING TMUX_DEPENDENCIES = libevent ncurses host-pkgconf # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear From c817be894728ee496881ee0a72c2fadef1761fdd Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 11 May 2018 08:51:53 +0300 Subject: [PATCH 1281/2640] uhubctl: bump to version 2.0.0 Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/uhubctl/uhubctl.hash | 3 ++- package/uhubctl/uhubctl.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index 6afee905bf..3724f3fbf9 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 dfc85571ad86a071bf7a0db7cadf97a870e628777e47176520de6866b4f042b6 uhubctl-047bb1e392efd3e0ea5d5caf351e20761e12cd44.tar.gz +sha256 4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e uhubctl-v2.0.0.tar.gz +sha256 3260a6cd23e2677be1fa0815785cd5fa499d363a033f58cc299e12220662d486 LICENSE diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index 74845001ba..3d2adb347e 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHUBCTL_VERSION = 047bb1e392efd3e0ea5d5caf351e20761e12cd44 +UHUBCTL_VERSION = v2.0.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE From f2c2e7a9f992460f5b6133fd5a2188e92df33cc2 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Fri, 11 May 2018 19:31:45 +0200 Subject: [PATCH 1282/2640] libostree: bump to version 2018.5 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 1f0e9ce95f..9ee0c7bdb2 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f5b1e083ed630fd32a263731fe9595ecdd07cfd5cba3e354931f481c4181de1c libostree-2018.4.tar.xz +sha256 ad0f5a0e7a7f22f87c72b318b2cfdbe8cf908a1a469ec94eb72984bbb3690261 libostree-2018.5.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index ba6379d7e7..ddb230517b 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.4 +LIBOSTREE_VERSION = 2018.5 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From fc0d31caeedba084a5cd5ef3766a48c7a8193018 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 May 2018 18:42:12 +0300 Subject: [PATCH 1283/2640] strace: disable (again) mpers for musl It turns out that mpers support in strace still does not play nicely with musl libc. As explained in commit 7892a778b (package/strace: disable libmpers with musl toolchains) headers mixup causes gcc header to be included, instead of the musl one, resulting in conflicting types. Commit 1088372941 (strace: bump to version 4.21) incorrectly enabled mpers for musl. Revert that. Fixes: http://autobuild.buildroot.net/results/345/3452419498c074ca66f36f0f87263fa10662ac86/ Cc: Romain Naour Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 0529d79af6..1cb0c88c4f 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -11,6 +11,14 @@ STRACE_LICENSE = BSD-3-Clause STRACE_LICENSE_FILES = COPYING STRACE_CONF_OPTS = --enable-mpers=check +# strace bundle some kernel headers to build libmpers, this mixes userspace +# headers and kernel headers which break the build with musl. +# The stddef.h from gcc is used instead of the one from musl. +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +STRACE_CONF_OPTS += st_cv_m32_mpers=no \ + st_cv_mx32_mpers=no +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) STRACE_DEPENDENCIES += libunwind STRACE_CONF_OPTS += --with-libunwind From 06043706893f1e5476435b60feb5901dd04b9af7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 May 2018 18:55:41 +0300 Subject: [PATCH 1284/2640] strace: bump to version 4.22 Drop upstream patch. Update license file hash; copyright year update. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/0001-m68k-fix-build.patch | 97 ------------------------ package/strace/strace.hash | 6 +- package/strace/strace.mk | 2 +- 3 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 package/strace/0001-m68k-fix-build.patch diff --git a/package/strace/0001-m68k-fix-build.patch b/package/strace/0001-m68k-fix-build.patch deleted file mode 100644 index 9675eaaa3c..0000000000 --- a/package/strace/0001-m68k-fix-build.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Wed, 21 Feb 2018 23:03:27 +0000 -Subject: [PATCH] m68k: fix build - -When is included after , the build fails -on m68k with the following diagnostics: - - In file included from /usr/include/linux/ptrace.h:101:0, - from ptrace.h:51, - from sigreturn.c:2: - /usr/include/m68k-linux-gnu/sys/reg.h:26:3: error: expected identifier - before numeric constant - PT_D1 = 0, - ^ - -Apparently, the only architecture where strace needs definitions -provided by is x86_64, other three (m68k, tile, and x86) -are fine with definitions already provided by . - -Fix the issue by getting rid of and defining necessary -macros in linux/x86_64/arch_regs.h file. - -* configure.ac (AC_CHECK_HEADERS): Remove sys/reg.h. -* regs.h: Do not include . -* linux/x86_64/arch_regs.h (R15, R14, R13, R12, RBP, RBX, R11, R10, -R9, R8, RAX, RCX, RDX, RSI, RDI, ORIG_RAX, RIP, CS, EFLAGS, RSP, SS, -FS_BASE, GS_BASE, DS, ES, FS, GS): New macros. -* NEWS: Mention this fix. - -Fixes: v4.21~21 ("Include early") -[baruch: drop the NEWS and configure.ac hunks] -Signed-off-by: Baruch Siach ---- -Upstream status: commit 6ebf6c4f9e5e - - NEWS | 3 +++ - configure.ac | 1 - - linux/x86_64/arch_regs.h | 29 +++++++++++++++++++++++++++++ - regs.h | 5 ----- - 4 files changed, 32 insertions(+), 6 deletions(-) - -diff --git a/linux/x86_64/arch_regs.h b/linux/x86_64/arch_regs.h -index c2ccee671d4f..d502ca4bf202 100644 ---- a/linux/x86_64/arch_regs.h -+++ b/linux/x86_64/arch_regs.h -@@ -1,2 +1,31 @@ - extern uint32_t *const i386_esp_ptr; - extern uint64_t *const x86_64_rsp_ptr; -+ -+/* does not provide these definitions. */ -+#define R15 0 -+#define R14 1 -+#define R13 2 -+#define R12 3 -+#define RBP 4 -+#define RBX 5 -+#define R11 6 -+#define R10 7 -+#define R9 8 -+#define R8 9 -+#define RAX 10 -+#define RCX 11 -+#define RDX 12 -+#define RSI 13 -+#define RDI 14 -+#define ORIG_RAX 15 -+#define RIP 16 -+#define CS 17 -+#define EFLAGS 18 -+#define RSP 19 -+#define SS 20 -+#define FS_BASE 21 -+#define GS_BASE 22 -+#define DS 23 -+#define ES 24 -+#define FS 25 -+#define GS 26 -diff --git a/regs.h b/regs.h -index d89581d7dd3f..7a044cef8fbf 100644 ---- a/regs.h -+++ b/regs.h -@@ -2,11 +2,6 @@ - #define STRACE_REGS_H - - #include -- --#ifdef HAVE_SYS_REG_H --# include --#endif -- - #include "arch_regs.h" - - #endif /* !STRACE_REGS_H */ --- -2.17.0 - diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 21da83058e..f50e89c060 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# https://strace.io/files/4.21/strace-4.21.tar.xz.asc -sha256 5c7688db44073e94c59a5627744e5699454419824cc8166e8bcfd7ec58375c37 strace-4.21.tar.xz -sha256 ea7ff222f36c9df0aa2924a8f7c7d2aec3ea11e752feba4b15ec79b695b6236a COPYING +# https://strace.io/files/4.22/strace-4.22.tar.xz.asc +sha256 068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d strace-4.22.tar.xz +sha256 df862ba273812c589fd69acc74197a25d38c5295baccab00a62d39d1894c0253 COPYING diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 0529d79af6..4d42085819 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.21 +STRACE_VERSION = 4.22 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = BSD-3-Clause From 40e99050c81a9885789aa8b0b64a013ddedda190 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 10 May 2018 18:22:35 +0200 Subject: [PATCH 1285/2640] firmware-imx: bump to version 7.4 This update includes GA version of the DDR training binaries for i.MX8M. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/firmware-imx.hash | 2 +- package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index ca8556fa21..dd0e13a7cf 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3e107d83ed2367c9565250d6ff3903cc604bf4d9aa505391260ead0f51ceb8d9 firmware-imx-7.2.bin +sha256 8a8ec439d014e928f42c49bab1c382914ec5b4f1041df28e5d687eb194bd07ab firmware-imx-7.4.bin sha256 faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a EULA sha256 0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a COPYING diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 351496a7a7..b9756fc2bf 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 7.2 +FIRMWARE_IMX_VERSION = 7.4 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin From 5da10dc54c571aa91d71140da9b803cc0782825b Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Thu, 10 May 2018 21:07:34 +0300 Subject: [PATCH 1286/2640] libuv: bump to version 1.20.3 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 899fae2817..e877e0a1e9 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a5e62a6ed3c25a712477b55ce923e7f49af95b80319f88b9c950200d65427793 libuv-v1.20.2.tar.gz +sha256 43a388687194a15d5f3cc1980d53c405020a3586254c620e5f3c4d241bb9da05 libuv-v1.20.3.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index d857d64c49..83b39ac7a2 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.20.2 +LIBUV_VERSION = v1.20.3 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From ea7218774624d6d3dfe76d1e2f1e6a5dab446dce Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 May 2018 21:51:06 +0300 Subject: [PATCH 1287/2640] mtd: bump to version 2.0.2 Add license file hash. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/mtd/mtd.hash | 5 +++-- package/mtd/mtd.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index c452654bfb..4bd0cda097 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,3 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.0.1.tar.bz2.asc -sha256 312baa0446e4e728ceb413c53533e41e547d1c13ffa0752b2f879fd289fc2f63 mtd-utils-2.0.1.tar.bz2 +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.0.2.tar.bz2.asc +sha256 fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8 mtd-utils-2.0.2.tar.bz2 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 7094aad89e..83bd6a6ae9 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.0.1 +MTD_VERSION = 2.0.2 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 From 970cb26ec22e165c9b1fea27a85cfe5762096b19 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 11 May 2018 17:50:58 +0200 Subject: [PATCH 1288/2640] docs/manual: using a branch name as FOO_VERSION does not work For various reasons, we've always suggested users to avoid using a branch as version string for their packages, because it does not work as a they would expect: - it is not reproducible, because the branch may change between two builds that are done at different times; - it does not even follow the branch, as Buildroot anyway generates a local tarball, which it will reuse on subsequent builds. Furthermore, since we fetch and not pull, any existing local branch is not updated. Yet, until recently, using a branch name would just work (with the above limitations): the git tree was cloned, the branch checked out, and the tarball created. But with the advent of the git caching, using a branch name does not work anymore. Indeed, we now do a git-fetch, and that does not create a local master branch. So we can't check out master, because it does not exist locally. And for other branches, as noticed above, the local branch does not get udpated to the remote one. Furthermore, the local branches are only created by chance, again as a side-effect of trying to fetch the "special refs". So, we can't say that we reliably support the use of a branch name. Update the manual to state that using a branch does not work. Remove the 'stable' example, as it looked like the name of a stable branch; instead, replace it with a version string that ressemble a tag. Fix the layout of the manual by making the version examples an actual bulleted list. Note: the above is only entirely true for git. For Mercurial, CVS and subversion, the status may be mixed, but nonetheless, using branches is still a bad idea, if at least because it is not reproducible, and because Buildroot does not even follow the branch. So, we do not differentiate between the various SCMs, and just flatly state that using a branch name is not supported. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Maxime Hadjinlian Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 7e1f246752..cc91e894bd 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -199,12 +199,12 @@ information is (assuming the package name is +libfoo+) : * +LIBFOO_VERSION+, mandatory, must contain the version of the package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is assumed to be the same as +LIBFOO_VERSION+. It can also be a - revision number, branch or tag for packages that are fetched - directly from their revision control system. + - Examples: + - +LIBFOO_VERSION = 0.1.2+ + - +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ + - +LIBFOO_VERSION = stable+ + revision number or a tag for packages that are fetched directly + from their version control system. Do not use a branch name as + version; it does not work. Examples: + ** a version for a release tarball: +LIBFOO_VERSION = 0.1.2+ + ** a sha1 for a git tree: +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ + ** a tag for a git tree +LIBFOO_VERSION = v0.1.2+ * +LIBFOO_SOURCE+ may contain the name of the tarball of the package, which Buildroot will use to download the tarball from From b0e34e6690df382042eb29b148236d071f492a45 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 11 May 2018 22:50:33 +0200 Subject: [PATCH 1289/2640] package/go: fixing host go cross compilation Actually if GOHOSTOS == GOOS || GOHOSTARCH == GOARCH the go build system assume it's not cross compiling and uses the same toolchain for both the host and the target. This commit adds a patch to enable the explicit GO_ASSUME_CROSSCOMPILING in go build system and updates to go package accordingly. Fixes: http://autobuild.buildroot.net/results/3636b1ac5756a782fd7578186508aaf9d105e3e9/ http://autobuild.buildroot.net/results/25790dca7e19527bb360d7dfb325cd9cfc3b56cc/ and many more. References: https://github.com/golang/go/issues/25177 https://golang.org/cl/112156 Signed-off-by: Angelo Compagnucci Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- ...explicit-option-for-crosscompilation.patch | 40 +++++++++++++++++++ package/go/go.mk | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 package/go/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch new file mode 100644 index 0000000000..f76c5b1d03 --- /dev/null +++ b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch @@ -0,0 +1,40 @@ +From e1382a731a726293e30901038c6870fa77ef6095 Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Tue, 8 May 2018 16:08:44 +0200 +Subject: [PATCH] build.go: explicit option for crosscompilation + +Actually if GOHOSTOS == GOOS || GOHOSTARCH == GOARCH the go build system +assume it's not cross compiling and uses the same toolchain also for the +bootstrap. This is a problem in case the cross compilation mandates a +different toolchain for bootstrap and target. This patch adds +GO_ASSUME_CROSSCOMPILING varible to assure that in case of cross +compilation CC_FOR_TARGET can be different from CC. + +Signed-off-by: Angelo Compagnucci +Signed-off-by: Anisse Astier +--- + src/cmd/dist/build.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go +index 99d1db5..eb4097f 100644 +--- a/src/cmd/dist/build.go ++++ b/src/cmd/dist/build.go +@@ -252,12 +252,13 @@ func xinit() { + // $CC_FOR_goos_goarch, if set, applies only to goos/goarch. + func compilerEnv(envName, def string) map[string]string { + m := map[string]string{"": def} ++ crosscompiling := os.Getenv("GO_ASSUME_CROSSCOMPILING") + + if env := os.Getenv(envName); env != "" { + m[""] = env + } + if env := os.Getenv(envName + "_FOR_TARGET"); env != "" { +- if gohostos != goos || gohostarch != goarch { ++ if gohostos != goos || gohostarch != goarch || crosscompiling == "1" { + m[gohostos+"/"+gohostarch] = m[""] + } + m[""] = env +-- +2.7.4 + diff --git a/package/go/go.mk b/package/go/go.mk index 4d55e16cc3..6af58f04be 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -75,7 +75,8 @@ HOST_GO_MAKE_ENV = \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GOOS=linux \ CC=$(HOSTCC_NOCCACHE) \ - CXX=$(HOSTCXX_NOCCACHE) + CXX=$(HOSTCXX_NOCCACHE) \ + GO_ASSUME_CROSSCOMPILING=1 HOST_GO_TARGET_CC = \ CC_FOR_TARGET="$(TARGET_CC)" \ From 72c29925637ee51c505d9d12e22564573ab83e29 Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Fri, 11 May 2018 22:50:34 +0200 Subject: [PATCH 1290/2640] go: cleanup cross-compilation support Now that we fixed cross-compilation in the go package, cleanup the build to remove the workaround added in 60c5c96ae109dcea48e0997b5e6e6645ac9b86 "package/go: Build host tools with host CC". We only need a single pass to build the go toolchain. Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- package/go/go.mk | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index 6af58f04be..b70c5d49d8 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -58,13 +58,7 @@ else HOST_GO_CGO_ENABLED = 0 endif -# The go build system doesn't have the notion of cross compiling, but just the -# notion of architecture. When the host and target architectures are different -# it expects to be given a target cross compiler in CC_FOR_TARGET. When the -# architectures are the same it will use CC_FOR_TARGET for both host and target -# compilation. To work around this limitation build and install a set of -# compiler and tool binaries built with CC_FOR_TARGET set to the host compiler. -# Also, the go build system is not compatible with ccache, so use +# The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ @@ -82,25 +76,14 @@ HOST_GO_TARGET_CC = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" -HOST_GO_HOST_CC = \ - CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \ - CXX_FOR_TARGET=$(HOSTCXX_NOCCACHE) - -HOST_GO_TMP = $(@D)/host-go-tmp - define HOST_GO_BUILD_CMDS - cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) CGO_ENABLED=0 ./make.bash - mkdir -p $(HOST_GO_TMP) - mv $(@D)/pkg/tool $(HOST_GO_TMP)/ - mv $(@D)/bin/ $(HOST_GO_TMP)/ cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash endef define HOST_GO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/go $(HOST_GO_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt ln -sf ../lib/go/bin/go $(HOST_DIR)/bin/ ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/bin/ @@ -109,7 +92,7 @@ define HOST_GO_INSTALL_CMDS mkdir -p $(HOST_GO_ROOT)/pkg cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ - cp -a $(HOST_GO_TMP)/tool $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 @@ -117,7 +100,7 @@ define HOST_GO_INSTALL_CMDS # Set all file timestamps to prevent the go compiler from rebuilding any # built in packages when programs are built. - find $(HOST_GO_ROOT) -type f -exec touch -r $(HOST_GO_TMP)/bin/go {} \; + find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef $(eval $(host-generic-package)) From 14441d6ec72b168c245d3f933fc2bf3094f1f6e4 Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Fri, 11 May 2018 22:50:35 +0200 Subject: [PATCH 1291/2640] go: add self to developers to get cc-ed for build failures Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b910a86a8c..dabea65b03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -153,6 +153,9 @@ F: package/python-pydal/ F: package/python-web2py/ F: package/sysdig/ +N: Anisse Astier +F: package/go/ + N: Antony Pavlov F: package/lsscsi/ From 486334dd819b15943b6f9e93868a354be0b8ab20 Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Fri, 11 May 2018 22:50:36 +0200 Subject: [PATCH 1292/2640] go: honor building with V=1 for debugging purposes Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- package/go/go.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/go/go.mk b/package/go/go.mk index b70c5d49d8..6e2612481d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -78,7 +78,8 @@ HOST_GO_TARGET_CC = \ define HOST_GO_BUILD_CMDS cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash + $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + ./make.bash $(if $(VERBOSE),-v) endef define HOST_GO_INSTALL_CMDS From 81815b85a20d09b8346322ad025c2bb430d17ed3 Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Fri, 11 May 2018 22:50:37 +0200 Subject: [PATCH 1293/2640] go: security bump to version 1.10.2 This bump contains many bug fixes, as well as the following security issue, patched in Go 1.10.1: CVE-2018-7187: The "go get" implementation in Go 1.9.4, when the -insecure command-line option is used, does not validate the import path (get/vcs.go only checks for "://" anywhere in the string), which allows remote attackers to execute arbitrary OS commands via a crafted web site. Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 73c1578d0b..9f5b80e9f5 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,2 +1,2 @@ # From https://golang.org/dl/ -sha256 f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24 go1.10.src.tar.gz +sha256 6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd go1.10.2.src.tar.gz diff --git a/package/go/go.mk b/package/go/go.mk index 6e2612481d..73f14cc78f 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.10 +GO_VERSION = 1.10.2 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 439e2add6c39bb128e1a5f1fb624ecfb99948d5e Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 10 May 2018 15:17:12 -0700 Subject: [PATCH 1294/2640] python-websockets: backport fix for upstream issue #350 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- ...ehavior-of-recv-in-the-CLOSING-state.patch | 261 ++++++++++++++++++ 1 file changed, 261 insertions(+) create mode 100644 package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch diff --git a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch new file mode 100644 index 0000000000..cb97b36bde --- /dev/null +++ b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch @@ -0,0 +1,261 @@ +From 402059e4a46a764632eba8a669f5b012f173ee7b Mon Sep 17 00:00:00 2001 +From: Aymeric Augustin +Date: Tue, 1 May 2018 17:05:05 +0200 +Subject: [PATCH] Fix behavior of recv() in the CLOSING state. + +The behavior wasn't tested correctly: in some test cases, the connection +had already moved to the CLOSED state, where the close code and reason +are already known. + +Refactor half_close_connection_{local,remote} to allow multiple runs of +the event loop while remaining in the CLOSING state. Refactor affected +tests accordingly. + +I verified that all tests in the CLOSING state were behaving is intended +by inserting debug statements in recv/send/ping/pong and running: + +$ PYTHONASYNCIODEBUG=1 python -m unittest -v websockets.test_protocol.{Client,Server}Tests.test_{recv,send,ping,pong}_on_closing_connection_{local,remote} + +Fix #317, #327, #350, #357. + +Signed-off-by: Joseph Kogut +--- + websockets/protocol.py | 10 ++--- + websockets/test_protocol.py | 78 +++++++++++++++++++++++++++++-------- + 2 files changed, 66 insertions(+), 22 deletions(-) + +diff --git a/websockets/protocol.py b/websockets/protocol.py +index f8121a1..7583fe9 100644 +--- a/websockets/protocol.py ++++ b/websockets/protocol.py +@@ -303,7 +303,7 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): + # Don't yield from self.ensure_open() here because messages could be + # received before the closing frame even if the connection is closing. + +- # Wait for a message until the connection is closed ++ # Wait for a message until the connection is closed. + next_message = asyncio_ensure_future( + self.messages.get(), loop=self.loop) + try: +@@ -315,15 +315,15 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): + next_message.cancel() + raise + +- # Now there's no need to yield from self.ensure_open(). Either a +- # message was received or the connection was closed. +- + if next_message in done: + return next_message.result() + else: + next_message.cancel() + if not self.legacy_recv: +- raise ConnectionClosed(self.close_code, self.close_reason) ++ assert self.state in [State.CLOSING, State.CLOSED] ++ # Wait until the connection is closed to raise ++ # ConnectionClosed with the correct code and reason. ++ yield from self.ensure_open() + + @asyncio.coroutine + def send(self, data): +diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py +index 70348fb..bfd4e3b 100644 +--- a/websockets/test_protocol.py ++++ b/websockets/test_protocol.py +@@ -105,7 +105,7 @@ class CommonTests: + self.loop.call_soon(self.loop.stop) + self.loop.run_forever() + +- def make_drain_slow(self, delay=3 * MS): ++ def make_drain_slow(self, delay=MS): + # Process connection_made in order to initialize self.protocol.writer. + self.run_loop_once() + +@@ -174,6 +174,8 @@ class CommonTests: + # Empty the outgoing data stream so we can make assertions later on. + self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) + ++ assert self.protocol.state is State.CLOSED ++ + def half_close_connection_local(self, code=1000, reason='close'): + """ + Start a closing handshake but do not complete it. +@@ -181,31 +183,56 @@ class CommonTests: + The main difference with `close_connection` is that the connection is + left in the CLOSING state until the event loop runs again. + ++ The current implementation returns a task that must be awaited or ++ cancelled, else asyncio complains about destroying a pending task. ++ + """ + close_frame_data = serialize_close(code, reason) +- # Trigger the closing handshake from the local side. +- self.ensure_future(self.protocol.close(code, reason)) ++ # Trigger the closing handshake from the local endpoint. ++ close_task = self.ensure_future(self.protocol.close(code, reason)) + self.run_loop_once() # wait_for executes + self.run_loop_once() # write_frame executes + # Empty the outgoing data stream so we can make assertions later on. + self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) +- # Prepare the response to the closing handshake from the remote side. +- self.loop.call_soon( +- self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) +- self.loop.call_soon(self.receive_eof_if_client) ++ ++ assert self.protocol.state is State.CLOSING ++ ++ # Complete the closing sequence at 1ms intervals so the test can run ++ # at each point even it goes back to the event loop several times. ++ self.loop.call_later( ++ MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) ++ self.loop.call_later(2 * MS, self.receive_eof_if_client) ++ ++ # This task must be awaited or cancelled by the caller. ++ return close_task + + def half_close_connection_remote(self, code=1000, reason='close'): + """ +- Receive a closing handshake. ++ Receive a closing handshake but do not complete it. + + The main difference with `close_connection` is that the connection is + left in the CLOSING state until the event loop runs again. + + """ ++ # On the server side, websockets completes the closing handshake and ++ # closes the TCP connection immediately. Yield to the event loop after ++ # sending the close frame to run the test while the connection is in ++ # the CLOSING state. ++ if not self.protocol.is_client: ++ self.make_drain_slow() ++ + close_frame_data = serialize_close(code, reason) +- # Trigger the closing handshake from the remote side. ++ # Trigger the closing handshake from the remote endpoint. + self.receive_frame(Frame(True, OP_CLOSE, close_frame_data)) +- self.receive_eof_if_client() ++ self.run_loop_once() # read_frame executes ++ # Empty the outgoing data stream so we can make assertions later on. ++ self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) ++ ++ assert self.protocol.state is State.CLOSING ++ ++ # Complete the closing sequence at 1ms intervals so the test can run ++ # at each point even it goes back to the event loop several times. ++ self.loop.call_later(2 * MS, self.receive_eof_if_client) + + def process_invalid_frames(self): + """ +@@ -335,11 +362,13 @@ class CommonTests: + self.assertEqual(data, b'tea') + + def test_recv_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.recv()) + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_recv_on_closing_connection_remote(self): + self.half_close_connection_remote() + +@@ -421,24 +450,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_send_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_send_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_send_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) ++ + self.assertNoFrameSent() + + # Test the ping coroutine. +@@ -466,24 +500,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_ping_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_ping_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_ping_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) ++ + self.assertNoFrameSent() + + # Test the pong coroutine. +@@ -506,24 +545,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_pong_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_pong_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_pong_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) ++ + self.assertNoFrameSent() + + # Test the protocol's logic for acknowledging pings with pongs. +-- +2.17.0 + From 95fc31239962ae488b159f83e8fc436c10b1128c Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Fri, 11 May 2018 13:47:52 +0200 Subject: [PATCH 1295/2640] package/clang: link libclang against libLLVM.so libclang.so is statically linking against all LLVM static libraries instead of linking dynamically against libLLVM.so. This patch fixes this problem by setting LLVM_LINK_LLVM_DYLIB to ON. Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/clang/clang.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 8d86c5edda..14d6441c9a 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -85,5 +85,9 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN endef HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN +# This option must be enabled to link libclang dynamically against libLLVM.so +HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON +CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From 01b9b56173727989c23bb4828a9088483c3a7de2 Mon Sep 17 00:00:00 2001 From: Julien Boibessot Date: Thu, 10 May 2018 16:37:26 +0200 Subject: [PATCH 1296/2640] package/qt5cinex: fix download The Buildroot dl-wrapper tries to download Qt5_CinematicExperience_%22rpi_%221.0.tgz, which fails, so this commit fixes the archive name by removing useless double quotes. Signed-off-by: Julien Boibessot Signed-off-by: Thomas Petazzoni --- package/qt5cinex/qt5cinex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk index d9254f53c5..89c38ee3f5 100644 --- a/package/qt5cinex/qt5cinex.mk +++ b/package/qt5cinex/qt5cinex.mk @@ -8,7 +8,7 @@ QT5CINEX_VERSION = 1.0 QT5CINEX_SITE = http://quitcoding.com/download ifeq ($(BR2_PACKAGE_QT5CINEX_HD),y) -QT5CINEX_HD = "rpi_" +QT5CINEX_HD = rpi_ endif QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_HD)$(QT5CINEX_VERSION).tgz From 5f00f966197836d1baab19f932c3ba74537cee24 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Thu, 10 May 2018 00:23:41 +0530 Subject: [PATCH 1297/2640] configs: amarula: vyasa: bump u-boot version to v2018.11 bump the U-Boot stable version to v2018.11 Tested-by: Shyam Saini Signed-off-by: Jagan Teki Signed-off-by: Thomas Petazzoni --- configs/amarula_vyasa_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index ccaab9551e..88fb6abbec 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -10,7 +10,7 @@ BR2_KERNEL_HEADERS_4_14=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From d64dd8c78c3a74d3c3329688087c2f50ae5f3d71 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 10 May 2018 09:17:49 +0200 Subject: [PATCH 1298/2640] package/libdrm: bump version to 2.4.92 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 10 +++++----- package/libdrm/libdrm.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index bc15ecf79f..52624b6a02 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002853.html -md5 23d87cda92700b710a37d9b8edaa9f54 libdrm-2.4.91.tar.bz2 -sha1 44e42ce3cd41666e343ba393c73f6f1ad9fe1e74 libdrm-2.4.91.tar.bz2 -sha256 634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800 libdrm-2.4.91.tar.bz2 -sha512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772 libdrm-2.4.91.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2018-May/176249.html +md5 f9b00d985f82d0be6ecc20c799acc89e libdrm-2.4.92.tar.bz2 +sha1 aad04c8e35cd3ab589ff085b20f75ba43e086647 libdrm-2.4.92.tar.bz2 +sha256 e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51ff39fa libdrm-2.4.92.tar.bz2 +sha512 9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2 libdrm-2.4.92.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 8f533d72d7..06b1144616 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.91 +LIBDRM_VERSION = 2.4.92 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From ae8c25e256beda7b8a422b9b04f1451821c6b7e7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 9 May 2018 13:54:02 -0300 Subject: [PATCH 1299/2640] linux: bump default to version 4.16.8 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index cc946b0ac7..e202061831 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From aeb55c2b363870738f9e7e928868d379a21d6112 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 9 May 2018 13:54:03 -0300 Subject: [PATCH 1300/2640] linux-headers: bump 4.{9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 554f72ce30..d37b68afa5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -251,12 +251,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 default "4.4.131" if BR2_KERNEL_HEADERS_4_4 - default "4.9.98" if BR2_KERNEL_HEADERS_4_9 + default "4.9.99" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.39" if BR2_KERNEL_HEADERS_4_14 + default "4.14.40" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.7" if BR2_KERNEL_HEADERS_4_16 + default "4.16.8" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From a21d6517d952052b46ac608c1773e3d099f8ed39 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 May 2018 12:28:49 +0200 Subject: [PATCH 1301/2640] DEVELOPERS: add myself to some packages Add myself to lcms2, liblockfile, libnetfilter_conntrack, libnetfilter_queue and whois Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dabea65b03..492924a1d1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -679,6 +679,7 @@ F: package/gupnp-tools/ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ +F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ F: package/libcdio-paranoia/ @@ -692,8 +693,11 @@ F: package/libgtk2/ F: package/libgtk3/ F: package/libidn/ F: package/libjpeg/ +F: package/liblockfile/ F: package/libmatroska/ F: package/libmpdclient/ +F: package/libnetfilter_conntrack/ +F: package/libnetfilter_queue/ F: package/libupnp/ F: package/libupnp18/ F: package/minissdpd/ @@ -705,6 +709,7 @@ F: package/rygel/ F: package/safeclib/ F: package/tinycbor/ F: package/tinydtls/ +F: package/whois/ N: Falco Hyfing F: package/python-pymodbus/ From 8f2d402b528fb76ca761815c5f42db75b83239c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 May 2018 11:33:28 +0200 Subject: [PATCH 1302/2640] log4cplus: add C++11 dependencies log4cplus uses std::future which is a C++11 feature affected by the gcc bug 64735 Fixes: - http://autobuild.buildroot.net/results/4f4e9ed5dd5bad76eeee5d151e958f22603615b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/log4cplus/Config.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/Config.in b/package/log4cplus/Config.in index 8a112a4e8f..fd224dd270 100644 --- a/package/log4cplus/Config.in +++ b/package/log4cplus/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_LOG4CPLUS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future help log4cplus is a simple to use C++ logging API providing thread-safe, flexible, and arbitrarily granular control @@ -11,5 +13,9 @@ config BR2_PACKAGE_LOG4CPLUS http://sourceforge.net/projects/log4cplus -comment "log4cplus needs a toolchain w/ C++, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) +comment "log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "log4cplus needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From 8158331ae3fe942a8d31469e7909924c8ea3cef6 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Fri, 11 May 2018 23:22:10 -0300 Subject: [PATCH 1303/2640] package/python-cython: fix indentation Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/67844444 Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- package/python-cython/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/Config.in.host b/package/python-cython/Config.in.host index b69e59b718..69d32d5ab3 100644 --- a/package/python-cython/Config.in.host +++ b/package/python-cython/Config.in.host @@ -1,7 +1,7 @@ config BR2_PACKAGE_HOST_PYTHON_CYTHON - bool "host python-cython" - help - The Cython compiler for writing C extensions for the Python - language. + bool "host python-cython" + help + The Cython compiler for writing C extensions for the Python + language. - http://cython.org/ + http://cython.org/ From b4dfee63d25629b26fdfc89a870c22474482642f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 9 May 2018 21:34:16 +0200 Subject: [PATCH 1304/2640] package/apr-util: fix ldap detection configure checks if ldap_set_rebind_proc takes 2 or 3 arguments http://svn.apache.org/viewvc/apr/apr-util/tags/1.6.1/build/apu-conf.m4?revision=1812528&view=markup#l370 It uses the macro APR_TRY_COMPILE_NO_WARNING which adds -Werror to treat all warnings as errors when gcc is used: http://svn.apache.org/viewvc/apr/apr/tags/1.6.3/build/apr_common.m4?revision=1812527&view=markup#l504 In some buildroot configs a compiler warning occurs during this check: http://autobuild.buildroot.net/results/241/241ed78b93ce86c859e175530fa485711ff61615//apr-util-1.6.1/config.log /home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/features.h:218:5: error: #warning requested reentrant code, but thread support was disabled [-Werror=cpp] cc1: all warnings being treated as errors Due to this warning 'ac_cv_ldap_set_rebind_proc_style' is set to two instead of three leading to a build error later on. This patch forces ac_cv_ldap_set_rebind_proc_style=three to be inline with openldap which fixes http://autobuild.buildroot.net/results/241/241ed78b93ce86c859e175530fa485711ff61615/ This solution was inspired by a discussion on the fink mailinglist: https://sourceforge.net/p/fink/mailman/message/31720482/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/apr-util/apr-util.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index 973194b915..b006964ccb 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -48,6 +48,7 @@ APR_UTIL_CONF_OPTS += --without-sqlite3 endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) +APR_UTIL_CONF_ENV += ac_cv_ldap_set_rebind_proc_style=three APR_UTIL_CONF_OPTS += \ --with-ldap \ --with-ldap-include="$(STAGING_DIR)/usr/include/" \ From e7f72298a6c88b42a996962027f4f83a07713f26 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 9 May 2018 11:07:33 +0200 Subject: [PATCH 1305/2640] DEVELOPERS: Add myself to support/kconfig/ Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 492924a1d1..43b1668343 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1541,6 +1541,7 @@ F: package/modem-manager/ F: package/network-manager/ F: package/ofono/ F: package/python-networkmanager/ +F: support/kconfig/ N: Phil Eichinger F: package/libqrencode/ From 7984f2d97b4271c14e0922ef22027edaedd78e59 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 May 2018 10:43:05 +0200 Subject: [PATCH 1306/2640] libcap: only install shared version If BR2_SHARED_LIBS is set, only install shared version of library (continue to build both libraries through all target as there is no libcap.so target but only a libcap.so.$(VERSION).$(MINOR)) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 48c2cb3456..a947fa0686 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -18,6 +18,9 @@ HOST_LIBCAP_DEPENDENCIES = host-gperf ifeq ($(BR2_STATIC_LIBS),y) LIBCAP_MAKE_TARGET = libcap.a libcap.pc LIBCAP_MAKE_INSTALL_TARGET = install-static +else ifeq ($(BR2_SHARED_LIBS),y) +LIBCAP_MAKE_TARGET = all +LIBCAP_MAKE_INSTALL_TARGET = install-shared else LIBCAP_MAKE_TARGET = all LIBCAP_MAKE_INSTALL_TARGET = install From 83ae5bc84bc3eeea2b85b63307f95f6cb01ed197 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 May 2018 14:40:45 +0200 Subject: [PATCH 1307/2640] package/rauc: add workaround for older kernel headers Fixes: http://autobuild.buildroot.org/results/621/621587906bd2bb27c43b6fcbb051d75f20e32e7c/ http://autobuild.buildroot.org/results/52c/52ca760f0227075ca988754bb9eb8df0ea3e1563/ ... Signed-off-by: "Yann E. MORIN" Cc: Andrey Yurovsky Signed-off-by: Thomas Petazzoni --- ...mmc-add-workaround-for-older-kernels.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/rauc/0001-emmc-add-workaround-for-older-kernels.patch diff --git a/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch b/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch new file mode 100644 index 0000000000..23c9484e61 --- /dev/null +++ b/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch @@ -0,0 +1,33 @@ +From 7c67c0ef267d470fcec950d2be49507255f39fc5 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 13 May 2018 14:17:44 +0200 +Subject: [PATCH] emmc: add workaround for older kernels + +Kernels up to (and including 3.3) forgot to include types.h in their +mmc/ioctl.h, and thus __u32 (and others) are not defined, causing +compilation errors: + + http://autobuild.buildroot.org/results/621/621587906bd2bb27c43b6fcbb051d75f20e32e7c/build-end.log + +Fix that by explicitly including types.h before mmc/ioctl.h. + +Signed-off-by: "Yann E. MORIN" +--- + src/emmc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/emmc.c b/src/emmc.c +index e8b0b05..2ce3373 100644 +--- a/src/emmc.c ++++ b/src/emmc.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include /* kernel < 3.4 forgot that in mmc/ioctl.h */ + #include + #include + #include +-- +2.14.1 + From 366e42c2cf60ecf9640ad7a57dcbe5d9d287dc02 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 May 2018 18:59:23 +0200 Subject: [PATCH 1308/2640] package/xen: force location of init scripts The Xen configure scripts looks at the build host to decide where to install the Sys-V startup scripts, and that location differs between various distros. Force the location. Fixes: http://autobuild.buildroot.org/results/869/869829ab086e824d164c5c5ec7f087ed83993be6/ http://autobuild.buildroot.org/results/336/3360e5a9e3d007b4ed77345b5fe93b2dacb6ad49/ http://autobuild.buildroot.org/results/29e/29e308ce3cc9c83497ba1c1f98fcda3f48fd03c4/ Signed-off-by: "Yann E. MORIN" Cc: Matt Weber Cc: Alistair Francis Reviewed-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- package/xen/xen.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 8ba2b9d5c2..1b741a90f6 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -17,7 +17,9 @@ else ifeq ($(ARCH),arm) XEN_ARCH = arm32 endif -XEN_CONF_OPTS = --disable-ocamltools +XEN_CONF_OPTS = \ + --disable-ocamltools \ + --with-initddir=/etc/init.d XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python2 XEN_MAKE_ENV = \ From 35a093a17edc56184a9964ca646bea8ace627b31 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 13 May 2018 21:37:59 +0300 Subject: [PATCH 1309/2640] libkrb5: disable rpath The default rpath value for krb5 is /usr/lib. On some hosts this might confuse the build time linker as it looks for target libraries in the host /usr/lib directory. Should fix: http://autobuild.buildroot.net/results/6df/6df84ed325ddd92248741d2f4737423b1b999489/ http://autobuild.buildroot.net/results/049/049f5147288b418402b6e5a4181eff4d426c8d7a/ http://autobuild.buildroot.net/results/432/432d5d0295f77cd34b78e70e8b4b7d77ef19ae3c/ Signed-off-by: Baruch Siach Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libkrb5/libkrb5.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index c40be63278..d9d7160ae8 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -28,7 +28,8 @@ LIBKRB5_CONF_OPTS = \ --without-system-et \ --without-system-ss \ --without-system-verto \ - --without-tcl + --without-tcl \ + --disable-rpath ifeq ($(BR2_PACKAGE_OPENLDAP),y) LIBKRB5_CONF_OPTS += --with-ldap From 766f95d1f0fa352fb60bc49454df4c6544b0feaa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 10 May 2018 13:17:48 +0200 Subject: [PATCH 1310/2640] snort: fix build on sparc v8 Add patch to remove -mcpu=v9 before checking sparc architecture Fixes: - http://autobuild.buildroot.net/results/59625daa154e3136171dcb89bdc3b8b31dc85021 Signed-off-by: Fabrice Fontaine Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/snort/0005-fix-sparc.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/snort/0005-fix-sparc.patch diff --git a/package/snort/0005-fix-sparc.patch b/package/snort/0005-fix-sparc.patch new file mode 100644 index 0000000000..14792d2c59 --- /dev/null +++ b/package/snort/0005-fix-sparc.patch @@ -0,0 +1,28 @@ +When checking if the architecture supports the %time register +instruction, do not force -mcpu to v9 while doing so. Otherwise it's +like "let's see if this v9 instruction exists when I force the compiler +to think I'm using v9", which is non-sensical. + +Signed-off-by: Fabrice Fontaine + +diff -Naurp ./snort-2.9.11.1-orig/configure.in snort-2.9.11.1/configure.in +--- ./snort-2.9.11.1-orig/configure.in 2018-05-10 12:20:19.253510678 +0200 ++++ snort-2.9.11.1/configure.in 2018-05-10 12:40:18.547584998 +0200 +@@ -942,8 +942,6 @@ fi + + # check for sparc %time register + if eval "echo $host_cpu|grep -i sparc >/dev/null"; then +- OLD_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -mcpu=v9 " + AC_MSG_CHECKING([for sparc %time register]) + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( +@@ -957,8 +955,6 @@ if eval "echo $host_cpu|grep -i sparc >/ + AC_MSG_RESULT($sparcv9) + if test "x$sparcv9" = "xyes"; then + AC_DEFINE([SPARCV9],[1],[For sparc v9 with %time register]) +- else +- CFLAGS="$OLD_CFLAGS" + fi + fi + From 0f095a5318bb8c33d4435b5727283eb64d539e4c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 9 May 2018 19:25:53 +0200 Subject: [PATCH 1311/2640] package/znc: python support depends on icu Upstream checks for icu when build with python support: https://github.com/znc/znc/commit/4fe4a45dd62411ba9ede04750ca44f071e7d6cbb Fixes http://autobuild.buildroot.net/results/9e4/9e44159820789f1d25efcbd24318b0e05e132371/ Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/znc/znc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 33ac266dd3..2a04c66377 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -32,7 +32,8 @@ else ZNC_CONF_OPTS += --disable-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) +# python support depends on icu +ifeq ($(BR2_PACKAGE_ICU)$(BR2_PACKAGE_PYTHON3),yy) ZNC_DEPENDENCIES += python3 host-swig ZNC_CONF_OPTS += --enable-python=python3 else From 04d185bfc718c6e1739cf4a7d8f3f0d45df0385a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 May 2018 12:34:37 +0200 Subject: [PATCH 1312/2640] package/jamvm: move arch dependency to a symbol Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/jamvm/Config.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in index 57e1a8e6f4..51d5da03b8 100644 --- a/package/jamvm/Config.in +++ b/package/jamvm/Config.in @@ -1,10 +1,16 @@ +config BR2_PACKAGE_JAMVM_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel + default y if BR2_powerpc + config BR2_PACKAGE_JAMVM bool "jamvm" + depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS + depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ - || BR2_mips || BR2_mipsel || BR2_powerpc - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_CLASSPATH help @@ -14,7 +20,6 @@ config BR2_PACKAGE_JAMVM http://jamvm.sf.net comment "jamvm needs a toolchain w/ threads, dynamic library" - depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ - || BR2_mips || BR2_mipsel || BR2_powerpc + depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From 67974fe6da0dc346ad40f6b7d373a05aa0b1e1f9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 May 2018 12:34:38 +0200 Subject: [PATCH 1313/2640] package/jamvm: restrict on what MIPS procs are allowed jamvm uses deprecated opcodes to store/load words from the FPU coprocessor registers, and in so doing, expects those registers to be 32-bit. Thus, restrict the conditions under which jamvm is available under mips. Fixes: http://autobuild.buildroot.org/results/f76/f76e10e4c1ce25b42fb2e5d2012adf2eaf1b2fe1/ http://autobuild.buildroot.org/results/162/162d0e41dc9bc6d6f6594ccee0cb4217067fc71f/ ... Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/jamvm/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in index 51d5da03b8..7717ccaadb 100644 --- a/package/jamvm/Config.in +++ b/package/jamvm/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_JAMVM_ARCH_SUPPORTS bool default y if BR2_arm || BR2_armeb default y if BR2_i386 || BR2_x86_64 - default y if BR2_mips || BR2_mipsel + default y if (BR2_mips || BR2_mipsel) \ + && (BR2_MIPS_FP32_MODE_32 || BR2_MIPS_SOFT_FLOAT) default y if BR2_powerpc config BR2_PACKAGE_JAMVM From dad6f570af5b7d2ef800c6dc55316933bd4b1803 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 10 May 2018 11:35:00 +0200 Subject: [PATCH 1314/2640] cups-filters: fix avahi dependency avahi support requires avahi-client, which needs avahi-daemon and dbus Fixes: - http://autobuild.buildroot.net/results/5c326bb56199000eb0e53a4d0f3c6c13be71cda0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups-filters/cups-filters.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 82ea46dd94..131e58246e 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -40,7 +40,8 @@ else CUPS_FILTERS_CONF_OPTS += --disable-dbus endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support requires avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) CUPS_FILTERS_DEPENDENCIES += avahi CUPS_FILTERS_CONF_OPTS += --enable-avahi else From 07ce2885fd6f3cf1c9e72ec2b9a852971ce7c939 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 10 May 2018 12:11:01 +0200 Subject: [PATCH 1315/2640] woff2: fix build on m68k Same issue on woff2 than in some other packages such as lcdapi: see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 Fixes: - http://autobuild.buildroot.net/results/6c97a08e6ca2e914d54fbb525b3f0bb90023ef07 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/woff2/woff2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/woff2/woff2.mk b/package/woff2/woff2.mk index b2ff33fe98..2f0206c82b 100644 --- a/package/woff2/woff2.mk +++ b/package/woff2/woff2.mk @@ -21,4 +21,10 @@ ifneq ($(BR2_SHARED_LIBS),y) WOFF2_CONF_OPTS += -DCMAKE_SKIP_RPATH=ON endif +# Internal error, aborting at dw2gencfi.c:215 in emit_expr_encoded +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 +ifeq ($(BR2_m68k_cf),y) +WOFF2_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" +endif + $(eval $(cmake-package)) From 04918ca72f7d558022a8679df6519c90a579424a Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 9 May 2018 18:44:11 +0200 Subject: [PATCH 1316/2640] support/kconfig: Add missing target to README.buildroot Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- support/kconfig/README.buildroot | 1 + 1 file changed, 1 insertion(+) diff --git a/support/kconfig/README.buildroot b/support/kconfig/README.buildroot index 62e3a11b1e..3140713b39 100644 --- a/support/kconfig/README.buildroot +++ b/support/kconfig/README.buildroot @@ -15,6 +15,7 @@ Then verify the toplevel targets work: config defconfig menuconfig + nconfig xconfig gconfig oldconfig From d0527483fae228c31c3bb36aeba347c0a8df4eba Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 9 May 2018 18:33:22 +0200 Subject: [PATCH 1317/2640] toolchain/buildroot: fix default of C library choice The BR2_TOOLCHAIN_UCLIBC symbol doesn't exist, it was meant to be BR2_TOOLCHAIN_BUILDROOT_UCLIBC. Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-buildroot/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 2f6624d217..75e8191f46 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -22,7 +22,7 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR choice prompt "C library" - default BR2_TOOLCHAIN_UCLIBC + default BR2_TOOLCHAIN_BUILDROOT_UCLIBC default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC From 28d8f8dfd5b10748b009377445d710abef6b8502 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 May 2018 15:42:01 +0200 Subject: [PATCH 1318/2640] package/attr: fix install Do not overwrite destination file if it exists. Fixes: #10986 Reported-by: mzweerspenko+bugzilla@gmail.com Signed-off-by: "Yann E. MORIN" Cc: mzweerspenko+bugzilla@gmail.com Signed-off-by: Thomas Petazzoni --- ...use-install-1-to-install-executables.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/attr/0004-all-use-install-1-to-install-executables.patch diff --git a/package/attr/0004-all-use-install-1-to-install-executables.patch b/package/attr/0004-all-use-install-1-to-install-executables.patch new file mode 100644 index 0000000000..ef59bb797c --- /dev/null +++ b/package/attr/0004-all-use-install-1-to-install-executables.patch @@ -0,0 +1,67 @@ +From 4187e60ab52cac3ed36036a354977310dab68dcb Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Tue, 8 May 2018 15:16:10 +0200 +Subject: [PATCH] all: use install(1) to install executables + +When the destination file already exists, the current install script +will overwrite it with the new executable. + +However, when the existing executable is a symlink or hardlink to +something else, like busybox, this effectively overwrites that something +with the new executable, and thus replaces busybox and all its applets +with the code for either of the three commands. + +We fix that by simply calling install(1). install(1) is sufficiently +widespread that we don't bother checking for it, as this is just a +workaround while waiting for the version bump that will eventually fix +it for good. + +Signed-off-by: "Yann E. MORIN" +--- + attr/Makefile | 4 ++-- + getfattr/Makefile | 4 ++-- + setfattr/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/attr/Makefile b/attr/Makefile +index 1c467e8..326dd7e 100644 +--- a/attr/Makefile ++++ b/attr/Makefile +@@ -29,6 +29,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +diff --git a/getfattr/Makefile b/getfattr/Makefile +index 91d3df2..f913172 100644 +--- a/getfattr/Makefile ++++ b/getfattr/Makefile +@@ -30,6 +30,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +diff --git a/setfattr/Makefile b/setfattr/Makefile +index d55461b..26dc5d8 100644 +--- a/setfattr/Makefile ++++ b/setfattr/Makefile +@@ -30,6 +30,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +-- +2.14.1 + From c3e62d39844b28b59650747e59e86a21d71f05c8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 May 2018 15:42:02 +0200 Subject: [PATCH 1319/2640] package/acl: fix install Do not overwrite destination file if it exists. Simliar to bug #10986. Signed-off-by: "Yann E. MORIN" Cc: mzweerspenko+bugzilla@gmail.com Signed-off-by: Thomas Petazzoni --- ...use-install-1-to-install-executables.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/acl/0003-all-use-install-1-to-install-executables.patch diff --git a/package/acl/0003-all-use-install-1-to-install-executables.patch b/package/acl/0003-all-use-install-1-to-install-executables.patch new file mode 100644 index 0000000000..9640dd866d --- /dev/null +++ b/package/acl/0003-all-use-install-1-to-install-executables.patch @@ -0,0 +1,67 @@ +From d3bd7b29b79147b4155e78a8ea06ded98b91f92a Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Tue, 8 May 2018 15:23:57 +0200 +Subject: [PATCH] all: use install(1) to install executables + +When the destination file already exists, the current install script +will overwrite it with the new executable. + +However, when the existing executable is a symlink or hardlink to +something else, like busybox, this effectively overwrites that something +with the new executable, and thus replaces busybox and all its applets +with the code for either of the three commands. + +We fix that by simply calling install(1). install(1) is sufficiently +widespread that we don't bother checking for it, as tis is just a +workaround while waiting for the version bump that will eventually fix +it for good. + +Signed-off-by: "Yann E. MORIN" +--- + chacl/Makefile | 4 ++-- + getfacl/Makefile | 4 ++-- + setfacl/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/chacl/Makefile b/chacl/Makefile +index 33858d6..c857329 100644 +--- a/chacl/Makefile ++++ b/chacl/Makefile +@@ -30,6 +30,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +diff --git a/getfacl/Makefile b/getfacl/Makefile +index 7fbafda..8ac63e0 100644 +--- a/getfacl/Makefile ++++ b/getfacl/Makefile +@@ -31,6 +31,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +diff --git a/setfacl/Makefile b/setfacl/Makefile +index c44e7c0..eea2ede 100644 +--- a/setfacl/Makefile ++++ b/setfacl/Makefile +@@ -31,6 +31,6 @@ default: $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) ++ + install-dev install-lib: +-- +2.14.1 + From a9bb361435532d00bbcff6fed97618b68441b9cc Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 8 May 2018 15:28:31 +0200 Subject: [PATCH 1320/2640] support/download/file: fix file:// protocol handling Since the rework of the download infrastructure, the "file" download helper gets passed an URL that starts with file://, but forgets to strip it before passing it to "cp", causing a failure as the "cp" program isn't prepared for file paths starting with file://. This is fixed by stripping the file:// at the beginning of the URL. In addition, the path passed to cp lacked a slash between the directory path and the filename part of the url. This is fixed by adding a slash at the appropriate places. Fixes the following build failure when the "file" download method is used: cp: cannot stat 'file:///home/angelo/DEV/TOOLCHAINSarmv7-eabihf--glibc--bleeding-edge-2017.11-1.tar.bz2': No such file or directory Signed-off-by: Angelo Compagnucci Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/file b/support/download/file index fefd6d271c..6dd37b04dc 100755 --- a/support/download/file +++ b/support/download/file @@ -40,4 +40,4 @@ _localfiles() { eval ${LOCALFILES} "${@}" } -_localfiles ${verbose} "'${dir}${file}'" "'${output}'" +_localfiles ${verbose} "'${dir##file://}/${file}'" "'${output}'" From 43ca1987e6e5eb69677e7f1b461feeef187f0656 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 8 May 2018 17:58:29 +0200 Subject: [PATCH 1321/2640] support/download/file: remove set -x Signed-off-by: Angelo Compagnucci Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/file | 1 - 1 file changed, 1 deletion(-) diff --git a/support/download/file b/support/download/file index 6dd37b04dc..e52fcf2c8c 100755 --- a/support/download/file +++ b/support/download/file @@ -2,7 +2,6 @@ # We want to catch any unexpected failure, and exit immediately set -e -set -x # Download helper for cp, to be called from the download wrapper script # From cc39457fb9e1f569ca4958374046d5d99fcc50cf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 18:43:02 +0300 Subject: [PATCH 1322/2640] wget: security bump to version 1.19.5 Fixes CVE-2018-0494: cookie injection vulnerability. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index ab0d1d1dfd..eee4a5194e 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.19.4.tar.lz.sig -sha256 2fc0ffb965a8dc8f1e4a89cbe834c0ae7b9c22f559ebafc84c7874ad1866559a wget-1.19.4.tar.lz +# https://ftp.gnu.org/gnu/wget/wget-1.19.5.tar.lz.sig +sha256 29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75 wget-1.19.5.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 23e4c8acca..72a73cce79 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.19.4 +WGET_VERSION = 1.19.5 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf From 9113c0cbbaa9da796fef744700425eeff34f77b3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 May 2018 22:06:17 +0200 Subject: [PATCH 1323/2640] lynx: add patch to fix static link issue The lynx package incorrectly uses target LDFLAGS to build a host tool, which causes a problem when we do a statically link build for the target, on a host machine that doesn't support static linking. A simple patch fixes the problematic makefile, and it has been submitted upstream on the project mailing list. Fixes: http://autobuild.buildroot.net/results/38ba2531eeeb4a7985eddd2df8bfaf0b56e6a687/ Signed-off-by: Thomas Petazzoni --- ...-t-build-host-tools-with-target-LDFL.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch diff --git a/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch b/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch new file mode 100644 index 0000000000..cc057cee13 --- /dev/null +++ b/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch @@ -0,0 +1,41 @@ +From bb47abe9e7996147f6b7b325f5c9b2143abf8f13 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 7 May 2018 22:00:52 +0200 +Subject: [PATCH] src/chrtrans: don't build host tools with target LDFLAGS + +In a cross-compilation context, the LDFLAGS variable contains linker +flags used when building things for the target. However, the makeuctb +tool is built for the host machine, and therefore should not use the +same LDFLAGS as the target, which is why BUILD_LDFLAGS exist. + +Using LDFLAGS when building a tool for the host can cause problems +when some flags in LDFLAGS are not supported by the host machine. For +example, if you're linking statically lynx for the target, but the +build machine does not support static linking: + +gcc -I../.. -I../../src -I../../src/chrtrans -I../../WWW/Library/Implementation -I../../ -static -o makeuctb makeuctb.o +/usr/bin/ld: cannot find -lc +collect2: error: ld returned 1 exit status + +Signed-off-by: Thomas Petazzoni +Upstream-status: submitted on the mailing list +--- + src/chrtrans/makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in +index aab358f..6e0ef03 100644 +--- a/src/chrtrans/makefile.in ++++ b/src/chrtrans/makefile.in +@@ -123,7 +123,7 @@ OBJS = makeuctb$o + C_SRC = $(OBJS:$o=.c) + + $(MAKEUCTB) : $(OBJS) +- $(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS) ++ $(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS) + + makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c + +-- +2.14.3 + From 85f9d0893476911dc8757893a281b55d2dc06309 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 May 2018 22:20:34 +0200 Subject: [PATCH 1324/2640] cifs-utils: unconditionally disable PIE PIE support in Buildroot should be enabled via the global option BR2_RELRO_FULL option, and not done on a per-package basis, therefore PIE should unconditionally be disabled in the cifs-utils package. This has the added side-effect that it works around a binutils bug on SPARC causing the linker to segfault when PIE is enabled: sparc-linux-gcc -Wall -Wextra -D_FORTIFY_SOURCE=2 -fpie -pie -Wl,-z,relro,-z,now -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o mount.cifs mount.cifs.o mtab.o resolve_host.o util.o -lcap-ng collect2: fatal error: ld terminated with signal 6 [Aborted], core dumped This issue will reappear when we start testing BR2_RELRO_FULL in the autobuilders, but in the mean time it avoids the problem. Fixes: http://autobuild.buildroot.net/results/a5342890f39bdccae1324e7d3dbe0eab1aad28e5/ Signed-off-by: Thomas Petazzoni --- package/cifs-utils/cifs-utils.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 9044fdf83c..9343e3ea89 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -13,9 +13,9 @@ CIFS_UTILS_LICENSE_FILES = COPYING CIFS_UTILS_AUTORECONF = YES CIFS_UTILS_DEPENDENCIES = host-pkgconf -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -CIFS_UTILS_CONF_OPTS += --disable-pie -endif +# Let's disable PIE unconditionally. We want PIE to be enabled only by +# the global BR2_RELRO_FULL option. +CIFS_UTILS_CONF_OPTS = --disable-pie ifeq ($(BR2_PACKAGE_KEYUTILS),y) CIFS_UTILS_DEPENDENCIES += keyutils From a557aedad2d8b4735afe709e68ed58f7304580d8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 21:26:16 +0300 Subject: [PATCH 1325/2640] zstd: fix host headers installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If host-zstd builds when $(HOST_DIR)/include has not been created yet, the install-includes target does not create this directory. Instead, the install command copies the headers over $(HOST_DIR)/include, thus creating a regular file instead of a directory. This leads to the following installation failure: Installing includes install: cannot create directory ‘.../host/usr/include/’: File exists Makefile:166: recipe for target 'install-pc' failed make[1]: *** [install-pc] Error 1 Add a patch to fix that. Cc: Peter Seiderer Cc: Andrey Smirnov Signed-off-by: Baruch Siach Reviewed-by: Peter Seiderer Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...ate-include-directory-before-headers.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch diff --git a/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch b/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch new file mode 100644 index 0000000000..e95f8c0be4 --- /dev/null +++ b/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch @@ -0,0 +1,45 @@ +From 9a0643b633c00e86db059e3790bdea7155fb6dc9 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 8 May 2018 20:43:28 +0300 +Subject: [PATCH] lib/Makefile: create include directory before headers + installation + +Make sure that $(INCLUDEDIR) exists before copying the headers there. +Otherwise, the contest of header files is copied over +$(DESTDIR)$(INCLUDEDIR), making it a regular file. + +While at it, remove $(DESTDIR)$(INCLUDEDIR) from the list of directories +to create in the install-pc target. The install-pc target does not need +this directory. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/facebook/zstd/pull/1123 + + lib/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index f64f192d4724..d8178c7a58a0 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -163,7 +163,7 @@ install: install-pc install-static install-shared install-includes + @echo zstd static and shared library installed + + install-pc: libzstd.pc +- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ ++ @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ + @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ + + install-static: libzstd.a +@@ -178,6 +178,7 @@ install-shared: libzstd + + install-includes: + @echo Installing includes ++ @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ + @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) + @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) + @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings +-- +2.17.0 + From a12499bf9918aa8af1abc81029e98bcf99892f0f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 12 May 2018 09:03:00 +0200 Subject: [PATCH 1326/2640] utils/scancpan: generates hashes of license files Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- utils/scancpan | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 6d1cdc57aa..da8e7b91ac 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -483,6 +483,7 @@ use Module::CoreList; use HTTP::Tiny; use Safe; use MetaCPAN::API::Tiny; +use Digest::SHA qw(sha256_hex); # Below, 5.026 should be aligned with the version of perl actually # bundled in Buildroot: @@ -519,7 +520,7 @@ my %need_dlopen; # name -> 1 if requires dynamic library my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %deps_optional; # name -> list of optional target dependencies -my %license_files; # name -> list of license files +my %license_files; # name -> hash of license files my %checksum; # author -> list of checksum my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); @@ -556,7 +557,7 @@ sub find_license_files { if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) { @license_files = ($1); } - return \@license_files; + return @license_files; } sub fetch { @@ -567,16 +568,19 @@ sub fetch { say qq{fetch ${name}} unless $quiet; my $result = $mcpan->release( distribution => $name ); $dist{$name} = $result; + $license_files{$name} = {}; eval { - my $manifest = $mcpan->source( author => $result->{author}, - release => $name . q{-} . $result->{version}, - path => 'MANIFEST' ); + my $author = $result->{author}; + my $release = $name . q{-} . $result->{version}; + my $manifest = $mcpan->source( author => $author, release => $release, path => 'MANIFEST' ); $need_dlopen{$name} = is_xs( $manifest ); - $license_files{$name} = find_license_files( $manifest ); + foreach my $fname (find_license_files( $manifest )) { + my $license = $mcpan->source( author => $author, release => $release, path => $fname ); + $license_files{$name}->{$fname} = sha256_hex( $license ); + } }; if ($@) { warn $@; - $license_files{$name} = []; } my %build = (); my %runtime = (); @@ -692,7 +696,7 @@ while (my ($distname, $dist) = each %dist) { $license =~ s|mit|MIT|; $license =~ s|openssl|OpenSSL|; $license =~ s|perl_5|Artistic or GPL-1.0+|; - my $license_files = join q{ }, @{$license_files{$distname}}; + my $license_files = join q{ }, keys %{$license_files{$distname}}; say qq{write ${mkname}} unless $quiet; open my $fh, q{>}, $mkname; say {$fh} qq{################################################################################}; @@ -731,6 +735,13 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{# retrieved by scancpan from ${mirror}/}; say {$fh} qq{md5 ${md5} ${filename}}; say {$fh} qq{sha256 ${sha256} ${filename}}; + if (scalar keys %{$license_files{$distname}}) { + say {$fh} q{}; + say {$fh} qq{# computed by scancpan}; + while (my ($license, $digest) = each %{$license_files{$distname}}) { + say {$fh} qq{sha256 ${digest} ${license}}; + } + } close $fh; } } @@ -819,7 +830,6 @@ Perl/CPAN distributions required by the specified distnames. The dependencies and metadata are fetched from https://metacpan.org/. After running this script, it is necessary to check the generated files. -You have to manually add the license files (PERL_FOO_LICENSE_FILES variable). For distributions that link against a target library, you have to add the buildroot package name for that library to the DEPENDENCIES variable. @@ -831,7 +841,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2017 by Francois Perrad +Copyright (C) 2013-2018 by Francois Perrad This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From fd82d624b5b92a330ccbcfa1131ae0ea7ab9c9d8 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sun, 13 May 2018 12:36:01 +0200 Subject: [PATCH 1327/2640] gqrx: bump to version 2.11.4 Add hashes for license files, and drop the patch that was a backport from an upstream commit. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- .../gqrx/0001-fix_compilation_in_gcc-6.patch | 34 ------------------- package/gqrx/gqrx.hash | 4 ++- package/gqrx/gqrx.mk | 2 +- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 package/gqrx/0001-fix_compilation_in_gcc-6.patch diff --git a/package/gqrx/0001-fix_compilation_in_gcc-6.patch b/package/gqrx/0001-fix_compilation_in_gcc-6.patch deleted file mode 100644 index 22ec1effe9..0000000000 --- a/package/gqrx/0001-fix_compilation_in_gcc-6.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001 -From: Valentin Ochs -Date: Fri, 21 Oct 2016 20:12:50 +0200 -Subject: [PATCH] Cosmetic & readability changes - -Backport patch from -https://github.com/csete/gqrx/commit/e6baaee4968345a53e977f593362267a91041cff - -Fix compilation in gcc-6 - -Signed-off-by: Valentin Ochs -Signed-off-by: Gwenhael Goavec-Merou ---- -diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp -index e491632..b877546 100644 ---- a/src/qtgui/plotter.cpp -+++ b/src/qtgui/plotter.cpp -@@ -1336,8 +1336,11 @@ void CPlotter::drawOverlay() - #endif - - int level = 0; -- for (; level < nLevels && tagEnd[level] > x; level++); -- level %= nLevels; -+ while(level < nLevels && tagEnd[level] > x) -+ level++; -+ -+ if(level == nLevels) -+ level = 0; - - tagEnd[level] = x + nameWidth + slant - 1; - m_BookmarkTags.append(qMakePair(QRect(x, level * levelHeight, nameWidth + slant, fontHeight), bookmarks[i].frequency)); --- -2.10.2 - diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index bb52a616d7..7c1fc9852f 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,2 +1,4 @@ # Locally calculated: -sha256 2736a963dac4051ca8ae91a440ee6643ef7d26c9de5b9c83a369d5fc9328d453 gqrx-v2.6.1.tar.gz +sha256 c4e836c552dc99bf383ca84b2ddc0c67e3d05b073676318e2a011bcd463303ef gqrx-v2.11.4.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 2a7651c252..b51bb23eaf 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GQRX_VERSION = v2.6.1 +GQRX_VERSION = v2.11.4 GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK From 10e2c9b39084f5ed48016c1c8bb4a83a41b05c27 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 9 May 2018 17:48:21 +0200 Subject: [PATCH 1328/2640] feh: Bump to version 2.26 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/feh/feh.hash | 2 +- package/feh/feh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/feh/feh.hash b/package/feh/feh.hash index 0f8ac8c0b0..0653fc2eee 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 05a81fbe0997f6274c7617efc351647be38e5244c2624bd203459025c9a68ecd feh-2.22.2.tar.bz2 +sha256 b1d6bfdd79060d864b8eff05b916153be04801998148620125e3ac31f99f6c86 feh-2.26.tar.bz2 diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 311cef3afb..0bbec23111 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 2.22.2 +FEH_VERSION = 2.26 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt From 3587331f53d464ec2f9af432e61bc51b7f007dd5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 May 2018 12:23:52 +0200 Subject: [PATCH 1329/2640] libhdhomerun: bump to version 20180327 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libhdhomerun/libhdhomerun.hash | 3 ++- package/libhdhomerun/libhdhomerun.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libhdhomerun/libhdhomerun.hash b/package/libhdhomerun/libhdhomerun.hash index 0938889d88..ed972ddfc1 100644 --- a/package/libhdhomerun/libhdhomerun.hash +++ b/package/libhdhomerun/libhdhomerun.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 0cb392231961fab6c226c69012503e2ebe46ac0f13512689bd37d6cf9ee838a1 libhdhomerun_20170930.tgz +sha256 d91fd3782f9a0834242f7110c44067647843602f8e95052045250b7c229ccbd5 libhdhomerun_20180327.tgz +sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/libhdhomerun/libhdhomerun.mk b/package/libhdhomerun/libhdhomerun.mk index 10aff88e6a..5e32370a9d 100644 --- a/package/libhdhomerun/libhdhomerun.mk +++ b/package/libhdhomerun/libhdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHDHOMERUN_VERSION = 20170930 +LIBHDHOMERUN_VERSION = 20180327 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun LIBHDHOMERUN_LICENSE = LGPL-2.1+ From e0a8b910f66531421dde1f20ba9aac604dc24e86 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 18:05:17 +0300 Subject: [PATCH 1330/2640] busybox: remove musl specific tweaks Busybox build fine under current musl using its provided shadow passwords and utmp/wtmp support. Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60a55a2c78..7033c4304a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -156,21 +156,6 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS endef endif -# We also need to use internal shadow password functions when using -# the musl C library, since some of them are not yet implemented by -# musl. -# -# Do not use utmp/wmtp support. wmtp support is not available in musl, -# and utmp support is not sufficient for Busybox. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -define BUSYBOX_MUSL_TWEAKS - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_UTMP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_WTMP,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - define BUSYBOX_INSTALL_UDHCPC_SCRIPT if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ @@ -293,7 +278,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) $(BUSYBOX_SET_INDIVIDUAL_BINARIES) - $(BUSYBOX_MUSL_TWEAKS) endef define BUSYBOX_CONFIGURE_CMDS From 9e11eaa82f4d8dd832811212d52ae11dcf85c97f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 18:05:18 +0300 Subject: [PATCH 1331/2640] busybox: remove shadow passwords config tweaks These configuration tweaks were added for compatibility with Blackfin toolchains that bundled a uClibc version without shadow passwords support. Blackfin is gone, so this is no longer needed. Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7033c4304a..75fe7e137b 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,14 +148,6 @@ define BUSYBOX_PREFER_STATIC endef endif -# Disable shadow passwords support if unsupported by the C library -ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),) -define BUSYBOX_INTERNAL_SHADOW_PASSWORDS - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - define BUSYBOX_INSTALL_UDHCPC_SCRIPT if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ @@ -273,7 +265,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_MDEV) $(BUSYBOX_SET_CRYPT_SHA) $(BUSYBOX_LINUX_PAM) - $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) $(BUSYBOX_SET_INIT) $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) From 561433f8f23b19a303ff9d6e0358693a9b125931 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 18:05:19 +0300 Subject: [PATCH 1332/2640] toolchain: remove BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS Commit b9882925a4 (toolchain: introduce BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS) added this symbol to identify Blackfin toolchains without shadow passwords support. We no longer support Blackfin. Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 5 ----- .../toolchain-external-custom/Config.in.options | 3 --- 2 files changed, 8 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 121ddb4fa4..77f95ee1c3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -15,7 +15,6 @@ config BR2_TOOLCHAIN_USES_GLIBC select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS select BR2_TOOLCHAIN_SUPPORTS_PIE config BR2_TOOLCHAIN_USES_UCLIBC @@ -43,7 +42,6 @@ choice config BR2_TOOLCHAIN_BUILDROOT bool "Buildroot toolchain" depends on BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT - select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS config BR2_TOOLCHAIN_EXTERNAL bool "External toolchain" @@ -108,9 +106,6 @@ config BR2_TOOLCHAIN_HAS_THREADS_DEBUG config BR2_TOOLCHAIN_HAS_THREADS_NPTL bool -config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS - bool - config BR2_TOOLCHAIN_HAS_SSP bool diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 65d94d0adf..55370e967a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -277,9 +277,6 @@ choice config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC bool "uClibc/uClibc-ng" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - # For the time being, we assume that all custom external - # toolchains have shadow password support. - select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS help Select this option if your external toolchain uses the uClibc (available from http://www.uclibc.org/) From eb4b00129ccea673f48c8872ea0a6947f1f904e4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 May 2018 23:20:30 +0200 Subject: [PATCH 1333/2640] clamav: reformat patches as Git-formatted patches ClamAV is using Git upstream (https://github.com/Cisco-Talos/clamav-devel), so it makes sense to use Git-formatted patches. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...c-fix-build-error-due-to-missing-soc.patch | 34 +++++++++++++++++++ package/clamav/0001-clamdscan.patch | 21 ------------ ...acktrace-if-using-uClibc-without-ba.patch} | 22 +++++++++--- 3 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch delete mode 100644 package/clamav/0001-clamdscan.patch rename package/clamav/{0002-backtrace-uClibc.patch => 0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch} (53%) diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch new file mode 100644 index 0000000000..daac677eaa --- /dev/null +++ b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch @@ -0,0 +1,34 @@ +From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 7 May 2018 23:14:46 +0200 +Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un + definition +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +proto.c: In function ‘dconnect’: +proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’ + if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) + +Signed-off-by: Bernd Kuhls +Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html +--- + clamdscan/proto.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/clamdscan/proto.c b/clamdscan/proto.c +index 0205f6da0..d3396732f 100644 +--- a/clamdscan/proto.c ++++ b/clamdscan/proto.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SYS_SELECT_H + #include + #endif +-- +2.14.3 + diff --git a/package/clamav/0001-clamdscan.patch b/package/clamav/0001-clamdscan.patch deleted file mode 100644 index c395ae1600..0000000000 --- a/package/clamav/0001-clamdscan.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes build error - -proto.c: In function ‘dconnect’: -proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’ - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Patch sent upstream: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html - -Signed-off-by: Bernd Kuhls - -diff -uNr clamav-0.98.3.org/clamdscan/proto.c clamav-0.98.3/clamdscan/proto.c ---- clamav-0.98.3.org/clamdscan/proto.c 2014-05-06 20:39:56.000000000 +0200 -+++ clamav-0.98.3/clamdscan/proto.c 2014-05-10 10:41:44.000000000 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif diff --git a/package/clamav/0002-backtrace-uClibc.patch b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 53% rename from package/clamav/0002-backtrace-uClibc.patch rename to package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch index 82ad67307d..e99a9742ec 100644 --- a/package/clamav/0002-backtrace-uClibc.patch +++ b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch @@ -1,4 +1,8 @@ -mbox: do not use backtrace if using uClibc without backtrace support +From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Mon, 7 May 2018 23:15:58 +0200 +Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace + support Since uClibc can be configured without support for backtrace, disable the backtrace if we are building with a uClibc that was built without @@ -8,10 +12,15 @@ This is a bit hacky, and would greatly benefit from a test in ./configure instead, but does nicely as a quick fix for now. Signed-off-by: "Yann E. MORIN" -diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c ---- clamav-0.98.4.orig/libclamav/mbox.c 2014-05-21 17:25:05.000000000 +0200 -+++ clamav-0.98.4/libclamav/mbox.c 2014-11-16 17:21:04.885383286 +0100 -@@ -83,7 +83,7 @@ +--- + libclamav/mbox.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libclamav/mbox.c b/libclamav/mbox.c +index 71f540c0a..4851297a9 100644 +--- a/libclamav/mbox.c ++++ b/libclamav/mbox.c +@@ -98,7 +98,7 @@ #include #endif @@ -20,3 +29,6 @@ diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c #define HAVE_BACKTRACE #endif #endif +-- +2.14.3 + From 037572ee56ce7b18110eb45ddf507623cba726aa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 May 2018 23:20:31 +0200 Subject: [PATCH 1334/2640] clamav: add patch to fix build failure caused by lack of libcurl When json-c is enabled but libcurl is disabled, clamav tries to build the clamsubmit program, which fails with: CC clamsubmit.o clamsubmit.c:6:23: fatal error: curl/curl.h: No such file or directory #include This is due to an incorrect curl-config detection logic, leading to /bin/curl-config being present making the configure script believe that curl is available, even when --without-libcurl is explicitly passed. This commit adds a patch, submitted upstream, which fixes this problem. Fixes: http://autobuild.buildroot.net/results/c43d2ebd8ab30016969d642dbd71c297dc5f6bab/ Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...n-libs-curl.m4-fix-curl-config-detec.patch | 75 +++++++++++++++++++ package/clamav/clamav.mk | 2 + 2 files changed, 77 insertions(+) create mode 100644 package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch diff --git a/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch b/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch new file mode 100644 index 0000000000..1d26b099b9 --- /dev/null +++ b/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch @@ -0,0 +1,75 @@ +From 6b6ff53b5931c162be13504a1efc53fc5212f9d1 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 7 May 2018 22:57:34 +0200 +Subject: [PATCH] m4/reorganization/libs/curl.m4: fix curl-config detection + logic + +The current logic in curl.m4 doesn't behave properly when +--without-libcurl is passed to the ./configure script. + +Indeed, in this case what happens is that: + + (1) Since --without-libcurl is passed, LIBCURL_HOME is set to nothing + + (2) find_curl is set to "no" + + (3) Due to find_curl being "no", LIBCURL_HOME is not set to + /usr/local and remains empty + + (4) We test if $LIBCURL_HOME/bin/curl_config exists, which is + equivalent to testing if /bin/curl-config exists. So curl.m4 is + looking at /bin/curl-config, which is irrelevant in a + cross-compilation context: it is not because the build machine + has libcurl installed that it is available for the target. + + Due to this mistake, it sets have_curl="yes" + +Due to this, the ./configure script assumes it can build the +clamsubmit program, which fails at build time because curl/curl.h +doesn't exist. + +To fix this, this commit rewrites the curl-config detection logic with +a simpler loop. If find_curl=yes, it means we have to find libcurl +ourselves, so we iterate over /usr/local and /usr, and check if a +bin/curl-config binary is available there. If so, we use this path as +LIBCURL_HOME and set have_curl="yes". + +This preserves the existing behavior, while fixing the situation where +--without-libcurl is passed, but /bin/curl-config exists. + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/Cisco-Talos/clamav-devel/pull/87 +--- + m4/reorganization/libs/curl.m4 | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/m4/reorganization/libs/curl.m4 b/m4/reorganization/libs/curl.m4 +index 2a5966ee7..b6a9c2137 100644 +--- a/m4/reorganization/libs/curl.m4 ++++ b/m4/reorganization/libs/curl.m4 +@@ -19,17 +19,12 @@ fi + [find_curl="yes"]) + + if test "X$find_curl" = "Xyes"; then +- LIBCURL_HOME=/usr/local +-fi +-if test -f "$LIBCURL_HOME/bin/curl-config"; then +- have_curl="yes" +-else +- if test "X$find_curl" = "Xyes"; then +- LIBCURL_HOME=/usr +- if test -f "$LIBCURL_HOME/bin/curl-config"; then +- have_curl="yes" ++ for p in /usr/local /usr ; do ++ if test -f "${p}/bin/curl-config"; then ++ LIBCURL_HOME=$p ++ have_curl="yes" + fi +- fi ++ done + fi + + if test "X$have_curl" = "Xyes"; then +-- +2.14.3 + diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 2711ca2a86..c0138a8944 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -16,6 +16,8 @@ CLAMAV_DEPENDENCIES = \ openssl \ zlib \ $(TARGET_NLS_DEPENDENCIES) +# 0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch +CLAMAV_AUTORECONF = YES # mmap cannot be detected when cross-compiling, needed for mempool support CLAMAV_CONF_ENV = \ From 6ff41f264cb1858b3f530b1e079d4858c04a1295 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 8 May 2018 18:15:37 +0200 Subject: [PATCH 1335/2640] cifs-utils: bump to version 6.8 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ount.cifs-Remove-data_blob.h-include.patch | 32 ------------------- package/cifs-utils/cifs-utils.hash | 5 ++- package/cifs-utils/cifs-utils.mk | 2 +- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch diff --git a/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch b/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch deleted file mode 100644 index 6536076577..0000000000 --- a/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 -From: Thomas Witt -Date: Wed, 15 Mar 2017 20:20:44 +0000 -Subject: [PATCH] mount.cifs: Remove data_blob.h include - -data_blob.h includes talloc.h from libtalloc, but that is only marked as -a dependency for cifs.upcall. No symbols from that header are used by -cifs.mount, so remove it to avoid the libtalloc dependency - -Signed-off-by: Thomas Witt -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 272d523a57a4 - - mount.cifs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 13b71ef50303..2612feb4d591 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -61,7 +61,6 @@ - #include "mount.h" - #include "util.h" - #include "resolve_host.h" --#include "data_blob.h" - - #ifndef MS_MOVE - #define MS_MOVE 8192 --- -2.11.0 - diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index ebc9c43e72..fda1573eeb 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab cifs-utils-6.7.tar.bz2 +sha256 e7d1f6050c43f21f82cd77e288eb756755effd22f0c310fc2c525df9d41dff79 cifs-utils-6.8.tar.bz2 + +# Hash for license file: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 9044fdf83c..199e8422d5 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.7 +CIFS_UTILS_VERSION = 6.8 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ From 4c32dc466a377b2ae8d52dbc131e668e6872b46c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 May 2018 21:26:17 +0300 Subject: [PATCH 1336/2640] zstd: bump to version 1.3.4 Cc: Andrey Smirnov Signed-off-by: Baruch Siach Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/zstd/zstd.hash | 2 +- package/zstd/zstd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index 51e5fc245c..f7aadfb5db 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a77c47153ee7de02626c5b2a097005786b71688be61e9fb81806a011f90b297b zstd-v1.3.3.tar.gz +sha256 92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9 zstd-v1.3.4.tar.gz # License files (locally computed as well) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index c74c8f24b6..4915cee07d 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = v1.3.3 +ZSTD_VERSION = v1.3.4 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From 048a7258eb7b4b2d95e923a9eb11b0b355448cff Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Apr 2018 22:53:04 +0200 Subject: [PATCH 1337/2640] core/pkg-infra: add missing step hooks Also call the step hooks from the three steps they are currently not called in: - download, - actual download (when main archive is not the real source, like external toolchains), - rsync (for local or override-srcdir). Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 8a3b5f90a9..387762b094 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -132,6 +132,7 @@ endif # Retrieve the archive $(BUILD_DIR)/%/.stamp_downloaded: + @$(call step_start,download) $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) # Only show the download message if it isn't already downloaded $(Q)for p in $($(PKG)_ALL_DOWNLOADS); do \ @@ -143,12 +144,15 @@ $(BUILD_DIR)/%/.stamp_downloaded: $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) + @$(call step_end,download) $(Q)touch $@ # Retrieve actual source archive, e.g. for prebuilt external toolchains $(BUILD_DIR)/%/.stamp_actual_downloaded: + @$(call step_start,actual-download) $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)) $(Q)mkdir -p $(@D) + @$(call step_end,actual-download) $(Q)touch $@ # Unpack the archive @@ -167,11 +171,13 @@ $(BUILD_DIR)/%/.stamp_extracted: # Rsync the source directory if the _OVERRIDE_SRCDIR feature is # used. $(BUILD_DIR)/%/.stamp_rsynced: + @$(call step_start,rsync) @$(call MESSAGE,"Syncing from source dir $(SRCDIR)") $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $($(PKG)_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D) $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) + @$(call step_end,rsync) $(Q)touch $@ # Patch From 782deb7a4db68229fa38489ac598f312e4a4df49 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sun, 6 May 2018 15:04:02 -0400 Subject: [PATCH 1338/2640] gst1-plugins-bad: rework license type construction Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list. Signed-off-by: Danomi Manchego Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 9f7cd9777e..b001c33592 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \ @@ -771,13 +771,13 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += UNKNOWN +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN endif # Use the following command to extract license info for plugins. From 2499c489930f904d545e7fd83d09a296d58c0c36 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 6 May 2018 11:56:23 +0200 Subject: [PATCH 1339/2640] libnetfilter_conntrack: bump to version 1.0.7 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../libnetfilter_conntrack/libnetfilter_conntrack.hash | 8 +++++--- package/libnetfilter_conntrack/libnetfilter_conntrack.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index de9d1d3fcf..dd236cd3dc 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,3 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.tar.bz2.{md5sum,sha1sum} -md5 7139c5f408dd9606ffecfd5dcda8175b libnetfilter_conntrack-1.0.6.tar.bz2 -sha1 015f985a8e171889a67769ba02d070eca53bac07 libnetfilter_conntrack-1.0.6.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.tar.bz2.sha256sum +sha256 33685351e29dff93cc21f5344b6e628e41e32b9f9e567f4bec0478eb41f989b6 libnetfilter_conntrack-1.0.7.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 2e9f6b7a64..40b74fe92d 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.6 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.7 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES From 1a8f6d032e41a6f7a87b1883564384d58f82ace2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 6 May 2018 12:12:51 +0200 Subject: [PATCH 1340/2640] libnetfilter_queue: bump to version 1.0.3 - Remove both patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnetfilter_queue/0001-uclinux.patch | 26 ----------- package/libnetfilter_queue/0002-musl.patch | 45 ------------------- .../libnetfilter_queue.hash | 9 ++-- .../libnetfilter_queue/libnetfilter_queue.mk | 2 +- 4 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 package/libnetfilter_queue/0001-uclinux.patch delete mode 100644 package/libnetfilter_queue/0002-musl.patch diff --git a/package/libnetfilter_queue/0001-uclinux.patch b/package/libnetfilter_queue/0001-uclinux.patch deleted file mode 100644 index 21895d9b0e..0000000000 --- a/package/libnetfilter_queue/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 311b60655761f6f3c4fe44cf6eff63427283f25e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:13:58 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 07747a6..289868f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ AC_PROG_INSTALL - CHECK_GCC_FVISIBILITY - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnetfilter_queue/0002-musl.patch b/package/libnetfilter_queue/0002-musl.patch deleted file mode 100644 index 3765d58af3..0000000000 --- a/package/libnetfilter_queue/0002-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5348da83403383a60831f4c297841afb98692887 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:45:46 +0200 -Subject: [PATCH] extra: Define _GNU_SOURCE to get members of tcphdr&ucphdr - -The source uses linux names for members of tcphdr. For example -"source" instead of "th_sport", ... musl libc's headers need -_GNU_SOURCE defined in order to expose these. - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -[yann.morin.1998@free.fr: backported from upstream] -Signed-off-by: "Yann E. MORIN" ---- - src/extra/tcp.c | 1 + - src/extra/udp.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/extra/tcp.c b/src/extra/tcp.c -index bf161aa..d1cd79d 100644 ---- a/src/extra/tcp.c -+++ b/src/extra/tcp.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - - #include -diff --git a/src/extra/udp.c b/src/extra/udp.c -index 6e6baed..8c44a66 100644 ---- a/src/extra/udp.c -+++ b/src/extra/udp.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - - #include --- -1.9.1 - diff --git a/package/libnetfilter_queue/libnetfilter_queue.hash b/package/libnetfilter_queue/libnetfilter_queue.hash index 4ea37216c7..1425d41b31 100644 --- a/package/libnetfilter_queue/libnetfilter_queue.hash +++ b/package/libnetfilter_queue/libnetfilter_queue.hash @@ -1,3 +1,6 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.2.tar.bz2.{md5sum,sha1sum} -md5 df09befac35cb215865b39a36c96a3fa libnetfilter_queue-1.0.2.tar.bz2 -sha1 8cc0b8ed33162281bc9fa8bcfa8c9dcb08848ff9 libnetfilter_queue-1.0.2.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.3.tar.bz2.{md5sum,sha1sum} +md5 700ce0ae4784257ab5abe6fd1802f366 libnetfilter_queue-1.0.3.tar.bz2 +sha1 3d182e3211b633d0a0f8a2b12ef80dc2621f53cb libnetfilter_queue-1.0.2.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_queue/libnetfilter_queue.mk b/package/libnetfilter_queue/libnetfilter_queue.mk index 75910c5905..302f9a2575 100644 --- a/package/libnetfilter_queue/libnetfilter_queue.mk +++ b/package/libnetfilter_queue/libnetfilter_queue.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_QUEUE_VERSION = 1.0.2 +LIBNETFILTER_QUEUE_VERSION = 1.0.3 LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2 LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files LIBNETFILTER_QUEUE_INSTALL_STAGING = YES From c27ed9f618e1d28459868402dad32bd1f48f99e4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 14 May 2018 08:25:19 +0200 Subject: [PATCH 1341/2640] package/asterisk: Fix issues building without SSL Fixes http://autobuild.buildroot.net/results/7d0/7d069dd5629e406cecd17bacfa818e7c8e6b2064/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...uild-fix-issues-building-without-ssl.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/asterisk/0006-build-fix-issues-building-without-ssl.patch diff --git a/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch new file mode 100644 index 0000000000..b02031e5ab --- /dev/null +++ b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch @@ -0,0 +1,57 @@ +From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001 +From: Corey Farrell +Date: Sun, 19 Nov 2017 14:52:59 -0500 +Subject: [PATCH] Build: Fix issues building without SSL. + +* Fix conditional in libasteriskssl. +* Use variables produced by configure to link the SSL and uuid libraries + into libasteriskpj.so instead of hard-coding them. + +ASTERISK-27431 + +Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d + +Downloaded from upstream master branch +https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1 + +Signed-off-by: Bernd Kuhls +--- + main/Makefile | 4 ++-- + main/libasteriskssl.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/main/Makefile b/main/Makefile +index 08d1f65580e..c724e2012b0 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -273,7 +273,7 @@ endif + + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS) + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS) +-$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) ++$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) + ifeq ($(GNU_LD),1) + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common + endif +@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib + # /lib or /usr/lib + $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS) + $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE +-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) ++$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) + $(ASTPJ_LIB): SOLINK=$(DYLINK) + + # Special rules for building a shared library (not a dynamically loadable module) +diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c +index 8b19e247da9..e2e256f8ffe 100644 +--- a/main/libasteriskssl.c ++++ b/main/libasteriskssl.c +@@ -37,7 +37,7 @@ + #endif + + #if defined(HAVE_OPENSSL) && \ +- !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ (!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + + #include + From e702d5f69b0ed2e3ee24f7840a9f431175c1c983 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Thu, 17 May 2018 15:31:14 +0200 Subject: [PATCH 1342/2640] package/llvm: bump to version 5.0.2 5.0.2 is API and ABI compatible with 5.0.0 and 5.0.1 and includes mitigations for CVE-2017-5715 (Spectre Variant 2) for X86 and MIPS. Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/llvm/llvm.hash | 2 +- package/llvm/llvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 3e998c4328..14f8bb4488 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0 llvm-5.0.1.src.tar.xz +sha256 d522eda97835a9c75f0b88ddc81437e5edbb87dc2740686cb8647763855c2b3c llvm-5.0.2.src.tar.xz sha256 abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672 LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 978f176f28..3abf428989 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_VERSION = 5.0.1 +LLVM_VERSION = 5.0.2 LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = NCSA From 31e4328728dd78f4df7499d5e310be597a759907 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Thu, 17 May 2018 15:31:15 +0200 Subject: [PATCH 1343/2640] package/clang: bump to version 5.0.2 5.0.2 is API and ABI compatible with 5.0.0 and 5.0.1 and includes mitigations for CVE-2017-5715 (Spectre Variant 2) for X86 and MIPS. Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- package/clang/clang.hash | 2 +- package/clang/clang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clang/clang.hash b/package/clang/clang.hash index a5bf909814..bf54f9bb53 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff cfe-5.0.1.src.tar.xz +sha256 fa9ce9724abdb68f166deea0af1f71ca0dfa9af8f7e1261f2cae63c280282800 cfe-5.0.2.src.tar.xz sha256 de4c79665f0f5688b0ace17cba6f8e0343925bb95e0949d66d47bbd4527310d6 LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 14d6441c9a..ae0140c783 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLANG_VERSION = 5.0.1 +CLANG_VERSION = 5.0.2 CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION) CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = NCSA From 6d3d09e23213e88c14f2ddc883700499315a41bc Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 17 May 2018 14:39:21 +0200 Subject: [PATCH 1344/2640] linux: don't override HOSTCC for kconfig Kconfig uses either pkg-config or hard-coded /usr/include paths to find the ncurses or ncursesw library. If ncursesw is found, it will include . Since Buildroot's host-ncurses doesn't install a .pc file, and linux.mk anyway doesn't pass the pkg-config options to find the host pkg-config files, Kconfig will always find the system's ncursesw.h. However, since commit dde090c299 (linux: fix passing of host CFLAGS and LDFLAGS) HOST_LDFLAGS is passed to the linux build system. Thus, if host-ncurses was already built before 'make linux-menuconfig' is called, the build will pick up libncurses from the host directory, which is NOT widechar. Thus, two different ncurses configurations are mixed into the final mconf program. This will result in serious breakage in the rendering of the menus (lots of @ and question mark characters). As a workaround (suggested by Yann), don't pass HOST_CFLAGS and HOST_LDFLAGS when running kconfig commands. For kconfig, we should never need host packages anyway. This way, the kconfig calls will always use the system's ncurses and never our host-ncurses. Note that the same problem could pop up for other kconfig packages as well if we ever pass HOST_CFLAGS/HOST_LDFLAGS to them. We could force HOSTCC=$(HOSTCC) directly in kconfig-package. However, for now there are no other packages that exhibit this problem, so this can be revisited when they do. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: David De Grave Cc: Scott Fan Cc: Yann E. MORIN Tested-by: Matt Weber Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index b6b91391b6..6b5f5344ed 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -235,7 +235,14 @@ LINUX_KCONFIG_FILE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) endif LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig -LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) + +# LINUX_MAKE_FLAGS overrides HOSTCC to allow the kernel build to find our +# host-openssl and host-libelf. However, this triggers a bug in the kconfig +# build script that causes it to build with /usr/include/ncurses.h (which is +# typically wchar) but link with $(HOST_DIR)/lib/libncurses.so (which is not). +# We don't actually need any host-package for kconfig, so remove the HOSTCC +# override again. +LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) HOSTCC="$(HOSTCC)" # If no package has yet set it, set it from the Kconfig option LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES) From db3dd600256e4ce3ba18496ea3e15c993489b598 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Wed, 16 May 2018 17:26:35 +0200 Subject: [PATCH 1345/2640] package/llvm: fix host-llvm build with GCC8 This patch fixes the build of lli for host-llvm when using GCC 8. It was taken from llvm-5.0 package for Fedora 28. Link to bug: https://bugzilla.redhat.com/show_bug.cgi?id=1540620 Fixes: http://autobuild.buildroot.net/results/824c70e982d8ec7e518cf4db058767df42db6b04/ Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- ...type-in-ORC-readMem-client-interface.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch diff --git a/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch new file mode 100644 index 0000000000..0343b4c7e8 --- /dev/null +++ b/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch @@ -0,0 +1,37 @@ +From 72ea6ea635d5b5a88f411710daf7e1d340d232d8 Mon Sep 17 00:00:00 2001 +From: Tilmann Scheller +Date: Thu, 1 Feb 2018 11:40:01 -0600 +Subject: [PATCH] Fix return type in ORC readMem() client interface. + +GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang +and earlier versions of GCC don't detect the issue. + +Fixes rhbz#1540620. + +This patch was taken from llvm5.0-5.0.1-7.fc28.src.rpm + +Link to bug: https://bugzilla.redhat.com/show_bug.cgi?id=1540620 + +Signed-off-by: Valentin Korenblit +--- + include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +index da02250ba16..bed472e2e0e 100644 +--- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h ++++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +@@ -713,8 +713,8 @@ private: + + uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } + +- Expected> readMem(char *Dst, JITTargetAddress Src, +- uint64_t Size) { ++ Expected> readMem(char *Dst, JITTargetAddress Src, ++ uint64_t Size) { + // Check for an 'out-of-band' error, e.g. from an MM destructor. + if (ExistingError) + return std::move(ExistingError); +-- +2.14.3 + From b872d829d092059ae8d5e86115d1515164d01a74 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 17 May 2018 22:07:38 +0200 Subject: [PATCH 1346/2640] exim: do not link buildconfig with $(LIBS) The existing patch 0001-Build-buildconfig-for-the-host.patch changes the exim build system to use the host compiler to build the "buildconfig" program instead of the cross-compiler. However, it still uses $(LIBS) which lists the target libraries to link with, which shouldn't be used. Since buildconfig doesn't use any library beyond the C library, we can simply drop using $(LIBS). This will fix build failures of exim on Fedora 28, where libnsl is no longer provided by the C library, causing build failures such as: /usr/bin/gcc buildconfig.c /usr/bin/ld: cannot find -lnsl Fixes: http://autobuild.buildroot.net/results/ac78fe18657558b3c12c03c08bf1081d7c06ca85/ Signed-off-by: Thomas Petazzoni --- package/exim/0001-Build-buildconfig-for-the-host.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch index a926fbdab3..87eb527974 100644 --- a/package/exim/0001-Build-buildconfig-for-the-host.patch +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch @@ -17,7 +17,7 @@ index 29a6ad3..420ba60 100644 - @echo "$(CC) buildconfig.c" - $(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) + @echo "$(HOSTCC) buildconfig.c" -+ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) ++ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c # Target for the exicyclog utility script From a5ff200b0df12babdf22658ddd386498f5ccd69f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 16 May 2018 00:10:53 -0300 Subject: [PATCH 1347/2640] configs/mx53loco: Adjust comment to reflect the real kernel version The kernel used is from 4.16 version, so adjust the comment. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx53loco_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 16dde351bd..ae56fcad8c 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,7 +2,7 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.15 series +# Linux headers same as kernel, a 4.16 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # System From 7b5c6b2464a3518ee9a49f58ed1e2428da5f6aa6 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 15 May 2018 21:24:11 -0300 Subject: [PATCH 1348/2640] imx8mqevk: readme: Put switch configuration for SD card boot Improve the documentation by adding the configuration of SW801 and SW802 switches for SD card boot. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/imx8mqevk/readme.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/freescale/imx8mqevk/readme.txt b/board/freescale/imx8mqevk/readme.txt index d50dd6e203..cb7e1dc202 100644 --- a/board/freescale/imx8mqevk/readme.txt +++ b/board/freescale/imx8mqevk/readme.txt @@ -63,6 +63,9 @@ Boot the i.MX8mq EVK board To boot your newly created system: - insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW801: ON ON OFF OFF +SW802: ON OFF - put a micro USB cable into the Debug USB Port and connect using a terminal emulator at 115200 bps, 8n1; - power on the board. From e797818582b867f95cbe3266bbcce7f961e0d3b7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 15 May 2018 21:24:12 -0300 Subject: [PATCH 1349/2640] imx8mqevk: readme: Write the SoC name in capital letters Use "i.MX8MQ" (in capital letters) for the SoC name for better readability. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/imx8mqevk/readme.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/imx8mqevk/readme.txt b/board/freescale/imx8mqevk/readme.txt index cb7e1dc202..1840290edb 100644 --- a/board/freescale/imx8mqevk/readme.txt +++ b/board/freescale/imx8mqevk/readme.txt @@ -1,8 +1,8 @@ *************************** -Freescale i.MX8mq EVK board +Freescale i.MX8MQ EVK board *************************** -This file documents the Buildroot support for the Freescale i.MX8mq +This file documents the Buildroot support for the Freescale i.MX8MQ EVK board. Hardware support @@ -14,7 +14,7 @@ support for GPU, VPU and other HW features. Build ===== -First, configure Buildroot for the i.MX8mq EVK board: +First, configure Buildroot for the i.MX8MQ EVK board: make freescale_imx8mqevk_defconfig @@ -58,7 +58,7 @@ command as root: For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template_imx8. -Boot the i.MX8mq EVK board +Boot the i.MX8MQ EVK board ========================== To boot your newly created system: From 739383f855dc5d95fe24d8e2eb08a2548f44d370 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 15 May 2018 20:41:38 +0200 Subject: [PATCH 1350/2640] libkcapi: depends on BR2_TOOLCHAIN_HAS_SYNC_4 Since commit https://github.com/smuellerDD/libkcapi/commit/4d0a5c235536b5f679e6a9b0c847f56c9cfc3835, libkcapi uses __sync_add_and_fetch_4 and __sync_sub_and_fetch_4 Fixes: - http://autobuild.buildroot.net/results/de5e136ea433633d836bff1d2ac1d3b461391b83 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libkcapi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libkcapi/Config.in b/package/libkcapi/Config.in index 7397cfe800..1dbcdc381b 100644 --- a/package/libkcapi/Config.in +++ b/package/libkcapi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBKCAPI bool "libkcapi" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 help Linux Kernel Crypto API userspace interface library From 45cf64ca0c0070151e4321e218e20cae5d730797 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 17 May 2018 22:32:01 +0200 Subject: [PATCH 1351/2640] libnss: backport upstream patch to fix build with gcc 8.x This commit backports upstream patch https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df to our libnss package to fix the build with gcc 8.x. Fixes: http://autobuild.buildroot.net/results/1ca35171200286fa032b24606aaa50de6a2d449e/ Signed-off-by: Thomas Petazzoni --- ...d-stringop-truncation-warning-r-fran.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch diff --git a/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch b/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch new file mode 100644 index 0000000000..c14880b117 --- /dev/null +++ b/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch @@ -0,0 +1,33 @@ +From f0ce70989526fc9a0223398c99ea0d09777ea5df Mon Sep 17 00:00:00 2001 +From: Martin Thomson +Date: Thu, 15 Feb 2018 16:34:02 +1100 +Subject: [PATCH] Bug 1438426 - Avoid stringop-truncation warning, r=franziskus + +--HG-- +extra : rebase_source : 4ea1630d0da0ce3523309e3da33ee50961682242 + +Upstream-commit: https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df +[Thomas: edited after git format-patch to add the nss/ prefix needed +for the patch to apply properly on the source code extracted by the +tarball.] +Signed-off-by: Thomas Petazzoni +--- + nss/coreconf/nsinstall/pathsub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/nsinstall/pathsub.c b/nss/coreconf/nsinstall/pathsub.c +index a42a9f30a..c31a946f0 100644 +--- a/nss/coreconf/nsinstall/pathsub.c ++++ b/nss/coreconf/nsinstall/pathsub.c +@@ -212,7 +212,7 @@ reversepath(char *inpath, char *name, int len, char *outpath) + xchdir(".."); + } else { + cp -= 3; +- strncpy(cp, "../", 3); ++ memcpy(cp, "../", 3); + xchdir(buf); + } + } +-- +2.14.3 + From 83b97af9b52ded0be6430b0337c61b4ab1ae6032 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 17 May 2018 10:38:09 +0100 Subject: [PATCH 1352/2640] package/zic: bump version to 2018e Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index df578fe1b3..6b7994731c 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,2 +1,2 @@ -# From http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html -sha512 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 tzcode2018c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html +sha512 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 tzcode2018e.tar.gz diff --git a/package/zic/zic.mk b/package/zic/zic.mk index aba8bc5b3f..224b7ab407 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2018c +ZIC_VERSION = 2018e ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = http://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From 878a197210f2860e8fb8c3fe181dc2b60d46e6d4 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 17 May 2018 10:38:10 +0100 Subject: [PATCH 1353/2640] package/tzdata: bump version to 2018e Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index cfcd49ef26..6a0ea17ce9 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,2 +1,2 @@ -# From http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html -sha512 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 tzdata2018c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html +sha512 d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae tzdata2018e.tar.gz diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 28323e84e7..e20c946208 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2018c +TZDATA_VERSION = 2018e TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = http://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 From 1d4eb844e3f25c96e6e84f69e0c9ee6bd4b5a501 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Wed, 16 May 2018 23:30:11 +0100 Subject: [PATCH 1354/2640] package/nodejs: bump version to 8.11.2 See https://nodejs.org/en/blog/release/v8.11.2/ Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index b3900f6a7d..25b035d694 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From http://nodejs.org/dist/v8.11.1/SHASUMS256.txt -sha256 40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a node-v8.11.1.tar.xz +# From http://nodejs.org/dist/v8.11.2/SHASUMS256.txt +sha256 539946c0381809576bed07424a35fc1740d52f4bd56305d6278d9e76c88f4979 node-v8.11.2.tar.xz # Hash for license file sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 2642525c47..0c7db83012 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.11.1 +NODEJS_VERSION = 8.11.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 454aa2da5e79ec8627f1d66ac640ec7bb04025dc Mon Sep 17 00:00:00 2001 From: Martijn de Gouw Date: Thu, 17 May 2018 21:29:00 +0200 Subject: [PATCH 1355/2640] package/protobuf: bump to version 3.5.1 GRPC requires protobuf 3.5.0+ Signed-off-by: Martijn de Gouw Signed-off-by: Thomas Petazzoni --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index fa02440a40..4492487efb 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2bb34b4a8211a30d12ef29fd8660995023d119c99fbab2e5fe46f17528c9cc78 protobuf-cpp-3.4.1.tar.gz +sha256 c28dba8782da2cfea1e11c61d335958c31a9c1bc553063546af9cbe98f204092 protobuf-cpp-3.5.1.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index d2782ddcfd..1440589c14 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works, as they share the same # version/site variables. -PROTOBUF_VERSION = 3.4.1 +PROTOBUF_VERSION = 3.5.1 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 91cab4ecc0..9c7606ce34 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1faa722cf475c8e4c43ddb393d6f1477f1a56c93be38a1c8e367c358db476b5f protobuf-python-3.4.1.tar.gz +sha256 13d3c15ebfad8c28bee203dd4a0f6e600d2a7d2243bac8b5d0e517466500fcae protobuf-python-3.5.1.tar.gz From bc8c206026028edb4747df9b8f032b206ccdba6c Mon Sep 17 00:00:00 2001 From: Martijn de Gouw Date: Thu, 17 May 2018 22:02:50 +0200 Subject: [PATCH 1356/2640] package/libuio: bump to 0.2.8 After years of inactivity, several bugfixes and features are merged Signed-off-by: Martijn de Gouw Signed-off-by: Thomas Petazzoni --- package/libuio/libuio.hash | 2 +- package/libuio/libuio.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libuio/libuio.hash b/package/libuio/libuio.hash index 6afe7dea8b..ce2f86ee19 100644 --- a/package/libuio/libuio.hash +++ b/package/libuio/libuio.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 57f9617f75d20f7912b270568cffdf098fe9d0c1ca690c002e949be8424aa4e6 libuio-940861de278cb794bf9d775b76a4d1d4f9108607.tar.gz +sha256 1494375bd493ef1a1b868ce2cbc7d29f3f9f692c21f70689eae28566e56f2c15 libuio-ca28ff0f69d89a789a47552c72db5a43d280710b.tar.gz diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index 8f72253add..13429ec0f1 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -4,8 +4,8 @@ # ################################################################################ -# v0.2.7 -LIBUIO_VERSION = 940861de278cb794bf9d775b76a4d1d4f9108607 +# v0.2.8 +LIBUIO_VERSION = ca28ff0f69d89a789a47552c72db5a43d280710b LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION)) LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs) LIBUIO_LICENSE_FILES = COPYING From 051e2f2d0b3a74ede4cc1865513ebe4c59e7d2ed Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 18 May 2018 06:00:36 +0300 Subject: [PATCH 1357/2640] libcurl: security bump to version 7.60.0 Drop upstream patch. This release fixes the security issues listed below. CVE-2018-1000300: curl might overflow a heap based memory buffer when closing down an FTP connection with very long server command replies. https://curl.haxx.se/docs/adv_2018-82c2.html CVE-2018-1000301: curl can be tricked into reading data beyond the end of a heap based buffer used to store downloaded content. https://curl.haxx.se/docs/adv_2018-b138.html Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...-openssl-fix-build-with-LibreSSL-2.7.patch | 75 ------------------- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 package/libcurl/0001-openssl-fix-build-with-LibreSSL-2.7.patch diff --git a/package/libcurl/0001-openssl-fix-build-with-LibreSSL-2.7.patch b/package/libcurl/0001-openssl-fix-build-with-LibreSSL-2.7.patch deleted file mode 100644 index 45ae4e2950..0000000000 --- a/package/libcurl/0001-openssl-fix-build-with-LibreSSL-2.7.patch +++ /dev/null @@ -1,75 +0,0 @@ -From de115e14079d12e8826eabaa396677dc40beb5d1 Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Mon, 2 Apr 2018 19:04:06 +0200 -Subject: [PATCH] openssl: fix build with LibreSSL 2.7 - - - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API - -Fixes #2319 -Closes #2447 -Closes #2448 - -Signed-off-by: Bernard Spil -(cherry picked from commit 7c90c93c0b061da81f69fabdd57125b2783c15fb) -Signed-off-by: Adam Duskett ---- - lib/vtls/openssl.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c -index 2a6b3cfac..bbb8ec766 100644 ---- a/lib/vtls/openssl.c -+++ b/lib/vtls/openssl.c -@@ -104,7 +104,8 @@ - #endif - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \ -- !defined(LIBRESSL_VERSION_NUMBER) -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER - #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */ - #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ -@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void) - #endif - - #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ -- !defined(LIBRESSL_VERSION_NUMBER) -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define HAVE_X509_GET0_SIGNATURE 1 - #endif - -@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void) - * Whether SSL_CTX_set_keylog_callback is available. - * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287 - * BoringSSL: supported since d28f59c27bac (committed 2015-11-19) -- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it -+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it - * lies and pretends to be OpenSSL 2.0.0). - */ - #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \ -@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state) - if(!session || !keylog_file_fp) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that - * we have a valid SSL context if we have a non-NULL session. */ - SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE); -@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) - case CURL_SSLVERSION_TLSv1_2: - case CURL_SSLVERSION_TLSv1_3: - /* it will be handled later with the context options */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - req_method = TLS_client_method(); - #else - req_method = SSLv23_client_method(); --- -2.14.3 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index aec61e3f83..cb1e6e72f2 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.59.0.tar.xz.asc -sha256 e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc curl-7.59.0.tar.xz +# https://curl.haxx.se/download/curl-7.60.0.tar.xz.asc +sha256 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 curl-7.60.0.tar.xz sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a3e66d094c..fbaeaa8975 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.59.0 +LIBCURL_VERSION = 7.60.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 968f2fbd7d99b7b6b875709acf13501be21aa26e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 17 May 2018 23:51:53 +0200 Subject: [PATCH 1358/2640] faketime: add patch to disable -Werror faketime currently doesn't build on host machines that use gcc 8.x due to stricter checks done by gcc, and the fact that it is built with -Werror. As a simple stop-gap measure, this commit patches the faketime Makefile to not use -Werror anymore. The actual fixes for the gcc 8.x issues have been submitted upstream at https://github.com/wolfcw/libfaketime/pull/161, but disabling -Werror is a much smaller fix. Also, it is worth mentioning that removing -Werror makes the existing patch 0001-Disable-the-non-null-compare-warning-error.patch (which was just disabling one specific warning). We nonetheless keep this patch around as it is a backport from upstream. Fixes: http://autobuild.buildroot.net/results/bd223dfa1c4baa68e427d4941bd2e9917e22da84/ Signed-off-by: Thomas Petazzoni --- .../0002-src-Makefile-disable-Werror.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/faketime/0002-src-Makefile-disable-Werror.patch diff --git a/package/faketime/0002-src-Makefile-disable-Werror.patch b/package/faketime/0002-src-Makefile-disable-Werror.patch new file mode 100644 index 0000000000..e1e3b321b8 --- /dev/null +++ b/package/faketime/0002-src-Makefile-disable-Werror.patch @@ -0,0 +1,32 @@ +From bcde6e6f34c3cf78a254315c5caa530db91802fb Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 17 May 2018 23:41:03 +0200 +Subject: [PATCH] src/Makefile: disable -Werror + +gcc 8.x has enabled additional warnings that break the build due to +-Werror, so let's drop -Werror for now. A set of patches has been +submitted upstream (https://github.com/wolfcw/libfaketime/pull/161) to +properly fix the gcc 8.x issues, but in the mean time, disabling +-Werror is a simpler option. + +Signed-off-by: Thomas Petazzoni +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index bbbd476..6b0d2cd 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -67,7 +67,7 @@ INSTALL ?= install + PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' ++CFLAGS += -std=gnu99 -Wall -Wextra -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' + LIB_LDFLAGS += -shared + LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread + LDADD += -ldl -lm -lrt +-- +2.14.3 + From eb04235783abe58a6a7f8ecc8f9ab46a6d03b543 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 18 May 2018 08:05:00 -0500 Subject: [PATCH 1359/2640] support/scripts/pkg-stats: use parenthesis for print Use Python 3 style print calls, in order to make pkg-stats Python 3 compliant. Signed-off-by: Matthew Weber Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 43f7e8d543..b7b00e8634 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -499,17 +499,17 @@ def parse_args(): def __main__(): args = parse_args() if args.npackages and args.packages: - print "ERROR: -n and -p are mutually exclusive" + print("ERROR: -n and -p are mutually exclusive") sys.exit(1) if args.packages: package_list = args.packages.split(",") else: package_list = None - print "Build package list ..." + print("Build package list ...") packages = get_pkglist(args.npackages, package_list) - print "Getting package make info ..." + print("Getting package make info ...") package_init_make_info() - print "Getting package details ..." + print("Getting package details ...") for pkg in packages: pkg.set_infra() pkg.set_license() @@ -517,9 +517,9 @@ def __main__(): pkg.set_patch_count() pkg.set_check_package_warnings() pkg.set_current_version() - print "Calculate stats" + print("Calculate stats") stats = calculate_stats(packages) - print "Write HTML" + print("Write HTML") dump_html(packages, stats, args.output) From 0d7757110a18addce7f4885f6c509f9a275215cb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 18 May 2018 14:43:01 +0300 Subject: [PATCH 1360/2640] nfs-utils: update homepage link The linux-nfs project switched to a new homepage. Update the help text link. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/nfs-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index 4e139363fc..055b711f0d 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_NFS_UTILS help The NFS Linux kernel server. - http://sourceforge.net/projects/nfs + http://linux-nfs.org/ if BR2_PACKAGE_NFS_UTILS From a90d1e9da5e96bfdf77164ae496596ba4974d2c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 May 2018 20:13:41 +0200 Subject: [PATCH 1361/2640] package/pngquant: bump version to 2.11.7 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pngquant/pngquant.hash | 5 +++-- package/pngquant/pngquant.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index a3f1005d32..a279100eca 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,5 @@ # From https://pngquant.org/releases.html -sha1 30f54b0731b8913a8c8b3bd1fdf53e1c68b12262 pngquant-2.10.1-src.tar.gz +sha1 be140ec83c571b19219b639f2671b2316a2acaa1 pngquant-2.11.7-src.tar.gz # Locally computed -sha256 e07a21fe37b6ae9fa5524f1e20a8e73b698566d42d2cc3edd469531745faa850 pngquant-2.10.1-src.tar.gz +sha256 d70b46c3335c7abf21944aced2d9d2b54819ab84ed1a140b354d5e8cc9f0fb0a pngquant-2.11.7-src.tar.gz +sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index f181d6fb47..20e5e763fb 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.10.1 +PNGQUANT_VERSION = 2.11.7 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From 4b48636a854e8859ef55584b702dde271ab4fb04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 16 May 2018 18:50:59 +0200 Subject: [PATCH 1362/2640] package/perl-http-message: bump version to 6.16 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-http-message/perl-http-message.hash | 6 ++++-- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index a34d0456b1..b58792b5af 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,3 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e4c6e183860c42cbdff65dcd76c333b0 HTTP-Message-6.14.tar.gz -sha256 71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9 HTTP-Message-6.14.tar.gz +md5 eddd79e2d2975a55bb6ea2e7707e3137 HTTP-Message-6.16.tar.gz +sha256 46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0 HTTP-Message-6.16.tar.gz +# Locally computed +sha256 66f0d1e8593d5512d7a8cd90549a976aaae97e4fa9b6097249b3682f14747a6b LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 722d6be671..c35796e065 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.14 +PERL_HTTP_MESSAGE_VERSION = 6.16 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_DEPENDENCIES = perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri From f7fae441c9064207a0fa21c18134358e26c800b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 17 May 2018 20:38:24 +0200 Subject: [PATCH 1363/2640] libopusenc: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The libopusenc library provides a high-level API for encoding opus audio files and live streams. Signed-off-by: Jörg Krause [Thomas: add missing select on opus in Config.in file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libopusenc/Config.in | 8 ++++++++ package/libopusenc/libopusenc.hash | 3 +++ package/libopusenc/libopusenc.mk | 16 ++++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/libopusenc/Config.in create mode 100644 package/libopusenc/libopusenc.hash create mode 100644 package/libopusenc/libopusenc.mk diff --git a/DEVELOPERS b/DEVELOPERS index b910a86a8c..7fc7e354d0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1045,6 +1045,7 @@ F: configs/bananapro_defconfig F: package/augeas/ F: package/bctoolbox/ F: package/freescale-imx/imx-alsa-plugins/ +F: package/libopusenc/ F: package/libshout/ F: package/libupnpp/ F: package/luv/ diff --git a/package/Config.in b/package/Config.in index ecee4938c9..1d6ddee8ec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1359,6 +1359,7 @@ menu "Multimedia" source "package/libmpeg2/Config.in" source "package/libogg/Config.in" source "package/libopenh264/Config.in" + source "package/libopusenc/Config.in" source "package/libplayer/Config.in" source "package/libtheora/Config.in" source "package/libvpx/Config.in" diff --git a/package/libopusenc/Config.in b/package/libopusenc/Config.in new file mode 100644 index 0000000000..4b29f9b82c --- /dev/null +++ b/package/libopusenc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBOPUSENC + bool "libopusenc" + select BR2_PACKAGE_OPUS + help + The libopusenc library provides a high-level API for + encoding opus audio files and live streams. + + http://opus-codec.org diff --git a/package/libopusenc/libopusenc.hash b/package/libopusenc/libopusenc.hash new file mode 100644 index 0000000000..1eea51b6bc --- /dev/null +++ b/package/libopusenc/libopusenc.hash @@ -0,0 +1,3 @@ +# From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt +sha256 02e6e0b14cbbe0569d948a46420f9c9a81d93bba32dc576a4007cbf96da68ef3 libopusenc-0.1.1.tar.gz +sha256 93b17ab56b8230127fea532be0dcb4e6d71e66ab5e8ce5d6ae8785d7288b164f COPYING diff --git a/package/libopusenc/libopusenc.mk b/package/libopusenc/libopusenc.mk new file mode 100644 index 0000000000..0debe85c71 --- /dev/null +++ b/package/libopusenc/libopusenc.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libopusenc +# +################################################################################ + +LIBOPUSENC_VERSION = 0.1.1 +LIBOPUSENC_SITE = https://downloads.xiph.org/releases/opus +LIBOPUSENC_LICENSE = BSD-3-Clause +LIBOPUSENC_LICENSE_FILES = COPYING +LIBOPUSENC_INSTALL_STAGING = YES +LIBOPUSENC_DEPENDENCIES = host-pkgconf opus + +LIBOPUSENC_CONF_OPTS = --disable-examples + +$(eval $(autotools-package)) From 9c7ce893a01b3f1fa81ce41580465a472431064c Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Tue, 15 May 2018 16:34:42 +0300 Subject: [PATCH 1364/2640] gdb: actually disable gdbserver if BR2_PACKAGE_GDB_SERVER is unset The gdb configure script is given --enable-gdbserver when BR2_PACKAGE_GDB_SERVER is set, but it is not given --disable-gdbserver when BR2_PACKAGE_GDB_SERVER is unset. gdb gdb/configure.ac defaults to enabling gdbserver in "native" (host=target) cases, which is always the case when buildroot builds a gdb which runs on the target hardware. The gdbserver will overwrite BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY gdbserver, if any. Fix that by passing --disable-gdbserver when BR2_PACKAGE_GDB_SERVER is unset. Signed-off-by: Anssi Hannula Signed-off-by: Thomas Petazzoni --- package/gdb/gdb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 215f473cc0..5661b4a465 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -109,7 +109,7 @@ GDB_CONF_OPTS = \ --without-x \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ - $(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \ + $(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \ --with-curses \ --without-included-gettext \ --disable-werror \ From 811ddf60f44e1f1511332de3cd902415364c5dba Mon Sep 17 00:00:00 2001 From: Sam Bobroff Date: Wed, 16 May 2018 16:29:09 +1000 Subject: [PATCH 1365/2640] rustc: enable on powerpc64le architecture Rust supports powerpc64le to the same level as powerpc64, so allow it. Signed-off-by: Sam Bobroff Tested-by: Eric Le Bihan Acked-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 1c79eededc..84a8e0f90b 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) - default y if BR2_powerpc || BR2_powerpc64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ && BR2_MIPS_NABI64 From 545567a8fc3eaac197c089c4ea905675d8d3dab9 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 19 May 2018 07:39:12 +0200 Subject: [PATCH 1366/2640] qt5wayland: fix hardwareintegration/client/xcomposite-egl compile Add upstream patch, fixes [1]: ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp: In member function 'void QtWaylandClient::QWaylandXCompositeEGLWindow::createEglSurface()': ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp:124:82: error: invalid conversion from 'Window {aka long unsigned int}' to 'EGLNativeWindowType {aka void*}' [-fpermissive] m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0); ^~~~~~~~~ In file included from ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h:57:0, from ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h:46, from ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp:40: .../host/arm-buildroot-linux-musleabihf/sysroot/usr/include/EGL/egl.h:265:31: note: initializing argument 3 of 'void* eglCreateWindowSurface(EGLDisplay, EGLConfig, EGLNativeWindowType, const EGLint*)' EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, [1] http://autobuild.buildroot.net/results/9bcc76ed9e23c0d525f20b4da7f3bb5efe3083d4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...Fix-compilation-for-Renesas-R-Car-M3.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch diff --git a/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch b/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch new file mode 100644 index 0000000000..df09d4f382 --- /dev/null +++ b/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch @@ -0,0 +1,44 @@ +From 1619f8bcdd1680c9557996b4977580090a749037 Mon Sep 17 00:00:00 2001 +From: Johan Klokkhammer Helsing +Date: Thu, 9 Feb 2017 12:53:56 +0100 +Subject: [PATCH] Fix compilation for Renesas R-Car M3 + +Change-Id: Ib85001884bb880a18d8aa1241da0eb614a6b58ba +Reviewed-by: Paul Olav Tvete + +Upstream: http://code.qt.io/cgit/qt/qtwayland.git/patch/?id=8b204b2c56be5e7c1fd21144ae140c9b865dd86b +Signed-off-by: Peter Seiderer +--- + .../client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp | 2 +- + .../compositor/xcomposite-egl/xcompositeeglintegration.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp +index 431cb14..9c3dee3 100644 +--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp ++++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp +@@ -121,7 +121,7 @@ void QWaylandXCompositeEGLWindow::createEglSurface() + XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow, CompositeRedirectManual); + XMapWindow(m_glxIntegration->xDisplay(), m_xWindow); + +- m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0); ++ m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, reinterpret_cast(m_xWindow), nullptr); + if (m_surface == EGL_NO_SURFACE) { + qFatal("Could not make eglsurface"); + } +diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp +index 3cc0ba0..071b088 100644 +--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ++++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp +@@ -129,7 +129,7 @@ QOpenGLTexture *XCompositeEglClientBuffer::toOpenGlTexture(int plane) + attribList.append(EGL_TEXTURE_2D); + attribList.append(EGL_NONE); + +- EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(),config,pixmap,attribList.constData()); ++ EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(), config, reinterpret_cast(pixmap), attribList.constData()); + if (surface == EGL_NO_SURFACE) { + qDebug() << "Failed to create eglsurface" << pixmap << compositorBuffer->window(); + } +-- +2.16.3 + From 81fe62e09560f770a1d5de0ee2fd5810a022c072 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Tue, 15 May 2018 12:18:02 +0200 Subject: [PATCH 1367/2640] package/iucode-tool: Add systemd service config Signed-off-by: Alex Suykov Signed-off-by: David De Grave (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/iucode-tool/iucode-tool.mk | 8 ++++++++ package/iucode-tool/iucode.service | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 package/iucode-tool/iucode.service diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index fb746c3cb8..38f9da438e 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -18,4 +18,12 @@ define IUCODE_TOOL_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S00iucode-tool endef +define IUCODE_TOOL_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/iucode-tool/iucode.service \ + $(TARGET_DIR)/usr/lib/systemd/system/iucode.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/iucode.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iucode.service +endef + $(eval $(autotools-package)) diff --git a/package/iucode-tool/iucode.service b/package/iucode-tool/iucode.service new file mode 100644 index 0000000000..d99acc6a54 --- /dev/null +++ b/package/iucode-tool/iucode.service @@ -0,0 +1,10 @@ +[Unit] +Description=Upload microcode into the processor + +[Service] +Type=oneshot +ExecStart=/usr/sbin/iucode_tool -k /usr/share/misc/intel-microcode.dat +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target From a759d5e696dc8dbfc2e2137db26d85e43d8972fe Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 19 May 2018 20:58:26 +0200 Subject: [PATCH 1368/2640] package/exim: remove libnsl linking glibc now considers its built-in libnsl as being obsolete, and requires passing --enable-obsolete-libnsl to have it built and installed. libnsl is now provided as a separate project [1], but it isn't packaged yet in Buildroot. In preparation for dropping --enable-obsolete-libnsl from the glibc package, this commit ensures that exim doesn't use libnsl. It was already the case for uclibc and musl toolchains, so this commit simply extends that to make sure libnsl is also not used with glibc toolchains. Only Exim's nis.so and nisplus.so lookup modules require libnsl, but they are not build by default. So we can safely remove -lnsl from the Makefile-Linux. If someone want these modules, a new libnsl package must be added first to provide nsl library. Since we remove -lnsl unconditionally, use a patch instead of a sed command. [1] https://github.com/thkukuk/libnsl.git [2] https://fedoraproject.org/wiki/Changes/NISIPv6 Signed-off-by: Romain Naour Cc: Baruch Siach Cc: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/exim/0006-remove-libnsl.patch | 37 +++++++++++++++++++++++++++ package/exim/exim.mk | 9 ------- 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 package/exim/0006-remove-libnsl.patch diff --git a/package/exim/0006-remove-libnsl.patch b/package/exim/0006-remove-libnsl.patch new file mode 100644 index 0000000000..8ca53c9acb --- /dev/null +++ b/package/exim/0006-remove-libnsl.patch @@ -0,0 +1,37 @@ +From b722f8fc01f6b1d71c98c0c66f759935b0dac136 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 19 May 2018 20:36:41 +0200 +Subject: [PATCH] remove libnsl + +glibc now considers its built-in libnsl as being obsolete, and requires +passing --enable-obsolete-libnsl to have it built and installed. libnsl +is now provided as a separate project [1], but it isn't packaged yet in +Buildroot. + +Exim's nis.so and nisplus.so lookup modules require libnsl, +but they are not build by default. So we can safely remove -lnsl +from the Makefile-Linux. + +[1] https://github.com/thkukuk/libnsl.git + +Signed-off-by: Romain Naour +--- + OS/Makefile-Linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/OS/Makefile-Linux b/OS/Makefile-Linux +index 990f884..ea5644b 100644 +--- a/OS/Makefile-Linux ++++ b/OS/Makefile-Linux +@@ -19,7 +19,7 @@ CFLAGS_DYNAMIC ?= -shared -rdynamic + DBMLIB = -ldb + USE_DB = yes + +-LIBS = -lnsl -lcrypt -lm ++LIBS = -lcrypt -lm + LIBRESOLV = -lresolv + + X11=/usr/X11R6 +-- +2.14.3 + diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 37eab501a4..bde2df1153 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -72,14 +72,6 @@ define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL endef endif -# only glibc provides libnsl, remove -lnsl for all other toolchains -# http://bugs.exim.org/show_bug.cgi?id=1564 -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) -define EXIM_REMOVE_LIBNSL_FROM_MAKEFILE - $(SED) 's/-lnsl//g' $(@D)/OS/Makefile-Linux -endef -endif - # musl does not provide struct ip_options nor struct ip_opts (but it is # available with both glibc and uClibc) ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) @@ -96,7 +88,6 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) $(call exim-config-add,HOSTCC,$(HOSTCC)) $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) - $(EXIM_REMOVE_LIBNSL_FROM_MAKEFILE) $(EXIM_FIX_IP_OPTIONS_FOR_MUSL) endef From 345730c38c8fad89f771cf14e58df125bb15a6fd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 19 May 2018 20:58:27 +0200 Subject: [PATCH 1369/2640] Revert "glibc: install the obsolete libnsl" libnsl from Glibc is deprecated and should not be used anymore. Remove libnsl.so.* from GLIBC_LIBS_LIB. libnsl is now an separate library that can be packaged later if necessary [1]. Note: libnsl from Glibc doesn't build with gcc 8 due new warning [2]. [1] https://github.com/thkukuk/libnsl.git [2] http://patchwork.sourceware.org/patch/26437 This reverts commit 398747f5fafca8c07e696612d8eded53d4f935c7. Signed-off-by: Romain Naour Cc: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3ab673c0cc..c1c5ac687f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -100,7 +100,6 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --without-gd \ --enable-obsolete-rpc \ - --enable-obsolete-nsl \ --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) @@ -113,7 +112,7 @@ endef GLIBC_LIBS_LIB = \ ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \ - libm.so.* libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* \ + libm.so.* libpthread.so.* libresolv.so.* librt.so.* \ libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.* ifeq ($(BR2_PACKAGE_GDB),y) From a047a1c8f44bd0eec8fe8ec47479e1f10a24ff9e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 19 May 2018 17:37:32 +0200 Subject: [PATCH 1370/2640] package/terminology: bump version to 1.2.1 Switch to meson build system introduced with 1.2.0 release. Handle NLS option with BR2_SYSTEM_ENABLE_NLS. Add license file hash. See release note: (1.2.0) https://sourceforge.net/p/enlightenment/mailman/message/36294478/ (1.2.1) https://sourceforge.net/p/enlightenment/mailman/message/36317484/ Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/terminology/terminology.hash | 5 +++-- package/terminology/terminology.mk | 32 ++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index 81ae5d8d61..f341d5c2f7 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,2 +1,3 @@ -# From https://sourceforge.net/p/enlightenment/mailman/message/36026490/ -sha256 da12b8a24ca5248b2d292d9b1e19cabc61ae29b21f96d4b6f4f3e7b4feeecc16 terminology-1.1.1.tar.xz +# From https://sourceforge.net/p/enlightenment/mailman/message/36317484/ +sha256 ac8673a129ed78ef669a8c04e7a136f5ca95226ce5ef375a451421bac41828c6 terminology-1.2.1.tar.xz +sha256 605988548c7a52562d6f64d936a579b53f690e62ca92261b6a440bf9023ff521 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index ed811b3a85..af37187d90 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,13 +4,37 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.1.1 +TERMINOLOGY_VERSION = 1.2.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause TERMINOLOGY_LICENSE_FILES = COPYING -TERMINOLOGY_DEPENDENCIES = efl host-pkgconf -TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/bin/edje_cc +TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-meson host-pkgconf +TERMINOLOGY_MESON_OPTS = \ + --prefix=/usr \ + --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \ + -Dedje-cc=$(HOST_DIR)/bin/edje_cc -$(eval $(autotools-package)) +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +TERMINOLOGY_MESON_OPTS += -Dnls=true +else +TERMINOLOGY_MESON_OPTS += -Dnls=false +endif + +define TERMINOLOGY_CONFIGURE_CMDS + rm -rf $(@D)/build + mkdir -p $(@D)/build + $(TARGET_MAKE_ENV) meson $(TERMINOLOGY_MESON_OPTS) $(@D) $(@D)/build +endef + +define TERMINOLOGY_BUILD_CMDS + $(TARGET_MAKE_ENV) ninja -C $(@D)/build +endef + +define TERMINOLOGY_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install +endef + +$(eval $(generic-package)) From f18ca0e7bb0e522846296139cdf0f8039d7dca1c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 19 May 2018 17:41:46 +0200 Subject: [PATCH 1371/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.0.4 See: https://lists.freedesktop.org/archives/mesa-dev/2018-May/195215.html Signed-off-by: Romain Naour Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 5a8e3f9b84..18c98a7f9e 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.0.3 +MESA3D_HEADERS_VERSION = 18.0.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 983c0e65e5..9b9f01703c 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-May/000426.html -md5 b260580a26b71a5e52c608e3fe6d08a6 mesa-18.0.3.tar.xz -sha1 2c12c9f69eb7ba787dd1245b53bb98ceb08362d3 mesa-18.0.3.tar.xz -sha256 099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30 mesa-18.0.3.tar.xz -sha512 decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d mesa-18.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-May/000429.html +md5 ef525adaff7f31bedd4c5134bc313da9 mesa-18.0.4.tar.xz +sha1 4bbee07d8eb42625f215f49d39a657fabdc2f29d mesa-18.0.4.tar.xz +sha256 1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f mesa-18.0.4.tar.xz +sha512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c mesa-18.0.3.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d897c0d4c2..1b2fca1f90 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.0.3 +MESA3D_VERSION = 18.0.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From ae7e5960a31795707ebdff5952b01881bffbf484 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 16 May 2018 17:51:59 +0200 Subject: [PATCH 1372/2640] imx-gpu-viv: add Wayland backend option This package has been tested with Wayland back-end using weston-imx repository on a i.MX6Q Nitrogen6x: https://source.codeaurora.org/external/imx/weston-imx/ (tag rel_imx_4.9.51_8mq_ga to work with both i.MX6 and i.MX8MQ) Weston was started as follows: # export XDG_RUNTIME_DIR=/tmp # weston --tty=1 --device=/dev/fb0 Finally the Vivante sample apps were started from weston-terminal: # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 10 +++++++++- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index cf58ad475c..4e753a41f3 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_IMX_GPU_VIV select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBOPENVG help - Userspace libraries for Vivante GPU on i.MX6 platforms + Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and OpenVG. It also contains a DRI plugin for X11. It also @@ -44,12 +44,20 @@ comment "X11 backend needs Xorg package" config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + bool "Wayland" + # libdrm needed by gbm_viv.so + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB + default "wl" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_PROVIDES_LIBEGL default "imx-gpu-viv" diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 0dc2072984..a339c22978 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -25,6 +25,10 @@ ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +IMX_GPU_VIV_DEPENDENCIES += libdrm wayland +endif + define IMX_GPU_VIV_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef @@ -62,6 +66,12 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +define IMX_GPU_VIV_FIXUP_PKGCONFIG + ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc +endef +endif + ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) define IMX_GPU_VIV_FIXUP_PKGCONFIG for lib in egl gbm glesv1_cm glesv2 vg; do \ From 430ac895487dda261e6f68a066fd27847165d545 Mon Sep 17 00:00:00 2001 From: Vincent Prince Date: Wed, 16 May 2018 11:16:05 +0200 Subject: [PATCH 1373/2640] imx-usb-loader: allow building the target variant Having imx-usb-loader on the target might be useful when you're building a system that itself will be responsible for booting/flashing i.MX based devices. Signed-off-by: Vincent Prince [Thomas: - improve commit log - fix indentation - drop BR2_arm dependency - add missing host-pkgconf dependency - fix prefix variable to install in $(TARGET_DIR)/usr] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/imx-usb-loader/Config.in | 9 +++++++++ package/imx-usb-loader/imx-usb-loader.mk | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 package/imx-usb-loader/Config.in diff --git a/package/Config.in b/package/Config.in index 1d6ddee8ec..61210cea36 100644 --- a/package/Config.in +++ b/package/Config.in @@ -188,6 +188,7 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" + source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" source "package/mtools/Config.in" diff --git a/package/imx-usb-loader/Config.in b/package/imx-usb-loader/Config.in new file mode 100644 index 0000000000..6f083f34d1 --- /dev/null +++ b/package/imx-usb-loader/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_IMX_USB_LOADER + bool "imx-usb-loader" + select BR2_PACKAGE_LIBUSB + help + This package contains tools to download and execute code + on Freescale i.MX5/i.MX6 and Vybrid SoCs through the + Serial Download Protocol. + + https://github.com/boundarydevices/imx_usb_loader diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index 946a1f3d55..01a654e6cf 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -8,14 +8,24 @@ IMX_USB_LOADER_VERSION = 7e77787c83288a421080a9bf2f67063931f561be IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING +IMX_USB_LOADER_DEPENDENCIES = libusb host-pkgconf HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb host-pkgconf +define IMX_USB_LOADER_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + define HOST_IMX_USB_LOADER_BUILD_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef +define IMX_USB_LOADER_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(TARGET_DIR)/usr install +endef + define HOST_IMX_USB_LOADER_INSTALL_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install endef +$(eval $(generic-package)) $(eval $(host-generic-package)) From 967d302e8bbb409c5b5106b0c87091d47f01a890 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 14 May 2018 06:23:56 +0300 Subject: [PATCH 1374/2640] skeleton: create include/ directory Don't rely on a random host package to create the include/ directory for us. Some packages do the wrong thing since they implicitly assume that this directory exists already. Commit a557aedad2 (zstd: fix host headers installation) shows an example of that. Cc: Maxime Hadjinlian Cc: Yann E. MORIN Signed-off-by: Baruch Siach Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/skeleton/skeleton.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index efcf420d72..9d97f02f08 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -16,6 +16,7 @@ SKELETON_ADD_SKELETON_DEPENDENCY = NO define HOST_SKELETON_INSTALL_CMDS $(Q)ln -snf . $(HOST_DIR)/usr $(Q)mkdir -p $(HOST_DIR)/lib + $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ (*64) ln -snf lib $(HOST_DIR)/lib64;; \ (*) ln -snf lib $(HOST_DIR)/lib32;; \ From 63bf9e71d6153f5a8e73e191cff8ff39f409026b Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Mon, 14 May 2018 11:09:24 +0300 Subject: [PATCH 1375/2640] configs/snps_arc*_defconfig: update linux version With this commit we update Linux kernel version to 4.16.8 and Linux headers version to 4.16. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- configs/snps_arc700_axs101_defconfig | 6 +++--- configs/snps_archs38_axs103_defconfig | 6 +++--- configs/snps_archs38_haps_defconfig | 6 +++--- configs/snps_archs38_hsdk_defconfig | 6 +++--- configs/snps_archs38_vdk_defconfig | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 0fefaf4aa8..8a4814286e 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index 39ceeae433..11069a5d9d 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/snps_archs38_haps_defconfig b/configs/snps_archs38_haps_defconfig index 6583c1ec3a..2ef49b4d44 100644 --- a/configs/snps_archs38_haps_defconfig +++ b/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 125063b444..40aed984db 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -2,8 +2,8 @@ BR2_arcle=y BR2_archs38=y -# Linux headers -BR2_KERNEL_HEADERS_4_14=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # System BR2_TARGET_GENERIC_HOSTNAME="hsdk" @@ -13,7 +13,7 @@ BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig index 46b539beec..129e3267e5 100644 --- a/configs/snps_archs38_vdk_defconfig +++ b/configs/snps_archs38_vdk_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 89d9ca945c2ac673a7e75cf8e4b44fae8c0d3c85 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Mon, 14 May 2018 11:10:35 +0300 Subject: [PATCH 1376/2640] configs/snps_arc*_defconfig: update u-boot version With this commit we update u-boot version to 2018.05 for Synopsys boards. U-boot version 2018.05 was released recently and includes significant changes for ARC boards: * Fix for compile-time warning for AXS10x * Add support of platform-specific commands for HSDK * Add support for on-board SPI flash on HSDK Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- ...01-axs103-Clean-up-smp_kick_all_cpus.patch | 48 ------------- ...lave-core-kick-start-on-axs103-v1.1-.patch | 72 ------------------- configs/snps_arc700_axs101_defconfig | 2 +- configs/snps_archs38_axs103_defconfig | 3 +- configs/snps_archs38_hsdk_defconfig | 2 +- 5 files changed, 3 insertions(+), 124 deletions(-) delete mode 100644 board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch delete mode 100644 board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch diff --git a/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch b/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch deleted file mode 100644 index 7af878d813..0000000000 --- a/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ee5a5a51780bcb17e5240335ddfa9c98a0e6f890 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Thu, 30 Mar 2017 19:18:30 +0300 -Subject: [PATCH] axs103: Clean-up smp_kick_all_cpus() - - * Rely on default pulse polarity value - * Don't mess with "multicore" value as it doesn't affect execution - -In essence we now do a bare minimal stuff: - 1) Select HS38x2_1 with CORE_SEL=1 bits - 2) Select "manual" core start (via CREG) with START_MODE=0 - 3) Generate cpu_start pulse with START=1 - -Signed-off-by: Alexey Brodkin -Signed-off-by: Vlad Zakharov ---- - board/synopsys/axs10x/axs10x.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c -index a5e774b2cf7b..57c790220f71 100644 ---- a/board/synopsys/axs10x/axs10x.c -+++ b/board/synopsys/axs10x/axs10x.c -@@ -61,16 +61,14 @@ void smp_kick_all_cpus(void) - { - /* CPU start CREG */ - #define AXC003_CREG_CPU_START 0xF0001400 -- - /* Bits positions in CPU start CREG */ - #define BITS_START 0 --#define BITS_POLARITY 8 -+#define BITS_START_MODE 4 - #define BITS_CORE_SEL 9 --#define BITS_MULTICORE 12 -- --#define CMD (1 << BITS_MULTICORE) | (1 << BITS_CORE_SEL) | \ -- (1 << BITS_POLARITY) | (1 << BITS_START) - -- writel(CMD, (void __iomem *)AXC003_CREG_CPU_START); -+ int cmd = readl((void __iomem *)AXC003_CREG_CPU_START); -+ cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START); -+ cmd &= ~(1 << BITS_START_MODE); -+ writel(cmd, (void __iomem *)AXC003_CREG_CPU_START); - } - #endif --- -2.7.4 - diff --git a/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch b/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch deleted file mode 100644 index 0fcc0e630f..0000000000 --- a/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a5fa3b17cb10ce020f8b7fe6a26c45d75f55b481 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Fri, 31 Mar 2017 11:14:35 +0300 -Subject: [PATCH] axs103: Support slave core kick-start on axs103 v1.1 - firmware - -In axs103 v1.1 procedure to kick-start slave cores has changed quite a bit -compared to previous implementation. - -In particular: - * We used to have a generic START bit for all cores selected by CORE_SEL - mask. But now we don't touch CORE_SEL at all because we have a dedicated - START bit for each core: - bit 0: Core 0 (master) - bit 1: Core 1 (slave) - * Now there's no need to select "manual" mode of core start - -Additional challenge for us is how to tell which axs103 firmware we're -dealing with. For now we'll rely on ARC core version which was bumped -from 2.1c to 3.0. - -Signed-off-by: Alexey Brodkin -Signed-off-by: Vlad Zakharov ---- - board/synopsys/axs10x/axs10x.c | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - -diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c -index 57c790220f71..e6b69da3da7f 100644 ---- a/board/synopsys/axs10x/axs10x.c -+++ b/board/synopsys/axs10x/axs10x.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include "axs10x.h" - - DECLARE_GLOBAL_DATA_PTR; -@@ -66,9 +67,27 @@ void smp_kick_all_cpus(void) - #define BITS_START_MODE 4 - #define BITS_CORE_SEL 9 - -+/* -+ * In axs103 v1.1 START bits semantics has changed quite a bit. -+ * We used to have a generic START bit for all cores selected by CORE_SEL mask. -+ * But now we don't touch CORE_SEL at all because we have a dedicated START bit -+ * for each core: -+ * bit 0: Core 0 (master) -+ * bit 1: Core 1 (slave) -+ */ -+#define BITS_START_CORE1 1 -+ -+#define ARCVER_HS38_3_0 0x53 -+ -+ int core_family = read_aux_reg(ARC_AUX_IDENTITY) & 0xff; - int cmd = readl((void __iomem *)AXC003_CREG_CPU_START); -- cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START); -- cmd &= ~(1 << BITS_START_MODE); -+ -+ if (core_family < ARCVER_HS38_3_0) { -+ cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START); -+ cmd &= ~(1 << BITS_START_MODE); -+ } else { -+ cmd |= (1 << BITS_START_CORE1); -+ } - writel(cmd, (void __iomem *)AXC003_CREG_CPU_START); - } - #endif --- -2.7.4 - diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 8a4814286e..2a71ff3896 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -22,6 +22,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index 11069a5d9d..1ad79eb406 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -23,7 +23,6 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" -BR2_TARGET_UBOOT_PATCH="board/synopsys/axs10x/patches/u-boot" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 40aed984db..4c337e5ce7 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -31,7 +31,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y From 17ceb6affc1c422eb73c856b34ae791a33762704 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 16 May 2018 17:52:00 +0200 Subject: [PATCH 1377/2640] weston: remove dependency on mesa3d to enable egl Other packages can actually provide Wayland libraries like imx-gpu-viv. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/weston/weston.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/weston/weston.mk b/package/weston/weston.mk index e9de56b2c6..efe12bc01e 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -50,8 +50,7 @@ else WESTON_CONF_OPTS += --disable-weston-launch endif -# Needs wayland-egl, which normally only mesa provides -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)$(BR2_PACKAGE_MESA3D_OPENGL_ES),yy) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND),y) WESTON_CONF_OPTS += --enable-egl WESTON_DEPENDENCIES += libegl else From e0d4e6091d76683be04e5bea537497b576c8a809 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 15 May 2018 16:56:22 +0200 Subject: [PATCH 1378/2640] ltp-testsuite: Bump to version 20180515 Dropped patch applied by upstream + LTP_TESTSUITE_AUTORECONF = YES which this patch required and thus not needed any more. Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...a-v2-detection-for-cross-compilation.patch | 37 ------------------- package/ltp-testsuite/ltp-testsuite.hash | 4 +- package/ltp-testsuite/ltp-testsuite.mk | 5 +-- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch diff --git a/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch b/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch deleted file mode 100644 index 6ad1db046e..0000000000 --- a/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 01c134f30be755a43af12a4ae2c31177d04be790 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Mon, 29 Jan 2018 10:31:40 +0100 -Subject: [PATCH] numa: Fix numa v2 detection for cross compilation - -Changed to AC_COMPILE_IFELSE as AC_RUN_IFELSE cannot be run while -cross compiling. - -Bug found by Buildroot project. - -Signed-off-by: Petr Vorel -Reported-by: Baruch Siach ---- - m4/ltp-numa.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 -index fc3383e97..633f54c18 100644 ---- a/m4/ltp-numa.m4 -+++ b/m4/ltp-numa.m4 -@@ -28,11 +28,11 @@ AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ - AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no]) - - if test "x$have_numa_headers" != "xno"; then -- AC_RUN_IFELSE([AC_LANG_PROGRAM([ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include - ], [ - #if LIBNUMA_API_VERSION < 2 --exit(1); -+# error Required numa headers >= 2 - #endif - ])], [have_numa_headers_v2=yes]) - fi --- -2.16.0 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index d75d204385..93ab41d3b7 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,2 +1,2 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20180118/ltp-full-20180118.tar.xz.sha1 -sha1 2e643f1e29cd89efc8059729f60237a427fd409e ltp-full-20180118.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20180515/ltp-full-20180515.tar.xz.sha1 +sha1 db424d391987ff62664662210ef98cd42c7cc6b5 ltp-full-20180515.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index f5ea4344ed..b536dbd369 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20180118 +LTP_TESTSUITE_VERSION = 20180515 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ @@ -57,9 +57,6 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" -# Required by patch 0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch -LTP_TESTSUITE_AUTORECONF = YES - # Requires uClibc fts and bessel support, normally not enabled ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) define LTP_TESTSUITE_REMOVE_UNSUPPORTED From 9cb6caf891588302d04baa4bbe84d672736ca502 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Mon, 14 May 2018 20:43:15 +0300 Subject: [PATCH 1379/2640] uclibc: ARC: Don't mess with CPU selection Since uClibc-ng commit cde74b83f9b2 "ARC: remove special CFLAGS/LDFLAGS handling" i.e. starting v1.0.23 CONFIG_ARC_CPU_xx options are not used. Instead uClibc relies on toolchain defaults or build-system CFLAGS for selection of ARC-specific code (i.e. distinguishes between ARCompact and ARCv2 ISAs). So we drop corresponding quirks from Buildroot as well. Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc/Config.in | 7 ------- package/uclibc/uclibc.mk | 6 ------ 2 files changed, 13 deletions(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 0747cc8d7c..a566881852 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -106,13 +106,6 @@ config BR2_UCLIBC_TARGET_ARCH default "i386" if BR2_i386 default "x86_64" if BR2_x86_64 -config BR2_UCLIBC_ARC_TYPE - string - default "ARC_CPU_700" if BR2_arc750d - default "ARC_CPU_700" if BR2_arc770d - default "ARC_CPU_HS" if BR2_archs38 - depends on BR2_UCLIBC_TARGET_ARCH = "arc" - config BR2_UCLIBC_MIPS_ABI string default "O32" if BR2_MIPS_OABI32 diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 7de9219873..bb44da28b4 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -82,11 +82,6 @@ endif # ifeq ($(UCLIBC_TARGET_ARCH),arc) -UCLIBC_ARC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_ARC_TYPE)) -define UCLIBC_ARC_TYPE_CONFIG - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_TYPE),$(@D)/.config) -endef - UCLIBC_ARC_PAGE_SIZE = CONFIG_ARC_PAGE_SIZE_$(call qstrip,$(BR2_ARC_PAGE_SIZE)) define UCLIBC_ARC_PAGE_SIZE_CONFIG $(SED) '/CONFIG_ARC_PAGE_SIZE_*/d' $(@D)/.config @@ -387,7 +382,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) - $(UCLIBC_ARC_TYPE_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) $(UCLIBC_ARC_ATOMICS_CONFIG) $(UCLIBC_ARM_ABI_CONFIG) From 3212e81e685f4134d8df8d98089b8f4be22f13bf Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Mon, 14 May 2018 14:24:21 +0300 Subject: [PATCH 1380/2640] ltrace: allow selection on aarch64 ltrace works fine on aarch64, so allow enabling it on that architecture. Signed-off-by: Anssi Hannula Signed-off-by: Thomas Petazzoni --- package/ltrace/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index 4d5fb723d6..369f54a12e 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LTRACE # broken (error: 'struct ltelf' has no member named # 'relplt_count'). Issue reported upstream at # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756764. - depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \ + depends on (BR2_i386 || BR2_arm || BR2_aarch64 || BR2_mips || BR2_mipsel \ || BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa) select BR2_PACKAGE_ELFUTILS help From da64e35f389df21c911f9ea7cf672e247f1aeedb Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 14 May 2018 16:04:29 +0200 Subject: [PATCH 1381/2640] librtlsdr: bump to version v0.5.4 Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- ...sable_shared_library_target_in_build.patch | 80 ------------------- package/librtlsdr/librtlsdr.hash | 4 +- package/librtlsdr/librtlsdr.mk | 2 +- 3 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index b763c48b2e..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,80 +0,0 @@ -librtlsdr: disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Signed-off-by: Yuvaraj Patil ---- -diff -Nurp librtlsdr-v0.5.3_orig/src/CMakeLists.txt librtlsdr-v0.5.3/src/CMakeLists.txt ---- librtlsdr-v0.5.3_orig/src/CMakeLists.txt 2014-09-24 17:31:40.610337074 +0530 -+++ librtlsdr-v0.5.3/src/CMakeLists.txt 2014-09-24 17:32:38.838334632 +0530 -@@ -20,6 +20,7 @@ - ######################################################################## - # Setup library - ######################################################################## -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr_shared SHARED - librtlsdr.c - tuner_e4k.c -@@ -37,6 +38,7 @@ set_target_properties(rtlsdr_shared PROP - set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) -+endif() - - add_library(rtlsdr_static STATIC - librtlsdr.c -@@ -71,6 +73,12 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - -+if(BUILD_SHARED_LIBS) -+set(rtlsdr_lib rtlsdr_shared) -+else() -+set(rtlsdr_lib rtlsdr_static) -+endif() -+ - ######################################################################## - # Build utility - ######################################################################## -@@ -81,33 +89,33 @@ add_executable(rtl_fm rtl_fm.c) - add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) --set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) - --target_link_libraries(rtl_sdr rtlsdr_shared convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr_shared convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr_shared convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr_shared convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr_shared convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr_shared convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) diff --git a/package/librtlsdr/librtlsdr.hash b/package/librtlsdr/librtlsdr.hash index 24bca467b1..9184196d9a 100644 --- a/package/librtlsdr/librtlsdr.hash +++ b/package/librtlsdr/librtlsdr.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 98fb5c34ac94d6f2235a0bb41a08f8bed7949e1d1b91ea57a7c1110191ea58de librtlsdr-v0.5.3.tar.gz +sha256 6fd0d298c1a18fc8005b0c2f6199b08bc15e3fb4f4312f551eea2ae269c940c5 librtlsdr-v0.5.4.tar.gz +# License file, locally calculated +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index ca0a43829d..02b3d31fd9 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTLSDR_VERSION = v0.5.3 +LIBRTLSDR_VERSION = v0.5.4 LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING From dbe39f2c3c809a0609b81591c268b47b81f45292 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 7 May 2018 17:44:00 -0300 Subject: [PATCH 1382/2640] uboot: bump to version 2018.05 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 95c17e3986..482711ca64 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -39,7 +39,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2018.03" + bool "2018.05" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -87,7 +87,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2018.03" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2018.05" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 788c1696f8..17840d8d9b 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd u-boot-2018.03.tar.bz2 +sha256 4da13c2a6139a78cc08608f21fd4741db27eda336cfad7ab8264fda923b9c048 u-boot-2018.05.tar.bz2 From 536805cfcc8068e3786c51a0c07def23ebe6cfea Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 7 May 2018 17:44:01 -0300 Subject: [PATCH 1383/2640] uboot-tools: bump to version 2018.05 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 788c1696f8..17840d8d9b 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd u-boot-2018.03.tar.bz2 +sha256 4da13c2a6139a78cc08608f21fd4741db27eda336cfad7ab8264fda923b9c048 u-boot-2018.05.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 882576d2d5..b247c2173d 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2018.03 +UBOOT_TOOLS_VERSION = 2018.05 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ From f36d4be02c262b4706ed05e0303feb3fbac3b435 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 14 May 2018 16:52:55 -0700 Subject: [PATCH 1384/2640] libnss: bump to version 3.37 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- ...-Build-Hacl_Poly1305_64_o_on_Aarch64.patch | 38 ------------------- package/libnss/libnss.hash | 2 +- package/libnss/libnss.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch diff --git a/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch b/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch deleted file mode 100644 index 94f1a65273..0000000000 --- a/package/libnss/0003-Build-Hacl_Poly1305_64_o_on_Aarch64.patch +++ /dev/null @@ -1,38 +0,0 @@ -# HG changeset patch -# User Daiki Ueno -# Date 1516710574 -3600 -# Node ID 1668fafc1db4f739d5d15fbc94283858f842deb5 -# Parent c3702e37a048e386f88e7c50a228d27669332725 -Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer - -[Upstream: https://hg.mozilla.org/projects/nss/rev/1668fafc1db4 - Peter: adjust paths for tarball] -Signed-off-by: Peter Korsgaard -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY - - ifneq (1,$(CC_IS_GCC)) - EXTRA_SRCS += chacha20.c - VERIFIED_SRCS += Hacl_Chacha20.c - else - EXTRA_SRCS += chacha20_vec.c - endif - else -- EXTRA_SRCS += poly1305.c -+ ifeq ($(CPU_ARCH),aarch64) -+ EXTRA_SRCS += Hacl_Poly1305_64.c -+ else -+ EXTRA_SRCS += poly1305.c -+ endif -+ - EXTRA_SRCS += chacha20.c - VERIFIED_SRCS += Hacl_Chacha20.c - endif # x86_64 - endif # NSS_DISABLE_CHACHAPOLY - - ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) - # All intel architectures get the 64 bit version - # With custom uint128 if necessary (faster than generic 32 bit version). - diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 775ef4868c..fa145c91f2 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ # From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_35_RTM/src/SHA256SUMS -sha256 f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa nss-3.35.tar.gz +sha256 5821969e85d241833e96cb82bd4211ddea6d87003f2cccce25e0eab4aefa6268 nss-3.37.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 0fa7f2cfac..053c09f7dc 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.35 +LIBNSS_VERSION = 3.37 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From b1cb30bc0434b48544a1b3c72323b8b1a0015f47 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 14 May 2018 16:52:56 -0700 Subject: [PATCH 1385/2640] DEVELOPERS: add myself for libnss Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 43b1668343..656dead14c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -941,6 +941,7 @@ F: configs/qemu_ppc64le_pseries_defconfig N: Joseph Kogut F: package/gconf/ +F: package/libnss/ F: package/python-cython/ F: package/python-raven/ F: package/python-schedule/ From 34f256a9da690f66f8064a517564028b3be220f6 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sun, 13 May 2018 22:12:08 -0400 Subject: [PATCH 1386/2640] gst1-plugins-bad: update plugin licenses Update several of the licenses annotated in the gst1-plugins-bad.mk file. 1. Specify GPL-2.0 in license info. * All of the *.[ch] that specify GPL also specify version 2 or later. 2. Remove GPL from audiovisualizers. * Changlog notes move from GPL to LGPL. (2015-04-25) * docs/plugins/inspect/plugin-audiovisualizers.xml claims "LGPL". * All *.[ch] files under ./gst/audiovisualizers say "GNU Library General Public License". 3. Add GPL to yadif. * Changelog notes that yadif is "GPL". (2013-02-07) * docs/plugins/inspect/plugin-yadif.xml claims "GPL". * All *.[ch] files under ./gst/yadif say "GNU General Public License" except for one "GNU Library General Public License". 4. Remove UNKNOWN from fdk_aac. * docs/plugins/inspect/plugin-fdkaac.xml claims "LGPL". * All *.[ch] files under ./ext/fdkaac say "GNU Lesser" or "GNU Library General Public License". 5. Add BSD-2c to dtls. * docs/plugins/inspect/plugin-dtls.xml claims "BSD". * All *.[ch] files under ./gst/dtls have BSD-2c text. 6. Add BSD-2c to openh264. * Changelog notes that openh264 is "BSD-2". (2014-10-03) * docs/plugins/inspect/plugin-openh264.xml claims "BSD". * All *.[ch] files under ./ext/openh264 have BSD-2c text. Signed-off-by: Danomi Manchego Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../gst1-plugins-bad/gst1-plugins-bad.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index b001c33592..90e2209a99 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -8,7 +8,7 @@ GST1_PLUGINS_BAD_VERSION = 1.12.4 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and +# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ @@ -198,7 +198,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers endif @@ -514,6 +513,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif endif @@ -585,7 +585,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac endif @@ -632,6 +631,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls GST1_PLUGINS_BAD_DEPENDENCIES += openssl +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls endif @@ -682,6 +682,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 endif @@ -771,10 +772,15 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif +# Add BSD license if BSD licensed plugins enabled. +ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y) +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause +endif + # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN From cdcc4cd1ec2aa402d35ee248db4fe478c99a9af4 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Mon, 7 May 2018 23:34:29 +0300 Subject: [PATCH 1387/2640] python-reentry: new package A plugin manager based on setuptools entry points mechanism. Signed-off-by: Asaf Kahlon Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-reentry/Config.in | 10 ++++++++++ package/python-reentry/python-reentry.hash | 4 ++++ package/python-reentry/python-reentry.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-reentry/Config.in create mode 100644 package/python-reentry/python-reentry.hash create mode 100644 package/python-reentry/python-reentry.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7fc7e354d0..f9531944a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -191,6 +191,7 @@ F: package/stress/ N: Asaf Kahlon F: package/python-jsonmodels/ +F: package/python-reentry/ F: package/python-subprocess32/ F: package/python-yieldfrom/ F: package/zeromq/ diff --git a/package/Config.in b/package/Config.in index 61210cea36..71a380bc3f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -912,6 +912,7 @@ menu "External python modules" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" source "package/python-raven/Config.in" + source "package/python-reentry/Config.in" source "package/python-remi/Config.in" source "package/python-requests/Config.in" source "package/python-requests-oauthlib/Config.in" diff --git a/package/python-reentry/Config.in b/package/python-reentry/Config.in new file mode 100644 index 0000000000..18518f2c3f --- /dev/null +++ b/package/python-reentry/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_REENTRY + bool "python-reentry" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_PY # runtime + help + A plugin manager based on setuptools entry points mechanism. + + https://pypi.org/project/reentry/ diff --git a/package/python-reentry/python-reentry.hash b/package/python-reentry/python-reentry.hash new file mode 100644 index 0000000000..7a3bbf4d99 --- /dev/null +++ b/package/python-reentry/python-reentry.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/pypi/reentry/json +sha256 00df980d8c61713f5002d4d893ba6ea38e9a721cd04aef5a520b974e700ab550 reentry-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 4ae7f3216208a7e2327236e95bcd2397b2495f1c2298c708986c893bea608509 LICENSE diff --git a/package/python-reentry/python-reentry.mk b/package/python-reentry/python-reentry.mk new file mode 100644 index 0000000000..d3f0e03ef0 --- /dev/null +++ b/package/python-reentry/python-reentry.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-reentry +# +################################################################################ + +PYTHON_REENTRY_VERSION = 1.2.0 +PYTHON_REENTRY_SOURCE = reentry-$(PYTHON_REENTRY_VERSION).tar.gz +PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/e2/b4/46dfac6613302fea51454a01aebedae9440aff9d813aedbbc5f687552e3b +PYTHON_REENTRY_SETUP_TYPE = setuptools +PYTHON_REENTRY_LICENSE = MIT +PYTHON_REENTRY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 0e06c3117665c5aabe94f1bbab7fb709e2953226 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 20 May 2018 11:41:44 +0200 Subject: [PATCH 1388/2640] python-cython: fix check-package warnings Fixes: package/python-cython/Config.in.host:2: should be indented with one tab (http://nightly.buildroot.org/#_config_files) package/python-cython/Config.in.host:3: should be indented with one tab (http://nightly.buildroot.org/#_config_files) package/python-cython/Config.in.host:4: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/python-cython/Config.in.host:5: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) Signed-off-by: Thomas Petazzoni --- package/python-cython/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/Config.in.host b/package/python-cython/Config.in.host index b69e59b718..69d32d5ab3 100644 --- a/package/python-cython/Config.in.host +++ b/package/python-cython/Config.in.host @@ -1,7 +1,7 @@ config BR2_PACKAGE_HOST_PYTHON_CYTHON - bool "host python-cython" - help - The Cython compiler for writing C extensions for the Python - language. + bool "host python-cython" + help + The Cython compiler for writing C extensions for the Python + language. - http://cython.org/ + http://cython.org/ From a335d32a5f31dec4f23c89ce9f496fac6eba3d69 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:11:01 +0200 Subject: [PATCH 1389/2640] mbedtls: security bump to version 2.7.3 Extract from release announcement: - (2.9, 2.7, 2.1) Fixed an issue in the X.509 module which could lead to a buffer overread during certificate validation. Additionally, the issue could also lead to unnecessary callback checks being made or to some validation checks to be omitted. The overread could be triggered remotely, while the other issues would require a non DER-compliant certificate to be correctly signed by a trusted CA, or a trusted CA with a non DER-compliant certificate. Found by luocm. Fixes #825. - (2.9, 2.7, 2.1) Fixed the buffer length assertion in the ssl_parse_certificate_request() function which could lead to an arbitrary overread of the message buffer. The overreads could be caused by receiving a malformed algorithms section which was too short. In builds with debug output, this overread data was output with the debug data. - (2.9, 2.7, 2.1) Fixed a client-side bug in the validation of the server's ciphersuite choice which could potentially lead to the client accepting a ciphersuite it didn't offer or a ciphersuite that could not be used with the TLS or DTLS version chosen by the server. This could lead to corruption of internal data structures for some configurations. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index f5331bed15..16f03fb7d8 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.8.0-2.7.2-and-2.1.11-released -sha1 e36d7cbdc2ed0a5d5659385840e8fbb4d351234e mbedtls-2.7.2-apache.tgz -sha256 fd38c2bb5fbe1ffd3e7fdcdd71130986f2010f25b3a5575eb8ded0dd3bc573d7 mbedtls-2.7.2-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.9.0-2.7.3-and-2.1.12-released +sha1 8352f6713a9ee695f6f19e893c0e85941af71967 mbedtls-2.7.3-apache.tgz +sha256 05282af7d95fedb2430c248ffe3081646800b8dae9071f8da11a07100963d765 mbedtls-2.7.3-apache.tgz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index ca44ee3713..e6012dcb3f 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.7.2 +MBEDTLS_VERSION = 2.7.3 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From cc69f0c44612a9090133f2d735612111548c0b1a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:34:15 +0200 Subject: [PATCH 1390/2640] libmodbus: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmodbus/libmodbus.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index b5c4450d6b..2d65e28a34 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,2 +1,3 @@ # Locally computed sha256 c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637 libmodbus-3.1.4.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER From e54c22429766faad882c37362bd138037b15e6ca Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:37:22 +0200 Subject: [PATCH 1391/2640] libmodplug: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmodplug/libmodplug.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index 0077e26ccd..d50a56eeda 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad libmodplug-0.8.8.5.tar.gz +sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING From 8e884ba02be77bd91ef2ffe067d4220ce06e9850 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:37:35 +0200 Subject: [PATCH 1392/2640] libmpd: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmpd/libmpd.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libmpd/libmpd.hash b/package/libmpd/libmpd.hash index ca06c754fb..c0e5c6b3c3 100644 --- a/package/libmpd/libmpd.hash +++ b/package/libmpd/libmpd.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 libmpd-11.8.17.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING From a9345056809b3f502a3eaad767be81a917427fd1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:39:16 +0200 Subject: [PATCH 1393/2640] libnetfilter_cthelper: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnetfilter_cthelper/libnetfilter_cthelper.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.hash b/package/libnetfilter_cthelper/libnetfilter_cthelper.hash index 5108652638..42deade7dd 100644 --- a/package/libnetfilter_cthelper/libnetfilter_cthelper.hash +++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.hash @@ -1,3 +1,6 @@ # From ftp://ftp.netfilter.org/pub/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.tar.bz2.{md5sum,sha1sum} md5 b2efab1a3a198a5add448960ba011acd libnetfilter_cthelper-1.0.0.tar.bz2 sha1 5d0a82794bd46aafde20c16800edca23d563de66 libnetfilter_cthelper-1.0.0.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING From 3d8beeb5e03b25f5f3efd890cb280e7e06f2a1a8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:40:46 +0200 Subject: [PATCH 1394/2640] libnetfilter_cttimeout: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash index 7749f96ec8..af5a281e4d 100644 --- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash +++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash @@ -1,3 +1,6 @@ # From ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.tar.bz2.{md5sum,sha1sum} md5 7697437fc9ebb6f6b83df56a633db7f9 libnetfilter_cttimeout-1.0.0.tar.bz2 sha1 24cba24b0371e80007be4ea0fa9d872df63b8a7a libnetfilter_cttimeout-1.0.0.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING From db0f6437c081fc3ecc8ad48141bd6d7e95f56bbe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:41:35 +0200 Subject: [PATCH 1395/2640] libnetfilter_log: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnetfilter_log/libnetfilter_log.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libnetfilter_log/libnetfilter_log.hash b/package/libnetfilter_log/libnetfilter_log.hash index 4fe6a9b8b6..292538db5d 100644 --- a/package/libnetfilter_log/libnetfilter_log.hash +++ b/package/libnetfilter_log/libnetfilter_log.hash @@ -1,3 +1,6 @@ # From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.1.tar.bz2.{md5sum,sha1sum} md5 2a4bb0654ae675a52d2e8d1c06090b94 libnetfilter_log-1.0.1.tar.bz2 sha1 0b95bcb1ad15eea906fa3607cd6c2290bd48d5bd libnetfilter_log-1.0.1.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING From 49ce0186fe69170da257efecc98e2c1444f2d39f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:44:52 +0200 Subject: [PATCH 1396/2640] libnfc: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnfc/libnfc.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libnfc/libnfc.hash b/package/libnfc/libnfc.hash index 307e04929a..32decf2d03 100644 --- a/package/libnfc/libnfc.hash +++ b/package/libnfc/libnfc.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 libnfc-1.7.1.tar.bz2 +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING From 9c64d35a88dd5c906eaabdea86348a48948deec0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:49:46 +0200 Subject: [PATCH 1397/2640] libnfnetlink: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnfnetlink/libnfnetlink.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libnfnetlink/libnfnetlink.hash b/package/libnfnetlink/libnfnetlink.hash index 93844f22ee..3392d239b6 100644 --- a/package/libnfnetlink/libnfnetlink.hash +++ b/package/libnfnetlink/libnfnetlink.hash @@ -1,3 +1,6 @@ # From ftp://ftp.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.1.tar.bz2.{md5sum,sha1sum} md5 98927583d2016a9fb1936fed992e2c5e libnfnetlink-1.0.1.tar.bz2 sha1 27ae2dfbd976e28cb7a417f9e946c901f512dd9a libnfnetlink-1.0.1.tar.bz2 + +# Hash for license file: +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING From 2ed0546c20f9ee419432c027efc8b5b2f6588755 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 10:57:29 +0200 Subject: [PATCH 1398/2640] liboauth: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/liboauth/liboauth.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/liboauth/liboauth.hash b/package/liboauth/liboauth.hash index 6806a08f9f..5fa0353d50 100644 --- a/package/liboauth/liboauth.hash +++ b/package/liboauth/liboauth.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f liboauth-1.0.3.tar.gz +sha256 c30608672733bf3abd2ccf6f3206be8d91b7ee58b007b2fdbcfbc61c655e7fb7 COPYING.MIT From e9d61fa4b6fa1050a4494d585c30ab32b663b841 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sun, 20 May 2018 10:08:53 +0200 Subject: [PATCH 1399/2640] quazip: upgrade to 0.7.5 and the new, Github upstream Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/quazip/quazip.hash | 4 ++-- package/quazip/quazip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index 87bf7c2c50..4e9af16a1a 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5 quazip-0.7.3.tar.gz +# From github release page +sha256 f3a56647d4706c9daef411e40e3884702e2bd770e980145c3899321788ba8bb2 quazip-0.7.5.tar.gz diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 09037a54ce..7bef2fe7d9 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,8 +4,8 @@ # ################################################################################ -QUAZIP_VERSION = 0.7.3 -QUAZIP_SITE = http://sourceforge.net/projects/quazip/files/quazip/$(QUAZIP_VERSION) +QUAZIP_VERSION = 0.7.5 +QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ zlib \ From 71b54ba98b98b05b5bcad05a89db5ef6699b3a2b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 12:20:32 +0200 Subject: [PATCH 1400/2640] libopenh264: bump to version 1.7.0 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libopenh264/libopenh264.hash | 3 ++- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 2fc76ecc1a..b9cd9ed53e 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 65d307bf312543ad6e98ec02abb7c27d8fd2c9740fd069d7249844612674a2c7 libopenh264-v1.6.0.tar.gz +sha256 9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f libopenh264-v1.7.0.tar.gz +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index feead5b849..233e7971f4 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = v1.6.0 +LIBOPENH264_VERSION = v1.7.0 LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From c6c9b95ccd422f146047f3eb4d2c201009bbdb3c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 12:21:11 +0200 Subject: [PATCH 1401/2640] libogg: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libogg/libogg.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libogg/libogg.hash b/package/libogg/libogg.hash index 0c65b8e1a9..d6962a55ed 100644 --- a/package/libogg/libogg.hash +++ b/package/libogg/libogg.hash @@ -1,2 +1,5 @@ # From: http://www.xiph.org/downloads/ sha256 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 libogg-1.3.3.tar.xz + +# Hash for license file: +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING From b677b490f7055963ac1f5a15856a6eab904ccbc7 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 21:07:25 +0100 Subject: [PATCH 1402/2640] configs/raspberrypi*: bump kernel version Now based on 4.14.39 (from 4.14.29) Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 62c55fee20..ccf35da7de 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 95195bd5e8..a9defeb22b 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index bbb3900e41..b5e5110d00 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index df9f89927f..1a6e378e2c 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 45a76beb6a..856f321433 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index ee76f2b682..f8debfdd31 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 0460117eb8..d068f3e843 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c117a8bccf37bfba323065b566cf999ed4629a4a)/linux-c117a8bccf37bfba323065b566cf999ed4629a4a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,865ddc1393f558198e7e7ce70928ff2e49c4f7f6)/linux-865ddc1393f558198e7e7ce70928ff2e49c4f7f6.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources From fbb45f6d7f937e503900a04ff920320c411d8f34 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 21:07:26 +0100 Subject: [PATCH 1403/2640] configs/raspberrypi3_64_defconfig: add support for rpi3b+ The kernel now includes the rpi3b+ device tree for aarch64 Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- board/raspberrypi/genimage-raspberrypi3-64.cfg | 1 + configs/raspberrypi3_64_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/genimage-raspberrypi3-64.cfg b/board/raspberrypi/genimage-raspberrypi3-64.cfg index c5f86527d0..0d0ca750a7 100644 --- a/board/raspberrypi/genimage-raspberrypi3-64.cfg +++ b/board/raspberrypi/genimage-raspberrypi3-64.cfg @@ -2,6 +2,7 @@ image boot.vfat { vfat { files = { "bcm2710-rpi-3-b.dtb", + "bcm2710-rpi-3-b-plus.dtb", "bcm2837-rpi-3-b.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 1a6e378e2c..3d74815fc2 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -16,7 +16,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" BR2_PACKAGE_RPI_FIRMWARE=y # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set From 975fff568f9b5ea99d02b1c24d434ee4cb490864 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 21:07:27 +0100 Subject: [PATCH 1404/2640] package/rpi-firmware: bump version Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 4854deae03..d481ee524f 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz +sha256 5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 rpi-firmware-287af2a2be0787a5d45281d1d6183a2161c798d4.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index eab4c5d307..853ab6ed02 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0 +RPI_FIRMWARE_VERSION = 287af2a2be0787a5d45281d1d6183a2161c798d4 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 7608198c5cea38f4eb0122fb413f5c9e61ff6b7e Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 21:07:28 +0100 Subject: [PATCH 1405/2640] package/rpi-wifi-firmware: bump version Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index bc0d7c8b02..4659f2a6b8 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30 rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz +sha256 c219f1d232fb80fbf23e7f2ed97d9c495855355a36dda373a8985c699ee1dd4b rpi-wifi-firmware-b5307312a172c8d87d44f6df32f5e24f1c19770e.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 32dd3e519b..7e8dbada09 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907 +RPI_WIFI_FIRMWARE_VERSION = b5307312a172c8d87d44f6df32f5e24f1c19770e RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx From 8e5837cae71a2676d9c74017e6b1ef23d99ab51c Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 21:07:29 +0100 Subject: [PATCH 1406/2640] package/rpi-bt-firmware: bump version Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 553a7e4298..043706a1b8 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30 rpi-bt-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz +sha256 c219f1d232fb80fbf23e7f2ed97d9c495855355a36dda373a8985c699ee1dd4b rpi-bt-firmware-b5307312a172c8d87d44f6df32f5e24f1c19770e.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index bbb40854e8..b1c0aa7c94 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,17 +4,14 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907 +RPI_BT_FIRMWARE_VERSION = b5307312a172c8d87d44f6df32f5e24f1c19770e RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx -RPI_BT_FIRMWARE_FILES = brcm/BCM43430A1.hcd BCM4345C0.hcd - define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(foreach file,$(RPI_BT_FIRMWARE_FILES),\ - $(INSTALL) -D -m 0644 $(@D)/firmware/$(file) $(TARGET_DIR)/lib/firmware/$(notdir $(file)) - ) + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm endef $(eval $(generic-package)) From 7ab59879c798b56fb0dc203a8d55df712709a34f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 5 May 2018 11:43:04 +0200 Subject: [PATCH 1407/2640] zmqpp: fix build with or1k and gcc < 6 Use CONFIG variable to disable optimizations when or1k and gcc < 6 are detected otherwise set CONFIG to release or debug depending on BR2_ENABLE_DEBUG Fixes: - http://autobuild.buildroot.net/results/523e58eefba7ef23a09ef53160da22190ccbb098 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zmqpp/zmqpp.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index f576527463..e57f7de4ea 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -12,6 +12,15 @@ ZMQPP_LICENSE = MPL-2.0 ZMQPP_LICENSE_FILES = LICENSE ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread +ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release) + +# gcc bug internal compiler error: in merge_overlapping_regs, at +# regrename.c:304. This bug is fixed since gcc 6. +# By setting CONFIG to empty, all optimizations such as -funroll-loops +# -ffast-math -finline-functions -fomit-frame-pointer are disabled +ifeq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) +ZMQPP_CONFIG = +endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZMQPP_LDFLAGS += -latomic @@ -31,7 +40,7 @@ endif define ZMQPP_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(ZMQPP_LDFLAGS)" \ + CONFIG=$(ZMQPP_CONFIG) LDFLAGS="$(ZMQPP_LDFLAGS)" \ $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),client,library) -C $(@D) endef From b27bcedccbecaecfbbfdb69ba5c24f1f0e3fc064 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 May 2018 08:05:38 +0200 Subject: [PATCH 1408/2640] package/transmission: fix systemd support Patch 0006-libsystemd.patch backports an upstream commit which renames the systemd configure option. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/transmission/transmission.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 4e78604fdb..32e8e70789 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -49,9 +49,9 @@ TRANSMISSION_CONF_OPTS += --enable-daemon ifeq ($(BR2_PACKAGE_SYSTEMD),y) TRANSMISSION_DEPENDENCIES += systemd -TRANSMISSION_CONF_OPTS += --with-systemd-daemon +TRANSMISSION_CONF_OPTS += --with-systemd else -TRANSMISSION_CONF_OPTS += --without-systemd-daemon +TRANSMISSION_CONF_OPTS += --without-systemd endif define TRANSMISSION_USERS From acadbe6393e360d4b77195ec61bbe8b48d668c85 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 May 2018 08:05:39 +0200 Subject: [PATCH 1409/2640] package/transmission: fix inotify configure option The configure option is really called --with-inotify: https://github.com/transmission/transmission/blob/2.9x/configure.ac#L211 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/transmission/transmission.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 32e8e70789..f10fa190c8 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -16,7 +16,7 @@ TRANSMISSION_DEPENDENCIES = \ zlib TRANSMISSION_AUTORECONF = YES TRANSMISSION_CONF_OPTS = \ - --disable-libnotify \ + --without-inotify \ --enable-lightweight TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception TRANSMISSION_LICENSE_FILES = COPYING From 79a678d7745bc3f3b5f361a7e3f25f39c3f1568b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 May 2018 08:05:40 +0200 Subject: [PATCH 1410/2640] package/transmission: remove BR2_PACKAGE_TRANSMISSION_REMOTE Commit 6e223241e1bb58a27eb890291f9f5c1fcc6a0818 ("Add Transmission package"), which added the transmission package, introduced a BR2_PACKAGE_TRANSMISSION_REMOTE Config.in option, supposedly matching the --enable-remote/--disable-remote transmission option. However, transmission as of version 2.33 packaged by this initial commit, did not have a --enable-remote/--disable-remote option, and it was apparently never part of transmission. Therefore, this commit removes this useless option. Since the transmission-remote tool is automatically built when the daemon is enabled, the Config.in.legacy handling selects BR2_PACKAGE_TRANSMISSION_DAEMON. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 11 +++++++++++ package/transmission/Config.in | 5 ----- package/transmission/transmission.mk | 6 ------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 66d3a0c5a8..1494704221 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,17 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_TRANSMISSION_REMOTE + bool "transmission remote tool option removed" + select BR2_LEGACY + select BR2_PACKAGE_TRANSMISSION_DAEMON + help + Upstream does not provide a separate configure option for + the tool transmission-remote, it is built when the + transmission daemon has been enabled. Therefore, Buildroot + has automatically enabled BR2_PACKAGE_TRANSMISSION_DAEMON + for you. + config BR2_PACKAGE_LIBKCAPI_APPS bool "libkcapi test applications removed" select BR2_LEGACY diff --git a/package/transmission/Config.in b/package/transmission/Config.in index 2110e52ac6..dac4d1b330 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -32,11 +32,6 @@ config BR2_PACKAGE_TRANSMISSION_DAEMON help Install transmission daemon. -config BR2_PACKAGE_TRANSMISSION_REMOTE - bool "transmission-remote" - help - Install transmission remote management tool. - config BR2_PACKAGE_TRANSMISSION_GTK bool "transmission-gtk" depends on BR2_PACKAGE_LIBGTK3 && BR2_SYSTEM_ENABLE_NLS diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index f10fa190c8..65add0d8c0 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -75,12 +75,6 @@ else TRANSMISSION_CONF_OPTS += --disable-daemon endif -ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y) -TRANSMISSION_CONF_OPTS += --enable-remote -else -TRANSMISSION_CONF_OPTS += --disable-remote -endif - ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) TRANSMISSION_CONF_OPTS += --with-gtk TRANSMISSION_DEPENDENCIES += libgtk3 From f451bed9c45c97cf6000e6935ab430102716b63d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 May 2018 08:05:37 +0200 Subject: [PATCH 1411/2640] package/transmission: bump version to 2.9.4 Removed patch 0003, a different fix was committed upstream: https://github.com/transmission/transmission/commit/b21a6140e963491f146293c9b0a2863a9ae99ad3 Renumbered remaining patches. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...clude.patch => 0003-fix-utp-include.patch} | 0 .../transmission/0003-miniupnpc-cross.patch | 31 ------------------- ....0.18-has-sys-quota.h-synced-with-G.patch} | 0 ...libsystemd.patch => 0005-libsystemd.patch} | 0 package/transmission/transmission.hash | 2 +- package/transmission/transmission.mk | 2 +- 6 files changed, 2 insertions(+), 33 deletions(-) rename package/transmission/{0004-fix-utp-include.patch => 0003-fix-utp-include.patch} (100%) delete mode 100644 package/transmission/0003-miniupnpc-cross.patch rename package/transmission/{0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch => 0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch} (100%) rename package/transmission/{0006-libsystemd.patch => 0005-libsystemd.patch} (100%) diff --git a/package/transmission/0004-fix-utp-include.patch b/package/transmission/0003-fix-utp-include.patch similarity index 100% rename from package/transmission/0004-fix-utp-include.patch rename to package/transmission/0003-fix-utp-include.patch diff --git a/package/transmission/0003-miniupnpc-cross.patch b/package/transmission/0003-miniupnpc-cross.patch deleted file mode 100644 index 5037c2e67a..0000000000 --- a/package/transmission/0003-miniupnpc-cross.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix libminiupnpc version detection - -Problem is known upstream: https://trac.transmissionbt.com/ticket/6140 - -For buildroot we know the libminiupnpc version so we hard-code 2.0. - -Signed-off-by: Bernd Kuhls - -diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac ---- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 -+++ transmission-2.92/configure.ac 2016-07-02 21:48:13.452385686 +0200 -@@ -386,18 +386,7 @@ - dnl MINIUPNPC_API_VERSION and we won't have to figure - dnl it out on our own - if test "x$upnp_version" = "xunknown" ; then -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [#include -- #include ], -- [#ifdef MINIUPNPC_API_VERSION -- return EXIT_SUCCESS; -- #else -- return EXIT_FAILURE; -- #endif] -- )], -- [upnp_version=">= 1.7"] -- ) -+ upnp_version="2.0" - fi - - dnl Or maybe it's miniupnp 1.6 diff --git a/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch similarity index 100% rename from package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch rename to package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch diff --git a/package/transmission/0006-libsystemd.patch b/package/transmission/0005-libsystemd.patch similarity index 100% rename from package/transmission/0006-libsystemd.patch rename to package/transmission/0005-libsystemd.patch diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index 4c1c3f9a3a..0d2af32f4f 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b transmission-2.93.tar.xz +sha256 35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d transmission-2.94.tar.xz sha256 20801783bf59e27d03ed6aab625b32a34e221ae95bf801db87827c8023398495 COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 4e78604fdb..640c78c650 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 2.93 +TRANSMISSION_VERSION = 2.94 TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_DEPENDENCIES = \ From e2d21433372b7b0f073edebe7122e7b48b484251 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 12:38:20 +0200 Subject: [PATCH 1412/2640] liboping: bump to version 1.10.0 - Rework ncurses dependency to use new --with[out]-ncurses option - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/liboping/liboping.hash | 5 ++++- package/liboping/liboping.mk | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/liboping/liboping.hash b/package/liboping/liboping.hash index 3e796cca62..926b234f05 100644 --- a/package/liboping/liboping.hash +++ b/package/liboping/liboping.hash @@ -1,2 +1,5 @@ # From http://noping.cc/#download -sha256 44bb1d88b56b88fda5533edb3aa005c69b3cd396f20453a157d7e31e536f3530 liboping-1.9.0.tar.bz2 +sha256 eb38aa93f93e8ab282d97e2582fbaea88b3f889a08cbc9dbf20059c3779d5cd8 liboping-1.10.0.tar.bz2 + +# Hash for license file: +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk index 114e0c27e5..4aa3e30ee8 100644 --- a/package/liboping/liboping.mk +++ b/package/liboping/liboping.mk @@ -4,13 +4,19 @@ # ################################################################################ -LIBOPING_VERSION = 1.9.0 +LIBOPING_VERSION = 1.10.0 LIBOPING_SITE = http://noping.cc/files LIBOPING_SOURCE = liboping-$(LIBOPING_VERSION).tar.bz2 LIBOPING_INSTALL_STAGING = YES -LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) LIBOPING_CONF_OPTS = --without-perl-bindings LIBOPING_LICENSE = LGPL-2.1+, GPL-2.0 LIBOPING_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_NCURSES),y) +LIBOPING_DEPENDENCIES += ncurses +LIBOPING_CONF_OPTS += --with-ncurses +else +LIBOPING_CONF_OPTS += --without-ncurses +endif + $(eval $(autotools-package)) From a76aabd8842d28747fa8ec62b9c4a19f062b7fb7 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sun, 20 May 2018 12:39:07 +0200 Subject: [PATCH 1413/2640] proj: upgrade to 5.0.1 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/proj/proj.hash | 4 ++-- package/proj/proj.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/proj/proj.hash b/package/proj/proj.hash index 6a791baae4..aadbc385df 100644 --- a/package/proj/proj.hash +++ b/package/proj/proj.hash @@ -1,5 +1,5 @@ # Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5 -md5 d598336ca834742735137c5674b214a1 proj-4.9.3.tar.gz +md5 15c8d7d6a8cb945c7878d0ff322a232c proj-5.0.1.tar.gz # Locally calculated -sha256 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7 proj-4.9.3.tar.gz +sha256 a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c proj-5.0.1.tar.gz sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING diff --git a/package/proj/proj.mk b/package/proj/proj.mk index 6d029bba06..0b239b2bbe 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 4.9.3 +PROJ_VERSION = 5.0.1 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING From b8f19aae299bb94705698554f9ac5555b95a5bcd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 13:40:54 +0200 Subject: [PATCH 1414/2640] zmqpp: bump to version 4.2.0 - Merge both patches in a single one and slighlty update it to keep current behavior (BUILD_STATIC set to yes by default) to be able to send it upstream: https://github.com/zeromq/zmqpp/pull/218. Patch has been merged upstream. - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ilding-shared-or-static-library-only.patch | 51 +++++++++++-------- ...all-static-library-for-static-builds.patch | 33 ------------ package/zmqpp/zmqpp.hash | 3 +- package/zmqpp/zmqpp.mk | 2 +- 4 files changed, 33 insertions(+), 56 deletions(-) delete mode 100644 package/zmqpp/0002-Install-static-library-for-static-builds.patch diff --git a/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch b/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch index 70caee8162..04fad80f32 100644 --- a/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch +++ b/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch @@ -1,33 +1,42 @@ -From 02ad67e60ef698ee47f6ee53b36e5b89c2fd71e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 24 Feb 2016 10:07:11 -0300 -Subject: [PATCH 1/2] Allow building shared or static library only +From 93005632eca13d8eda409f6e9496fd5dd69e75b0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 May 2018 18:38:31 +0200 +Subject: [PATCH] Allow building shared or static library only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -[Gustavo: update for 4.1.2] +Patchs retrieved from: + - https://git.buildroot.net/buildroot/tree/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch + - https://git.buildroot.net/buildroot/tree/package/zmqpp/0002-Install-static-library-for-static-builds.patch +Both patches have been merged in a single one and slightly updated to +keep default behavior of building and installing static library +(BUILD_STATIC is set to yes by default) + +[Upstream status: merged (https://github.com/zeromq/zmqpp/pull/218)] Signed-off-by: Jörg Krause Signed-off-by: Gustavo Zacarias +Signed-off-by: Fabrice Fontaine --- - Makefile | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) + Makefile | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 9df5996..86c8fac 100644 +index 689acaa..e43054c 100644 --- a/Makefile +++ b/Makefile -@@ -79,6 +79,8 @@ ifeq ($(UNAME_S),Darwin) +@@ -81,6 +81,9 @@ ifeq ($(UNAME_S),Darwin) endif +BUILD_SHARED ?= yes ++BUILD_STATIC ?= yes + CONFIG_FLAGS = ifeq ($(CONFIG),debug) CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 -@@ -93,13 +95,22 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) +@@ -95,13 +98,22 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG endif @@ -51,20 +60,25 @@ index 9df5996..86c8fac 100644 COMMON_LIBS = -lzmq LIBRARY_LIBS = -@@ -147,10 +158,11 @@ install: - mkdir -p $(INCLUDEDIR)/$(LIBRARY_DIR) +@@ -150,11 +162,15 @@ install: mkdir -p $(LIBDIR) + mkdir -p $(PKGCONFIGDIR) install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) -+ifeq ($(BUILD_SHARED),yes) - install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) +- install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) - install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) + install -m 755 $(BUILD_PATH)/$(PKGCONFIG_FILE) $(PKGCONFIGDIR)/$(PKGCONFIG_FILE) ++ifeq ($(BUILD_SHARED),yes) ++ install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) ++endif ++ifeq ($(BUILD_STATIC),yes) ++ install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) +endif if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi $(LDCONFIG) @echo "use make installcheck to test the install" -@@ -172,7 +184,7 @@ clean: +@@ -176,7 +192,7 @@ clean: client: $(CLIENT_TARGET) @@ -73,11 +87,6 @@ index 9df5996..86c8fac 100644 # # BUILD Targets -@@ -211,4 +223,3 @@ test: $(TESTS_TARGET) - $(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp - -mkdir -p $(dir $@) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $< -- -- -2.4.10 +2.14.1 diff --git a/package/zmqpp/0002-Install-static-library-for-static-builds.patch b/package/zmqpp/0002-Install-static-library-for-static-builds.patch deleted file mode 100644 index 402f85e263..0000000000 --- a/package/zmqpp/0002-Install-static-library-for-static-builds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 283676e2e8f15bedca20c3d94caeecfdebe11ffd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 23 Nov 2015 22:53:09 +0100 -Subject: [PATCH 2/2] Install static library for static builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[Gustavo: update for 4.1.2] - -Signed-off-by: Jörg Krause -Signed-off-by: Gustavo Zacarias ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile b/Makefile -index 86c8fac..fbaff63 100644 ---- a/Makefile -+++ b/Makefile -@@ -163,6 +163,9 @@ ifeq ($(BUILD_SHARED),yes) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) - endif -+ifeq ($(BUILD_STATIC),yes) -+ install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) -+endif - if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi - $(LDCONFIG) - @echo "use make installcheck to test the install" --- -2.4.10 - diff --git a/package/zmqpp/zmqpp.hash b/package/zmqpp/zmqpp.hash index 63c6a34f0c..c440b2aca2 100644 --- a/package/zmqpp/zmqpp.hash +++ b/package/zmqpp/zmqpp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 831ad02df64034268d910c30f9fb1b1e631ad810182951af9d7d622650831eb5 zmqpp-4.1.2.tar.gz +sha256 c1d4587df3562f73849d9e5f8c932ca7dcfc7d8bec31f62d7f35073ef81f4d29 zmqpp-4.2.0.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index f576527463..b4cb055737 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZMQPP_VERSION = 4.1.2 +ZMQPP_VERSION = 4.2.0 ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION)) ZMQPP_INSTALL_STAGING = YES ZMQPP_DEPENDENCIES = zeromq From 12e55e4df5a4ef88246162b3f197a5891eda0da8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 13:46:41 +0200 Subject: [PATCH 1415/2640] libosip2: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libosip2/libosip2.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 9ff2d9a98a..c6df5f2362 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd libosip2-3.6.0.tar.gz + +# Hash for license file: +sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING From ffb85a4a16df94e4980057a194e5fdc3c8332e32 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:32 +0200 Subject: [PATCH 1416/2640] libidn2: new package Libidn2 is an implementation of the IDNA2008 + TR46 specifications (RFC 5890, RFC 5891, RFC 5892, RFC 5893, TR 46). http://www.gnu.org/software/libidn/ Signed-off-by: Fabrice Fontaine [Thomas: - Use positive logic to test the BR2_PACKAGE_LIBIDN2_BINARY condition. - Put the definition of LIBIDN2_REMOVE_BINARY inside the BR2_PACKAGE_LIBIDN2_BINARY condition, as suggested by Arnout. - Adjust license details: library is under GPL-2.0+ or LGPL-3.0+, while the command line tool is under GPL-3.0+.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libidn2/Config.in | 17 +++++++++++++++++ package/libidn2/libidn2.hash | 8 ++++++++ package/libidn2/libidn2.mk | 30 ++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+) create mode 100644 package/libidn2/Config.in create mode 100644 package/libidn2/libidn2.hash create mode 100644 package/libidn2/libidn2.mk diff --git a/DEVELOPERS b/DEVELOPERS index f9531944a3..978ba9625c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -689,6 +689,7 @@ F: package/libglib2/ F: package/libgtk2/ F: package/libgtk3/ F: package/libidn/ +F: package/libidn2/ F: package/libjpeg/ F: package/libmatroska/ F: package/libmpdclient/ diff --git a/package/Config.in b/package/Config.in index 71a380bc3f..6c0583a745 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1411,6 +1411,7 @@ menu "Networking" source "package/libgsasl/Config.in" source "package/libhttpparser/Config.in" source "package/libidn/Config.in" + source "package/libidn2/Config.in" source "package/libiscsi/Config.in" source "package/libkrb5/Config.in" source "package/libldns/Config.in" diff --git a/package/libidn2/Config.in b/package/libidn2/Config.in new file mode 100644 index 0000000000..38b1378990 --- /dev/null +++ b/package/libidn2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBIDN2 + bool "libidn2" + help + Libidn2 is an implementation of the IDNA2008 + TR46 + specifications (RFC 5890, RFC 5891, RFC 5892, RFC 5893, + TR 46). + + http://www.gnu.org/software/libidn/ + +if BR2_PACKAGE_LIBIDN2 + +config BR2_PACKAGE_LIBIDN2_BINARY + bool "idn2 binary" + help + Install idn2 command line tool + +endif diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash new file mode 100644 index 0000000000..980f78f50d --- /dev/null +++ b/package/libidn2/libidn2.hash @@ -0,0 +1,8 @@ +# From Calculated locally after checking signature +sha256 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0 libidn2-2.0.4.tar.gz + +# Hash for license files: +sha256 4fa501e804195b4136c9cec4bc510365b8cbaf4bc075d6401a77ae0213370457 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 +sha256 01d621eef165cf4d3d3dbb737aa0699178d94c6f18cf87e9dde6db3ca7790f46 COPYING.unicode diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk new file mode 100644 index 0000000000..d47913b2eb --- /dev/null +++ b/package/libidn2/libidn2.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# libidn2 +# +################################################################################ + +LIBIDN2_VERSION = 2.0.4 +LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn +LIBIDN2_LICENSE := GPL-2.0+ or LGPL-3.0+ (library) +LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode +LIBIDN2_DEPENDENCIES = \ + host-pkgconf \ + $(TARGET_NLS_DEPENDENCIES) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN2_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) +LIBIDN2_DEPENDENCIES += libunistring +endif + +ifeq ($(BR2_PACKAGE_LIBIDN2_BINARY),) +define LIBIDN2_REMOVE_BINARY + rm -f $(TARGET_DIR)/usr/bin/idn2 +endef +LIBIDN2_POST_INSTALL_TARGET_HOOKS += LIBIDN2_REMOVE_BINARY +else +LIBIDN2_LICENSE := $(LIBIDN2_LICENSE), GPL-3.0+ (program) +endif + +$(eval $(autotools-package)) From 8451acf298714cd3870366c82a26eafc9c2c00b7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:33 +0200 Subject: [PATCH 1417/2640] libcurl: replace libidn by libidn2 libidn has been replaced by libidn2 since 7.51.0 (October 2016): https://github.com/curl/curl/commit/9c91ec778104ae3b744b39444d544e82d5ee9ece Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a3e66d094c..b75e9fb2e9 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -9,7 +9,6 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBIDN),libidn) \ $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING @@ -68,6 +67,13 @@ else LIBCURL_CONF_OPTS += --disable-ares endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +LIBCURL_DEPENDENCIES += libidn2 +LIBCURL_CONF_OPTS += --with-libidn2 +else +LIBCURL_CONF_OPTS += --without-libidn2 +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 From 4d71ef3cf658b2bb3400938bb1e6b0ddd4f28dbd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:34 +0200 Subject: [PATCH 1418/2640] wget: add optional dependency for libidn2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 23e4c8acca..c3c792f1e8 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -26,6 +26,13 @@ else WGET_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +WGET_CONF_OPTS += --with-libidn +WGET_DEPENDENCIES += libidn2 +else +WGET_CONF_OPTS += --without-libidn +endif + ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) WGET_DEPENDENCIES += util-linux endif From f48d3ff58b0584b6e64fdc3ea453e088af40dfba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:35 +0200 Subject: [PATCH 1419/2640] gnutls: add optional libidn2 support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 6be7c6e27e..3d1a627781 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -68,6 +68,13 @@ else GNUTLS_CONF_OPTS += --without-idn endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +GNUTLS_CONF_OPTS += --with-libidn2 +GNUTLS_DEPENDENCIES += libidn2 +else +GNUTLS_CONF_OPTS += --without-libidn2 +endif + ifeq ($(BR2_PACKAGE_P11_KIT),y) GNUTLS_CONF_OPTS += --with-p11-kit GNUTLS_DEPENDENCIES += p11-kit From aa406bb94bcf65846e2ba2a38a7480ac418e7183 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:36 +0200 Subject: [PATCH 1420/2640] lftp: switch from libidn to libidn2 libidn has been removed since 4.8.1 (August 2017): https://github.com/lavv17/lftp/commit/731abec393f3deff490c77d1d55eb7219bc6b556 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lftp/lftp.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index e1ca0533ee..68f3dfce2c 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -41,11 +41,11 @@ else LFTP_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_LIBIDN),y) -LFTP_DEPENDENCIES += libidn -LFTP_CONF_OPTS += --with-libidn=$(STAGING_DIR)/usr +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +LFTP_DEPENDENCIES += libidn2 +LFTP_CONF_OPTS += --with-libidn2=$(STAGING_DIR)/usr else -LFTP_CONF_OPTS += --without-libidn +LFTP_CONF_OPTS += --without-libidn2 endif # Remove /usr/share/lftp From 4ded5d6af4f0198036183f00de190569d7578bc3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:37 +0200 Subject: [PATCH 1421/2640] systemd: add optional dependency on libidn2 Signed-off-by: Fabrice Fontaine [Thomas: simplify ifeq/else/endif sequence.] Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index db7fb43636..1e4b257731 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -75,11 +75,15 @@ else SYSTEMD_CONF_OPTS += -Daudit=false endif -ifeq ($(BR2_PACKAGE_LIBIDN),y) +# Both options can't be selected at the same time so prefer libidn2 +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +SYSTEMD_DEPENDENCIES += libidn2 +SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false +else ifeq ($(BR2_PACKAGE_LIBIDN),y) SYSTEMD_DEPENDENCIES += libidn -SYSTEMD_CONF_OPTS += -Dlibidn=true +SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false else -SYSTEMD_CONF_OPTS += -Dlibidn=false +SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From 387a362de24b3c55c504c58442609d3adfadf48f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 22:40:38 +0200 Subject: [PATCH 1422/2640] whois: add libidn2 support libidn2 support is enabled since February 2017 (5.2.15): https://github.com/rfc1036/whois/commit/8ed6d730959b1f988dd43a511c40b9419bb2b0db Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 22117cf3aa..18071ab6bd 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -27,6 +27,11 @@ WHOIS_DEPENDENCIES += libidn WHOIS_MAKE_ENV += HAVE_LIBIDN=1 endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +WHOIS_DEPENDENCIES += libidn2 +WHOIS_MAKE_ENV += HAVE_LIBIDN2=1 +endif + ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) WHOIS_BUILD_TARGETS = WHOIS_INSTALL_TARGETS = install From 191d3c2b27c7460873b0d6786f02774db0822970 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 25 Feb 2018 19:34:15 +0100 Subject: [PATCH 1423/2640] package/strace: enable demangling of C++ symbol names in stack trace Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/strace/strace.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4d42085819..7b3ff184fb 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -18,6 +18,14 @@ else STRACE_CONF_OPTS += --without-libunwind endif +# Demangling symbols in stack trace needs libunwind and libiberty. +ifeq ($(BR2_PACKAGE_BINUTILS)$(BR2_PACKAGE_LIBUNWIND),yy) +STRACE_DEPENDENCIES += binutils +STRACE_CONF_OPTS += --with-libiberty=check +else +STRACE_CONF_OPTS += --without-libiberty +endif + define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph endef From 2a9c075fdc945462ea5a530d0128bb6cf2683a02 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 16:29:06 +0200 Subject: [PATCH 1424/2640] whois: bump to version 5.3.0 - libidn1 support has been removed: https://github.com/rfc1036/whois/commit/5d60bbe102b71c03b9a46eb0a7aada3532bd4481 - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 7 +++++-- package/whois/whois.mk | 9 ++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 29623b529f..635066c5e3 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,2 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20170727T214450Z/pool/main/w/whois/whois_5.2.17.dsc -sha256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 whois_5.2.17.tar.xz +# From http://snapshot.debian.org/archive/debian/20180121T094839Z/pool/main/w/whois/whois_5.3.0.dsc +sha256 4d789c403bfb5833c8ae168a5f31be70e34b045bd5d95a54c82a27b0ff135723 whois_5.3.0.tar.xz + +# Hash for license file: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 18071ab6bd..5cd7cde7fd 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.2.17 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20170727T214450Z/pool/main/w/whois +WHOIS_VERSION = 5.3.0 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180121T094839Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES) @@ -22,11 +22,6 @@ WHOIS_EXTRA_LIBS += -liconv WHOIS_MAKE_ENV += HAVE_ICONV=1 endif -ifeq ($(BR2_PACKAGE_LIBIDN),y) -WHOIS_DEPENDENCIES += libidn -WHOIS_MAKE_ENV += HAVE_LIBIDN=1 -endif - ifeq ($(BR2_PACKAGE_LIBIDN2),y) WHOIS_DEPENDENCIES += libidn2 WHOIS_MAKE_ENV += HAVE_LIBIDN2=1 From 1ed82d44ccdc8f9bfd2d91fd58dcb02cb4656415 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 16:33:26 +0200 Subject: [PATCH 1425/2640] libpam-tacplus: bump to version 1.5.0-beta.2 - Remove LIBPAM_TACPLUS_AUTORECONF_OPTS as m4 directory doesn't exist anymore - Add patch to fix getrandom call (sent upstream) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Fix-getrandom-call-in-magic.c.patch | 30 +++++++++++++++++++ package/libpam-tacplus/libpam-tacplus.hash | 3 +- package/libpam-tacplus/libpam-tacplus.mk | 3 +- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch diff --git a/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch b/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch new file mode 100644 index 0000000000..bde717f3f0 --- /dev/null +++ b/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch @@ -0,0 +1,30 @@ +From 5b49ec03b165b8d7c69e196bf1c2780274fbe1ee Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 May 2018 15:47:33 +0200 +Subject: [PATCH] Fix getrandom call in magic.c + +_GNU_SOURCE must be defined before any includes to be able to use +getrandom + +Signed-off-by: Fabrice Fontaine + +[Upstream status: https://github.com/jeroennijhof/pam_tacplus/pull/118] +--- + libtac/lib/magic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c +index 97aa035..a9cbe86 100644 +--- a/libtac/lib/magic.c ++++ b/libtac/lib/magic.c +@@ -18,6 +18,7 @@ + * See `CHANGES' file for revision history. + */ + ++#define _GNU_SOURCE + #include + #include + #include +-- +2.14.1 + diff --git a/package/libpam-tacplus/libpam-tacplus.hash b/package/libpam-tacplus/libpam-tacplus.hash index c8a772322e..ba014347ec 100644 --- a/package/libpam-tacplus/libpam-tacplus.hash +++ b/package/libpam-tacplus/libpam-tacplus.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 747f7ad980a3726ed3abc5fec92e867efa8af8c53caac547cab7eb6af5ce0edf libpam-tacplus-1.3.9.tar.gz +sha256 6e1ce4e3194a4d7823a0f0b352485d5028790e4a0974b9a9619f71b07f79a5fa libpam-tacplus-v1.5.0-beta.2.tar.gz +sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk index f43e2b9a49..eebe297f79 100644 --- a/package/libpam-tacplus/libpam-tacplus.mk +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBPAM_TACPLUS_VERSION = 1.3.9 +LIBPAM_TACPLUS_VERSION = v1.5.0-beta.2 LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION)) LIBPAM_TACPLUS_LICENSE = GPL-2.0+ LIBPAM_TACPLUS_LICENSE_FILES = COPYING LIBPAM_TACPLUS_DEPENDENCIES = linux-pam # Fetching from github, we need to generate the configure script LIBPAM_TACPLUS_AUTORECONF = YES -LIBPAM_TACPLUS_AUTORECONF_OPTS = -I m4 LIBPAM_TACPLUS_INSTALL_STAGING = YES LIBPAM_TACPLUS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) From d22b7b94590290e7115127d8516932e3191dff31 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 16:31:12 +0200 Subject: [PATCH 1426/2640] libpcap: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpcap/libpcap.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 6894046aff..f8bc1bcfef 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e libpcap-1.8.1.tar.gz + +# Hash for license file: +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE From c1d28bc3d1e4cdca25e84f49ffa16d51b01c855d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 16:37:59 +0200 Subject: [PATCH 1427/2640] libpciaccess: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpciaccess/libpciaccess.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libpciaccess/libpciaccess.hash b/package/libpciaccess/libpciaccess.hash index b73c27c290..651f0462b7 100644 --- a/package/libpciaccess/libpciaccess.hash +++ b/package/libpciaccess/libpciaccess.hash @@ -3,3 +3,6 @@ md5 8f436e151d5106a9cfaa71857a066d33 libpciaccess-0.14.tar.bz2 sha1 f70a958bf4e744cb4ee93be64e9bc52ac05cdaeb libpciaccess-0.14.tar.bz2 sha256 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4 libpciaccess-0.14.tar.bz2 sha512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b libpciaccess-0.14.tar.bz2 + +# Hash for license file: +sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING From f945096dca4bfb22acf6e8925f86a0efbdebed22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 17:03:02 +0200 Subject: [PATCH 1428/2640] libpfm4: bump to version 4.9.0 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpfm4/libpfm4.hash | 7 ++++--- package/libpfm4/libpfm4.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libpfm4/libpfm4.hash b/package/libpfm4/libpfm4.hash index 8bebc493fd..20671fb6e0 100644 --- a/package/libpfm4/libpfm4.hash +++ b/package/libpfm4/libpfm4.hash @@ -1,5 +1,6 @@ # From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 2ed06d6e746f7b1cd4b70e9736e621052f60d625 libpfm-4.6.0.tar.gz -md5 5077b9022440e4951d96f2d0e73bd487 libpfm-4.6.0.tar.gz +sha1 3a7b556e0778fd76e9e7abb06e5d4d2599ffbefc libpfm-4.9.0.tar.gz +md5 42ad4a2e5b8e1f015310db8535739c73 libpfm-4.9.0.tar.gz # Locally calculated -sha256 5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f libpfm-4.6.0.tar.gz +sha256 db0fbe8ee28fd9beeb5d3e80b7cb3b104debcf6a9fcf5cb8b882f0662c79e4e2 libpfm-4.9.0.tar.gz +sha256 beef323d68fc5db9c67b20e8e9de7ccde371d20cdbcdd686804055b18b926d90 COPYING diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index 913fc35831..88632f478b 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.6.0 +LIBPFM4_VERSION = 4.9.0 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license From eb892295f12b8115b308843c7c53db2254b873af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 17:03:19 +0200 Subject: [PATCH 1429/2640] oprofile: bump to version 1.2.0 - Remove second patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-Fix-FTBFS-problem-with-GCC-6.patch | 51 ------------------- package/oprofile/oprofile.hash | 9 ++-- package/oprofile/oprofile.mk | 2 +- 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch diff --git a/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch b/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch deleted file mode 100644 index 34bf365226..0000000000 --- a/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 -From: William Cohen -Date: Fri, 5 Feb 2016 17:30:19 -0500 -Subject: [PATCH] Fix FTBFS problem with GCC-6 - -GCC-6 is pickier about some of the type conversions causing the Fedora -24 mass rebuild the build of oprofile failed with: - -make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' -g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp -op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': -op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream}' to 'const bool' in initialization - bool const verbose = cverb << (vbfd & vlevel1); - ^ -op_bfd.cpp:546:7: error: in argument to unary ! - if (!verbose) - ^~~~~~~ - -Avoid the intermediate bool type to make GCC-6 happy. - -Signed-off-by: William Cohen -[Backported from upstream] -Signed-off-by: Romain Naour ---- - libutil++/op_bfd.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp -index 389c920..f2eb42b 100644 ---- a/libutil++/op_bfd.cpp -+++ b/libutil++/op_bfd.cpp -@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, - { - op_bfd_symbol const & sym = syms[sym_idx]; - -- bool const verbose = cverb << (vbfd & vlevel1); -- - if (anon_obj) - start = sym.vma(); - else - start = sym.filepos(); - end = start + sym.size(); - -- if (!verbose) -+ if (!(cverb << (vbfd & vlevel1))) - return; - - io_state state(cverb << (vbfd & vlevel1)); --- -2.5.5 - diff --git a/package/oprofile/oprofile.hash b/package/oprofile/oprofile.hash index cc15ed1100..737137e0dd 100644 --- a/package/oprofile/oprofile.hash +++ b/package/oprofile/oprofile.hash @@ -1,3 +1,6 @@ -# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.1.0/ -sha1 38c0d8812fe605f6ddd1cd183a482aa7605c0e81 oprofile-1.1.0.tar.gz -md5 248c4c069f9476f427fa7195563f9867 oprofile-1.1.0.tar.gz +# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.2.0/ +sha1 7bf28b74953bd042ff23dc53c399be96d37f144c oprofile-1.2.0.tar.gz +md5 4fcd3920984dcb607314b2e225086c3a oprofile-1.2.0.tar.gz + +# Hash for license file: +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 4e0278eb2a..2b82194406 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPROFILE_VERSION = 1.1.0 +OPROFILE_VERSION = 1.2.0 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_LICENSE = GPL-2.0+ OPROFILE_LICENSE_FILES = COPYING From 1417ccecefc94006f7fddac4f761f4f4811bb14e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 17:22:31 +0200 Subject: [PATCH 1430/2640] libphidget: bump to version 2.1.8.20170607 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libphidget/libphidget.hash | 3 ++- package/libphidget/libphidget.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libphidget/libphidget.hash b/package/libphidget/libphidget.hash index a89ba367ed..120d6373e1 100644 --- a/package/libphidget/libphidget.hash +++ b/package/libphidget/libphidget.hash @@ -1,2 +1,3 @@ # locally computed -sha256 2d496828a085ada8ff139da9306bd2b8cb987798fee93caf0089dc399195e238 libphidget_2.1.8.20140319.tar.gz +sha256 f6da13dc0db057c1a87e0a831e3f5507cd26a32f3ced40f2c0ad783fc244bcd5 libphidget_2.1.8.20170607.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libphidget/libphidget.mk b/package/libphidget/libphidget.mk index 803d5012a4..d84a8b911d 100644 --- a/package/libphidget/libphidget.mk +++ b/package/libphidget/libphidget.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPHIDGET_VERSION = 2.1.8.20140319 +LIBPHIDGET_VERSION = 2.1.8.20170607 LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz LIBPHIDGET_SITE = https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget LIBPHIDGET_DEPENDENCIES = libusb From 743ac2d53b1a263054a815e1e9c8b184adbf250d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 17:22:32 +0200 Subject: [PATCH 1431/2640] phidgetwebservice: bump to version 2.1.8.20170607 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/phidgetwebservice/phidgetwebservice.hash | 3 ++- package/phidgetwebservice/phidgetwebservice.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/phidgetwebservice/phidgetwebservice.hash b/package/phidgetwebservice/phidgetwebservice.hash index 7cd85da79a..e369049c1c 100644 --- a/package/phidgetwebservice/phidgetwebservice.hash +++ b/package/phidgetwebservice/phidgetwebservice.hash @@ -1,2 +1,3 @@ # locally computed -sha256 e8add82fd41d9cb274b88ee369a1f7366e35f85abcfcabb9e2a383574bb779c5 phidgetwebservice_2.1.8.20140319.tar.gz +sha256 904af15ecd13ae4e807ed8af181e3a4521e59f8f3791be0aa4ceb1afdbf764a2 phidgetwebservice_2.1.8.20170607.tar.gz +sha256 ea8af5e789cb2d4e9b10bce3874982ade163b749b6bfbdb32e2df21c4d106de1 COPYING diff --git a/package/phidgetwebservice/phidgetwebservice.mk b/package/phidgetwebservice/phidgetwebservice.mk index 36c0185e72..bdcc388b26 100644 --- a/package/phidgetwebservice/phidgetwebservice.mk +++ b/package/phidgetwebservice/phidgetwebservice.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHIDGETWEBSERVICE_VERSION = 2.1.8.20140319 +PHIDGETWEBSERVICE_VERSION = 2.1.8.20170607 PHIDGETWEBSERVICE_SOURCE = phidgetwebservice_$(PHIDGETWEBSERVICE_VERSION).tar.gz PHIDGETWEBSERVICE_SITE = http://www.phidgets.com/downloads/libraries PHIDGETWEBSERVICE_DEPENDENCIES = libphidget From bfbba99e01f53adfc8b8d1ce103d14f812cad29b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 18:16:56 +0200 Subject: [PATCH 1432/2640] znc: add mandatory dependency on threads Threads support is mandatory since version 1.7.0: https://github.com/znc/znc/commit/582cd635f5a047761b1052a40088ab86e62fffc1 Fixes: - http://autobuild.buildroot.net/results/cc56c7dbee594056288296398772ef9e22846299 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/znc/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/znc/Config.in b/package/znc/Config.in index feca2c42f0..4fc7bbb95b 100644 --- a/package/znc/Config.in +++ b/package/znc/Config.in @@ -4,12 +4,13 @@ config BR2_PACKAGE_ZNC depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS help Advanced IRC bouncer http://www.znc.in -comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8" +comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU From 747323706798d394c938c2db969c20af9aa053e3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 May 2018 16:30:21 +0200 Subject: [PATCH 1433/2640] libpam-radius-auth: add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpam-radius-auth/libpam-radius-auth.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libpam-radius-auth/libpam-radius-auth.hash b/package/libpam-radius-auth/libpam-radius-auth.hash index ffd7404df3..3e8dc02558 100644 --- a/package/libpam-radius-auth/libpam-radius-auth.hash +++ b/package/libpam-radius-auth/libpam-radius-auth.hash @@ -1,2 +1,5 @@ # Locally calculated after checking PGP signature sha256 742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305 pam_radius-1.4.0.tar.gz + +# Hash for license file: +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 LICENSE From 43884e7f5011cbd70a9a17bfd87041953cfa74ee Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:13 +0100 Subject: [PATCH 1434/2640] arch/arm: add cortex-m7 core Nothing fancy, just a plain Cortex-M, armv7-M core... Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index c99a995db2..7651d10927 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -241,6 +241,11 @@ config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M +config BR2_cortex_m7 + bool "cortex-M7" + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_ARMV7M + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 endif # !BR2_ARCH_IS_64 comment "armv8 cores" @@ -716,6 +721,7 @@ config BR2_GCC_TARGET_CPU # armv7m default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 + default "cortex-m7" if BR2_cortex_m7 # armv8a default "cortex-a32" if BR2_cortex_a32 default "cortex-a35" if BR2_cortex_a35 From 6edfa3bf781606eb6747739f289e5319421daddc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:13 +0100 Subject: [PATCH 1435/2640] arch/arm: add cortex-m7 core Nothing fancy, just a plain Cortex-M, armv7-M core... Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index c99a995db2..7651d10927 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -241,6 +241,11 @@ config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M +config BR2_cortex_m7 + bool "cortex-M7" + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_ARMV7M + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 endif # !BR2_ARCH_IS_64 comment "armv8 cores" @@ -716,6 +721,7 @@ config BR2_GCC_TARGET_CPU # armv7m default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 + default "cortex-m7" if BR2_cortex_m7 # armv8a default "cortex-a32" if BR2_cortex_a32 default "cortex-a35" if BR2_cortex_a35 From 7f7701301edc18042d6bd47b7ca3aae7c597670f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:14 +0100 Subject: [PATCH 1436/2640] arch/arm: introduce generic FPU internal option Currently, we consider that any VFP FPU is a superset of VFPv2, and thus we use VFPv2 as a way to detect that a VFP is used. However, for Cortex-M cores, the optional FPU is not a superset of VFPv2; it is even not a VFP [0]. As a consequence, we can no longer consider VFPv2 as a indication that an FPU is present. So, we introduce two new internal options, BR2_ARM_CPU_MAYBE_HAS_FPU and BR2_ARM_CPU_HAS_FPU, which we use to consider the presence of an FPU. [0] https://en.wikipedia.org/wiki/ARM_Cortex-M#Cortex-M4 Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 7651d10927..c2f3f8d9a3 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -6,12 +6,21 @@ config BR2_ARM_CPU_HAS_NEON config BR2_ARM_CPU_MAYBE_HAS_NEON bool +# For some cores, the FPU is optional +config BR2_ARM_CPU_MAYBE_HAS_FPU + bool + +config BR2_ARM_CPU_HAS_FPU + bool + # for some cores, VFPv2 is optional config BR2_ARM_CPU_MAYBE_HAS_VFPV2 bool + select BR2_ARM_CPU_MAYBE_HAS_FPU config BR2_ARM_CPU_HAS_VFPV2 bool + select BR2_ARM_CPU_HAS_FPU # for some cores, VFPv3 is optional config BR2_ARM_CPU_MAYBE_HAS_VFPV3 @@ -450,7 +459,7 @@ config BR2_ARM_ENABLE_NEON config BR2_ARM_ENABLE_VFP bool "Enable VFP extension support" - depends on BR2_ARM_CPU_MAYBE_HAS_VFPV2 + depends on BR2_ARM_CPU_MAYBE_HAS_FPU select BR2_ARM_CPU_HAS_VFPV4 if BR2_ARM_CPU_MAYBE_HAS_VFPV4 select BR2_ARM_CPU_HAS_VFPV3 if BR2_ARM_CPU_MAYBE_HAS_VFPV3 select BR2_ARM_CPU_HAS_VFPV2 if BR2_ARM_CPU_MAYBE_HAS_VFPV2 @@ -461,7 +470,7 @@ config BR2_ARM_ENABLE_VFP choice prompt "Target ABI" - default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2 + default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_FPU default BR2_ARM_EABI depends on BR2_arm || BR2_armeb help @@ -496,7 +505,7 @@ config BR2_ARM_EABI config BR2_ARM_EABIHF bool "EABIhf" - depends on BR2_ARM_CPU_HAS_VFPV2 + depends on BR2_ARM_CPU_HAS_FPU help The EABIhf is an extension of EABI which supports the 'hard' floating point model. This model uses the floating point @@ -520,7 +529,7 @@ choice default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4 default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3 default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2 - default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_VFPV2 + default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_FPU config BR2_ARM_SOFT_FLOAT bool "Soft float" From 09c6e28233230a84932591699d802b1b6677f7cf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:15 +0100 Subject: [PATCH 1437/2640] arch/arm: add option for FPv4 FPU The FPv4-SP FPU is a single-precision FPU with 16 double registers [0] [1]. It is only available for cortex-m4 cores, and is known to gcc as fpv4-sp-d16 (note that there is no leading 'v') since gcc-4.5 [2]. [0] https://en.wikipedia.org/wiki/ARM_Cortex-M#Cortex-M4 [1] https://developer.arm.com/docs/ddi0439/latest/floating-point-unit [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=639cb7b789a54bf78d6ae5e2644450f5eb1837a6 Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index c2f3f8d9a3..e6950cccca 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -40,6 +40,15 @@ config BR2_ARM_CPU_HAS_VFPV4 bool select BR2_ARM_CPU_HAS_VFPV3 +# FPv4 is always optional +config BR2_ARM_CPU_MAYBE_HAS_FPV4 + bool + select BR2_ARM_CPU_MAYBE_HAS_FPU + +config BR2_ARM_CPU_HAS_FPV4 + bool + select BR2_ARM_CPU_HAS_FPU + config BR2_ARM_CPU_HAS_FP_ARMV8 bool select BR2_ARM_CPU_HAS_VFPV4 @@ -460,6 +469,7 @@ config BR2_ARM_ENABLE_NEON config BR2_ARM_ENABLE_VFP bool "Enable VFP extension support" depends on BR2_ARM_CPU_MAYBE_HAS_FPU + select BR2_ARM_CPU_HAS_FPV4 if BR2_ARM_CPU_MAYBE_HAS_FPV4 select BR2_ARM_CPU_HAS_VFPV4 if BR2_ARM_CPU_MAYBE_HAS_VFPV4 select BR2_ARM_CPU_HAS_VFPV3 if BR2_ARM_CPU_MAYBE_HAS_VFPV3 select BR2_ARM_CPU_HAS_VFPV2 if BR2_ARM_CPU_MAYBE_HAS_VFPV2 @@ -526,6 +536,7 @@ endchoice choice prompt "Floating point strategy" default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8 + default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4 default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4 default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3 default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2 @@ -636,6 +647,14 @@ config BR2_ARM_FPU_NEON_VFPV4 example on Cortex-A5 and Cortex-A7, support for VFPv4 and NEON is optional. +config BR2_ARM_FPU_FPV4D16 + bool "FPv4-D16" + depends on BR2_ARM_CPU_HAS_FPV4 + help + This option allows to use the FPv4-SP (single precision) + floating point unit, as available in some ARMv7m processors + (Cortex-M4). + config BR2_ARM_FPU_FP_ARMV8 bool "FP-ARMv8" depends on BR2_ARM_CPU_HAS_FP_ARMV8 @@ -768,6 +787,7 @@ config BR2_GCC_TARGET_FPU default "vfpv4-d16" if BR2_ARM_FPU_VFPV4D16 default "neon" if BR2_ARM_FPU_NEON default "neon-vfpv4" if BR2_ARM_FPU_NEON_VFPV4 + default "fpv4-sp-d16" if BR2_ARM_FPU_FPV4D16 default "fp-armv8" if BR2_ARM_FPU_FP_ARMV8 default "neon-fp-armv8" if BR2_ARM_FPU_NEON_FP_ARMV8 depends on BR2_arm || BR2_armeb From 81d8a25bc820c3461c5a8c21159572ee89e0761c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:16 +0100 Subject: [PATCH 1438/2640] arch/arm: add options for FPv5 FPU Contrary to its older brother, the FPv5 comes in two flavours; single- and double-precision [0] [1]. the two variants are only available for cortex-m7 cores, and the two variants are known to gcc as fpv5-sp-d16 and fpv5-d16, respectively, since gcc-5 [2]. [0] https://en.wikipedia.org/wiki/ARM_Cortex-M#Cortex-M7 [1] https://developer.arm.com/docs/ddi0489/latest/floating-point-unit [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=a076f99fa702deac764f6e0441b9435ad999f521 Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index e6950cccca..46bc34dd96 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -49,6 +49,15 @@ config BR2_ARM_CPU_HAS_FPV4 bool select BR2_ARM_CPU_HAS_FPU +# FPv5 is always optional +config BR2_ARM_CPU_MAYBE_HAS_FPV5 + bool + select BR2_ARM_CPU_MAYBE_HAS_FPV4 + +config BR2_ARM_CPU_HAS_FPV5 + bool + select BR2_ARM_CPU_HAS_FPV4 + config BR2_ARM_CPU_HAS_FP_ARMV8 bool select BR2_ARM_CPU_HAS_VFPV4 @@ -469,6 +478,7 @@ config BR2_ARM_ENABLE_NEON config BR2_ARM_ENABLE_VFP bool "Enable VFP extension support" depends on BR2_ARM_CPU_MAYBE_HAS_FPU + select BR2_ARM_CPU_HAS_FPV5 if BR2_ARM_CPU_MAYBE_HAS_FPV5 select BR2_ARM_CPU_HAS_FPV4 if BR2_ARM_CPU_MAYBE_HAS_FPV4 select BR2_ARM_CPU_HAS_VFPV4 if BR2_ARM_CPU_MAYBE_HAS_VFPV4 select BR2_ARM_CPU_HAS_VFPV3 if BR2_ARM_CPU_MAYBE_HAS_VFPV3 @@ -536,6 +546,7 @@ endchoice choice prompt "Floating point strategy" default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8 + default BR2_ARM_FPU_FPV5D16 if BR2_ARM_CPU_HAS_FPV5 default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4 default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4 default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3 @@ -655,6 +666,30 @@ config BR2_ARM_FPU_FPV4D16 floating point unit, as available in some ARMv7m processors (Cortex-M4). +config BR2_ARM_FPU_FPV5D16 + bool "FPv5-D16" + depends on BR2_ARM_CPU_HAS_FPV5 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + help + This option allows to use the FPv5-SP (single precision) + floating point unit, as available in some ARMv7m processors + (Cortex-M7). + + Note that if you want binary code that works on the earlier + Cortex-M4, you should instead select FPv4-D16. + +config BR2_ARM_FPU_FPV5DPD16 + bool "FPv5-DP-D16" + depends on BR2_ARM_CPU_HAS_FPV5 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + help + This option allows to use the FPv5-DP (double precision) + floating point unit, as available in some ARMv7m processors + (Cortex-M7). + + Note that if you want binary code that works on the earlier + Cortex-M4, you should instead select FPv4-D16. + config BR2_ARM_FPU_FP_ARMV8 bool "FP-ARMv8" depends on BR2_ARM_CPU_HAS_FP_ARMV8 @@ -788,6 +823,8 @@ config BR2_GCC_TARGET_FPU default "neon" if BR2_ARM_FPU_NEON default "neon-vfpv4" if BR2_ARM_FPU_NEON_VFPV4 default "fpv4-sp-d16" if BR2_ARM_FPU_FPV4D16 + default "fpv5-sp-d16" if BR2_ARM_FPU_FPV5D16 + default "fpv5-d16" if BR2_ARM_FPU_FPV5DPD16 default "fp-armv8" if BR2_ARM_FPU_FP_ARMV8 default "neon-fp-armv8" if BR2_ARM_FPU_NEON_FP_ARMV8 depends on BR2_arm || BR2_armeb From 87f0536474daffa6f1ee8ae73b37eda3fab75b67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 20 May 2018 19:13:29 +0200 Subject: [PATCH 1439/2640] Revert "arch/arm: add cortex-m7 core" This reverts commit 43884e7f5011cbd70a9a17bfd87041953cfa74ee, which was intended for the next branch, not master. Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 7651d10927..c99a995db2 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -241,11 +241,6 @@ config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M -config BR2_cortex_m7 - bool "cortex-M7" - select BR2_ARM_CPU_HAS_THUMB2 - select BR2_ARM_CPU_ARMV7M - select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 endif # !BR2_ARCH_IS_64 comment "armv8 cores" @@ -721,7 +716,6 @@ config BR2_GCC_TARGET_CPU # armv7m default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 - default "cortex-m7" if BR2_cortex_m7 # armv8a default "cortex-a32" if BR2_cortex_a32 default "cortex-a35" if BR2_cortex_a35 From 7ee527dd91f2e9eafba8b9d3e33cd9ebaaa11cdc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:17 +0100 Subject: [PATCH 1440/2640] arch/arm: cortex-m4 may have an FPv4 FPU Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 46bc34dd96..aadd14f5fc 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -267,6 +267,7 @@ config BR2_cortex_m3 config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_MAYBE_HAS_FPV4 select BR2_ARM_CPU_ARMV7M config BR2_cortex_m7 bool "cortex-M7" From 3e44065ab5af177103cbf26724e48e300cffee5d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2018 21:18:18 +0100 Subject: [PATCH 1441/2640] arch/arm: cortex-m7 may have a FPv5 FPU Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index aadd14f5fc..f0488b4685 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -272,6 +272,7 @@ config BR2_cortex_m4 config BR2_cortex_m7 bool "cortex-M7" select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_MAYBE_HAS_FPV5 select BR2_ARM_CPU_ARMV7M select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 endif # !BR2_ARCH_IS_64 From 384c1559c08ee4ffd46a0ea2f8df07b9dcd5effa Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sun, 20 May 2018 13:11:14 -0400 Subject: [PATCH 1442/2640] gst1-plugins-bad: fix typo preventing use of the netsim plugin Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 90e2209a99..b041014f81 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -378,7 +378,7 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_NETSIM),y) +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim else GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim From 0f711e71c21f23c98d56ec8ea8a1778f049a2d1e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 19 May 2018 22:55:01 +0200 Subject: [PATCH 1443/2640] ltrace: remove bogus comment in Config.in file In commit dfaa18af00dfcff71a0159adaafb0880e58fa6a1 ("ltrace: disable on mips/mipsel"), ltrace was disabled on mips/mipsel due to build issues, and a comment was added in the Config.in file to explain that even though ltrace has mips/mipsel support, it isn't enabled because it doesn't build. Then, in commit d23cce19c299e3010ba2dca84ab4ad35eff3cdbb ("ltrace: enable for mips/mipsel"), the build of ltrace on mips/mipsel was re-enabled, because it has been fixed upstream. However, the comment in the Config.in comment was not removed in this commit. Due to this, we have a comment that says "we don't allow enabling ltrace on mips/mipsel" and the line right below precisely allows to enable ltrace on mips/mipsel. Fix this inconsistency by removing the no longer valid comment. Signed-off-by: Thomas Petazzoni --- package/ltrace/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index 4d5fb723d6..3a46b6a4f6 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -3,10 +3,6 @@ config BR2_PACKAGE_LTRACE depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - # ltrace normally has mips/mipsel support, but it's currently - # broken (error: 'struct ltelf' has no member named - # 'relplt_count'). Issue reported upstream at - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756764. depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \ || BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa) select BR2_PACKAGE_ELFUTILS From af72a42b0af3588919efe88301e622b683098d8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 19 May 2018 22:55:02 +0200 Subject: [PATCH 1444/2640] ltrace: fix visibility of Config.in comment The BR2_PACKAGE_LTRACE option has some architecture dependencies, but those architecture dependencies are not taken into account for the Config.in comment. To fix this, this commit introduces a BR2_PACKAGE_LTRACE_ARCH_SUPPORTS hidden boolean that gets used by both the BR2_PACKAGE_LTRACE option and the Config.in comment. Signed-off-by: Thomas Petazzoni --- package/ltrace/Config.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index 3a46b6a4f6..2defbe28a0 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -1,10 +1,20 @@ +config BR2_PACKAGE_LTRACE_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_powerpc + default y if BR2_sparc + default y if BR2_x86_64 + default y if BR2_xtensa + config BR2_PACKAGE_LTRACE bool "ltrace" depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \ - || BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa) + depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS select BR2_PACKAGE_ELFUTILS help Debugging program which runs a specified command until it @@ -15,5 +25,6 @@ config BR2_PACKAGE_LTRACE http://ltrace.org comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library" + depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) From 44acf13f65a328592e431c7992ff1eab2e124b77 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Tue, 13 Feb 2018 14:27:11 +0100 Subject: [PATCH 1445/2640] ejabberd: Call check-erlang-lib script directly from its location Avoid installing check-erlang-lib in the directory where the tarball is extracted. Instead, use an absolute path to its actual location, i.e.: $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib Signed-off-by: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/ejabberd/ejabberd.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 0f7af9b83e..acd52e5b38 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -23,24 +23,15 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y) EJABBERD_DEPENDENCIES += linux-pam endif -# Install check-erlang-lib script to the directory in which the -# package has been uncompressed, so it is available during the -# configure step. -define EJABBERD_INSTALL_CHECK_ERLANG_LIB - $(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \ - $(@D)/check-erlang-lib -endef - -EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB - EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler # Guess answers for these tests, configure will bail out otherwise # saying error: cannot run test program while cross compiling. +EJABBERD_CHECK_LIB = $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib EJABBERD_CONF_ENV = \ ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \ $(foreach lib,$(EJABBERD_ERLANG_LIBS), \ - ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`") + ac_cv_erlang_lib_dir_$(lib)="`$(EJABBERD_CHECK_LIB) $(lib)`") EJABBERD_CONF_OPTS = \ --enable-system-deps \ From 02f6e638c877ebc5b1d142bee077d6a241b99474 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 14 Feb 2018 12:13:51 +0100 Subject: [PATCH 1446/2640] libgit2: new package Signed-off-by: Nicolas Cavallari [Thomas: - Do not select BR2_PACKAGE_ZLIB, because zlib is an optional dependency. - Handle optional dependencies in a more usual way in libgit2.mk: group the addition in _DEPENDENCIES and in _CONF_OPTS for a given library together. - libgit2 can optionally use libssh2, not libssh. - Add the optional dependency on zlib. - Always pass USE_ICONV=ON, the detection works perfectly fine, with both a C library providing iconv support built-in, and with libiconv. If neither provides iconv, it gets disabled automatically as expected. - Add libiconv as an optional dependency.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/libgit2/Config.in | 8 ++++++ package/libgit2/libgit2.hash | 3 ++ package/libgit2/libgit2.mk | 54 ++++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 package/libgit2/Config.in create mode 100644 package/libgit2/libgit2.hash create mode 100644 package/libgit2/libgit2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 978ba9625c..78c356fed9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1394,6 +1394,9 @@ N: Naumann Andreas F: package/evemu/ F: package/libevdev/ +N: Nicolas Cavallari +F: package/libgit2/ + N: Nicolas Serafini F: package/exiv2/ F: package/nvidia-tegra23/nvidia-tegra23-binaries/ diff --git a/package/Config.in b/package/Config.in index 6c0583a745..b66f27a083 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1101,6 +1101,7 @@ menu "Database" source "package/hiredis/Config.in" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" + source "package/libgit2/Config.in" source "package/libpqxx/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in new file mode 100644 index 0000000000..24a1f3b5a9 --- /dev/null +++ b/package/libgit2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBGIT2 + bool "libgit2" + help + libgit2 is a portable, pure C implementation of the Git core + methods provided as a linkable library with a solid API, + allowing to build Git functionality into your application. + + https://github.com/libgit2/libgit2 diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash new file mode 100644 index 0000000000..cc09af3627 --- /dev/null +++ b/package/libgit2/libgit2.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 6a62393e0ceb37d02fe0d5707713f504e7acac9006ef33da1e88960bd78b6eac libgit2-v0.26.0.tar.gz +sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk new file mode 100644 index 0000000000..277a8d46ac --- /dev/null +++ b/package/libgit2/libgit2.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# libgit2 +# +################################################################################ + +LIBGIT2_VERSION = v0.26.0 +LIBGIT2_SITE = $(call github,libgit2,libgit2,$(LIBGIT2_VERSION)) +LIBGIT2_LICENSE = GPL-2.0 with linking exception +LIBGIT2_LICENSE_FILES = COPYING +LIBGIT2_INSTALL_STAGING = YES + +LIBGIT2_CONF_OPTS = \ + -DUSE_GSSAPI=OFF \ + -DBUILD_CLAR=OFF \ + -DUSE_ICONV=ON \ + -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + +# If libiconv is available (for !locale toolchains), then we can use +# it for iconv support. Note that USE_ICONV=ON is still correct even +# without libiconv because (1) most toolchain have iconv support +# without libiconv and (2) even if USE_ICONV=ON but iconv support is +# not available, libgit2 simply avoids using iconv. +ifeq ($(BR2_PACKAGE_LIBICONV),y) +LIBGIT2_DEPENDENCIES += libiconv +endif + +# No option to explicitly enable/disable zlib +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBGIT2_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +LIBGIT2_DEPENDENCIES += libssh2 +LIBGIT2_CONF_OPTS += -DUSE_SSH=ON +else +LIBGIT2_CONF_OPTS += -DUSE_SSH=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBGIT2_DEPENDENCIES += openssl +LIBGIT2_CONF_OPTS += -DUSE_OPENSSL=ON +else +LIBGIT2_CONF_OPTS += -DUSE_OPENSSL=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBGIT2_DEPENDENCIES += libcurl +LIBGIT2_CONF_OPTS += -DCURL=ON +else +LIBGIT2_CONF_OPTS += -DCURL=OFF +endif + +$(eval $(cmake-package)) From a46bddbc222c67f3234bd8cf93dcb3fe225eb2d9 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Mon, 21 May 2018 08:46:47 +0200 Subject: [PATCH 1447/2640] package/imx-mkimage: update hash Due to an update in the tar logic, see commit 6e2f5d0254 (download/git: fix transform regexp for older tar versions ) - This hash needs to be updated. Fixes: http://autobuild.buildroot.net/results/7c63ab1188a45d4684e159456f561a4e7c39e612/ Signed-off-by: Erik Larsson Signed-off-by: Peter Korsgaard --- package/imx-mkimage/imx-mkimage.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 5ecb92d22e..e1cbdd973c 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17e8285a346eb19d00780b13916dc281421c5b955707b9f2a662a6734142f1fb imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz +sha256 bc79e11cfbde303e200287fa6624028c8ce5344f8a35ed179b3fe217d74155da imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING From 127c0f3e474631f143d750b03647d34e80382662 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 20 May 2018 19:16:23 -0300 Subject: [PATCH 1448/2640] linux: bump default to version 4.16.10 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index e202061831..29c8c7e4f2 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 1d8afca9c69dc5246736d20d6e6ed266ccb70387 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 20 May 2018 19:16:24 -0300 Subject: [PATCH 1449/2640] linux-headers: bump 4.{9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d37b68afa5..c7640f1ab2 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -251,12 +251,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 default "4.4.131" if BR2_KERNEL_HEADERS_4_4 - default "4.9.99" if BR2_KERNEL_HEADERS_4_9 + default "4.9.101" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.40" if BR2_KERNEL_HEADERS_4_14 + default "4.14.42" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.8" if BR2_KERNEL_HEADERS_4_16 + default "4.16.10" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From bc730557571815cbb42a52b1f26d7119d1d14ac3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 21 May 2018 15:27:20 +0200 Subject: [PATCH 1450/2640] wavpack: add upstream security fixes Fixes the following security issues: CVE-2018-10536: An issue was discovered in WavPack 5.1.0 and earlier. The WAV parser component contains a vulnerability that allows writing to memory because ParseRiffHeaderConfig in riff.c does not reject multiple format chunks. CVE-2018-10537: An issue was discovered in WavPack 5.1.0 and earlier. The W64 parser component contains a vulnerability that allows writing to memory because ParseWave64HeaderConfig in wave64.c does not reject multiple format chunks. CVE-2018-10538: An issue was discovered in WavPack 5.1.0 and earlier for WAV input. Out-of-bounds writes can occur because ParseRiffHeaderConfig in riff.c does not validate the sizes of unknown chunks before attempting memory allocation, related to a lack of integer-overflow protection within a bytes_to_copy calculation and subsequent malloc call, leading to insufficient memory allocation. CVE-2018-10539: An issue was discovered in WavPack 5.1.0 and earlier for DSDiff input. Out-of-bounds writes can occur because ParseDsdiffHeaderConfig in dsdiff.c does not validate the sizes of unknown chunks before attempting memory allocation, related to a lack of integer-overflow protection within a bytes_to_copy calculation and subsequent malloc call, leading to insufficient memory allocation. CVE-2018-10540: An issue was discovered in WavPack 5.1.0 and earlier for W64 input. Out-of-bounds writes can occur because ParseWave64HeaderConfig in wave64.c does not validate the sizes of unknown chunks before attempting memory allocation, related to a lack of integer-overflow protection within a bytes_to_copy calculation and subsequent malloc call, leading to insufficient memory allocation. Signed-off-by: Peter Korsgaard --- ...1-issue-32-no-multiple-format-chunks.patch | 64 ++++++++++++++++ ...e-size-of-unknown-chunks-before-mall.patch | 75 +++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch create mode 100644 package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch diff --git a/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch new file mode 100644 index 0000000000..f837a0e966 --- /dev/null +++ b/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch @@ -0,0 +1,64 @@ +From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 22:18:07 -0700 +Subject: [PATCH] issue #30 issue #31 issue #32: no multiple format chunks in + WAV or W64 + +Signed-off-by: Peter Korsgaard +--- + cli/riff.c | 7 ++++++- + cli/wave64.c | 6 ++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/cli/riff.c b/cli/riff.c +index 7bddf63..5d6452e 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -53,7 +53,7 @@ extern int debug_logging_mode; + + int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) + { +- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; ++ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; + int64_t total_samples = 0, infilesize; + RiffChunkHeader riff_chunk_header; + ChunkHeader chunk_header; +@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and + int supported = TRUE, format; // make sure it's a .wav file we can handle + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || + !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || + bcount != chunk_header.ckSize) { +diff --git a/cli/wave64.c b/cli/wave64.c +index fa928a0..0388dc7 100644 +--- a/cli/wave64.c ++++ b/cli/wave64.c +@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + Wave64ChunkHeader chunk_header; + Wave64FileHeader filehdr; + WaveHeader WaveHeader; ++ int format_chunk = 0; + uint32_t bcount; + + infilesize = DoGetFileSize (infile); +@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { + int supported = TRUE, format; + ++ if (format_chunk++) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; + + if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || +-- +2.11.0 + diff --git a/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch new file mode 100644 index 0000000000..76ebce66d6 --- /dev/null +++ b/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch @@ -0,0 +1,75 @@ +From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 24 Apr 2018 17:27:01 -0700 +Subject: [PATCH] issue #33, sanitize size of unknown chunks before malloc() + +Signed-off-by: Peter Korsgaard +--- + cli/dsdiff.c | 9 ++++++++- + cli/riff.c | 9 ++++++++- + cli/wave64.c | 9 ++++++++- + 3 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index c016df9..fa56bbb 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + else { // just copy unknown chunks to output file + + int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git a/cli/riff.c b/cli/riff.c +index de98c1e..7bddf63 100644 +--- a/cli/riff.c ++++ b/cli/riff.c +@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack + else { // just copy unknown chunks to output file + + int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .WAV file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +diff --git a/cli/wave64.c b/cli/wave64.c +index 591d640..fa928a0 100644 +--- a/cli/wave64.c ++++ b/cli/wave64.c +@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + else { // just copy unknown chunks to output file + int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; +- char *buff = malloc (bytes_to_copy); ++ char *buff; ++ ++ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { ++ error_line ("%s is not a valid .W64 file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ ++ buff = malloc (bytes_to_copy); + + if (debug_logging_mode) + error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", +-- +2.11.0 + From b2b874fe678653d348a1d00bd11aad50ca383c0a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:30 +0200 Subject: [PATCH 1451/2640] bluez5_utils: rename options to have the proper suffix The bluez5_utils Config.in options had a bogus prefix: BR2_PACKAGE_BLUEZ5 instead of the expected BR2_PACKAGE_BLUEZ5_UTILS. This commit fixes that, and adds the appropriate Config.in.legacy handling. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 45 ++++++++++++++++++++++++++++ package/bluez5_utils/Config.in | 10 +++---- package/bluez5_utils/bluez5_utils.mk | 10 +++---- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1494704221..e5b313f23d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,51 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH + bool "bluez5-utils health plugin option renamed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH + help + For consistency reasons, the option + BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH has been renamed to + BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH. + +config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI + bool "bluez5-utils midi plugin option renamed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI + help + For consistency reasons, the option + BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI has been renamed to + BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI. + +config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC + bool "bluez5-utils nfc plugin option renamed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC + help + For consistency reasons, the option + BR2_PACKAGE_BLUEZ5_PLUGINS_NFC has been renamed to + BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC. + +config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP + bool "bluez5-utils sap plugin option renamed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP + help + For consistency reasons, the option + BR2_PACKAGE_BLUEZ5_PLUGINS_SAP has been renamed to + BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP. + +config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS + bool "bluez5-utils sixaxis plugin option renamed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS + help + For consistency reasons, the option + BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS has been renamed to + BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS. + config BR2_PACKAGE_TRANSMISSION_REMOTE bool "transmission remote tool option removed" select BR2_LEGACY diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 55831e9b61..c5e8dfbcf7 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -56,29 +56,29 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL help Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin -config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH bool "build health plugin" help Build BlueZ 5.x health plugin -config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI bool "build midi profile" select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_SEQ help Build BlueZ 5.x midi plugin -config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC bool "build nfc plugin" help Build BlueZ 5.x nfc plugin -config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP bool "build sap plugin" help Build BlueZ 5.x sap plugin -config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS +config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV help diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 3189855624..aff1fd9796 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -41,14 +41,14 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-experimental endif # enable health plugin -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH),y) BLUEZ5_UTILS_CONF_OPTS += --enable-health else BLUEZ5_UTILS_CONF_OPTS += --disable-health endif # enable midi profile -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y) BLUEZ5_UTILS_CONF_OPTS += --enable-midi BLUEZ5_UTILS_DEPENDENCIES += alsa-lib else @@ -56,21 +56,21 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-midi endif # enable nfc plugin -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC),y) BLUEZ5_UTILS_CONF_OPTS += --enable-nfc else BLUEZ5_UTILS_CONF_OPTS += --disable-nfc endif # enable sap plugin -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP),y) BLUEZ5_UTILS_CONF_OPTS += --enable-sap else BLUEZ5_UTILS_CONF_OPTS += --disable-sap endif # enable sixaxis plugin -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS),y) BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis else BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis From 94c146282fd74af73eddffb607d8e7300145dad5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:31 +0200 Subject: [PATCH 1452/2640] jquery-ui-themes: rename options to have proper prefix The choice options to select the specific jquery-ui theme to install had a prefix of BR2_PACKAGE_JQUERY_UI_THEME_ instead of BR2_PACKAGE_JQUERY_UI_THEMES_. This commit fixes that, and adds Config.in.legacy handling. It's worth mentioning that since those options are part of a choice, the legacy handling cannot select the new name of the option: we can simply inform the user about the renaming. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 216 +++++++++++++++++++++++++++++ package/jquery-ui-themes/Config.in | 96 ++++++------- 2 files changed, 264 insertions(+), 48 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e5b313f23d..f1938a13d2 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,222 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE + bool "jquery-ui-themes option black-tie renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + black-tie theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE to + BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE. + +config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER + bool "jquery-ui-themes option blitzer renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + blitzer theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_BLITZER to + BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER. + +config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO + bool "jquery-ui-themes option cupertino renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + cupertino theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO to + BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO. + +config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE + bool "jquery-ui-themes option dark-hive renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + dark-hive theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE to + BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE. + +config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV + bool "jquery-ui-themes option dot-luv renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + dot-luv theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV to + BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV. + +config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT + bool "jquery-ui-themes option eggplant renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + eggplant theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT to + BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT. + +config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE + bool "jquery-ui-themes option excite-bike renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + excite-bike theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE to + BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE. + +config BR2_PACKAGE_JQUERY_UI_THEME_FLICK + bool "jquery-ui-themes option flick renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + flick theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_FLICK to + BR2_PACKAGE_JQUERY_UI_THEMES_FLICK. + +config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS + bool "jquery-ui-themes option hot-sneaks renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + hot-sneaks theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS to + BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS. + +config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY + bool "jquery-ui-themes option humanity renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + humanity theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY to + BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY. + +config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG + bool "jquery-ui-themes option le-frog renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + le-frog theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG to + BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG. + +config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC + bool "jquery-ui-themes option mint-choc renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + mint-choc theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC to + BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC. + +config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST + bool "jquery-ui-themes option overcast renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + overcast theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST to + BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST. + +config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER + bool "jquery-ui-themes option pepper-grinder renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + pepper-grinder theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER to + BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER. + +config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND + bool "jquery-ui-themes option redmond renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + redmond theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_REDMOND to + BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND. + +config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS + bool "jquery-ui-themes option smoothness renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + smoothness theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS to + BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS. + +config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET + bool "jquery-ui-themes option south-street renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + south-street theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET to + BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET. + +config BR2_PACKAGE_JQUERY_UI_THEME_START + bool "jquery-ui-themes option start renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + start theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_START to + BR2_PACKAGE_JQUERY_UI_THEMES_START. + +config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY + bool "jquery-ui-themes option sunny renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + sunny theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_SUNNY to + BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY. + +config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE + bool "jquery-ui-themes option swanky-purse renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + swanky-purse theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE to + BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE. + +config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC + bool "jquery-ui-themes option trontastic renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + trontastic theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC to + BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC. + +config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS + bool "jquery-ui-themes option ui-darkness renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + ui-darkness theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS to + BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS. + +config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS + bool "jquery-ui-themes option ui-lightness renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + ui-lightness theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS to + BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS. + +config BR2_PACKAGE_JQUERY_UI_THEME_VADER + bool "jquery-ui-themes option vader renamed" + select BR2_LEGACY + help + For consistency reasons, the jquery-ui-themes option for the + vader theme has been renamed from + BR2_PACKAGE_JQUERY_UI_THEME_VADER to + BR2_PACKAGE_JQUERY_UI_THEMES_VADER. + config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH bool "bluez5-utils health plugin option renamed" select BR2_LEGACY diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in index fde3014602..29359544ac 100644 --- a/package/jquery-ui-themes/Config.in +++ b/package/jquery-ui-themes/Config.in @@ -13,105 +13,105 @@ choice help Specify the jQuery UI theme to install. -config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE +config BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE bool "black-tie" -config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER +config BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER bool "blitzer" -config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO +config BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO bool "cupertino" -config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE +config BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE bool "dark-hive" -config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV +config BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV bool "dot-luv" -config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT +config BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT bool "eggplant" -config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE +config BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE bool "excite-bike" -config BR2_PACKAGE_JQUERY_UI_THEME_FLICK +config BR2_PACKAGE_JQUERY_UI_THEMES_FLICK bool "flick" -config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS +config BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS bool "hot-sneaks" -config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY +config BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY bool "humanity" -config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG +config BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG bool "le-frog" -config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC +config BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC bool "mint-choc" -config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST +config BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST bool "overcast" -config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER +config BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER bool "pepper-grinder" -config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND +config BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND bool "redmond" -config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS +config BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS bool "smoothness" -config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET +config BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET bool "south-street" -config BR2_PACKAGE_JQUERY_UI_THEME_START +config BR2_PACKAGE_JQUERY_UI_THEMES_START bool "start" -config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY +config BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY bool "sunny" -config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE +config BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE bool "swanky-purse" -config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC +config BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC bool "trontastic" -config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS +config BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS bool "ui-darkness" -config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS +config BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS bool "ui-lightness" -config BR2_PACKAGE_JQUERY_UI_THEME_VADER +config BR2_PACKAGE_JQUERY_UI_THEMES_VADER bool "vader" endchoice config BR2_PACKAGE_JQUERY_UI_THEMES_THEME string - default "black-tie" if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE - default "blitzer" if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER - default "cupertino" if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO - default "dark-hive" if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE - default "dot-luv" if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV - default "eggplant" if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT - default "excite-bike" if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE - default "flick" if BR2_PACKAGE_JQUERY_UI_THEME_FLICK - default "hot-sneaks" if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS - default "humanity" if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY - default "le-frog" if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG - default "mint-choc" if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC - default "overcast" if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST - default "pepper-grinder" if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER - default "redmond" if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND - default "smoothness" if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS - default "south-street" if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET - default "start" if BR2_PACKAGE_JQUERY_UI_THEME_START - default "sunny" if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY - default "swanky-purse" if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE - default "trontastic" if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC - default "ui-darkness" if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS - default "ui-lightness" if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS - default "vader" if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER + default "black-tie" if BR2_PACKAGE_JQUERY_UI_THEMES_BLACK_TIE + default "blitzer" if BR2_PACKAGE_JQUERY_UI_THEMES_BLITZER + default "cupertino" if BR2_PACKAGE_JQUERY_UI_THEMES_CUPERTINO + default "dark-hive" if BR2_PACKAGE_JQUERY_UI_THEMES_DARK_HIVE + default "dot-luv" if BR2_PACKAGE_JQUERY_UI_THEMES_DOT_LUV + default "eggplant" if BR2_PACKAGE_JQUERY_UI_THEMES_EGGPLANT + default "excite-bike" if BR2_PACKAGE_JQUERY_UI_THEMES_EXCITE_BIKE + default "flick" if BR2_PACKAGE_JQUERY_UI_THEMES_FLICK + default "hot-sneaks" if BR2_PACKAGE_JQUERY_UI_THEMES_HOT_SNEAKS + default "humanity" if BR2_PACKAGE_JQUERY_UI_THEMES_HUMANITY + default "le-frog" if BR2_PACKAGE_JQUERY_UI_THEMES_LE_FROG + default "mint-choc" if BR2_PACKAGE_JQUERY_UI_THEMES_MINT_CHOC + default "overcast" if BR2_PACKAGE_JQUERY_UI_THEMES_OVERCAST + default "pepper-grinder" if BR2_PACKAGE_JQUERY_UI_THEMES_PEPPER_GRINDER + default "redmond" if BR2_PACKAGE_JQUERY_UI_THEMES_REDMOND + default "smoothness" if BR2_PACKAGE_JQUERY_UI_THEMES_SMOOTHNESS + default "south-street" if BR2_PACKAGE_JQUERY_UI_THEMES_SOUTH_STREET + default "start" if BR2_PACKAGE_JQUERY_UI_THEMES_START + default "sunny" if BR2_PACKAGE_JQUERY_UI_THEMES_SUNNY + default "swanky-purse" if BR2_PACKAGE_JQUERY_UI_THEMES_SWANKY_PURSE + default "trontastic" if BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC + default "ui-darkness" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS + default "ui-lightness" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS + default "vader" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_VADER endif From dc4e4aac03eab81228841749aeb19b9fcb9fedb5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:32 +0200 Subject: [PATCH 1453/2640] libftdi: rename option to have proper prefix The option name BR2_PACKAGE_LIBTFDI_CPP obviously had a typo: it should have been named BR2_PACKAGE_LIBFTDI_CPP, and add the necessary Config.in.legacy handling. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 9 +++++++++ package/libftdi/Config.in | 2 +- package/libftdi/libftdi.mk | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f1938a13d2..7ec9526710 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_LIBTFDI_CPP + bool "libftdi C++ bindings option renamed" + select BR2_LEGACY + select BR2_PACKAGE_LIBFTDI_CPP + help + The option BR2_PACKAGE_LIBTFDI_CPP was renamed to + BR2_PACKAGE_LIBFTDI_CPP in order to fix a typo in the option + name. + config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE bool "jquery-ui-themes option black-tie renamed" select BR2_LEGACY diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in index beb42d34c5..23dae1be1f 100644 --- a/package/libftdi/Config.in +++ b/package/libftdi/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBFTDI if BR2_PACKAGE_LIBFTDI -config BR2_PACKAGE_LIBTFDI_CPP +config BR2_PACKAGE_LIBFTDI_CPP bool "C++ bindings" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk index c1952ac68b..cdd77c2e68 100644 --- a/package/libftdi/libftdi.mk +++ b/package/libftdi/libftdi.mk @@ -15,7 +15,7 @@ LIBFTDI_AUTORECONF = YES LIBFTDI_CONF_OPTS = --without-examples # configure detect it automaticaly so we need to force it -ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y) +ifeq ($(BR2_PACKAGE_LIBFTDI_CPP),y) LIBFTDI_DEPENDENCIES += boost LIBFTDI_CONF_OPTS += --enable-libftdipp else From 9d2c5c2540bff90877043c6f8c70a5aebc3304db Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:33 +0200 Subject: [PATCH 1454/2640] ipsec-tools: rename options to have proper prefix A number of options in the ipsec-tools package had their Config.in option prefixed by BR2_PACKAGE_IPSEC, while the prefix should be BR2_PACKAGE_IPSEC_TOOLS. This commit fixes that, and adds the necessary Config.in.legacy handling. Since those options are part of a choice, the legacy handling cannot select the new name of the options, so the legacy handling only informs the user of the rename. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/ipsec-tools/Config.in | 8 ++++---- package/ipsec-tools/ipsec-tools.mk | 6 +++--- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7ec9526710..4e4f499454 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,30 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_IPSEC_SECCTX_DISABLE + bool "ipsec-tools security context disable option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_IPSEC_SECCTX_DISABLE was renamed to + BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE. + +config BR2_PACKAGE_IPSEC_SECCTX_ENABLE + bool "ipsec-tools SELinux security context enable option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_IPSEC_SECCTX_ENABLE was renamed to + BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE. + +config BR2_PACKAGE_IPSEC_SECCTX_KERNEL + bool "ipsec-tools kernel security context enable option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_IPSEC_SECCTX_KERNEL was renamed to + BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL. + config BR2_PACKAGE_LIBTFDI_CPP bool "libftdi C++ bindings option renamed" select BR2_LEGACY diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index 1635675a36..59154123e6 100644 --- a/package/ipsec-tools/Config.in +++ b/package/ipsec-tools/Config.in @@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID choice prompt "Security context" - default BR2_PACKAGE_IPSEC_SECCTX_DISABLE + default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE help Selects whether or not to enable security context support. -config BR2_PACKAGE_IPSEC_SECCTX_DISABLE +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE bool "Disable security context support" -config BR2_PACKAGE_IPSEC_SECCTX_ENABLE +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE bool "Enable SELinux security context support" -config BR2_PACKAGE_IPSEC_SECCTX_KERNEL +config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL bool "Enable kernel security context" endchoice diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index c0b180de55..ddae9a75f3 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -68,13 +68,13 @@ else IPSEC_TOOLS_CONF_OPTS += --disable-hybrid endif -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y) IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no endif -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y) IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes endif -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y) IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel endif From a79df201d6b00e2d2211c4defb7c2809aefb52eb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:34 +0200 Subject: [PATCH 1455/2640] janus-gateway: rename options to have proper prefix The sub-options of the janus-gateway package had their name option prefixed by BR2_PACKAGE_JANUS, while the prefix should be BR2_PACKAGE_JANUS_GATEWAY. This commit fixes that, and adds the necessary Config.in.legacy handling. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 117 +++++++++++++++++++++++++ package/janus-gateway/Config.in | 28 +++--- package/janus-gateway/janus-gateway.mk | 28 +++--- 3 files changed, 145 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4e4f499454..957099dd1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,123 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_JANUS_AUDIO_BRIDGE + bool "janus-gateway audio-bridge option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_AUDIO_BRIDGE has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE. + +config BR2_PACKAGE_JANUS_ECHO_TEST + bool "janus-gateway echo-test option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_ECHO_TEST has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST. + +config BR2_PACKAGE_JANUS_RECORDPLAY + bool "janus-gateway recordplay option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_RECORDPLAY has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY. + +config BR2_PACKAGE_JANUS_SIP_GATEWAY + bool "janus-gateway sip-gateway option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_SIP_GATEWAY has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY. + +config BR2_PACKAGE_JANUS_STREAMING + bool "janus-gateway streaming option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_STREAMING + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_STREAMING has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_STREAMING. + +config BR2_PACKAGE_JANUS_TEXT_ROOM + bool "janus-gateway text-room option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_TEXT_ROOM has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM. + +config BR2_PACKAGE_JANUS_VIDEO_CALL + bool "janus-gateway video-call option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_VIDEO_CALL has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL. + +config BR2_PACKAGE_JANUS_VIDEO_ROOM + bool "janus-gateway video-room option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_VIDEO_ROOM has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM. + +config BR2_PACKAGE_JANUS_MQTT + bool "janus-gateway mqtt option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_MQTT + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_MQTT has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_MQTT. + +config BR2_PACKAGE_JANUS_RABBITMQ + bool "janus-gateway rabbitmq option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_RABBITMQ has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ. + +config BR2_PACKAGE_JANUS_REST + bool "janus-gateway rest option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_REST + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_REST has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_REST. + +config BR2_PACKAGE_JANUS_UNIX_SOCKETS + bool "janus-gateway unix-sockets option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_UNIX_SOCKETS has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS. + +config BR2_PACKAGE_JANUS_WEBSOCKETS + bool "janus-gateway websockets option renamed" + select BR2_LEGACY + select BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS + help + For consistency reasons, the janus-gateway option + BR2_PACKAGE_JANUS_WEBSOCKETS has been renamed to + BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS. + config BR2_PACKAGE_IPSEC_SECCTX_DISABLE bool "ipsec-tools security context disable option renamed" select BR2_LEGACY diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in index 5bd4e9586b..94c00cd34a 100644 --- a/package/janus-gateway/Config.in +++ b/package/janus-gateway/Config.in @@ -19,21 +19,21 @@ if BR2_PACKAGE_JANUS_GATEWAY comment "plugins" -config BR2_PACKAGE_JANUS_AUDIO_BRIDGE +config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE bool "audio bridge" select BR2_PACKAGE_OPUS -config BR2_PACKAGE_JANUS_ECHO_TEST +config BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST bool "echo test" -config BR2_PACKAGE_JANUS_RECORDPLAY +config BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY bool "record and play" -config BR2_PACKAGE_JANUS_SIP_GATEWAY +config BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY bool "sip gateway" select BR2_PACKAGE_SOFIA_SIP -config BR2_PACKAGE_JANUS_STREAMING +config BR2_PACKAGE_JANUS_GATEWAY_STREAMING bool "streaming" # SO_REUSEPORT depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 @@ -41,22 +41,22 @@ config BR2_PACKAGE_JANUS_STREAMING comment "streaming plugin needs a toolchain w/ headers >= 3.9" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 -config BR2_PACKAGE_JANUS_TEXT_ROOM +config BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM bool "text room" -config BR2_PACKAGE_JANUS_VIDEO_CALL +config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL bool "video call" -config BR2_PACKAGE_JANUS_VIDEO_ROOM +config BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM bool "video room" -config BR2_PACKAGE_JANUS_VOICE_MAIL +config BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL bool "voice mail" select BR2_PACKAGE_LIBOGG comment "transports" -config BR2_PACKAGE_JANUS_MQTT +config BR2_PACKAGE_JANUS_GATEWAY_MQTT bool "MQTT" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS @@ -65,7 +65,7 @@ config BR2_PACKAGE_JANUS_MQTT comment "MQTT transport needs a toolchain w/ threads and dynamic library support" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_JANUS_RABBITMQ +config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ bool "RabbitMQ" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_RABBITMQ_C @@ -73,7 +73,7 @@ config BR2_PACKAGE_JANUS_RABBITMQ comment "RabbitMQ transport needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_JANUS_REST +config BR2_PACKAGE_JANUS_GATEWAY_REST bool "REST (HTTP/HTTPS)" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD @@ -81,11 +81,11 @@ config BR2_PACKAGE_JANUS_REST comment "REST transport needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_JANUS_UNIX_SOCKETS +config BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS bool "Unix Sockets" default y -config BR2_PACKAGE_JANUS_WEBSOCKETS +config BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS bool "WebSockets" depends on BR2_USE_MMU select BR2_PACKAGE_LIBWEBSOCKETS diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index c37cda0860..261fc25202 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -26,91 +26,91 @@ JANUS_GATEWAY_CONF_OPTS = \ --disable-data-channels \ --disable-sample-event-handler -ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE),y) JANUS_GATEWAY_DEPENDENCIES += opus JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge endif -ifeq ($(BR2_PACKAGE_JANUS_ECHO_TEST),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest endif -ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RECORDPLAY),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay endif -ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_SIP_GATEWAY),y) JANUS_GATEWAY_DEPENDENCIES += sofia-sip JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip endif -ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_STREAMING),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming endif -ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_TEXT_ROOM),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom endif -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_CALL),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall endif -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VIDEO_ROOM),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom endif -ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_VOICE_MAIL),y) JANUS_GATEWAY_DEPENDENCIES += libogg JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail endif -ifeq ($(BR2_PACKAGE_JANUS_MQTT),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_MQTT),y) JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c JANUS_GATEWAY_CONF_OPTS += --enable-mqtt else JANUS_GATEWAY_CONF_OPTS += --disable-mqtt endif -ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ),y) JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq else JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq endif -ifeq ($(BR2_PACKAGE_JANUS_REST),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_REST),y) JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd JANUS_GATEWAY_CONF_OPTS += --enable-rest else JANUS_GATEWAY_CONF_OPTS += --disable-rest endif -ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_UNIX_SOCKETS),y) JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets else JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets endif -ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y) +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_WEBSOCKETS),y) JANUS_GATEWAY_DEPENDENCIES += libwebsockets JANUS_GATEWAY_CONF_OPTS += --enable-websockets else From b54c5464cc57d70af2ac68adcb34dab616bef3be Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 May 2018 21:07:35 +0200 Subject: [PATCH 1456/2640] ti-sgx-km: rename options to have proper prefix The sub-options of the ti-sgx-km package had their name option prefixed by BR2_PACKAGE_TI_SGX, while the prefix should be BR2_PACKAGE_TI_SGX_KM. This commit fixes that, and adds the necessary Config.in.legacy handling. Since those options are part of a choice, the legacy handling cannot select the new name of the options, so the legacy handling only informs the user of the rename. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 32 ++++++++++++++++++++++++++++++++ package/ti-sgx-km/Config.in | 10 +++++----- package/ti-sgx-km/ti-sgx-km.mk | 8 ++++---- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 957099dd1c..4c00080965 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,38 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_TI_SGX_AM335X + bool "ti-sgx-km AM335X option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_TI_SGX_AM335X has been renamed to + BR2_PACKAGE_TI_SGX_KM_AM335X. + +config BR2_PACKAGE_TI_SGX_AM437X + bool "ti-sgx-km AM437X option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_TI_SGX_AM437X has been renamed to + BR2_PACKAGE_TI_SGX_KM_AM437X. + +config BR2_PACKAGE_TI_SGX_AM4430 + bool "ti-sgx-km AM4430 option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_TI_SGX_AM4430 has been renamed to + BR2_PACKAGE_TI_SGX_KM_AM4430. + +config BR2_PACKAGE_TI_SGX_AM5430 + bool "ti-sgx-km AM5430 option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_TI_SGX_AM5430 has been renamed to + BR2_PACKAGE_TI_SGX_KM_AM5430. + config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" select BR2_LEGACY diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in index a4c9bb8ca2..db3d3f9ddd 100644 --- a/package/ti-sgx-km/Config.in +++ b/package/ti-sgx-km/Config.in @@ -20,26 +20,26 @@ if BR2_PACKAGE_TI_SGX_KM choice prompt "Target" - default BR2_PACKAGE_TI_SGX_AM335X + default BR2_PACKAGE_TI_SGX_KM_AM335X help Select the SOC for which you would like to install drivers. -config BR2_PACKAGE_TI_SGX_AM335X +config BR2_PACKAGE_TI_SGX_KM_AM335X bool "AM335x" help AM335x CPU -config BR2_PACKAGE_TI_SGX_AM437X +config BR2_PACKAGE_TI_SGX_KM_AM437X bool "AM437x" help AM437x CPU -config BR2_PACKAGE_TI_SGX_AM4430 +config BR2_PACKAGE_TI_SGX_KM_AM4430 bool "AM4430" help AM4430 CPU -config BR2_PACKAGE_TI_SGX_AM5430 +config BR2_PACKAGE_TI_SGX_KM_AM5430 bool "AM5430" help AM5430 CPU diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk index db74da9b4a..0e1bc33902 100644 --- a/package/ti-sgx-km/ti-sgx-km.mk +++ b/package/ti-sgx-km/ti-sgx-km.mk @@ -17,13 +17,13 @@ TI_SGX_KM_MAKE_OPTS = \ KERNELDIR=$(LINUX_DIR) \ PVR_NULLDRM=1 -ifeq ($(BR2_PACKAGE_TI_SGX_AM335X),y) +ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y) TI_SGX_KM_PLATFORM_NAME = omap335x -else ifeq ($(BR2_PACKAGE_TI_SGX_AM437X),y) +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y) TI_SGX_KM_PLATFORM_NAME = omap437x -else ifeq ($(BR2_PACKAGE_TI_SGX_AM4430),y) +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y) TI_SGX_KM_PLATFORM_NAME = omap4430 -else ifeq ($(BR2_PACKAGE_TI_SGX_5430),y) +else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y) TI_SGX_KM_PLATFORM_NAME = omap5430 endif From 8553b3988717664a7130bcd58f54eb65cdb8c9e0 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 13 May 2018 21:07:36 +0200 Subject: [PATCH 1457/2640] libmediaart: rename options to have proper prefix Options should be prefixed by BR2_PACKAGE_LIBMEDIAART and not BR2_PACKAGE_MEDIAART, but package was using both prefixes. This was found as default symbol was defined as BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE (correct prefix), but symbol was actually BR2_PACKAGE_MEDIAART_BACKEND_NONE). This commit therefore renames the incorrectly named options, and adds Config.in.legacy handling. Since the options are part of a choice, the legacy handling cannot select the new options, and is only here to inform the user. Fixes: c443830a57 libmediaart: new package Signed-off-by: Petr Vorel [Thomas: improve commit log, add Config.in.legacy handling] Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/libmediaart/Config.in | 8 ++++---- package/libmediaart/libmediaart.mk | 6 +++--- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4c00080965..e7b0316a4f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,30 @@ endif ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_MEDIAART_BACKEND_NONE + bool "libmediaart none backend option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_MEDIAART_BACKEND_NONE has been renamed to + BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE + +config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF + bool "libmediaart gdk-pixbuf backend option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to + BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF + +config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF + bool "libmediaart qt backend option renamed" + select BR2_LEGACY + help + For consistency reasons, the option + BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to + BR2_PACKAGE_LIBMEDIAART_BACKEND_QT + config BR2_PACKAGE_TI_SGX_AM335X bool "ti-sgx-km AM335X option renamed" select BR2_LEGACY diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in index e5e770d4fc..e073677395 100644 --- a/package/libmediaart/Config.in +++ b/package/libmediaart/Config.in @@ -20,17 +20,17 @@ choice prompt "media art backend" default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE -config BR2_PACKAGE_MEDIAART_BACKEND_NONE +config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE bool "none" help With no backend, libmediaart will not be able to process MP3 album art. -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF bool "gdk-pixbuf" select BR2_PACKAGE_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_QT +config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT bool "Qt" depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT @@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5" endchoice -endif # BR2_PACKAGE_MEDIAART +endif # BR2_PACKAGE_LIBMEDIAART diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk index db4f1fa2a1..f64210c266 100644 --- a/package/libmediaart/libmediaart.mk +++ b/package/libmediaart/libmediaart.mk @@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES LIBMEDIAART_DEPENDENCIES = libglib2 LIBMEDIAART_CONF_OPTS = --disable-unit-tests -ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y) +ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y) LIBMEDIAART_DEPENDENCIES += gdk-pixbuf LIBMEDIAART_CONF_OPTS += \ --enable-gdkpixbuf \ --disable-qt -else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y) +else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y) # qt5 needs c++11 (since qt-5.7) ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" @@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \ LIBMEDIAART_CONF_OPTS += \ --disable-gdkpixbuf \ --enable-qt -else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y) +else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y) LIBMEDIAART_CONF_OPTS += \ --disable-gdkpixbuf \ --disable-qt From bd03966d4ebeb284ac3afb5f3b8cba13da2b9983 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 21 May 2018 15:29:42 -0500 Subject: [PATCH 1458/2640] toolchain: GCC bug 85862 GCC < 7.x hangs while building libnss for the Microblaze Arch. Discovered by http://autobuild.buildroot.net/results/158e8ebb39713e1b436a5cc1a1916f46c30694df Reported: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862 Simlar to: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49218 [Peter: tweak ecryptfs comment, add comment/dependencies for qt5webengine] Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- package/ecryptfs-utils/Config.in | 4 ++++ package/libnss/Config.in | 4 ++++ package/qt5/qt5webengine/Config.in | 6 ++++++ toolchain/Config.in | 8 ++++++++ 4 files changed, 22 insertions(+) diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in index bb4cc64488..6652d33e0e 100644 --- a/package/ecryptfs-utils/Config.in +++ b/package/ecryptfs-utils/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr depends on !BR2_MIPS_NABI32 # libnss depends on !BR2_STATIC_LIBS # libnss, keyutils + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # microblaze specific & GCC < 7.x select BR2_PACKAGE_KEYUTILS select BR2_PACKAGE_LIBNSS # runtime dependency only, some scripts are using the @@ -35,3 +36,6 @@ comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS + +comment "ecryptfs needs a toolchain not affected by GCC bug 85862" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss diff --git a/package/libnss/Config.in b/package/libnss/Config.in index 599c9a6536..34ddb91dfa 100644 --- a/package/libnss/Config.in +++ b/package/libnss/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBNSS depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 select BR2_PACKAGE_LIBNSPR select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB @@ -18,3 +19,6 @@ config BR2_PACKAGE_LIBNSS comment "libnss needs a toolchain w/ threads, dynamic library" depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "libnss needs a toolchain not affected by GCC bug 85862" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 969582712e..38486c6dcf 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -20,12 +20,18 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL +comment "qt5webengine needs a toolchain not affected by GCC bug 85862" + depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS + depends on !BR2_PACKAGE_QT5_VERSION_5_6 + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss + config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs diff --git a/toolchain/Config.in b/toolchain/Config.in index 121ddb4fa4..2479a6587c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -84,6 +84,14 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 default y if BR2_m68k_cf5208 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862 +# An infinite loop exists in the find_base_term() logic of 6.x +# on microblaze. http://autobuild.buildroot.net/results/158e8ebb39713e1b436a5cc1a1916f46c30694df/ +config BR2_TOOLCHAIN_HAS_GCC_BUG_85862 + bool + default y if BR2_microblaze + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool From 2136d0872d22923a06c11688b4ea7059f9d40db1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 21 May 2018 22:39:23 +0200 Subject: [PATCH 1459/2640] modem-manager: disable -Werror Fixes: http://autobuild.buildroot.net/results/5d9/5d9e299ff12726d07e8a584a213c1d2a2e419594/ The modem-manager build generates a number of build warnings like: mm-base-manager.c: In function 'handle_set_logging': mm-base-manager.c:680:15: error: assignment from incompatible pointer type [-Werror] ctx->self = g_object_ref (manager); Which cause a build failure because of -Werror. Pass --disable-more-warnings to disable -Werror. Signed-off-by: Peter Korsgaard --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 100c4a2941..fe4a7a95da 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -11,6 +11,7 @@ MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 libgudev MODEM_MANAGER_INSTALL_STAGING = YES +MODEM_MANAGER_CONF_OPTS = --disable-more-warnings ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) MODEM_MANAGER_DEPENDENCIES += libqmi From 24f62a921019b9ddddcc5babfa985364250df97d Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Tue, 22 May 2018 08:22:13 -0300 Subject: [PATCH 1460/2640] DEVELOPERS: add myself to modem-manager Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 656dead14c..efd331d20e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -408,6 +408,7 @@ N: Carlos Santos F: package/gtest/ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ +F: package/modem-manager/ F: package/perl-file-util/ F: package/util-linux/ F: package/tpm2-abrmd/ From c11ed3a4d961ed67e2b5845569cbbe214abdaa8d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 22 May 2018 23:26:26 +0200 Subject: [PATCH 1461/2640] Update for 2018.05-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 43 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 ++++++++-------- docs/website/news.html | 22 +++++++++++++++++++ 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index c386ef7cc6..4a51dafab5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,46 @@ +2018.05-rc2, Released May 22nd, 2018 + + Fixes all over the tree. + + Dependencies: Check that the current working directory (.) + isn't listed in PATH as that causes various build issues. + + Manual: Clarify that git branch names may not be used as + version identifiers. This has never been supported, but was + kind of working (with some limitations) before the git + download rework - Now it does not work at all. + + Linux: Ensure host version of ncurses is picked up and not + host-ncurses built by buildroot, as that otherwise causes + widechar/non-widechar conflicts and corrupted menuconfig + menus. + + Packages: Renamed a number of package options not prefixed + with BR2_PACKAGE_ for consstency. + + Download infrastructure: Fix file:// protocol handling after + download rework. + + Updated/fixed packages: acl, apr-util, asterisk, attr, + bluez5_utils, cifs-utils, clamav, clang, cups-filters, + dahdi-linux, exim, faketime, gdb, go, gst1-plugins-bad, + imx-mkimage, ipsec-tools, jamvm, janus-gateway, + jquery-ui-themes, libcap, libcurl, libftdi, libkcapi, libkrb5, + libmediaart, libmodbus, libmodplug, libmpd, + libnetfilter_cthelper, libnetfilter_cttimeout, libnfc, + libnfnetlink, libnss, liboauth, libogg, libosip2, + libpam-radius-auth, libpcap, libpciaccess, llvm, log4cplus, + ltrace, lynx, mbedtls, modem-manager, nfs-utils, + python-cython, python-websockets, qt5cinex, qt5wayland, rauc, + snort, strace, ti-sgx-km, transmission, wavpack, wget, woff2, + xen, zmqpp, znc, zstd + + Issues resolved (http://bugs.uclibc.org): + + #10986: Installing package attr when already supplied by... + #11011: BUildroot for Raspberry Pi 2 + #11016: Wrong compiler used for external user host packages + 2018.05-rc1, Released May 9th, 2018 Toolchain: glibc bumped to 2.27, musl bumped to 1.1.19, diff --git a/Makefile b/Makefile index 5fc435a225..3415f994bd 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.05-rc1 +export BR2_VERSION := 2018.05-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1525899000 +BR2_VERSION_EPOCH = 1527024000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 4ac00a27be..1ae05e9c62 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -77,37 +77,37 @@
    --> -

    Latest release candidate: 2018.05-rc1

    +

    Latest release candidate: 2018.05-rc2

    - +
    - +
    -

    buildroot-2018.05-rc1.tar.gz

    -

    PGP signature

    +

    buildroot-2018.05-rc2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2018.05-rc1.tar.bz2

    -

    PGP signature

    +

    buildroot-2018.05-rc2.tar.bz2

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index cb70b7119b..c14b108d1c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

    News

      +
    • +
      +
      +
      +

      2018.05-rc2 released

      +

      22 May 2018

      +
      +
      +

      Another week, another release candidate with more cleanups + and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2018.05-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From 3466298b0fa334e66050fede0629ad0f35baf21e Mon Sep 17 00:00:00 2001 From: John Faith Date: Tue, 22 May 2018 08:28:47 -0700 Subject: [PATCH 1462/2640] lttng-tools: Install to staging Install the LTTng control library headers and shared objects to staging. The C interface to LTTng described here: https://lttng.org/docs/v2.10/#doc-liblttng-ctl-lttng requires including and linking against liblttng-ctl, but those parts are not available unless this package does a staging install. Signed-off-by: John Faith Signed-off-by: Peter Korsgaard --- package/lttng-tools/lttng-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 59f64cc404..0898f09549 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -7,6 +7,7 @@ LTTNG_TOOLS_VERSION = 2.10.1 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 +LTTNG_TOOLS_INSTALL_STAGING = YES LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*) LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE LTTNG_TOOLS_CONF_OPTS += --disable-man-pages From 879aada6c6c4b0331f6231582032f66bd82a3104 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 22 May 2018 21:56:51 +0300 Subject: [PATCH 1463/2640] opkg: bump to version 0.3.6 Use upstream provided tarball and hash. The tarball conf/ subdirectory contains symlinks to host automake and libtool scripts. We can't rely on these being present or usable. Remove the symlinks, and keep autoreconf to populate the conf/ subdirectory using Buildroot provided autotools. Cc: Derek Baker Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/opkg/opkg.hash | 4 ++-- package/opkg/opkg.mk | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/opkg/opkg.hash b/package/opkg/opkg.hash index 80f3f0d1d2..321c41dbd0 100644 --- a/package/opkg/opkg.hash +++ b/package/opkg/opkg.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 2ec7157ccf866e49ca139e3632ba1ca9d61dc24382606b55062e423161a530b0 opkg-v0.3.1.tar.gz +# From http://downloads.yoctoproject.org/releases/opkg/SHA256SUMS +sha256 f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b opkg-0.3.6.tar.gz diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index 0c7e15ea75..4d34c6d4d3 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -4,15 +4,14 @@ # ################################################################################ -OPKG_VERSION = v0.3.1 -OPKG_SITE = http://git.yoctoproject.org/git/opkg -OPKG_SITE_METHOD = git -# Uses PKG_CHECK_MODULES() in configure.ac +OPKG_VERSION = 0.3.6 +OPKG_SITE = http://downloads.yoctoproject.org/releases/opkg OPKG_DEPENDENCIES = host-pkgconf libarchive OPKG_LICENSE = GPL-2.0+ OPKG_LICENSE_FILES = COPYING OPKG_INSTALL_STAGING = YES OPKG_CONF_OPTS = --disable-curl +# Populate the conf/ directory OPKG_AUTORECONF = YES # Ensure directory for lockfile exists @@ -20,6 +19,14 @@ define OPKG_CREATE_LOCKDIR mkdir -p $(TARGET_DIR)/usr/lib/opkg endef +# The conf/ directory contains symlinks to host automake and libtool provided +# scripts. Don't rely on them being present. +define OPKG_REMOVE_AUTOTOOLS_SYMLINKS + rm $(@D)/conf/* +endef + +OPKG_POST_EXTRACT_HOOKS += OPKG_REMOVE_AUTOTOOLS_SYMLINKS + ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y) OPKG_CONF_OPTS += --enable-gpg OPKG_CONF_ENV += \ From e0e35182a5fe9594de4d141fdb6784e9367a07da Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 22 May 2018 14:17:56 +0300 Subject: [PATCH 1464/2640] lz4: bump to version 1.8.2 Drop upstream patches. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...rictive-conditions-for-clock_gettime.patch | 58 ------------------ ...ib-allow-to-disable-shared-libraries.patch | 59 ------------------- package/lz4/lz4.hash | 2 +- package/lz4/lz4.mk | 2 +- 4 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 package/lz4/0001-use-more-restrictive-conditions-for-clock_gettime.patch delete mode 100644 package/lz4/0002-lib-allow-to-disable-shared-libraries.patch diff --git a/package/lz4/0001-use-more-restrictive-conditions-for-clock_gettime.patch b/package/lz4/0001-use-more-restrictive-conditions-for-clock_gettime.patch deleted file mode 100644 index 678f16abb7..0000000000 --- a/package/lz4/0001-use-more-restrictive-conditions-for-clock_gettime.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7dba09af47dd3daa1562a6332a643a1a59dba4a8 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Tue, 16 Jan 2018 10:21:37 -0800 -Subject: [PATCH] use more restrictive conditions for clock_gettime() - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 7dba09af47dd3 - - programs/util.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/programs/util.h b/programs/util.h -index fc7f63e8140e..a3576d7e3a57 100644 ---- a/programs/util.h -+++ b/programs/util.h -@@ -141,6 +141,7 @@ extern "C" { - * Time functions - ******************************************/ - #if defined(_WIN32) /* Windows */ -+ - typedef LARGE_INTEGER UTIL_time_t; - UTIL_STATIC UTIL_time_t UTIL_getTime(void) { UTIL_time_t x; QueryPerformanceCounter(&x); return x; } - UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) -@@ -165,7 +166,9 @@ extern "C" { - } - return 1000000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart; - } -+ - #elif defined(__APPLE__) && defined(__MACH__) -+ - #include - typedef U64 UTIL_time_t; - UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return mach_absolute_time(); } -@@ -189,7 +192,9 @@ extern "C" { - } - return ((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom); - } --#elif (PLATFORM_POSIX_VERSION >= 200112L) -+ -+#elif (PLATFORM_POSIX_VERSION >= 200112L) && (defined __UCLIBC__ || ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) || __GLIBC__ > 2)) -+ - #include - typedef struct timespec UTIL_time_t; - UTIL_STATIC UTIL_time_t UTIL_getTime(void) -@@ -227,7 +232,9 @@ extern "C" { - nano += diff.tv_nsec; - return nano; - } -+ - #else /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */ -+ - typedef clock_t UTIL_time_t; - UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return clock(); } - UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; } --- -2.17.0 - diff --git a/package/lz4/0002-lib-allow-to-disable-shared-libraries.patch b/package/lz4/0002-lib-allow-to-disable-shared-libraries.patch deleted file mode 100644 index 4f89e85577..0000000000 --- a/package/lz4/0002-lib-allow-to-disable-shared-libraries.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 95bde2a4ae4a92e984a5783ca1f09f44bf04fadb Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 19 Apr 2018 12:28:11 +0300 -Subject: [PATCH] lib: allow to disable shared libraries - -Just like BUILD_STATIC=no disables static libraries, BUILD_SHARED=no -disabled shared libraries. This is useful to support toolchains that do -not support shared libraries. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/lz4/lz4/pull/504 - - lib/Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/Makefile b/lib/Makefile -index dd33f50351a8..976d57cd75ed 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -42,6 +42,7 @@ LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) - LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT)) - LIBVER := $(shell echo $(LIBVER_SCRIPT)) - -+BUILD_SHARED:=yes - BUILD_STATIC:=yes - - CPPFLAGS+= -DXXH_NAMESPACE=LZ4_ -@@ -92,6 +93,7 @@ ifeq ($(BUILD_STATIC),yes) # can be disabled on command line - endif - - $(LIBLZ4): $(SRCFILES) -+ifeq ($(BUILD_SHARED),yes) # can be disabled on command line - @echo compiling dynamic library $(LIBVER) - ifneq (,$(filter Windows%,$(OS))) - @$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll\$@.dll -@@ -102,6 +104,7 @@ else - @ln -sf $@ liblz4.$(SHARED_EXT_MAJOR) - @ln -sf $@ liblz4.$(SHARED_EXT) - endif -+endif - - liblz4: $(LIBLZ4) - -@@ -159,9 +162,11 @@ ifeq ($(BUILD_STATIC),yes) - @$(INSTALL_DATA) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a - @$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(INCLUDEDIR)/lz4frame_static.h - endif -+ifeq ($(BUILD_SHARED),yes) - @$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) -+endif - @echo Installing headers in $(INCLUDEDIR) - @$(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h - @$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h --- -2.17.0 - diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash index bdc43d1e66..90bd217cdf 100644 --- a/package/lz4/lz4.hash +++ b/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 12f3a9e776a923275b2dc78ae138b4967ad6280863b77ff733028ce89b8123f9 lz4-v1.8.1.2.tar.gz +sha256 0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464 lz4-v1.8.2.tar.gz sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index c5540124e9..183df45649 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZ4_VERSION = v1.8.1.2 +LZ4_VERSION = v1.8.2 LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) From c75955baff986e61d320693edffb6a735d4aedcd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 May 2018 07:59:22 +0200 Subject: [PATCH 1465/2640] systemd: fix -Dlibidn2 option when libidn2 is not available Commit 4ded5d6af4f0198036183f00de190569d7578bc3 ("systemd: add optional dependency on libidn2") contained a mistake: -Dlibidn2=true was passed even when neither libidn nor libidn2 are available. Obviously it should be -Dlibidn2=false. Reported-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1e4b257731..8f7a9fa93c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -83,7 +83,7 @@ else ifeq ($(BR2_PACKAGE_LIBIDN),y) SYSTEMD_DEPENDENCIES += libidn SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false else -SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true +SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=false endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From fe07577181e178381a4aaf526da3a7c3fb4d8f6c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 21:19:04 +0300 Subject: [PATCH 1466/2640] procps-ng: security bump to version 3.3.15 Drop upstream patch. This release fixes the issues listed below. CVE-2018-1122: Local privilege escalation in top CVE-2018-1123: Denial of service in ps CVE-2018-1124: Local privilege escalation in libprocps CVE-2018-1125: Stack buffer overflow in pgrep CVE-2018-1126: Integer overflow in proc/alloc Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-proc-sig-fix-build-for-sparc.patch | 43 ------------------- package/procps-ng/procps-ng.hash | 8 ++-- package/procps-ng/procps-ng.mk | 2 +- 3 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch diff --git a/package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch b/package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch deleted file mode 100644 index 74f822aea3..0000000000 --- a/package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 070feb7c5ebd0f2ca721ca5d75bdd3fd8cffe961 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 27 Apr 2018 07:34:57 +0300 -Subject: [PATCH] proc/sig: fix build for sparc - -The code undefines SIGLOST which breaks references to SIGPWR. - -Taken from a patch suggested in upstream bug report #93. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://gitlab.com/procps-ng/procps/issues/93 ---- - proc/sig.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/proc/sig.c b/proc/sig.c -index b883185fc28a..6ca9512cc70c 100644 ---- a/proc/sig.c -+++ b/proc/sig.c -@@ -52,10 +52,6 @@ - # undef SIGSTKFLT - #endif - --#if !defined(__GNU__) && defined(SIGLOST) --# undef SIGLOST --#endif -- - #ifndef SIGRTMIN - # warning Standards require that define SIGRTMIN; assuming 32 - # define SIGRTMIN 32 -@@ -87,7 +83,7 @@ static const mapstruct sigtable[] = { - {"ILL", SIGILL}, - {"INT", SIGINT}, - {"KILL", SIGKILL}, --#ifdef SIGLOST -+#if defined(__GNU__) - {"LOST", SIGLOST}, /* Hurd-specific */ - #endif - {"PIPE", SIGPIPE}, --- -2.17.0 - diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 9488af2d9f..123db992ef 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 fce371ccc1c15a67af9d85e4057e559d procps-ng-3.3.14.tar.xz -sha1 fcc4631b1185f7250daecee2fcebe15efbbe0d65 procps-ng-3.3.14.tar.xz +md5 2b0717a7cb474b3d6dfdeedfbad2eccc procps-ng-3.3.15.tar.xz +sha1 2929bc64f0cf7b2db997eef79b7187658e47230d procps-ng-3.3.15.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.14.tar.xz.asc -sha256 5eda0253999b7d786e690edfa73301b3113c7a67058478866e98e9ff6736726c procps-ng-3.3.14.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.15.tar.xz.asc +sha256 10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 procps-ng-3.3.15.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 0d5ce9ddf0..e1fddea32c 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCPS_NG_VERSION = 3.3.14 +PROCPS_NG_VERSION = 3.3.15 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) From 6697e59403cfd837f4b07e44a89c3ce0d5db417b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 24 May 2018 20:51:18 +0300 Subject: [PATCH 1467/2640] lrzsz: install symlinks for XMODEM and YMODEM This sets the protocol choice according to the program invocation name. That is the common lrzsz installation practice. Cc: Matthew Starr Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 5dac07a295..25ecf3dead 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -24,6 +24,10 @@ define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz ln -sf rz $(TARGET_DIR)/usr/bin/lrz ln -sf sz $(TARGET_DIR)/usr/bin/lsz + ln -sf rz $(TARGET_DIR)/usr/bin/rb + ln -sf sz $(TARGET_DIR)/usr/bin/sb + ln -sf rz $(TARGET_DIR)/usr/bin/rx + ln -sf sz $(TARGET_DIR)/usr/bin/sx endef $(eval $(autotools-package)) From c3d9cfae39f16d39208f799c04e9048097485b80 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 22 May 2018 19:46:33 -0300 Subject: [PATCH 1468/2640] linux: bump default to version 4.16.11 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 29c8c7e4f2..f114b39cf4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 9e40a2d405128c22c4240fba3d66b2129789d0e3 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 22 May 2018 19:46:34 -0300 Subject: [PATCH 1469/2640] linux-headers: bump 4.{9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c7640f1ab2..fb5683c602 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -251,12 +251,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 default "4.4.131" if BR2_KERNEL_HEADERS_4_4 - default "4.9.101" if BR2_KERNEL_HEADERS_4_9 + default "4.9.102" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.42" if BR2_KERNEL_HEADERS_4_14 + default "4.14.43" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.10" if BR2_KERNEL_HEADERS_4_16 + default "4.16.11" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From f1dbb441cccae52c68e1c732be206d3968c0e521 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 23 May 2018 13:55:04 -0300 Subject: [PATCH 1470/2640] DEVELOPERS: update datacom email addresses We are moving from datacom.ind.br to datacom.com.br. The old domain will still be valid for an undefined period (probably forever). Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- DEVELOPERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index efd331d20e..f24ef2752e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -404,7 +404,7 @@ F: package/pps-tools/ N: Carlo Caione F: package/sunxi-boards/ -N: Carlos Santos +N: Carlos Santos F: package/gtest/ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ @@ -1596,7 +1596,7 @@ F: package/libhttpparser/ N: Rhys Williams F: package/lirc-tools/ -N: Ricardo Martincoski +N: Ricardo Martincoski F: package/atop/ N: Ricardo Martincoski @@ -1929,7 +1929,7 @@ F: package/wayland/ F: package/weston/ F: toolchain/ -N: Tiago Brusamarello +N: Tiago Brusamarello F: package/aer-inject/ N: Timo Ketola From 021e2d776463817fe9410fa847fca65c8caccf2c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 25 May 2018 06:30:43 +0300 Subject: [PATCH 1471/2640] busybox: bump to version 1.28.4 Fixes to dpkg and nsenter. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 8 ++++---- package/busybox/busybox.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 8537ceb4b7..066817aefb 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,7 +1,7 @@ -# From https://busybox.net/downloads/busybox-1.28.3.tar.bz2.sign -md5 82e5ad09ae4a07c266fc179492b51757 busybox-1.28.3.tar.bz2 -sha1 64b47e83dccc5db7fe4ca596b28c9b901a136fe3 busybox-1.28.3.tar.bz2 +# From https://busybox.net/downloads/busybox-1.28.4.tar.bz2.sign +md5 5661d013c9ef7cc31a453640c320f56b busybox-1.28.4.tar.bz2 +sha1 acd0558a659b795da1dfbd7e0ed5353d6836fa37 busybox-1.28.4.tar.bz2 # Locally calculated -sha256 ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e busybox-1.28.3.tar.bz2 +sha256 e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a busybox-1.28.4.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60a55a2c78..4ead637d65 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.28.3 +BUSYBOX_VERSION = 1.28.4 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 861103a1ad48460ef33357c703b39336e4a07d82 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 25 May 2018 07:07:26 +0300 Subject: [PATCH 1472/2640] libcoap: needs host-pkgconf The libcoap configure script uses pkg-config. Fixes: http://autobuild.buildroot.net/results/746/746c6dcbf3f941c7baa5b382bd264d830d839be1/ http://autobuild.buildroot.net/results/d98/d9840a22ae5eb6572b6641b93f8beadc27d2abb5/ http://autobuild.buildroot.net/results/905/905f122213ad9623ea5dd9d32c352efd151319f3/ Cc: Joris Lijssens Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libcoap/libcoap.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 31a6822dd3..4f87886ba0 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -9,6 +9,7 @@ LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = GPL-2.0+ or BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD +LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = --disable-examples LIBCOAP_AUTORECONF = YES From 2c57dc0469f7e32182932e5937f61f82b01a743a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 24 May 2018 23:14:43 +0200 Subject: [PATCH 1473/2640] cjson: bump to version 1.7.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index fd511afe6c..278484bdd3 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d1ca2665b34fea164a877637b4ad1624aa23390fe75de91b88e18c5d6ec91978 cjson-v1.7.6.tar.gz +sha256 6eb9d852a97ffbe149e747f54d63e39a674fa248bb24902a14c079803067949a cjson-v1.7.7.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index fabfe5df3b..e91ce9b4b2 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.7.6 +CJSON_VERSION = v1.7.7 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From c1bf88ba10f458650aff2dcccb613b68db60b945 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 23 May 2018 13:32:36 +0200 Subject: [PATCH 1474/2640] package: add python-webob Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-webob/Config.in | 9 +++++++++ package/python-webob/python-webob.hash | 5 +++++ package/python-webob/python-webob.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-webob/Config.in create mode 100644 package/python-webob/python-webob.hash create mode 100644 package/python-webob/python-webob.mk diff --git a/DEVELOPERS b/DEVELOPERS index 78c356fed9..63d554bf28 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1493,6 +1493,7 @@ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/python-texttable/ +F: package/python-webob/ F: package/python-websocket-client/ F: package/triggerhappy/ diff --git a/package/Config.in b/package/Config.in index b66f27a083..277186becb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -969,6 +969,7 @@ menu "External python modules" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" source "package/python-web2py/Config.in" + source "package/python-webob/Config.in" source "package/python-webpy/Config.in" source "package/python-websocket-client/Config.in" source "package/python-websockets/Config.in" diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in new file mode 100644 index 0000000000..fe77723f95 --- /dev/null +++ b/package/python-webob/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_WEBOB + bool "python-webob" + select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + help + WSGI request and response object. + + http://webob.org/ diff --git a/package/python-webob/python-webob.hash b/package/python-webob/python-webob.hash new file mode 100644 index 0000000000..41e8af34fe --- /dev/null +++ b/package/python-webob/python-webob.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/WebOb/json +md5 afea95e4f08330a0529ae33137caf4f0 WebOb-1.8.1.tar.gz +sha256 54f35073d2fdcddd7a98c2a1dedeede49739150737164a787220f30283139ba6 WebOb-1.8.1.tar.gz +# Locally computed sha256 checksums +sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/package/python-webob/python-webob.mk b/package/python-webob/python-webob.mk new file mode 100644 index 0000000000..fdf4793898 --- /dev/null +++ b/package/python-webob/python-webob.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-webob +# +################################################################################ + +PYTHON_WEBOB_VERSION = 1.8.1 +PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/ea/93/675ec37b631c823877718164b74fc057203c8979fd771bf60f711d64550b +PYTHON_WEBOB_SETUP_TYPE = setuptools +PYTHON_WEBOB_LICENSE = MIT +PYTHON_WEBOB_LICENSE_FILES = docs/license.txt + +$(eval $(python-package)) From 4b8b834e36c8f2b936998c1db85f6a45c73151f9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 23 May 2018 13:32:37 +0200 Subject: [PATCH 1475/2640] package: add python-request-id Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-request-id/Config.in | 7 +++++++ package/python-request-id/python-request-id.hash | 5 +++++ package/python-request-id/python-request-id.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-request-id/Config.in create mode 100644 package/python-request-id/python-request-id.hash create mode 100644 package/python-request-id/python-request-id.mk diff --git a/DEVELOPERS b/DEVELOPERS index 63d554bf28..3c2c032980 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1492,6 +1492,7 @@ F: package/python-functools32/ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ +F: package/python-request-id/ F: package/python-texttable/ F: package/python-webob/ F: package/python-websocket-client/ diff --git a/package/Config.in b/package/Config.in index 277186becb..6cd19ec97f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -914,6 +914,7 @@ menu "External python modules" source "package/python-raven/Config.in" source "package/python-reentry/Config.in" source "package/python-remi/Config.in" + source "package/python-request-id/Config.in" source "package/python-requests/Config.in" source "package/python-requests-oauthlib/Config.in" source "package/python-requests-toolbelt/Config.in" diff --git a/package/python-request-id/Config.in b/package/python-request-id/Config.in new file mode 100644 index 0000000000..39b5456d00 --- /dev/null +++ b/package/python-request-id/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_REQUEST_ID + bool "python-request-id" + select BR2_PACKAGE_PYTHON_WEBOB # runtime + help + Attach a unique identifier to every WSGI request. + + https://github.com/mmerickel/request_id diff --git a/package/python-request-id/python-request-id.hash b/package/python-request-id/python-request-id.hash new file mode 100644 index 0000000000..f412502b94 --- /dev/null +++ b/package/python-request-id/python-request-id.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/request-id/json +md5 29cdbb13f26c0e944e58cfbebfc52085 request-id-0.3.1.tar.gz +sha256 4c8adff44ad6779305d5493f780400aff5ff5139e98d622379c0e0797b58d812 request-id-0.3.1.tar.gz +# Locally computed sha256 checksums +sha256 2d65d17b4df34f184557b8031df05e4c264d2fa6b82e560be074967eff3b326c LICENSE.txt diff --git a/package/python-request-id/python-request-id.mk b/package/python-request-id/python-request-id.mk new file mode 100644 index 0000000000..96601b9750 --- /dev/null +++ b/package/python-request-id/python-request-id.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-request-id +# +################################################################################ + +PYTHON_REQUEST_ID_VERSION = 0.3.1 +PYTHON_REQUEST_ID_SOURCE = request-id-$(PYTHON_REQUEST_ID_VERSION).tar.gz +PYTHON_REQUEST_ID_SITE = https://files.pythonhosted.org/packages/2e/d4/bbe8cdd41012ba54d453452837101cecbb4151866b8aab6ca1ffb00d398c +PYTHON_REQUEST_ID_SETUP_TYPE = setuptools +PYTHON_REQUEST_ID_LICENSE = MIT +PYTHON_REQUEST_ID_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 08753b088909b447f989f9d211c74a18bb677294 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 10 May 2018 15:17:12 -0700 Subject: [PATCH 1476/2640] python-websockets: backport fix for upstream issue #350 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni (cherry picked from commit 439e2add6c39bb128e1a5f1fb624ecfb99948d5e) Signed-off-by: Peter Korsgaard --- ...ehavior-of-recv-in-the-CLOSING-state.patch | 261 ++++++++++++++++++ 1 file changed, 261 insertions(+) create mode 100644 package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch diff --git a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch new file mode 100644 index 0000000000..cb97b36bde --- /dev/null +++ b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch @@ -0,0 +1,261 @@ +From 402059e4a46a764632eba8a669f5b012f173ee7b Mon Sep 17 00:00:00 2001 +From: Aymeric Augustin +Date: Tue, 1 May 2018 17:05:05 +0200 +Subject: [PATCH] Fix behavior of recv() in the CLOSING state. + +The behavior wasn't tested correctly: in some test cases, the connection +had already moved to the CLOSED state, where the close code and reason +are already known. + +Refactor half_close_connection_{local,remote} to allow multiple runs of +the event loop while remaining in the CLOSING state. Refactor affected +tests accordingly. + +I verified that all tests in the CLOSING state were behaving is intended +by inserting debug statements in recv/send/ping/pong and running: + +$ PYTHONASYNCIODEBUG=1 python -m unittest -v websockets.test_protocol.{Client,Server}Tests.test_{recv,send,ping,pong}_on_closing_connection_{local,remote} + +Fix #317, #327, #350, #357. + +Signed-off-by: Joseph Kogut +--- + websockets/protocol.py | 10 ++--- + websockets/test_protocol.py | 78 +++++++++++++++++++++++++++++-------- + 2 files changed, 66 insertions(+), 22 deletions(-) + +diff --git a/websockets/protocol.py b/websockets/protocol.py +index f8121a1..7583fe9 100644 +--- a/websockets/protocol.py ++++ b/websockets/protocol.py +@@ -303,7 +303,7 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): + # Don't yield from self.ensure_open() here because messages could be + # received before the closing frame even if the connection is closing. + +- # Wait for a message until the connection is closed ++ # Wait for a message until the connection is closed. + next_message = asyncio_ensure_future( + self.messages.get(), loop=self.loop) + try: +@@ -315,15 +315,15 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): + next_message.cancel() + raise + +- # Now there's no need to yield from self.ensure_open(). Either a +- # message was received or the connection was closed. +- + if next_message in done: + return next_message.result() + else: + next_message.cancel() + if not self.legacy_recv: +- raise ConnectionClosed(self.close_code, self.close_reason) ++ assert self.state in [State.CLOSING, State.CLOSED] ++ # Wait until the connection is closed to raise ++ # ConnectionClosed with the correct code and reason. ++ yield from self.ensure_open() + + @asyncio.coroutine + def send(self, data): +diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py +index 70348fb..bfd4e3b 100644 +--- a/websockets/test_protocol.py ++++ b/websockets/test_protocol.py +@@ -105,7 +105,7 @@ class CommonTests: + self.loop.call_soon(self.loop.stop) + self.loop.run_forever() + +- def make_drain_slow(self, delay=3 * MS): ++ def make_drain_slow(self, delay=MS): + # Process connection_made in order to initialize self.protocol.writer. + self.run_loop_once() + +@@ -174,6 +174,8 @@ class CommonTests: + # Empty the outgoing data stream so we can make assertions later on. + self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) + ++ assert self.protocol.state is State.CLOSED ++ + def half_close_connection_local(self, code=1000, reason='close'): + """ + Start a closing handshake but do not complete it. +@@ -181,31 +183,56 @@ class CommonTests: + The main difference with `close_connection` is that the connection is + left in the CLOSING state until the event loop runs again. + ++ The current implementation returns a task that must be awaited or ++ cancelled, else asyncio complains about destroying a pending task. ++ + """ + close_frame_data = serialize_close(code, reason) +- # Trigger the closing handshake from the local side. +- self.ensure_future(self.protocol.close(code, reason)) ++ # Trigger the closing handshake from the local endpoint. ++ close_task = self.ensure_future(self.protocol.close(code, reason)) + self.run_loop_once() # wait_for executes + self.run_loop_once() # write_frame executes + # Empty the outgoing data stream so we can make assertions later on. + self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) +- # Prepare the response to the closing handshake from the remote side. +- self.loop.call_soon( +- self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) +- self.loop.call_soon(self.receive_eof_if_client) ++ ++ assert self.protocol.state is State.CLOSING ++ ++ # Complete the closing sequence at 1ms intervals so the test can run ++ # at each point even it goes back to the event loop several times. ++ self.loop.call_later( ++ MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) ++ self.loop.call_later(2 * MS, self.receive_eof_if_client) ++ ++ # This task must be awaited or cancelled by the caller. ++ return close_task + + def half_close_connection_remote(self, code=1000, reason='close'): + """ +- Receive a closing handshake. ++ Receive a closing handshake but do not complete it. + + The main difference with `close_connection` is that the connection is + left in the CLOSING state until the event loop runs again. + + """ ++ # On the server side, websockets completes the closing handshake and ++ # closes the TCP connection immediately. Yield to the event loop after ++ # sending the close frame to run the test while the connection is in ++ # the CLOSING state. ++ if not self.protocol.is_client: ++ self.make_drain_slow() ++ + close_frame_data = serialize_close(code, reason) +- # Trigger the closing handshake from the remote side. ++ # Trigger the closing handshake from the remote endpoint. + self.receive_frame(Frame(True, OP_CLOSE, close_frame_data)) +- self.receive_eof_if_client() ++ self.run_loop_once() # read_frame executes ++ # Empty the outgoing data stream so we can make assertions later on. ++ self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) ++ ++ assert self.protocol.state is State.CLOSING ++ ++ # Complete the closing sequence at 1ms intervals so the test can run ++ # at each point even it goes back to the event loop several times. ++ self.loop.call_later(2 * MS, self.receive_eof_if_client) + + def process_invalid_frames(self): + """ +@@ -335,11 +362,13 @@ class CommonTests: + self.assertEqual(data, b'tea') + + def test_recv_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.recv()) + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_recv_on_closing_connection_remote(self): + self.half_close_connection_remote() + +@@ -421,24 +450,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_send_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_send_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_send_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.send('foobar')) ++ + self.assertNoFrameSent() + + # Test the ping coroutine. +@@ -466,24 +500,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_ping_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_ping_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_ping_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.ping()) ++ + self.assertNoFrameSent() + + # Test the pong coroutine. +@@ -506,24 +545,29 @@ class CommonTests: + self.assertNoFrameSent() + + def test_pong_on_closing_connection_local(self): +- self.half_close_connection_local() ++ close_task = self.half_close_connection_local() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) ++ + self.assertNoFrameSent() + ++ self.loop.run_until_complete(close_task) # cleanup ++ + def test_pong_on_closing_connection_remote(self): + self.half_close_connection_remote() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) +- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) ++ ++ self.assertNoFrameSent() + + def test_pong_on_closed_connection(self): + self.close_connection() + + with self.assertRaises(ConnectionClosed): + self.loop.run_until_complete(self.protocol.pong()) ++ + self.assertNoFrameSent() + + # Test the protocol's logic for acknowledging pings with pongs. +-- +2.17.0 + From 71e33a927c00ab66d9c14732e40c051e48456d41 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Wed, 23 May 2018 14:58:29 -0700 Subject: [PATCH 1477/2640] python-websockets: bump to version 5.0 0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch is now upstream, so drop it. Signed-off-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- ...ehavior-of-recv-in-the-CLOSING-state.patch | 261 ------------------ package/python-websockets/Config.in | 3 +- .../python-websockets/python-websockets.hash | 7 +- .../python-websockets/python-websockets.mk | 6 +- 4 files changed, 9 insertions(+), 268 deletions(-) delete mode 100644 package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch diff --git a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch deleted file mode 100644 index cb97b36bde..0000000000 --- a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 402059e4a46a764632eba8a669f5b012f173ee7b Mon Sep 17 00:00:00 2001 -From: Aymeric Augustin -Date: Tue, 1 May 2018 17:05:05 +0200 -Subject: [PATCH] Fix behavior of recv() in the CLOSING state. - -The behavior wasn't tested correctly: in some test cases, the connection -had already moved to the CLOSED state, where the close code and reason -are already known. - -Refactor half_close_connection_{local,remote} to allow multiple runs of -the event loop while remaining in the CLOSING state. Refactor affected -tests accordingly. - -I verified that all tests in the CLOSING state were behaving is intended -by inserting debug statements in recv/send/ping/pong and running: - -$ PYTHONASYNCIODEBUG=1 python -m unittest -v websockets.test_protocol.{Client,Server}Tests.test_{recv,send,ping,pong}_on_closing_connection_{local,remote} - -Fix #317, #327, #350, #357. - -Signed-off-by: Joseph Kogut ---- - websockets/protocol.py | 10 ++--- - websockets/test_protocol.py | 78 +++++++++++++++++++++++++++++-------- - 2 files changed, 66 insertions(+), 22 deletions(-) - -diff --git a/websockets/protocol.py b/websockets/protocol.py -index f8121a1..7583fe9 100644 ---- a/websockets/protocol.py -+++ b/websockets/protocol.py -@@ -303,7 +303,7 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): - # Don't yield from self.ensure_open() here because messages could be - # received before the closing frame even if the connection is closing. - -- # Wait for a message until the connection is closed -+ # Wait for a message until the connection is closed. - next_message = asyncio_ensure_future( - self.messages.get(), loop=self.loop) - try: -@@ -315,15 +315,15 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): - next_message.cancel() - raise - -- # Now there's no need to yield from self.ensure_open(). Either a -- # message was received or the connection was closed. -- - if next_message in done: - return next_message.result() - else: - next_message.cancel() - if not self.legacy_recv: -- raise ConnectionClosed(self.close_code, self.close_reason) -+ assert self.state in [State.CLOSING, State.CLOSED] -+ # Wait until the connection is closed to raise -+ # ConnectionClosed with the correct code and reason. -+ yield from self.ensure_open() - - @asyncio.coroutine - def send(self, data): -diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py -index 70348fb..bfd4e3b 100644 ---- a/websockets/test_protocol.py -+++ b/websockets/test_protocol.py -@@ -105,7 +105,7 @@ class CommonTests: - self.loop.call_soon(self.loop.stop) - self.loop.run_forever() - -- def make_drain_slow(self, delay=3 * MS): -+ def make_drain_slow(self, delay=MS): - # Process connection_made in order to initialize self.protocol.writer. - self.run_loop_once() - -@@ -174,6 +174,8 @@ class CommonTests: - # Empty the outgoing data stream so we can make assertions later on. - self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) - -+ assert self.protocol.state is State.CLOSED -+ - def half_close_connection_local(self, code=1000, reason='close'): - """ - Start a closing handshake but do not complete it. -@@ -181,31 +183,56 @@ class CommonTests: - The main difference with `close_connection` is that the connection is - left in the CLOSING state until the event loop runs again. - -+ The current implementation returns a task that must be awaited or -+ cancelled, else asyncio complains about destroying a pending task. -+ - """ - close_frame_data = serialize_close(code, reason) -- # Trigger the closing handshake from the local side. -- self.ensure_future(self.protocol.close(code, reason)) -+ # Trigger the closing handshake from the local endpoint. -+ close_task = self.ensure_future(self.protocol.close(code, reason)) - self.run_loop_once() # wait_for executes - self.run_loop_once() # write_frame executes - # Empty the outgoing data stream so we can make assertions later on. - self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) -- # Prepare the response to the closing handshake from the remote side. -- self.loop.call_soon( -- self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) -- self.loop.call_soon(self.receive_eof_if_client) -+ -+ assert self.protocol.state is State.CLOSING -+ -+ # Complete the closing sequence at 1ms intervals so the test can run -+ # at each point even it goes back to the event loop several times. -+ self.loop.call_later( -+ MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) -+ self.loop.call_later(2 * MS, self.receive_eof_if_client) -+ -+ # This task must be awaited or cancelled by the caller. -+ return close_task - - def half_close_connection_remote(self, code=1000, reason='close'): - """ -- Receive a closing handshake. -+ Receive a closing handshake but do not complete it. - - The main difference with `close_connection` is that the connection is - left in the CLOSING state until the event loop runs again. - - """ -+ # On the server side, websockets completes the closing handshake and -+ # closes the TCP connection immediately. Yield to the event loop after -+ # sending the close frame to run the test while the connection is in -+ # the CLOSING state. -+ if not self.protocol.is_client: -+ self.make_drain_slow() -+ - close_frame_data = serialize_close(code, reason) -- # Trigger the closing handshake from the remote side. -+ # Trigger the closing handshake from the remote endpoint. - self.receive_frame(Frame(True, OP_CLOSE, close_frame_data)) -- self.receive_eof_if_client() -+ self.run_loop_once() # read_frame executes -+ # Empty the outgoing data stream so we can make assertions later on. -+ self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) -+ -+ assert self.protocol.state is State.CLOSING -+ -+ # Complete the closing sequence at 1ms intervals so the test can run -+ # at each point even it goes back to the event loop several times. -+ self.loop.call_later(2 * MS, self.receive_eof_if_client) - - def process_invalid_frames(self): - """ -@@ -335,11 +362,13 @@ class CommonTests: - self.assertEqual(data, b'tea') - - def test_recv_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.recv()) - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_recv_on_closing_connection_remote(self): - self.half_close_connection_remote() - -@@ -421,24 +450,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_send_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_send_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_send_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -+ - self.assertNoFrameSent() - - # Test the ping coroutine. -@@ -466,24 +500,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_ping_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_ping_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_ping_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -+ - self.assertNoFrameSent() - - # Test the pong coroutine. -@@ -506,24 +545,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_pong_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_pong_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_pong_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -+ - self.assertNoFrameSent() - - # Test the protocol's logic for acknowledging pings with pongs. --- -2.17.0 - diff --git a/package/python-websockets/Config.in b/package/python-websockets/Config.in index 7d80161a1a..888bec616f 100644 --- a/package/python-websockets/Config.in +++ b/package/python-websockets/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_WEBSOCKETS select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_PYTHON3_SSL help - An implementation of the WebSocket Protocol (RFC 6455) + An implementation of the WebSocket Protocol (RFC 6455 & + 7692). https://github.com/aaugustin/websockets diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 18947cc60a..2805e8a534 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/websockets/json, sha256 locally computed -md5 9e8c6b3c70def4146d75fbb0f52bdfc7 websockets-4.0.1.tar.gz -sha256 da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9 websockets-4.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/websockets/json +md5 fde30398f43401731ba38340a7031ab0 websockets-5.0.tar.gz +sha256 4ea90a598b546233a4c61bef98db4171ac30f1302826729af30001ac1f471098 websockets-5.0.tar.gz +# Locally computed sha256 checksums sha256 2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 7c5cf8c4e7..f7f2caaf0b 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 4.0.1 -PYTHON_WEBSOCKETS_SOURCE = websockets-${PYTHON_WEBSOCKETS_VERSION}.tar.gz -PYTHON_WEBSOCKETS_SITE = https://pypi.python.org/packages/b6/12/6194aac840c65253e45a38912e318f9ac548f9ba86d75bdb8fe66841b335 +PYTHON_WEBSOCKETS_VERSION = 5.0 +PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/0d/ea/0cc41f9ab63b4af08840a667b047d6fab6406aebb076932ef877a4511f78 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE From f1755c8784bf9f54e25b320edb464c7cdebf94fe Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 May 2018 17:58:46 +0200 Subject: [PATCH 1478/2640] package/bash-completion: fix a parallel build issue The STAGING_DIR/usr/share/bash-completion/completions directory is not created yet. Fixed by: https://github.com/scop/bash-completion/commit/ee6b37ad7ff5b309cbb9b886a871252abd9398fa Fixes: http://autobuild.buildroot.org/results/7ee/7eea0f512695605714cf2d8c971778d4784b4c75/build-end.log Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...file.am-Use-install-data-hook-not-in.patch | 35 +++++++++++++++++++ package/bash-completion/bash-completion.mk | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch diff --git a/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch b/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch new file mode 100644 index 0000000000..4d01eb6eea --- /dev/null +++ b/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch @@ -0,0 +1,35 @@ +From f9a1dfe7a3d0f35474b3f4ded05e3d97be5017bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Fri, 25 May 2018 17:38:59 +0200 +Subject: [PATCH] completions/Makefile.am: Use install-data-hook, not + install-data-local + +-hook is run after the main rule, while -local might end up before. +https://www.gnu.org/software/automake/manual/html_node/Extending.html#index-hook-targets + +Closes #212 + +[backported from ee6b37ad7ff5b309cbb9b886a871252abd9398fa] +Signed-off-by: Romain Naour +--- + completions/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/completions/Makefile.am b/completions/Makefile.am +index e442a9e..5c49796 100644 +--- a/completions/Makefile.am ++++ b/completions/Makefile.am +@@ -993,8 +993,8 @@ symlinks: $(targetdir) $(DATA) + all-local: targetdir = . + all-local: symlinks + +-install-data-local: targetdir = $(DESTDIR)$(bashcompdir) +-install-data-local: symlinks ++install-data-hook: targetdir = $(DESTDIR)$(bashcompdir) ++install-data-hook: symlinks + + check-local: + ret=0 +-- +2.7.4 + diff --git a/package/bash-completion/bash-completion.mk b/package/bash-completion/bash-completion.mk index 9976918648..c43fb15cd0 100644 --- a/package/bash-completion/bash-completion.mk +++ b/package/bash-completion/bash-completion.mk @@ -10,6 +10,9 @@ BASH_COMPLETION_SOURCE = bash-completion-$(BASH_COMPLETION_VERSION).tar.xz BASH_COMPLETION_LICENSE = GPL-2.0 BASH_COMPLETION_LICENSE_FILES = COPYING +# 0001-completions-Makefile.am-Use-install-data-hook-not-in.patch +BASH_COMPLETION_AUTORECONF = YES + # Install bash-completion.pc file BASH_COMPLETION_INSTALL_STAGING = YES From bfac65acd0a3e6273ae576f6317de5217840831f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 25 May 2018 15:13:56 -0300 Subject: [PATCH 1479/2640] linux: bump default to version 4.16.12 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index f114b39cf4..33d879588c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From eba30b1db8ca4b5d8a66d6f166d2a9d3fa5a0d07 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 25 May 2018 15:13:57 -0300 Subject: [PATCH 1480/2640] linux-headers: bump 4.{9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fb5683c602..6288811b38 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -251,12 +251,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 default "4.4.131" if BR2_KERNEL_HEADERS_4_4 - default "4.9.102" if BR2_KERNEL_HEADERS_4_9 + default "4.9.103" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.43" if BR2_KERNEL_HEADERS_4_14 + default "4.14.44" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.11" if BR2_KERNEL_HEADERS_4_16 + default "4.16.12" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7aaabe8fc04006b15bb5f9aaf08ac07603fcf7fe Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Fri, 25 May 2018 21:07:01 +0300 Subject: [PATCH 1481/2640] toolchain: Bump ARC tools to arc-2018.03-rc2 This commit bumps ARC toolchain to arc-2018.03-rc2, which includes significant changes since arc-2018.03-rc1. We want to test how new toolchain-rc2 builds packages, so we can make fixes before release of toolcain. This makes us closer to toolchain release which will be in a few weeks. Please note that it is a release candidate and it might contain some breakages, please don't use it for production builds. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- .../0002-ld-makefile.patch | 0 .../0003-check-ldrunpath-length.patch | 0 .../0004-add-sysroot-fix-from-bug-3049.patch | 0 .../0005-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 4 ++-- package/gcc/Config.in.host | 2 +- .../0100-uclibc-conf.patch | 0 .../0860-cilk-fix-build-without-wchar.patch | 0 .../0900-remove-selftests.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0002-ld-makefile.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0003-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0004-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0005-poison-system-directories.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0100-uclibc-conf.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0860-cilk-fix-build-without-wchar.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0900-remove-selftests.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 22478d917a..03b228168f 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -24,7 +24,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2018.03-rc1" if BR2_BINUTILS_VERSION_ARC + default "arc-2018.03-rc2" if BR2_BINUTILS_VERSION_ARC default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X diff --git a/package/binutils/arc-2018.03-rc1/0002-ld-makefile.patch b/package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0002-ld-makefile.patch rename to package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch diff --git a/package/binutils/arc-2018.03-rc1/0003-check-ldrunpath-length.patch b/package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0003-check-ldrunpath-length.patch rename to package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2018.03-rc1/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0004-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2018.03-rc1/0005-poison-system-directories.patch b/package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0005-poison-system-directories.patch rename to package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index ebe1f2ee24..c938222804 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,4 +4,4 @@ sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e8262 sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz # Locally calculated (fetched from Github) -sha512 7b8c4a5ec38a234b3ca097ce38e0e60628561251085fc83a614c8cf476eec53ca77ab34088987c80ce79772d5e2cc513b28a7df45f3dc5d0d3a82296e1f6474f binutils-arc-2018.03-rc1.tar.gz +sha512 c9d41001bd41d96f1cd78748c1e8df9715aab1158c0a1c9c90a2010e335c357d0d6816202b7fcf7c7d8d4a65e25920b0b35af6a59edd0d29fd9edddd8be95a48 binutils-arc-2018.03-rc2.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index b24e4334c2..be9e652e10 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2018.03-rc1 +BINUTILS_VERSION = arc-2018.03-rc2 else BINUTILS_VERSION = 2.29.1 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2018.03-rc1) +ifeq ($(BINUTILS_VERSION),arc-2018.03-rc2) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 7c08fb3596..00e72db032 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -73,7 +73,7 @@ config BR2_GCC_VERSION default "5.5.0" if BR2_GCC_VERSION_5_X default "6.4.0" if BR2_GCC_VERSION_6_X default "7.3.0" if BR2_GCC_VERSION_7_X - default "arc-2018.03-rc1" if BR2_GCC_VERSION_ARC + default "arc-2018.03-rc2" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/arc-2018.03-rc1/0100-uclibc-conf.patch b/package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0100-uclibc-conf.patch rename to package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch diff --git a/package/gcc/arc-2018.03-rc1/0860-cilk-fix-build-without-wchar.patch b/package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0860-cilk-fix-build-without-wchar.patch rename to package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch diff --git a/package/gcc/arc-2018.03-rc1/0900-remove-selftests.patch b/package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0900-remove-selftests.patch rename to package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index d9a651b547..817d04e390 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -8,6 +8,6 @@ sha512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bb sha512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 gcc-7.3.0.tar.xz # Locally calculated (fetched from Github) -sha512 16e5f9d1637be9a099a996074dc43803803497965c1eab6c0057f10d193d30dcc405ad852df82c4f8c61b195195ee797b788ba0b235d7b03e4410806ac5f94bc gcc-arc-2018.03-rc1.tar.gz +sha512 a0faf2bb34f6c72b6460c6432639d89915cfc63456cfdf016896b3ef075655b2e9f26e745d841bbc38e776bc7a3729359cca88f1e4fb83489fa6775a3ccb55b8 gcc-arc-2018.03-rc2.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index e8dd09e61c..0011966d88 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -74,7 +74,7 @@ endif # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2018.03-rc1-gdb" if BR2_arc + default "arc-2018.03-rc2-gdb" if BR2_arc default "7.10.1" if BR2_GDB_VERSION_7_10 default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB default "7.12.1" if BR2_GDB_VERSION_7_12 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index a2af7b35d9..cfbaac40f6 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,4 +5,4 @@ sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7 sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz # Locally calculated (fetched from Github) -sha512 975f0e09c9fd3ba1ca6aefdeb2da4b2804802606518c0cfdf7abe07c83a61341c1af5c2d2ddfd55ba6112fed420dedc529bc484d0c25b289bbed05edc99d0e72 gdb-arc-2018.03-rc1-gdb.tar.gz +sha512 0c58dd3e8fff8b51a459aba78f4acd1beaa3427e00a63a7242827f22c6af157e4aea91ab754cdc021e0075a5bf2b70df903dba67dbff2415fd0f82c8aab99087 gdb-arc-2018.03-rc2-gdb.tar.gz diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5a90e612b9..f19fa92af4 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) sha256 a74489d14f4017bee6a6c6fe76f1de0dbf7d66c8695116de5aadd141c4757892 glibc-glibc-2.27.tar.gz # Locally calculated (fetched from Github) -sha256 d88f60081285b639122a49425e5fcf8c8cbb0f05efde7a3cb206089fae53c232 glibc-arc-2018.03-rc1.tar.gz +sha256 ddc63360393ab88ab6a4a0c81d33481f34c5a9ebd758eec2e6bb35385058b4cb glibc-arc-2018.03-rc2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index c1c5ac687f..5711ede6d0 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2018.03-rc1 +GLIBC_VERSION = arc-2018.03-rc2 GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else # Generate version string using: From 9ee9adc747762347fe9e17d544bc5bc7b032e24c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 27 May 2018 09:40:21 -0300 Subject: [PATCH 1482/2640] linux-headers: bump 4.4.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6288811b38..74ea33c5b7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -250,7 +250,7 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 default "4.1.51" if BR2_KERNEL_HEADERS_4_1 - default "4.4.131" if BR2_KERNEL_HEADERS_4_4 + default "4.4.133" if BR2_KERNEL_HEADERS_4_4 default "4.9.103" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 From 775929c988db0197363a3c6f693fc3928bdb43de Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 23 May 2018 11:01:08 +0200 Subject: [PATCH 1483/2640] pkg-generic: error out with 'local' site method and no _SITE The 'local' site method is easily confused with the 'file' site method, making people create packages like this: FOO_SITE_METHOD = local FOO_SOURCE = foo.tar.gz $(eval $(generic-package)) Due to the intricacies of the generic package infra, this does not cause an error; instead, the foo.tar.gz tarball that happens to be present in the download directory will be used. This behaviour differs greatly from what is specified in the manual. Instead, error out immediately if a package specifies the 'local' site method but does not specify a _SITE. We check for _OVERRIDE_SRCDIR rather than checking for _SITE, just after _OVERRIDE_SRCDIR has been set to _SITE. Indeed, a package that sets _OVERRIDE_SRCDIR but not _SITE currently works correctly. There is no reason to make it fail. See also https://stackoverflow.com/questions/50364655/including-patches-to-build-root Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 8a3b5f90a9..9bd2358ef6 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -520,6 +520,9 @@ ifeq ($$($(2)_SITE_METHOD),local) ifeq ($$($(2)_OVERRIDE_SRCDIR),) $(2)_OVERRIDE_SRCDIR = $$($(2)_SITE) endif +ifeq ($$($(2)_OVERRIDE_SRCDIR),) +$$(error $(1) has local site method, but `$(2)_SITE` is not defined) +endif endif ifndef $(2)_LICENSE From f6b9d59f61b9084b1ae09e26e4bac5d6a1729cf6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 May 2018 10:49:16 +0200 Subject: [PATCH 1484/2640] wireguard: bump version to 0.0.20180524 Contains a number of fixes, including fixes for building with GCC 8. Signed-off-by: Peter Korsgaard --- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index 6cfc7bb9f0..7701424e4e 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2018-April/002697.html -sha256 b58cd2acf9e8d3fe9044c06c0056bd74da1f5673a456f011d36eee3f6fb1da16 WireGuard-0.0.20180420.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2018-May/002914.html +sha256 57614239c1f1a99a367f2c816153acda5bffada66a3b8e3b8215f1625784abc9 WireGuard-0.0.20180524.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index 20162e1d0f..ee68dc5580 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20180420 +WIREGUARD_VERSION = 0.0.20180524 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 From 4da86cd4be7606015d0bb9bb2540ca62b2630369 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Wed, 9 May 2018 13:41:16 -0500 Subject: [PATCH 1485/2640] xfsprogs: bump to 4.16.1 Resolves build failures like: http://autobuild.buildroot.net/results/953/95307f0f56c7ead1bd1f0ab0049aeb8b30fdc11c/ libunistring to libicu conversion required modifications to 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch and the libicu usage doesn't require the 0005-xfs_scrub-fix-cross-compile-with-libunistring.patch patch. I verified that the configuration time setup of the LIBICU library works correctly and doesn't require us to remove it. Upstream has reworked/included the following: 0003-workqueue-add-missing-pthreads-header.patch 0004-xfs_scrub-add-missing-paths-header.patch 0006-xfs_scrub-fix-build-with-older-kernel-headers.patch Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- ...-do-dynamic-linking-of-libtool-libra.patch | 6 +- ...orkqueue-add-missing-pthreads-header.patch | 41 ------------ ...4-xfs_scrub-add-missing-paths-header.patch | 37 ----------- ...-fix-cross-compile-with-libunistring.patch | 37 ----------- ...-fix-build-with-older-kernel-headers.patch | 63 ------------------- package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 9 ++- 7 files changed, 11 insertions(+), 184 deletions(-) delete mode 100644 package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch delete mode 100644 package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch delete mode 100644 package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch delete mode 100644 package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch diff --git a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch index 74636c2ebb..9030a2aac3 100644 --- a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch +++ b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch @@ -14,6 +14,8 @@ Signed-off-by: Vicente Olivert Riera [Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html] [baruch: update for v4.15.1; extend to include scrub] Signed-off-by: Baruch Siach +[matt: update for v4.16.1; adjusted libunistring -> libicu] +Signed-off-by: Matt Weber --- mdrestore/Makefile | 2 +- scrub/Makefile | 2 +- @@ -38,8 +40,8 @@ index 063279400262..949f6fd8ba94 100644 +++ b/scrub/Makefile @@ -70,7 +70,7 @@ xfs_scrub.c - LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT) - LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT) + LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT) + LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) -LLDFLAGS = -static +LLDFLAGS = -static-libtool-libs diff --git a/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch b/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch deleted file mode 100644 index e19261f033..0000000000 --- a/package/xfsprogs/0003-workqueue-add-missing-pthreads-header.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c05fc32d43b3870b63539c57428e1c52e3e7c3cd Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 16 Mar 2018 07:14:56 +0200 -Subject: [PATCH] workqueue: add missing pthreads header - -Fix the following build failure with musl libc: - -In file included from read_verify.c:25:0: -../include/workqueue.h:39:2: error: unknown type name 'pthread_t' - pthread_t *threads; - ^~~~~~~~~ -../include/workqueue.h:42:2: error: unknown type name 'pthread_mutex_t' - pthread_mutex_t lock; - ^~~~~~~~~~~~~~~ -../include/workqueue.h:43:2: error: unknown type name 'pthread_cond_t' - pthread_cond_t wakeup; - ^~~~~~~~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-xfs&m=152117771313565&w=2 - - include/workqueue.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/workqueue.h b/include/workqueue.h -index b4b3541701df..edb2f8ac5991 100644 ---- a/include/workqueue.h -+++ b/include/workqueue.h -@@ -22,6 +22,8 @@ - #ifndef _WORKQUEUE_H_ - #define _WORKQUEUE_H_ - -+#include -+ - struct workqueue; - - typedef void workqueue_func_t(struct workqueue *wq, uint32_t index, void *arg); --- -2.16.2 - diff --git a/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch b/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch deleted file mode 100644 index 7695cf35a7..0000000000 --- a/package/xfsprogs/0004-xfs_scrub-add-missing-paths-header.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 27747dcbfbde8a767b1a873716fce1d3aaf17c2f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 16 Mar 2018 07:16:19 +0200 -Subject: [PATCH] xfs_scrub: add missing paths header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the following build failure with musl libc: - -xfs_scrub.c: In function ‘main’: -xfs_scrub.c:670:11: error: ‘_PATH_MOUNTED’ undeclared (first use in this function) - mtab = _PATH_MOUNTED; - ^~~~~~~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-xfs&m=152117771313566&w=2 - - scrub/xfs_scrub.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c -index ab26e6335948..eedbe34ec7b3 100644 ---- a/scrub/xfs_scrub.c -+++ b/scrub/xfs_scrub.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.16.2 - diff --git a/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch b/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch deleted file mode 100644 index dfb66c6630..0000000000 --- a/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 45d9ba0f01cceb75f72d157a9e4d9aaeb753a9c4 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 20 Mar 2018 14:13:28 +0200 -Subject: [PATCH] xfs_scrub: fix cross compile with libunistring - -Commit 4bbed4ecc2a (xfs_scrub: warn about normalized Unicode name collisions) -added -lunistring to the list of the xfs_scrub dependencies. When cross -compiling make fails to find the library on the target sysroot: - -make[3]: *** No rule to make target `-lunistring', needed by `xfs_scrub'. Stop. - -Remove -lunistring from make dependencies of xfs_scrub to fix that. - -Cc: Darrick J. Wong -Signed-off-by: Baruch Siach ---- -Upstream status: https://patchwork.kernel.org/patch/10296957/ - - scrub/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scrub/Makefile b/scrub/Makefile -index 949f6fd8ba94..979603f524ff 100644 ---- a/scrub/Makefile -+++ b/scrub/Makefile -@@ -69,7 +69,7 @@ vfs.c \ - xfs_scrub.c - - LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT) --LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT) -+LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBRT) - LLDFLAGS = -static-libtool-libs - - ifeq ($(HAVE_MALLINFO),yes) --- -2.16.2 - diff --git a/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch b/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch deleted file mode 100644 index 9e1300d0cd..0000000000 --- a/package/xfsprogs/0006-xfs_scrub-fix-build-with-older-kernel-headers.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 7ea1df02d0f2549b6249c8bee1f6ae02bf1251a9 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 25 Mar 2018 00:01:23 +0300 -Subject: [PATCH] xfs_scrub: fix build with older kernel headers - -The OVERRIDE_SYSTEM_FSXATTR macro in include/linux.h is meant to -override the linux/fs.h kernel header provided struct fsxattr for -kernels older than v4.7. A few source files include linux/fs.h before -the local linux.h, making this override ineffective. Remove these header -includes from the source files, and rely on the linux.h include alone. - -This fixes the following build failures: - -In file included from ../include/xfs.h:37:0, - from disk.c:40: -../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr' - struct fsxattr { - ^~~~~~~ - -In file included from ../include/xfs.h:37:0, - from ../include/project.h:22, - from ../include/input.h:24, - from phase1.c:38: -../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr' - struct fsxattr { - ^~~~~~~ - -Cc: Darrick J. Wong -Signed-off-by: Baruch Siach ---- -Upstream status: https://patchwork.kernel.org/patch/10306419/ - - scrub/disk.c | 1 - - scrub/phase1.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/scrub/disk.c b/scrub/disk.c -index e12175c8656c..54d7a2a77c45 100644 ---- a/scrub/disk.c -+++ b/scrub/disk.c -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #ifdef HAVE_SG_IO - # include - #endif -diff --git a/scrub/phase1.c b/scrub/phase1.c -index 6cd544233c94..d15689e1b544 100644 ---- a/scrub/phase1.c -+++ b/scrub/phase1.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - #include "libfrog.h" - #include "workqueue.h" - #include "input.h" --- -2.16.2 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index c58dbb0766..4df2e8d9e4 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 27c36de9346a274143ad06c65b2fdbafd2806f3f37fa2c1235a08ed920d2bf3c xfsprogs-4.15.1.tar.xz +sha256 3d5c2da46112b86cbd967fee43cea731d38a1b2aaf601b57674ed34e808652df xfsprogs-4.16.1.tar.xz sha256 ee304b1b1da08b261f1d1f31d229fc70d2d0c552c7429e9e84c0fac878d94209 doc/COPYING diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index dffcc28ab7..814e0cf218 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 4.15.1 +XFSPROGS_VERSION = 4.16.1 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) @@ -20,8 +20,11 @@ XFSPROGS_CONF_OPTS = \ INSTALL_GROUP=root \ --enable-static -ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) -XFSPROGS_DEPENDENCIES += libunistring +ifeq ($(BR2_PACKAGE_ICU),y) +XFSPROGS_DEPENDENCIES += icu +XFSPROGS_CONF_OPTS += --enable-libicu +else +XFSPROGS_CONF_OPTS += --disable-libicu endif XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install From 82d882eef0939ff98622dc8ec1ae724ae65befbc Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Thu, 10 May 2018 00:13:09 +0530 Subject: [PATCH 1486/2640] board: amarula: vyasa: Give raw space for falcon mode RK3288 Vyasa board support falcon mode in U-Boot and SD layout start from 16MB offset for args and 17MB for uImage. So give full u-boot partition space as 30M so-that it can occupy bigger uImage file and doesn't overlap rootfs partition. [Peter: use # as comment character, clarify comment wording] Reported-by: Shyam Saini Tested-by: Shyam Saini Signed-off-by: Jagan Teki Signed-off-by: Shyam saini Signed-off-by: Peter Korsgaard --- board/amarula/vyasa/genimage.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/amarula/vyasa/genimage.cfg b/board/amarula/vyasa/genimage.cfg index fa41de3672..e7076679da 100644 --- a/board/amarula/vyasa/genimage.cfg +++ b/board/amarula/vyasa/genimage.cfg @@ -12,6 +12,7 @@ image sdcard.img { in-partition-table = "no" image = "u-boot-dtb.img" offset = 8M + size = 30M # falcon mode: args @ 16M args, uImage @ 17M } partition rootfs { From 4149aca2b360973925d571465f34e4a8d5653e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Oufella?= Date: Wed, 23 May 2018 09:46:08 -0400 Subject: [PATCH 1487/2640] qt-webkit-kiosk: bump to version 1.99.7-4-ga7720e5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This brings localstorage support in the app, plus a fix for the build issue logged at [1]. [1] http://autobuild.buildroot.net/results/f29fa8ef055fe0d41db5944974272530d02ecd29/ Signed-off-by: Jérôme Oufella Signed-off-by: Peter Korsgaard --- package/qt-webkit-kiosk/qt-webkit-kiosk.hash | 2 +- package/qt-webkit-kiosk/qt-webkit-kiosk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/package/qt-webkit-kiosk/qt-webkit-kiosk.hash index 8097c88c9d..666cb6ce55 100644 --- a/package/qt-webkit-kiosk/qt-webkit-kiosk.hash +++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 ec05f5bcb202265202a6f3ff74372516ce9beb82206ff67ca2b1b6fcb586ecd2 qt-webkit-kiosk-34efddb0bf0c36c8652f90dcd001db123f286f04.tar.gz +sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk index c279cbe7ce..a714fca9c9 100644 --- a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk +++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT_WEBKIT_KIOSK_VERSION = 34efddb0bf0c36c8652f90dcd001db123f286f04 +QT_WEBKIT_KIOSK_VERSION = a7720e50f2bd70aad99e0b465f5c4a57aca48127 QT_WEBKIT_KIOSK_SITE = https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk.git QT_WEBKIT_KIOSK_SITE_METHOD = git QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia From 4f50274e38946616eab41288ee037d9f565aeb9f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:45 +0300 Subject: [PATCH 1488/2640] libtirpc: add host package The libtirpc host package is only for two headers that the host rpcgen utility from the nfs-utils package needs to build. glibc used to provide these headers. In version 2.26 glibc deprecated them with its bundled Sun RPC. Recently Fedora stopped enabling Sun RPC in glibc. So we can no longer rely on these headers being present on the host. Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libtirpc/libtirpc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index d9bf22b83e..7bc361dc69 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -18,4 +18,11 @@ LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ" LIBTIRPC_CONF_OPTS = --disable-gssapi +define HOST_LIBTIRPC_INSTALL_CMDS + $(INSTALL) -D -m 0644 $(@D)/tirpc/rpc/types.h $(HOST_DIR)/include/rpc/types.h + $(INSTALL) -D -m 0644 $(@D)/tirpc/netconfig.h $(HOST_DIR)/include/netconfig.h +endef + $(eval $(autotools-package)) +# We are only copying headers; no need for the autotools infrastructure +$(eval $(host-generic-package)) From a0b92460c117f13bcfa910ea541200cf8433086b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:46 +0300 Subject: [PATCH 1489/2640] nfs-utils: add host package We only need the host package for the rpcgen utility. glibc deprecated this utility in version 2.26. Fedora has recently removed rpcgen from its glibc package. So we need to build the rpcgen from the nfs-utils package. The removal of Sun RPC from glibc also removed RPC headers from glibc. rpcgen needs two of these headers. Add host-libtirpc to provide the RPC headers. Tested-by: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 26112d69f2..9fa7ae200b 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -24,6 +24,20 @@ NFS_UTILS_CONF_OPTS = \ --with-statedir=/run/nfs \ --with-rpcgen=internal +HOST_NFS_UTILS_CONF_OPTS = \ + --disable-nfsv4 \ + --disable-nfsv41 \ + --disable-gss \ + --disable-uuid \ + --disable-ipv6 \ + --without-tcp-wrappers \ + --with-statedir=/run/nfs \ + --disable-caps \ + --disable-tirpc \ + --without-systemd \ + --with-rpcgen=internal +HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc + NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad @@ -89,4 +103,13 @@ endef # nfsiostat is interpreted python, so remove it unless it's in the target NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) +define HOST_NFS_UTILS_BUILD_CMDS + $(MAKE) -C $(@D)/tools/rpcgen +endef + +define HOST_NFS_UTILS_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/tools/rpcgen/rpcgen $(HOST_DIR)/bin/rpcgen +endef + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From d200fabc5a588998cfaf07f6ee3fa16a750d0bb5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:47 +0300 Subject: [PATCH 1490/2640] quota: depend on host-nfs-utils host-nfs-utils provides the host rpcgen utility. This fixes the build on recent Fedora systems that removed rpcgen from the glibc package. Fixes: http://autobuild.buildroot.net/results/730/730acb23663ebbbaba847073979654670a8bc64c/ http://autobuild.buildroot.net/results/e49/e49932e9d958203d585cdddd795df06aad6ff3a9/ http://autobuild.buildroot.net/results/1b7/1b7dccf7b9742d1b9cb57bffe55eac5cfc66b15c/ Cc: Jarkko Sakkinen Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/quota/quota.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 5bd9013d6a..38e18a60c2 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -6,7 +6,7 @@ QUOTA_VERSION = 4.01 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) -QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_AUTORECONF = YES QUOTA_LICENSE = GPL-2.0+ QUOTA_CONF_OPTS = --disable-strip-binaries From 60fc73adc72b9faa3b52599efc69213dd1f0172c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:48 +0300 Subject: [PATCH 1491/2640] samba4: depend on host-nfs-utils host-nfs-utils provides the host rpcgen utility. This fixes the build on recent Fedora systems that removed rpcgen from the glibc package. Fixes: http://autobuild.buildroot.net/results/6f8/6f869b8c7c182dfe7f1a291b5952320504540ebf/ http://autobuild.buildroot.net/results/4c2/4c228dd6369e4fc11b798af6ab2abe06d7473b78/ http://autobuild.buildroot.net/results/489/489be441abd19fba2b0c39357e64a6adcf773b60/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index c77bc04a89..b03af34cd0 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -11,7 +11,7 @@ SAMBA4_INSTALL_STAGING = YES SAMBA4_LICENSE = GPL-3.0+ SAMBA4_LICENSE_FILES = COPYING SAMBA4_DEPENDENCIES = \ - host-e2fsprogs host-heimdal host-python \ + host-e2fsprogs host-heimdal host-python host-nfs-utils \ e2fsprogs popt python zlib \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ From dec494f9f58111ee1cd69048114b56f10a159272 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:49 +0300 Subject: [PATCH 1492/2640] autofs: depend on host-nfs-utils host-nfs-utils provides the host rpcgen utility. This fixes the build on recent Fedora systems that removed rpcgen from the glibc package. Fixes: http://autobuild.buildroot.net/results/383/383bc8462f32a226645c9b792b8d65a25d74529d/ http://autobuild.buildroot.net/results/0c0/0c00f72512754b721813e13f0828d3a942f7b955/ http://autobuild.buildroot.net/results/50b/50b66d2a3c8264f618d7aa813b10050ed147209f/ Cc: Jonathan Ben Avraham Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/autofs/autofs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index 87a218441e..e7c65ef4b0 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -9,7 +9,7 @@ AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ AUTOFS_LICENSE_FILES = COPYING COPYRIGHT -AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf +AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils # autofs looks on the build machine for the path of modprobe, so tell # it explicitly where it will be located on the target. From 0965080fbcaf9e3f168a799cce0eefbc76c8e5a5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 May 2018 20:44:50 +0300 Subject: [PATCH 1493/2640] libtirpc: use rpcgen from host-nfs-utils Drop the patch adding local rpcgen. Instead use the host-nfs-utils provided rpcgen. Update the patch "Automatically generate XDR header files from .x sources using" to use external rpcgen. Renumber the other patches. Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...pcgen-program-from-nfs-utils-sources.patch | 6508 ----------------- ...erate-XDR-header-files-from-.x-sour.patch} | 35 +- ...s-needed-to-build-rpcbind-on-top-of.patch} | 0 ...isable-DES-authentification-support.patch} | 0 ...0006-include-stdint.h-for-uintptr_t.patch} | 0 package/libtirpc/libtirpc.mk | 1 + 6 files changed, 18 insertions(+), 6526 deletions(-) delete mode 100644 package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch rename package/libtirpc/{0004-Automatically-generate-XDR-header-files-from-.x-sour.patch => 0003-Automatically-generate-XDR-header-files-from-.x-sour.patch} (98%) rename package/libtirpc/{0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch => 0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch} (100%) rename package/libtirpc/{0006-Disable-DES-authentification-support.patch => 0005-Disable-DES-authentification-support.patch} (100%) rename package/libtirpc/{0007-include-stdint.h-for-uintptr_t.patch => 0006-include-stdint.h-for-uintptr_t.patch} (100%) diff --git a/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch b/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch deleted file mode 100644 index f2b15fe2f1..0000000000 --- a/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch +++ /dev/null @@ -1,6508 +0,0 @@ -From 866b651bcb9f93f47582e5e2e4f1eb3155025298 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 16:21:01 +0100 -Subject: [PATCH] Add rpcgen program from nfs-utils sources - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 2 +- - configure.ac | 14 +- - rpcgen/Makefile.am | 22 ++ - rpcgen/rpc_clntout.c | 217 ++++++++++ - rpcgen/rpc_cout.c | 706 +++++++++++++++++++++++++++++++++ - rpcgen/rpc_hout.c | 490 +++++++++++++++++++++++ - rpcgen/rpc_main.c | 1067 ++++++++++++++++++++++++++++++++++++++++++++++++++ - rpcgen/rpc_output.h | 16 + - rpcgen/rpc_parse.c | 609 ++++++++++++++++++++++++++++ - rpcgen/rpc_parse.h | 166 ++++++++ - rpcgen/rpc_sample.c | 247 ++++++++++++ - rpcgen/rpc_scan.c | 474 ++++++++++++++++++++++ - rpcgen/rpc_scan.h | 103 +++++ - rpcgen/rpc_svcout.c | 882 +++++++++++++++++++++++++++++++++++++++++ - rpcgen/rpc_tblout.c | 165 ++++++++ - rpcgen/rpc_util.c | 479 ++++++++++++++++++++++ - rpcgen/rpc_util.h | 166 ++++++++ - rpcgen/rpcgen.1 | 521 ++++++++++++++++++++++++ - 18 files changed, 6344 insertions(+), 2 deletions(-) - create mode 100644 rpcgen/Makefile.am - create mode 100644 rpcgen/rpc_clntout.c - create mode 100644 rpcgen/rpc_cout.c - create mode 100644 rpcgen/rpc_hout.c - create mode 100644 rpcgen/rpc_main.c - create mode 100644 rpcgen/rpc_output.h - create mode 100644 rpcgen/rpc_parse.c - create mode 100644 rpcgen/rpc_parse.h - create mode 100644 rpcgen/rpc_sample.c - create mode 100644 rpcgen/rpc_scan.c - create mode 100644 rpcgen/rpc_scan.h - create mode 100644 rpcgen/rpc_svcout.c - create mode 100644 rpcgen/rpc_tblout.c - create mode 100644 rpcgen/rpc_util.c - create mode 100644 rpcgen/rpc_util.h - create mode 100644 rpcgen/rpcgen.1 - -diff --git a/Makefile.am b/Makefile.am -index 466b6dd..8558289 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src man doc -+SUBDIRS = src man doc rpcgen - ACLOCAL_AMFLAGS = -I m4 - - noinst_HEADERS = tirpc/reentrant.h \ -diff --git a/configure.ac b/configure.ac -index e3cb8af..0ea2e6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,18 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netine - AC_CHECK_LIB([pthread], [pthread_create]) - AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) - --AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) -+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -+ -+AC_MSG_CHECKING([for a C compiler for build tools]) -+if test $cross_compiling = yes; then -+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) -+else -+ CC_FOR_BUILD=$CC -+fi -+AC_MSG_RESULT([$CC_FOR_BUILD]) -+AC_SUBST(CC_FOR_BUILD) -+ -+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile]) -+ - AC_OUTPUT(libtirpc.pc) - -diff --git a/rpcgen/Makefile.am b/rpcgen/Makefile.am -new file mode 100644 -index 0000000..2277b6f ---- /dev/null -+++ b/rpcgen/Makefile.am -@@ -0,0 +1,22 @@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -I../tirpc $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ -+ -+noinst_PROGRAMS = rpcgen -+ -+rpcgen_SOURCES = \ -+ rpc_clntout.c \ -+ rpc_cout.c \ -+ rpc_hout.c \ -+ rpc_main.c \ -+ rpc_parse.c \ -+ rpc_sample.c \ -+ rpc_scan.c \ -+ rpc_svcout.c \ -+ rpc_tblout.c \ -+ rpc_util.c \ -+ rpc_parse.h \ -+ rpc_scan.h \ -+ rpc_util.h -+ -+dist_man1_MANS = rpcgen.1 -diff --git a/rpcgen/rpc_clntout.c b/rpcgen/rpc_clntout.c -new file mode 100644 -index 0000000..e2f4382 ---- /dev/null -+++ b/rpcgen/rpc_clntout.c -@@ -0,0 +1,217 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler -+ * Copyright (C) 1987, Sun Microsytsems, Inc. -+ */ -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+/* extern pdeclaration(); */ -+/* void printarglist(); */ -+ -+#define DEFAULT_TIMEOUT 25 /* in seconds */ -+static char RESULT[] = "clnt_res"; -+ -+static void write_program(definition *def); -+static void printbody(proc_list *proc); -+ -+ -+void -+write_stubs(void) -+{ -+ list *l; -+ definition *def; -+ -+ f_print(fout, -+ "\n/* Default timeout can be changed using clnt_control() */\n"); -+ f_print(fout, "static struct timeval TIMEOUT = { %d, 0 };\n", -+ DEFAULT_TIMEOUT); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_program(def); -+ } -+ } -+} -+ -+static void -+write_program(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, "*\n"); -+ pvname(proc->proc_name, vp->vers_num); -+ printarglist(proc, "clnt", "CLIENT *"); -+ f_print(fout, "{\n"); -+ printbody(proc); -+ f_print(fout, "}\n"); -+ } -+ } -+} -+ -+/* -+ * Writes out declarations of procedure's argument list. -+ * In either ANSI C style, in one of old rpcgen style (pass by reference), -+ * or new rpcgen style (multiple arguments, pass by value); -+ */ -+ -+/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */ -+ -+void -+printarglist(proc_list *proc, char *addargname, char *addargtype) -+{ -+ -+ decl_list *l; -+ -+ if (!newstyle) { /* old style: always pass arg by reference */ -+ if (Cflag) { /* C++ style heading */ -+ f_print(fout, "("); -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ f_print(fout, "*argp, %s%s)\n", addargtype, addargname); -+ } else { -+ f_print(fout, "(argp, %s)\n", addargname); -+ f_print(fout, "\t"); -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ f_print(fout, "*argp;\n"); -+ } -+ } else if (streq(proc->args.decls->decl.type, "void")) { -+ /* newstyle, 0 argument */ -+ if (Cflag) -+ f_print(fout, "(%s%s)\n", addargtype, addargname); -+ else -+ f_print(fout, "(%s)\n", addargname); -+ } else { -+ /* new style, 1 or multiple arguments */ -+ if (!Cflag) { -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) -+ f_print(fout, "%s, ", l->decl.name); -+ f_print(fout, "%s)\n", addargname); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pdeclaration(proc->args.argname, &l->decl, 1, ";\n"); -+ } -+ } else { /* C++ style header */ -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pdeclaration(proc->args.argname, &l->decl, 0, ", "); -+ } -+ f_print(fout, " %s%s)\n", addargtype, addargname); -+ } -+ } -+ -+ if (!Cflag) -+ f_print(fout, "\t%s%s;\n", addargtype, addargname); -+} -+ -+ -+ -+static char * -+ampr(char *type) -+{ -+ if (isvectordef(type, REL_ALIAS)) { -+ return (""); -+ } else { -+ return ("&"); -+ } -+} -+ -+static void -+printbody(proc_list *proc) -+{ -+ decl_list *l; -+ bool_t args2 = (proc->arg_num > 1); -+ -+ /* For new style with multiple arguments, need a structure in which -+ * to stuff the arguments. */ -+ if (newstyle && args2) { -+ f_print(fout, "\t%s", proc->args.argname); -+ f_print(fout, " arg;\n"); -+ } -+ f_print(fout, "\tstatic "); -+ if (streq(proc->res_type, "void")) { -+ f_print(fout, "char "); -+ } else { -+ ptype(proc->res_prefix, proc->res_type, 0); -+ } -+ f_print(fout, "%s;\n", RESULT); -+ f_print(fout, "\n"); -+ f_print(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n", -+ ampr(proc->res_type), RESULT, RESULT); -+ if (newstyle && !args2 && (streq(proc->args.decls->decl.type, "void"))) { -+ /* newstyle, 0 arguments */ -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_void, (caddr_t) NULL, " -+ "(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ -+ } else if (newstyle && args2) { -+ /* newstyle, multiple arguments: stuff arguments into structure */ -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ f_print(fout, "\targ.%s = %s;\n", -+ l->decl.name, l->decl.name); -+ } -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, (caddr_t) &arg, " -+ "(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, proc->args.argname, -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ } else { /* single argument, new or old style */ -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, " -+ "(caddr_t) %s%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, -+ stringfix(proc->args.decls->decl.type), -+ (newstyle ? "&" : ""), -+ (newstyle ? proc->args.decls->decl.name : "argp"), -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ } -+ f_print(fout, "\t\treturn (NULL);\n"); -+ f_print(fout, "\t}\n"); -+ if (streq(proc->res_type, "void")) { -+ f_print(fout, "\treturn ((void *)%s%s);\n", -+ ampr(proc->res_type), RESULT); -+ } else { -+ f_print(fout, "\treturn (%s%s);\n", ampr(proc->res_type), RESULT); -+ } -+} -diff --git a/rpcgen/rpc_cout.c b/rpcgen/rpc_cout.c -new file mode 100644 -index 0000000..a61214f ---- /dev/null -+++ b/rpcgen/rpc_cout.c -@@ -0,0 +1,706 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_cout.c, XDR routine outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static int findtype(definition *def, char *type); -+static int undefined(char *type); -+static void print_generic_header(char *procname, int pointerp); -+static void print_header(definition *def); -+static void print_prog_header(proc_list *plist); -+static void print_trailer(void); -+static void print_ifopen(int indent, char *name); -+static void print_ifarg(char *arg); -+static void print_ifsizeof(char *prefix, char *type); -+static void print_ifclose(int indent); -+static void print_ifstat(int indent, char *prefix, char *type, relation rel, -+ char *amax, char *objname, char *name); -+static void emit_enum(definition *def); -+static void emit_program(definition *def); -+static void emit_union(definition *def); -+static void emit_struct(definition *def); -+static void emit_typedef(definition *def); -+static void print_stat(int indent, declaration *dec); -+static void emit_inline(declaration *decl, int flag); -+static void emit_single_in_line(declaration *decl, int flag, relation rel); -+static char * upcase(char *str); -+ -+/* -+ * Emit the C-routine for the given definition -+ */ -+void -+emit(definition *def) -+{ -+ if (def->def_kind == DEF_CONST) { -+ return; -+ } -+ if (def->def_kind == DEF_PROGRAM) { -+ emit_program(def); -+ return; -+ } -+ if (def->def_kind == DEF_TYPEDEF) { -+ /* now we need to handle declarations like -+ * struct typedef foo foo; -+ * since we dont want this to be expanded into 2 calls -+ * to xdr_foo */ -+ -+ if (strcmp(def->def.ty.old_type, def->def_name) == 0) -+ return; -+ }; -+ -+ print_header(def); -+ switch (def->def_kind) { -+ case DEF_UNION: -+ emit_union(def); -+ break; -+ case DEF_ENUM: -+ emit_enum(def); -+ break; -+ case DEF_STRUCT: -+ emit_struct(def); -+ break; -+ case DEF_TYPEDEF: -+ emit_typedef(def); -+ break; -+ default: -+ break; -+ } -+ print_trailer(); -+} -+ -+static int -+findtype(definition *def, char *type) -+{ -+ -+ if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) { -+ return (0); -+ } else { -+ return (streq(def->def_name, type)); -+ } -+} -+ -+static int -+undefined(char *type) -+{ -+ definition *def; -+ -+ def = (definition *) FINDVAL(defined, type, findtype); -+ -+ return (def == NULL); -+} -+ -+ -+static void -+print_generic_header(char *procname, int pointerp) -+{ -+ f_print(fout, "\n"); -+ f_print(fout, "bool_t\n"); -+ if (Cflag) { -+ f_print(fout, "xdr_%s(", procname); -+ f_print(fout, "XDR *xdrs, "); -+ f_print(fout, "%s ", procname); -+ if (pointerp) -+ f_print(fout, "*"); -+ f_print(fout, "objp)\n{\n\n"); -+ } else { -+ f_print(fout, "xdr_%s(xdrs, objp)\n", procname); -+ f_print(fout, "\tXDR *xdrs;\n"); -+ f_print(fout, "\t%s ", procname); -+ if (pointerp) -+ f_print(fout, "*"); -+ f_print(fout, "objp;\n{\n\n"); -+ } -+} -+ -+static void -+print_header(definition *def) -+{ -+ print_generic_header(def->def_name, -+ def->def_kind != DEF_TYPEDEF || -+ !isvectordef(def->def.ty.old_type, def->def.ty.rel)); -+ -+ /* Now add Inline support */ -+ -+ -+ if (Inline == 0) -+ return; -+} -+ -+static void -+print_prog_header(proc_list *plist) -+{ -+ print_generic_header(plist->args.argname, 1); -+} -+ -+static void -+print_trailer(void) -+{ -+ f_print(fout, "\treturn (TRUE);\n"); -+ f_print(fout, "}\n"); -+} -+ -+ -+static void -+print_ifopen(int indent, char *name) -+{ -+ tabify(fout, indent); -+ f_print(fout, " if (!xdr_%s(xdrs", name); -+} -+ -+static void -+print_ifarg(char *arg) -+{ -+ f_print(fout, ", %s", arg); -+} -+ -+static void -+print_ifsizeof(char *prefix, char *type) -+{ -+ if (streq(type, "bool")) { -+ f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool"); -+ } else { -+ f_print(fout, ", sizeof("); -+ if (undefined(type) && prefix) { -+ f_print(fout, "%s ", prefix); -+ } -+ f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type); -+ } -+} -+ -+static void -+print_ifclose(int indent) -+{ -+ f_print(fout, ")) {\n"); -+ tabify(fout, indent); -+ f_print(fout, "\t return (FALSE);\n"); -+ tabify(fout, indent); -+ f_print(fout, " }\n"); -+} -+ -+static void -+print_ifstat(int indent, char *prefix, char *type, relation rel, -+ char *amax, char *objname, char *name) -+{ -+ char *alt = NULL; -+ -+ switch (rel) { -+ case REL_POINTER: -+ print_ifopen(indent, "pointer"); -+ print_ifarg("(char **)"); -+ f_print(fout, "%s", objname); -+ print_ifsizeof(prefix, type); -+ break; -+ case REL_VECTOR: -+ if (streq(type, "string")) { -+ alt = "string"; -+ } else if (streq(type, "opaque")) { -+ alt = "opaque"; -+ } -+ if (alt) { -+ print_ifopen(indent, alt); -+ print_ifarg(objname); -+ } else { -+ print_ifopen(indent, "vector"); -+ print_ifarg("(char *)"); -+ f_print(fout, "%s", objname); -+ } -+ print_ifarg(amax); -+ if (!alt) { -+ print_ifsizeof(prefix, type); -+ } -+ break; -+ case REL_ARRAY: -+ if (streq(type, "string")) { -+ alt = "string"; -+ } else if (streq(type, "opaque")) { -+ alt = "bytes"; -+ } -+ if (streq(type, "string")) { -+ print_ifopen(indent, alt); -+ print_ifarg(objname); -+ } else { -+ if (alt) { -+ print_ifopen(indent, alt); -+ } else { -+ print_ifopen(indent, "array"); -+ } -+ /* The (void*) avoids a gcc-4.1 warning */ -+ print_ifarg("(char **)(void*)"); -+ if (*objname == '&') { -+ f_print(fout, "%s.%s_val, (u_int *)%s.%s_len", -+ objname, name, objname, name); -+ } else { -+ f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len", -+ objname, name, objname, name); -+ } -+ } -+ print_ifarg(amax); -+ if (!alt) { -+ print_ifsizeof(prefix, type); -+ } -+ break; -+ case REL_ALIAS: -+ print_ifopen(indent, type); -+ print_ifarg(objname); -+ break; -+ } -+ print_ifclose(indent); -+} -+ -+static void -+emit_enum(definition *def) -+{ -+ print_ifopen(1, "enum"); -+ print_ifarg("(enum_t *)objp"); -+ print_ifclose(1); -+} -+ -+static void -+emit_program(definition *def) -+{ -+ decl_list *dl; -+ version_list *vlist; -+ proc_list *plist; -+ -+ for (vlist = def->def.pr.versions; vlist != NULL; vlist = vlist->next) -+ for (plist = vlist->procs; plist != NULL; plist = plist->next) { -+ if (!newstyle || plist->arg_num < 2) -+ continue;/* old style, or single argument */ -+ print_prog_header(plist); -+ for (dl = plist->args.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ print_trailer(); -+ } -+} -+ -+ -+static void -+emit_union(definition *def) -+{ -+ declaration *dflt; -+ case_list *cl; -+ declaration *cs; -+ char *object; -+ char *vecformat = "objp->%s_u.%s"; -+ char *format = "&objp->%s_u.%s"; -+ -+ print_stat(1,&def->def.un.enum_decl); -+ f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name); -+ for (cl = def->def.un.cases; cl != NULL; cl = cl->next) { -+ -+ f_print(fout, "\tcase %s:\n", cl->case_name); -+ if(cl->contflag == 1) /* a continued case statement */ -+ continue; -+ cs = &cl->case_decl; -+ if (!streq(cs->type, "void")) { -+ object = alloc(strlen(def->def_name) + strlen(format) + -+ strlen(cs->name) + 1); -+ if (isvectordef (cs->type, cs->rel)) { -+ s_print(object, vecformat, def->def_name, -+ cs->name); -+ } else { -+ s_print(object, format, def->def_name, -+ cs->name); -+ } -+ print_ifstat(2, cs->prefix, cs->type, cs->rel, cs->array_max, -+ object, cs->name); -+ free(object); -+ } -+ f_print(fout, "\t\tbreak;\n"); -+ } -+ dflt = def->def.un.default_decl; -+ if (dflt != NULL) { -+ if (!streq(dflt->type, "void")) { -+ f_print(fout, "\tdefault:\n"); -+ object = alloc(strlen(def->def_name) + strlen(format) + -+ strlen(dflt->name) + 1); -+ if (isvectordef (dflt->type, dflt->rel)) { -+ s_print(object, vecformat, def->def_name, -+ dflt->name); -+ } else { -+ s_print(object, format, def->def_name, -+ dflt->name); -+ } -+ -+ print_ifstat(2, dflt->prefix, dflt->type, dflt->rel, -+ dflt->array_max, object, dflt->name); -+ free(object); -+ f_print(fout, "\t\tbreak;\n"); -+ } else { -+ /* Avoid gcc warnings about `value not handled in switch' */ -+ f_print(fout, "\tdefault:\n"); -+ f_print(fout, "\t\tbreak;\n"); -+ } -+ } else { -+ f_print(fout, "\tdefault:\n"); -+ f_print(fout, "\t\treturn (FALSE);\n"); -+ } -+ -+ f_print(fout, "\t}\n"); -+} -+ -+static void -+emit_struct(definition *def) -+{ -+ decl_list *dl; -+ int i, j, size, flag; -+ decl_list *cur = NULL, *psav; -+ bas_type *ptr; -+ char *sizestr, *plus; -+ char ptemp[256]; -+ int can_inline; -+ const char *buf_declaration; -+ -+ -+ if (Inline == 0) { -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ } else { -+ size = 0; -+ can_inline = 0; -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) { -+ -+ if (dl->decl.rel == REL_ALIAS) -+ size += ptr->length; -+ else { -+ can_inline = 1; -+ break; /* can be inlined */ -+ }; -+ } else { -+ if (size >= Inline) { -+ can_inline = 1; -+ break; /* can be inlined */ -+ } -+ size = 0; -+ } -+ if (size > Inline) -+ can_inline = 1; -+ -+ if (can_inline == 0) { /* can not inline, drop back to old mode */ -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ return; -+ }; -+ -+ -+ -+ -+ flag = PUT; -+ for (j = 0; j < 2; j++) { -+ -+ if (flag == PUT) -+ f_print(fout, "\n\t if (xdrs->x_op == XDR_ENCODE) {\n"); -+ else -+ f_print(fout, "\n \t return (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n"); -+ -+ -+ i = 0; -+ size = 0; -+ sizestr = NULL; -+ buf_declaration = "int32_t *"; -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) { /* xxx */ -+ -+ /* now walk down the list and check for basic types */ -+ if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) { -+ if (i == 0) -+ cur = dl; -+ i++; -+ -+ if (dl->decl.rel == REL_ALIAS) -+ size += ptr->length; -+ else { -+ /* this is required to handle arrays */ -+ -+ if (sizestr == NULL) -+ plus = " "; -+ else -+ plus = "+"; -+ -+ if (ptr->length != 1) -+ s_print(ptemp, " %s %s * %d", plus, dl->decl.array_max, ptr->length); -+ else -+ s_print(ptemp, " %s %s ", plus, dl->decl.array_max); -+ -+ /*now concatenate to sizestr !!!! */ -+ if (sizestr == NULL) -+ sizestr = strdup(ptemp); -+ else { -+ sizestr = realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1); -+ if (sizestr == NULL) { -+ -+ f_print(stderr, "Fatal error : no memory \n"); -+ crash(); -+ }; -+ sizestr = strcat(sizestr, ptemp); /*build up length of array */ -+ -+ } -+ } -+ -+ } else { -+ if (i > 0) -+ { -+ if (sizestr == NULL && size < Inline) { -+ /* don't expand into inline code if size < inline */ -+ while (cur != dl) { -+ print_stat(1, &cur->decl); -+ cur = cur->next; -+ } -+ } else { -+ -+ -+ -+ /* were already looking at a xdr_inlineable structure */ -+ if (sizestr == NULL) -+ f_print(fout, "\t %sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);", -+ buf_declaration, size); -+ else if (size == 0) -+ f_print(fout, -+ "\t %sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);", -+ buf_declaration, sizestr); -+ else -+ f_print(fout, -+ "\t %sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);", -+ buf_declaration, size, sizestr); -+ buf_declaration = ""; -+ -+ f_print(fout, "\n\t if (buf == NULL) {\n"); -+ -+ psav = cur; -+ while (cur != dl) { -+ print_stat(2, &cur->decl); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\n\t }\n\t else {\n"); -+ -+ cur = psav; -+ while (cur != dl) { -+ emit_inline(&cur->decl, flag); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\t }\n"); -+ } -+ } -+ size = 0; -+ i = 0; -+ sizestr = NULL; -+ print_stat(1, &dl->decl); -+ } -+ -+ } -+ if (i > 0) -+ { -+ if (sizestr == NULL && size < Inline) { -+ /* don't expand into inline code if size < inline */ -+ while (cur != dl) { -+ print_stat(1, &cur->decl); -+ cur = cur->next; -+ } -+ } else { -+ -+ /* were already looking at a xdr_inlineable structure */ -+ if (sizestr == NULL) -+ f_print(fout, "\t\t%sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);", -+ buf_declaration, size); -+ else if (size == 0) -+ f_print(fout, -+ "\t\t%sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);", -+ buf_declaration, sizestr); -+ else -+ f_print(fout, -+ "\t\t%sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);", -+ buf_declaration, size, sizestr); -+ buf_declaration = ""; -+ -+ f_print(fout, "\n\t\tif (buf == NULL) {\n"); -+ -+ psav = cur; -+ while (cur != NULL) { -+ print_stat(2, &cur->decl); -+ cur = cur->next; -+ } -+ f_print(fout, "\n\t }\n\t else {\n"); -+ -+ cur = psav; -+ while (cur != dl) { -+ emit_inline(&cur->decl, flag); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\t }\n"); -+ -+ } -+ } -+ flag = GET; -+ } -+ f_print(fout, "\t return(TRUE);\n\t}\n\n"); -+ -+ /* now take care of XDR_FREE case */ -+ -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ } -+} -+ -+ -+ -+ -+static void -+emit_typedef(definition *def) -+{ -+ char *prefix = def->def.ty.old_prefix; -+ char *type = def->def.ty.old_type; -+ char *amax = def->def.ty.array_max; -+ relation rel = def->def.ty.rel; -+ -+ -+ print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name); -+} -+ -+static void -+print_stat(int indent, declaration *dec) -+{ -+ char *prefix = dec->prefix; -+ char *type = dec->type; -+ char *amax = dec->array_max; -+ relation rel = dec->rel; -+ char name[256]; -+ -+ if (isvectordef(type, rel)) { -+ s_print(name, "objp->%s", dec->name); -+ } else { -+ s_print(name, "&objp->%s", dec->name); -+ } -+ print_ifstat(indent, prefix, type, rel, amax, name, dec->name); -+} -+ -+ -+static void -+emit_inline(declaration *decl, int flag) -+{ -+ -+ /*check whether an array or not */ -+ -+ switch (decl->rel) { -+ case REL_ALIAS: -+ emit_single_in_line(decl, flag, REL_ALIAS); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "\t\t{ register %s *genp; \n", decl->type); -+ f_print(fout, "\t\t int i;\n"); -+ f_print(fout, "\t\t for ( i = 0,genp=objp->%s;\n \t\t\ti < %s; i++){\n\t\t", -+ decl->name, decl->array_max); -+ emit_single_in_line(decl, flag, REL_VECTOR); -+ f_print(fout, "\t\t }\n\t\t };\n"); -+ break; -+ default: -+ break; -+ } -+} -+ -+static void -+emit_single_in_line(declaration *decl, int flag, relation rel) -+{ -+ char *upp_case; -+ int freed=0; -+ -+ if(flag == PUT) -+ f_print(fout,"\t\t (void) IXDR_PUT_"); -+ else -+ if(rel== REL_ALIAS) -+ f_print(fout,"\t\t objp->%s = IXDR_GET_",decl->name); -+ else -+ f_print(fout,"\t\t *genp++ = IXDR_GET_"); -+ -+ upp_case=upcase(decl->type); -+ -+ /* hack - XX */ -+ if(strcmp(upp_case,"INT") == 0) -+ { -+ free(upp_case); -+ freed=1; -+ upp_case="INT32"; -+ } -+ -+ if(strcmp(upp_case,"U_INT") == 0) -+ { -+ free(upp_case); -+ freed=1; -+ upp_case="U_INT32"; -+ } -+ -+ -+ if(flag == PUT) -+ if(rel== REL_ALIAS) -+ f_print(fout,"%s(buf,objp->%s);\n",upp_case,decl->name); -+ else -+ f_print(fout,"%s(buf,*genp++);\n",upp_case); -+ -+ else -+ f_print(fout,"%s(buf);\n",upp_case); -+ if(!freed) -+ free(upp_case); -+ -+} -+ -+ -+static char * -+upcase(char *str) -+{ -+ char *ptr, *hptr; -+ -+ -+ ptr = (char *) malloc(strlen(str)+1); -+ if (ptr == (char *) NULL) { -+ f_print(stderr, "malloc failed \n"); -+ exit(1); -+ }; -+ -+ hptr = ptr; -+ while (*str != '\0') -+ *ptr++ = toupper(*str++); -+ -+ *ptr = '\0'; -+ return (hptr); -+ -+} -diff --git a/rpcgen/rpc_hout.c b/rpcgen/rpc_hout.c -new file mode 100644 -index 0000000..ea1cb24 ---- /dev/null -+++ b/rpcgen/rpc_hout.c -@@ -0,0 +1,490 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_hout.c, Header file outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+ -+static int undefined2(char *type, char *stop); -+static void pxdrfuncdecl(char *name, int pointerp); -+static void pconstdef(definition *def); -+static void pargdef(definition *def); -+static void pstructdef(definition *def); -+static void puniondef(definition *def); -+static void pdefine(char *name, char *num); -+static void puldefine(char *name, char *num); -+static int define_printed(proc_list *stop, version_list *start); -+static void pprogramdef(definition *def); -+static void pprocdef(proc_list *proc, version_list *vp, -+ char *addargtype, int server_p, int mode); -+static void parglist(proc_list *proc, char *addargtype); -+static void penumdef(definition *def); -+static void ptypedef(definition *def); -+ -+/* -+ * Print the C-version of an xdr definition -+ */ -+void -+print_datadef(definition *def) -+{ -+ -+ if (def->def_kind == DEF_PROGRAM ) /* handle data only */ -+ return; -+ -+ if (def->def_kind != DEF_CONST) { -+ f_print(fout, "\n"); -+ } -+ switch (def->def_kind) { -+ case DEF_STRUCT: -+ pstructdef(def); -+ break; -+ case DEF_UNION: -+ puniondef(def); -+ break; -+ case DEF_ENUM: -+ penumdef(def); -+ break; -+ case DEF_TYPEDEF: -+ ptypedef(def); -+ break; -+ case DEF_PROGRAM: -+ pprogramdef(def); -+ break; -+ case DEF_CONST: -+ pconstdef(def); -+ break; -+ } -+ if (def->def_kind != DEF_PROGRAM && def->def_kind != DEF_CONST) { -+ pxdrfuncdecl( def->def_name, -+ def->def_kind != DEF_TYPEDEF || -+ !isvectordef(def->def.ty.old_type, def->def.ty.rel)); -+ -+ } -+} -+ -+ -+void -+print_funcdef(definition *def) -+{ -+ switch (def->def_kind) { -+ case DEF_PROGRAM: -+ f_print(fout, "\n"); -+ pprogramdef(def); -+ break; -+ default: -+ break; -+ } -+} -+ -+static void -+pxdrfuncdecl(char *name, int pointerp) -+{ -+ f_print(fout, -+ "#ifdef __cplusplus \n" -+ "extern \"C\" bool_t xdr_%s(XDR *, %s%s);\n" -+ "#elif __STDC__ \n" -+ "extern bool_t xdr_%s(XDR *, %s%s);\n" -+ "#else /* Old Style C */ \n" -+ "bool_t xdr_%s();\n" -+ "#endif /* Old Style C */ \n\n", -+ name, name, pointerp ? "*" : "", -+ name, name, pointerp ? "*" : "", -+ name); -+} -+ -+ -+static void -+pconstdef(definition *def) -+{ -+ pdefine(def->def_name, def->def.co); -+} -+ -+/* print out the definitions for the arguments of functions in the -+ header file -+*/ -+static void -+pargdef(definition *def) -+{ -+ decl_list *l; -+ version_list *vers; -+ char *name; -+ proc_list *plist; -+ -+ -+ for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) { -+ for(plist = vers->procs; plist != NULL; -+ plist = plist->next) { -+ -+ if (!newstyle || plist->arg_num < 2) { -+ continue; /* old style or single args */ -+ } -+ name = plist->args.argname; -+ f_print(fout, "struct %s {\n", name); -+ for (l = plist->args.decls; -+ l != NULL; l = l->next) { -+ pdeclaration(name, &l->decl, 1, ";\n" ); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+ pxdrfuncdecl(name, 0); -+ f_print( fout, "\n" ); -+ } -+ } -+ -+} -+ -+ -+static void -+pstructdef(definition *def) -+{ -+ decl_list *l; -+ char *name = def->def_name; -+ -+ f_print(fout, "struct %s {\n", name); -+ for (l = def->def.st.decls; l != NULL; l = l->next) { -+ pdeclaration(name, &l->decl, 1, ";\n"); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+} -+ -+static void -+puniondef(definition *def) -+{ -+ case_list *l; -+ char *name = def->def_name; -+ declaration *decl; -+ -+ f_print(fout, "struct %s {\n", name); -+ decl = &def->def.un.enum_decl; -+ if (streq(decl->type, "bool")) { -+ f_print(fout, "\tbool_t %s;\n", decl->name); -+ } else { -+ f_print(fout, "\t%s %s;\n", decl->type, decl->name); -+ } -+ f_print(fout, "\tunion {\n"); -+ for (l = def->def.un.cases; l != NULL; l = l->next) { -+ if (l->contflag == 0) -+ pdeclaration(name, &l->case_decl, 2, ";\n"); -+ } -+ decl = def->def.un.default_decl; -+ if (decl && !streq(decl->type, "void")) { -+ pdeclaration(name, decl, 2, ";\n"); -+ } -+ f_print(fout, "\t} %s_u;\n", name); -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+} -+ -+static void -+pdefine(char *name, char *num) -+{ -+ f_print(fout, "#define %s %s\n", name, num); -+} -+ -+static void -+puldefine(char *name, char *num) -+{ -+ f_print(fout, "#define %s ((u_int32_t)%s)\n", name, num); -+} -+ -+static int -+define_printed(proc_list *stop, version_list *start) -+{ -+ version_list *vers; -+ proc_list *proc; -+ -+ for (vers = start; vers != NULL; vers = vers->next) { -+ for (proc = vers->procs; proc != NULL; proc = proc->next) { -+ if (proc == stop) { -+ return (0); -+ } else if (streq(proc->proc_name, stop->proc_name)) { -+ return (1); -+ } -+ } -+ } -+ abort(); -+ /* NOTREACHED */ -+} -+ -+static void -+pprogramdef(definition *def) -+{ -+ version_list *vers; -+ proc_list *proc; -+ int i; -+ char *ext; -+ -+ pargdef(def); -+ -+ puldefine(def->def_name, def->def.pr.prog_num); -+ for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) { -+ if (tblflag) { -+ f_print(fout, "extern struct rpcgen_table %s_%s_table[];\n", -+ locase(def->def_name), vers->vers_num); -+ f_print(fout, "extern %s_%s_nproc;\n", -+ locase(def->def_name), vers->vers_num); -+ } -+ puldefine(vers->vers_name, vers->vers_num); -+ -+ /* -+ * Print out 3 definitions, one for ANSI-C, another for C++, -+ * a third for old style C -+ */ -+ -+ for (i = 0; i < 3; i++) { -+ if (i == 0) { -+ f_print(fout, "\n#ifdef __cplusplus\n"); -+ ext = "extern \"C\" "; -+ } else if (i == 1) { -+ f_print(fout, "\n#elif __STDC__\n"); -+ ext = "extern "; -+ } else { -+ f_print(fout, "\n#else /* Old Style C */ \n"); -+ ext = "extern "; -+ } -+ -+ -+ for (proc = vers->procs; proc != NULL; proc = proc->next) { -+ if (!define_printed(proc, def->def.pr.versions)) { -+ puldefine(proc->proc_name, proc->proc_num); -+ } -+ f_print(fout, "%s", ext); -+ pprocdef(proc, vers, "CLIENT *", 0, i); -+ f_print(fout, "%s", ext); -+ pprocdef(proc, vers, "struct svc_req *", 1, i); -+ -+ } -+ -+ } -+ f_print(fout, "#endif /* Old Style C */ \n"); -+ } -+} -+ -+static void -+pprocdef(proc_list *proc, version_list *vp, char *addargtype, -+ int server_p, int mode) -+{ -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, "* "); -+ if (server_p) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ -+ /* -+ * mode 0 == cplusplus, mode 1 = ANSI-C, mode 2 = old style C -+ */ -+ if (mode == 0 || mode == 1) -+ parglist(proc, addargtype); -+ else -+ f_print(fout, "();\n"); -+} -+ -+ -+ -+/* print out argument list of procedure */ -+static void -+parglist(proc_list *proc, char *addargtype) -+{ -+ decl_list *dl; -+ -+ f_print(fout, "("); -+ -+ if (proc->arg_num < 2 && newstyle && -+ streq(proc->args.decls->decl.type, "void")) { -+ /* 0 argument in new style: do nothing */ -+ } else { -+ for (dl = proc->args.decls; dl != NULL; dl = dl->next) { -+ ptype(dl->decl.prefix, dl->decl.type, 1); -+ if (!newstyle) -+ f_print(fout, "*"); /* old style passes by reference */ -+ -+ f_print(fout, ", "); -+ } -+ } -+ -+ f_print(fout, "%s);\n", addargtype); -+} -+ -+static void -+penumdef(definition *def) -+{ -+ char *name = def->def_name; -+ enumval_list *l; -+ char *last = NULL; -+ int count = 0; -+ -+ f_print(fout, "enum %s {\n", name); -+ for (l = def->def.en.vals; l != NULL; l = l->next) { -+ f_print(fout, "\t%s", l->name); -+ if (l->assignment) { -+ f_print(fout, " = %s", l->assignment); -+ last = l->assignment; -+ count = 1; -+ } else { -+ if (last == NULL) { -+ f_print(fout, " = %d", count++); -+ } else { -+ f_print(fout, " = %s + %d", last, count++); -+ } -+ } -+ f_print(fout, ",\n"); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef enum %s %s;\n", name, name); -+} -+ -+static void -+ptypedef(definition *def) -+{ -+ char *name = def->def_name; -+ char *old = def->def.ty.old_type; -+ char prefix[8]; /* enough to contain "struct ", including NUL */ -+ relation rel = def->def.ty.rel; -+ -+ -+ if (!streq(name, old)) { -+ if (streq(old, "string")) { -+ old = "char"; -+ rel = REL_POINTER; -+ } else if (streq(old, "opaque")) { -+ old = "char"; -+ } else if (streq(old, "bool")) { -+ old = "bool_t"; -+ } -+ if (undefined2(old, name) && def->def.ty.old_prefix) { -+ s_print(prefix, "%s ", def->def.ty.old_prefix); -+ } else { -+ prefix[0] = 0; -+ } -+ f_print(fout, "typedef "); -+ switch (rel) { -+ case REL_ARRAY: -+ f_print(fout, "struct {\n"); -+ f_print(fout, "\tu_int %s_len;\n", name); -+ f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name); -+ f_print(fout, "} %s", name); -+ break; -+ case REL_POINTER: -+ f_print(fout, "%s%s *%s", prefix, old, name); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "%s%s %s[%s]", prefix, old, name, -+ def->def.ty.array_max); -+ break; -+ case REL_ALIAS: -+ f_print(fout, "%s%s %s", prefix, old, name); -+ break; -+ } -+ f_print(fout, ";\n"); -+ } -+} -+ -+void -+pdeclaration(char *name, declaration *dec, int tab, char *separator) -+{ -+ char buf[8]; /* enough to hold "struct ", include NUL */ -+ char *prefix; -+ char *type; -+ -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ tabify(fout, tab); -+ if (streq(dec->type, name) && !dec->prefix) { -+ f_print(fout, "struct "); -+ } -+ if (streq(dec->type, "string")) { -+ f_print(fout, "char *%s", dec->name); -+ } else { -+ prefix = ""; -+ if (streq(dec->type, "bool")) { -+ type = "bool_t"; -+ } else if (streq(dec->type, "opaque")) { -+ type = "char"; -+ } else { -+ if (dec->prefix) { -+ s_print(buf, "%s ", dec->prefix); -+ prefix = buf; -+ } -+ type = dec->type; -+ } -+ switch (dec->rel) { -+ case REL_ALIAS: -+ f_print(fout, "%s%s %s", prefix, type, dec->name); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "%s%s %s[%s]", prefix, type, dec->name, -+ dec->array_max); -+ break; -+ case REL_POINTER: -+ f_print(fout, "%s%s *%s", prefix, type, dec->name); -+ break; -+ case REL_ARRAY: -+ f_print(fout, "struct {\n"); -+ tabify(fout, tab); -+ f_print(fout, "\tu_int %s_len;\n", dec->name); -+ tabify(fout, tab); -+ f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name); -+ tabify(fout, tab); -+ f_print(fout, "} %s", dec->name); -+ break; -+ } -+ } -+ f_print(fout, separator ); -+} -+ -+static int -+undefined2(char *type, char *stop) -+{ -+ list *l; -+ definition *def; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ if (streq(def->def_name, stop)) { -+ return (1); -+ } else if (streq(def->def_name, type)) { -+ return (0); -+ } -+ } -+ } -+ return (1); -+} -diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c -new file mode 100644 -index 0000000..28aa60c ---- /dev/null -+++ b/rpcgen/rpc_main.c -@@ -0,0 +1,1067 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_main.c, Top level of the RPC protocol compiler. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_scan.h" -+ -+struct commandline { -+ int cflag; /* xdr C routines */ -+ int hflag; /* header file */ -+ int lflag; /* client side stubs */ -+ int mflag; /* server side stubs */ -+ int nflag; /* netid flag */ -+ int sflag; /* server stubs for the given transport */ -+ int tflag; /* dispatch Table file */ -+ int Ssflag; /* produce server sample code */ -+ int Scflag; /* produce client sample code */ -+ char *infile; /* input module name */ -+ char *outfile; /* output module name */ -+}; -+ -+static char * extendfile(char *file, char *ext); -+static void open_output(char *infile, char *outfile); -+static void add_warning(void); -+static void clear_args(void); -+static void open_input(char *infile, char *define); -+static int check_nettype(char *name, char **list_to_check); -+static void c_output(char *infile, char *define, int extend, char *outfile); -+static void c_initialize(void); -+static char * generate_guard(char *pathname); -+static void h_output(char *infile, char *define, int extend, char *outfile); -+static void s_output(int argc, char **argv, char *infile, -+ char *define, int extend, char *outfile, -+ int nomain, int netflag); -+static void l_output(char *infile, char *define, int extend, char *outfile); -+static void t_output(char *infile, char *define, int extend, char *outfile); -+static void svc_output(char *, char *, int, char *); -+static void clnt_output(char *, char *, int, char *); -+static int do_registers(int argc, char **argv); -+static void addarg(char *cp); -+static void putarg(int where, char *cp); -+static void checkfiles(char *infile, char *outfile); -+static int parseargs(int argc, char **argv, struct commandline *cmd); -+static void usage(void); -+static void options_usage(void); -+ -+/* -+extern void write_sample_svc(); -+int write_sample_clnt(); -+void write_sample_clnt_main(); -+ -+static svc_output(); -+ */ -+ -+#define EXTEND 1 /* alias for TRUE */ -+#define DONT_EXTEND 0 /* alias for FALSE */ -+ -+#define SVR4_CPP "/usr/ccs/lib/cpp" -+#define SUNOS_CPP "/lib/cpp" -+static int cppDefined = 0; /* explicit path for C preprocessor */ -+ -+ -+static char *cmdname; -+ -+static char *svcclosetime = "120"; -+static char *CPP = SVR4_CPP; -+static char CPPFLAGS[] = "-C"; -+static char pathbuf[MAXPATHLEN + 1]; -+static char *allv[] = { -+ "rpcgen", "-s", "udp", "-s", "tcp", -+}; -+static int allc = sizeof(allv)/sizeof(allv[0]); -+static char *allnv[] = { -+ "rpcgen", "-s", "netpath", -+}; -+static int allnc = sizeof(allnv)/sizeof(allnv[0]); -+ -+/* -+ * machinations for handling expanding argument list -+ */ -+#if 0 -+static void addarg(); /* add another argument to the list */ -+static void putarg(); /* put argument at specified location */ -+static void clear_args(); /* clear argument list */ -+static void checkfiles(); /* check if out file already exists */ -+#endif -+ -+ -+ -+#define ARGLISTLEN 20 -+#define FIXEDARGS 2 -+ -+static char *arglist[ARGLISTLEN]; -+static int argcount = FIXEDARGS; -+ -+ -+int nonfatalerrors; /* errors */ -+int inetdflag/* = 1*/; /* Support for inetd */ /* is now the default */ -+int pmflag; /* Support for port monitors */ -+int logflag; /* Use syslog instead of fprintf for errors */ -+int tblflag; /* Support for dispatch table file */ -+ -+/* length at which to start doing an inline */ -+#define INLINE 3 -+ -+int Inline = INLINE; /* length at which to start doing an inline. 3 = default -+ * if 0, no xdr_inline code */ -+ -+int indefinitewait; /* If started by port monitors, hang till it wants */ -+int exitnow; /* If started by port monitors, exit after the call */ -+int timerflag; /* TRUE if !indefinite && !exitnow */ -+int newstyle; /* newstyle of passing arguments (by value) */ -+int Cflag = 0 ; /* ANSI C syntax */ -+static int allfiles; /* generate all files */ -+#ifdef linux -+int tirpcflag = 0; /* no tirpc by default */ -+#else -+int tirpcflag = 1; /* generating code for tirpc, by default */ -+#endif -+ -+int -+main(int argc, char **argv) -+{ -+ struct commandline cmd; -+ -+ (void) memset((char *) &cmd, 0, sizeof(struct commandline)); -+ clear_args(); -+ if (!parseargs(argc, argv, &cmd)) -+ usage(); -+ -+ if (cmd.cflag || cmd.hflag || cmd.lflag || cmd.tflag || cmd.sflag || -+ cmd.mflag || cmd.nflag || cmd.Ssflag || cmd.Scflag) { -+ checkfiles(cmd.infile, cmd.outfile); -+ } else -+ checkfiles(cmd.infile, NULL); -+ -+ if (cmd.cflag) { -+ c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.hflag) { -+ h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.lflag) { -+ l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.sflag || cmd.mflag || (cmd.nflag)) { -+ s_output(argc, argv, cmd.infile, "-DRPC_SVC", DONT_EXTEND, -+ cmd.outfile, cmd.mflag, cmd.nflag); -+ } else if (cmd.tflag) { -+ t_output(cmd.infile, "-DRPC_TBL", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.Ssflag) { -+ svc_output(cmd.infile, "-DRPC_SERVER", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.Scflag) { -+ clnt_output(cmd.infile, "-DRPC_CLIENT", DONT_EXTEND, cmd.outfile); -+ } else { -+ /* the rescans are required, since cpp may effect input */ -+ c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c"); -+ reinitialize(); -+ h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h"); -+ reinitialize(); -+ l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c"); -+ reinitialize(); -+ if (inetdflag || !tirpcflag) -+ s_output(allc, allv, cmd.infile, "-DRPC_SVC", EXTEND, -+ "_svc.c", cmd.mflag, cmd.nflag); -+ else -+ s_output(allnc, allnv, cmd.infile, "-DRPC_SVC", -+ EXTEND, "_svc.c", cmd.mflag, cmd.nflag); -+ if (tblflag) { -+ reinitialize(); -+ t_output(cmd.infile, "-DRPC_TBL", EXTEND, "_tbl.i"); -+ } -+ if (allfiles) { -+ reinitialize(); -+ svc_output(cmd.infile, "-DRPC_SERVER", EXTEND, "_server.c"); -+ } -+ if (allfiles) { -+ reinitialize(); -+ clnt_output(cmd.infile, "-DRPC_CLIENT", EXTEND, "_client.c"); -+ } -+ } -+ exit(nonfatalerrors); -+ /* NOTREACHED */ -+} -+ -+/* -+ * add extension to filename -+ */ -+static char * -+extendfile(char *file, char *ext) -+{ -+ char *res; -+ char *p; -+ -+ res = alloc(strlen(file) + strlen(ext) + 1); -+ if (res == NULL) { -+ abort(); -+ } -+ p = strrchr(file, '.'); -+ if (p == NULL) { -+ p = file + strlen(file); -+ } -+ (void) strcpy(res, file); -+ (void) strcpy(res + (p - file), ext); -+ return (res); -+} -+ -+/* -+ * Open output file with given extension -+ */ -+static void -+open_output(char *infile, char *outfile) -+{ -+ -+ if (outfile == NULL) { -+ fout = stdout; -+ return; -+ } -+ -+ if (infile != NULL && streq(outfile, infile)) { -+ f_print(stderr, "%s: output would overwrite %s\n", cmdname, -+ infile); -+ crash(); -+ } -+ fout = fopen(outfile, "w"); -+ if (fout == NULL) { -+ f_print(stderr, "%s: unable to open ", cmdname); -+ perror(outfile); -+ crash(); -+ } -+ record_open(outfile); -+ -+} -+ -+static void -+add_warning(void) -+{ -+ f_print(fout, "/*\n"); -+ f_print(fout, " * Please do not edit this file.\n"); -+ f_print(fout, " * It was generated using rpcgen.\n"); -+ f_print(fout, " */\n\n"); -+} -+ -+/* clear list of arguments */ -+static void -+clear_args(void) -+{ -+ int i; -+ for( i=FIXEDARGS; i" : infile; -+ (void) pipe(pd); -+ switch (fork()) { -+ case 0: -+ putarg(0, "cpp"); -+ putarg(1, CPPFLAGS); -+ addarg(define); -+ addarg(infile); -+ addarg((char *)NULL); -+ (void) close(1); -+ (void) dup2(pd[1], 1); -+ (void) close(pd[0]); -+ if (cppDefined) -+ execv(CPP, arglist); -+ else { -+ execvp("cpp", arglist); -+ if (errno == ENOENT) -+ execvp(SVR4_CPP, arglist); -+ if (errno == ENOENT) -+ execvp(SUNOS_CPP, arglist); -+ } -+ perror("execv"); -+ exit(1); -+ case -1: -+ perror("fork"); -+ exit(1); -+ } -+ (void) close(pd[1]); -+ fin = fdopen(pd[0], "r"); -+ if (fin == NULL) { -+ f_print(stderr, "%s: ", cmdname); -+ perror(infilename); -+ crash(); -+ } -+} -+ -+/* valid tirpc nettypes */ -+static char* valid_ti_nettypes[] = -+{ -+ "netpath", -+ "visible", -+ "circuit_v", -+ "datagram_v", -+ "circuit_n", -+ "datagram_n", -+ "udp", -+ "tcp", -+ "raw", -+ NULL -+}; -+ -+/* valid inetd nettypes */ -+static char* valid_i_nettypes[] = -+{ -+ "udp", -+ "tcp", -+ NULL -+}; -+ -+static int -+check_nettype(char *name, char **list_to_check) -+{ -+ int i; -+ for( i = 0; list_to_check[i] != NULL; i++ ) { -+ if( strcmp( name, list_to_check[i] ) == 0 ) { -+ return 1; -+ } -+ } -+ f_print( stderr, "illegal nettype :\'%s\'\n", name ); -+ return 0; -+} -+ -+/* -+ * Compile into an XDR routine output file -+ */ -+ -+static void -+c_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ -+ c_initialize(); -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ /* .h file already contains rpc/rpc.h */ -+ } else -+ f_print(fout, "#include \n"); -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ emit(def); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+ -+static void -+c_initialize(void) -+{ -+ -+ /* add all the starting basic types */ -+ -+ add_type(1,"int"); -+ add_type(1,"int32_t"); -+ add_type(1,"short"); -+ add_type(1,"bool"); -+ -+ add_type(1,"u_int"); -+ add_type(1,"u_int32_t"); -+ add_type(1,"u_short"); -+ -+} -+ -+char rpcgen_table_dcl[] = "struct rpcgen_table {\n\ -+ char *(*proc)();\n\ -+ xdrproc_t xdr_arg;\n\ -+ unsigned len_arg;\n\ -+ xdrproc_t xdr_res;\n\ -+ unsigned len_res;\n\ -+};\n"; -+ -+ -+static char * -+generate_guard(char *pathname) -+{ -+ char* filename, *guard, *tmp; -+ -+ filename = strrchr(pathname, '/' ); /* find last component */ -+ filename = ((filename == 0) ? pathname : filename+1); -+ guard = strdup(filename); -+ /* convert to upper case */ -+ tmp = guard; -+ while (*tmp) { -+ if (islower(*tmp)) -+ *tmp = toupper(*tmp); -+ tmp++; -+ } -+ -+ guard = extendfile(guard, "_H_RPCGEN"); -+ return( guard ); -+} -+ -+/* -+ * Compile into an XDR header file -+ */ -+static void -+h_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *outfilename; -+ long tell; -+ char *guard; -+ list *l; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ guard = generate_guard( outfilename ? outfilename: infile ); -+ -+ f_print(fout,"#ifndef _%s\n#define _%s\n\n", guard, -+ guard); -+ -+ f_print(fout, "#include \n\n"); -+ -+ f_print(fout, "#ifndef IXDR_GET_INT32\n"); -+ f_print(fout, "#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_PUT_INT32\n"); -+ f_print(fout, "#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_GET_U_INT32\n"); -+ f_print(fout, "#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_PUT_U_INT32\n"); -+ f_print(fout, "#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))\n"); -+ f_print(fout, "#endif\n"); -+ -+ tell = ftell(fout); -+ /* print data definitions */ -+ while ((def = get_definition()) != NULL) { -+ print_datadef(def); -+ } -+ -+ /* print function declarations. -+ Do this after data definitions because they might be used as -+ arguments for functions */ -+ for (l = defined; l != NULL; l = l->next) { -+ print_funcdef(l->val); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } else if (tblflag) { -+ f_print(fout, rpcgen_table_dcl); -+ } -+ f_print(fout, "\n#endif /* !_%s */\n", guard); -+} -+ -+/* -+ * Compile into an RPC service -+ */ -+static void -+s_output(int argc, char **argv, char *infile, char *define, int extend, -+ char *outfile, int nomain, int netflag) -+{ -+ char *include; -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ -+ f_print(fout, "#include \n"); -+ f_print(fout, "#include /* getenv, exit */\n"); -+ if (Cflag) { -+ f_print (fout, "#include /* for pmap_unset */\n"); -+ f_print (fout, "#include /* strcmp */ \n"); -+ } -+ if (strcmp(svcclosetime, "-1") == 0) -+ indefinitewait = 1; -+ else if (strcmp(svcclosetime, "0") == 0) -+ exitnow = 1; -+ else if (inetdflag || pmflag) { -+ f_print(fout, "#include \n"); -+ timerflag = 1; -+ } -+ -+#ifndef linux -+ if( !tirpcflag && inetdflag ) -+ f_print(fout, "#include /* TIOCNOTTY */\n"); -+#else -+ if( !tirpcflag ) -+ f_print(fout, "#include /* TIOCNOTTY */\n"); -+#endif -+ if( Cflag && (inetdflag || pmflag ) ) { -+ f_print(fout, "#ifdef __cplusplus\n"); -+ f_print(fout, "#include /* getdtablesize, open */\n"); -+ f_print(fout, "#endif /* __cplusplus */\n"); -+ -+ if( tirpcflag ) -+ f_print(fout, "#include /* setsid */\n"); -+ } -+ if( tirpcflag ) -+ f_print(fout, "#include \n"); -+ -+ f_print(fout, "#include \n"); -+#ifndef linux -+ f_print(fout, "#include \n"); -+#endif -+ if (inetdflag || !tirpcflag ) { -+ f_print(fout, "#include \n"); -+ f_print(fout, "#include \n"); -+ } -+ -+ if ( (netflag || pmflag) && tirpcflag ) { -+ f_print(fout, "#include \n"); -+ } -+ if (/*timerflag &&*/ tirpcflag) -+ f_print(fout, "#include /* rlimit */\n"); -+ if (logflag || inetdflag || pmflag) { -+#ifdef linux -+ f_print(fout, "#include \n"); -+#else -+ f_print(fout, "#ifdef SYSLOG\n"); -+ f_print(fout, "#include \n"); -+ f_print(fout, "#else\n"); -+ f_print(fout, "#define LOG_ERR 1\n"); -+ f_print(fout, "#define openlog(a, b, c)\n"); -+ f_print(fout, "#endif\n"); -+#endif -+ } -+ -+ /* for ANSI-C */ -+ f_print(fout, "\n#ifdef __STDC__\n#define SIG_PF void(*)(int)\n#endif\n"); -+ -+ f_print(fout, "\n#ifdef DEBUG\n#define RPC_SVC_FG\n#endif\n"); -+ if (timerflag) -+ f_print(fout, "\n#define _RPCSVC_CLOSEDOWN %s\n", svcclosetime); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_most(infile, netflag, nomain); -+ if (!nomain) { -+ if( !do_registers(argc, argv) ) { -+ if (outfilename) -+ (void) unlink(outfilename); -+ usage(); -+ } -+ write_rest(); -+ } -+} -+ -+/* -+ * generate client side stubs -+ */ -+static void -+l_output(char *infile, char *define, int extend, char *outfile) -+{ -+ char *include; -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (Cflag) -+ f_print (fout, "#include /* for memset */\n"); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_stubs(); -+} -+ -+/* -+ * generate the dispatch table -+ */ -+static void -+t_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_tables(); -+} -+ -+/* sample routine for the server template */ -+static void -+svc_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ checkfiles(infile,outfilename); /*check if outfile already exists. -+ if so, print an error message and exit*/ -+ open_output(infile, outfilename); -+ add_sample_msg(); -+ -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ write_sample_svc(def); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+ -+/* sample main routine for client */ -+static void -+clnt_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ int has_program = 0; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ checkfiles(infile, outfilename); /*check if outfile already exists. -+ if so, print an error message and exit*/ -+ -+ open_output(infile, outfilename); -+ add_sample_msg(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ has_program += write_sample_clnt(def); -+ } -+ -+ if (has_program) -+ write_sample_clnt_main(); -+ -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+/* -+ * Perform registrations for service output -+ * Return 0 if failed; 1 otherwise. -+ */ -+static int -+do_registers(int argc, char **argv) -+{ -+ int i; -+ -+ if (inetdflag || !tirpcflag) { -+ for (i = 1; i < argc; i++) { -+ if (streq(argv[i], "-s")) { -+ if (!check_nettype(argv[i + 1], valid_i_nettypes)) -+ return 0; -+ write_inetd_register(argv[i + 1]); -+ i++; -+ } -+ } -+ } else { -+ for (i = 1; i < argc; i++) -+ if (streq(argv[i], "-s")) { -+ if (!check_nettype(argv[i + 1], valid_ti_nettypes)) -+ return 0; -+ write_nettype_register(argv[i + 1]); -+ i++; -+ } else if (streq(argv[i], "-n")) { -+ write_netid_register(argv[i + 1]); -+ i++; -+ } -+ } -+ return 1; -+} -+ -+/* -+ * Add another argument to the arg list -+ */ -+static void -+addarg(char *cp) -+{ -+ if (argcount >= ARGLISTLEN) { -+ f_print(stderr, "rpcgen: too many defines\n"); -+ crash(); -+ /*NOTREACHED*/ -+ } -+ arglist[argcount++] = cp; -+ -+} -+ -+static void -+putarg(int where, char *cp) -+{ -+ if (where >= ARGLISTLEN) { -+ f_print(stderr, "rpcgen: arglist coding error\n"); -+ crash(); -+ /*NOTREACHED*/ -+ } -+ arglist[where] = cp; -+ -+} -+ -+/* -+ * if input file is stdin and an output file is specified then complain -+ * if the file already exists. Otherwise the file may get overwritten -+ * If input file does not exist, exit with an error -+ */ -+ -+static void -+checkfiles(char *infile, char *outfile) -+{ -+ -+ struct stat buf; -+ -+ if(infile) /* infile ! = NULL */ -+ if(stat(infile,&buf) < 0) -+ { -+ perror(infile); -+ crash(); -+ }; -+ if (outfile) { -+ if (stat(outfile, &buf) < 0) -+ return; /* file does not exist */ -+ else { -+ f_print(stderr, -+ "file '%s' already exists and may be overwritten\n", outfile); -+ crash(); -+ } -+ } -+} -+ -+/* -+ * Parse command line arguments -+ */ -+static int -+parseargs(int argc, char **argv, struct commandline *cmd) -+{ -+ int i; -+ int j; -+ char c; -+ char flag[(1 << 8 * sizeof(char))]; -+ int nflags; -+ -+ cmdname = argv[0]; -+ cmd->infile = cmd->outfile = NULL; -+ if (argc < 2) { -+ return (0); -+ } -+ allfiles = 0; -+ flag['c'] = 0; -+ flag['h'] = 0; -+ flag['l'] = 0; -+ flag['m'] = 0; -+ flag['o'] = 0; -+ flag['s'] = 0; -+ flag['n'] = 0; -+ flag['t'] = 0; -+ flag['S'] = 0; -+ flag['C'] = 0; -+ for (i = 1; i < argc; i++) { -+ if (argv[i][0] != '-') { -+ if (cmd->infile) { -+ f_print( stderr, "Cannot specify more than one input file!\n"); -+ -+ return (0); -+ } -+ cmd->infile = argv[i]; -+ } else { -+ for (j = 1; argv[i][j] != 0; j++) { -+ c = argv[i][j]; -+ switch (c) { -+ case 'a': -+ allfiles = 1; -+ break; -+ case 'c': -+ case 'h': -+ case 'l': -+ case 'm': -+ case 't': -+ if (flag[(int) c]) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ break; -+ case 'S': -+ /* sample flag: Ss or Sc. -+ Ss means set flag['S']; -+ Sc means set flag['C']; */ -+ c = argv[i][++j]; /* get next char */ -+ if( c == 's' ) -+ c = 'S'; -+ else if( c == 'c' ) -+ c = 'C'; -+ else -+ return( 0 ); -+ -+ if (flag[(int) c]) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ break; -+ case 'C': /* ANSI C syntax */ -+ Cflag = 1; -+ break; -+ -+ case 'b': /* turn TIRPC flag off for -+ generating backward compatible -+ */ -+ tirpcflag = 0; -+ break; -+ -+ case 'I': -+ inetdflag = 1; -+ break; -+ case 'N': -+ newstyle = 1; -+ break; -+ case 'L': -+ logflag = 1; -+ break; -+ case 'K': -+ if (++i == argc) { -+ return (0); -+ } -+ svcclosetime = argv[i]; -+ goto nextarg; -+ case 'T': -+ tblflag = 1; -+ break; -+ case 'i' : -+ if (++i == argc) { -+ return (0); -+ } -+ Inline = atoi(argv[i]); -+ goto nextarg; -+ case 'n': -+ case 'o': -+ case 's': -+ if (argv[i][j - 1] != '-' || -+ argv[i][j + 1] != 0) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ if (++i == argc) { -+ return (0); -+ } -+ if (c == 's') { -+ if (!streq(argv[i], "udp") && -+ !streq(argv[i], "tcp")) { -+ return (0); -+ } -+ } else if (c == 'o') { -+ if (cmd->outfile) { -+ return (0); -+ } -+ cmd->outfile = argv[i]; -+ } -+ goto nextarg; -+ case 'D': -+ if (argv[i][j - 1] != '-') { -+ return (0); -+ } -+ (void) addarg(argv[i]); -+ goto nextarg; -+ case 'Y': -+ if (++i == argc) { -+ return (0); -+ } -+ (void) strcpy(pathbuf, argv[i]); -+ (void) strcat(pathbuf, "/cpp"); -+ CPP = pathbuf; -+ cppDefined = 1; -+ goto nextarg; -+ -+ -+ -+ default: -+ return (0); -+ } -+ } -+ nextarg: -+ ; -+ } -+ } -+ -+ cmd->cflag = flag['c']; -+ cmd->hflag = flag['h']; -+ cmd->lflag = flag['l']; -+ cmd->mflag = flag['m']; -+ cmd->nflag = flag['n']; -+ cmd->sflag = flag['s']; -+ cmd->tflag = flag['t']; -+ cmd->Ssflag = flag['S']; -+ cmd->Scflag = flag['C']; -+ -+ if( tirpcflag ) { -+ pmflag = inetdflag ? 0 : 1; /* pmflag or inetdflag is always TRUE */ -+ if( (inetdflag && cmd->nflag)) { /* netid not allowed with inetdflag */ -+ f_print(stderr, "Cannot use netid flag with inetd flag!\n"); -+ return (0); -+ } -+ } else { /* 4.1 mode */ -+ pmflag = 0; /* set pmflag only in tirpcmode */ -+ inetdflag = 1; /* inetdflag is TRUE by default */ -+ if( cmd->nflag ) { /* netid needs TIRPC */ -+ f_print( stderr, "Cannot use netid flag without TIRPC!\n"); -+ return( 0 ); -+ } -+ } -+ -+ if( newstyle && ( tblflag || cmd->tflag) ) { -+ f_print( stderr, "Cannot use table flags with newstyle!\n"); -+ return( 0 ); -+ } -+ -+ /* check no conflicts with file generation flags */ -+ nflags = cmd->cflag + cmd->hflag + cmd->lflag + cmd->mflag + -+ cmd->sflag + cmd->nflag + cmd->tflag + cmd->Ssflag + cmd->Scflag; -+ -+ if (nflags == 0) { -+ if (cmd->outfile != NULL || cmd->infile == NULL) { -+ return (0); -+ } -+ } else if (nflags > 1) { -+ f_print( stderr, "Cannot have more than one file generation flag!\n"); -+ return (0); -+ } -+ return (1); -+} -+ -+static void -+usage(void) -+{ -+ f_print(stderr, "usage: %s infile\n", cmdname); -+ f_print(stderr, "\t%s [-a][-b][-C][-Dname[=value]] -i size [-I [-K seconds]] [-L][-N][-T] infile\n", -+ cmdname); -+ f_print(stderr, "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss] [-o outfile] [infile]\n", -+ cmdname); -+ f_print(stderr, "\t%s [-s nettype]* [-o outfile] [infile]\n", cmdname); -+ f_print(stderr, "\t%s [-n netid]* [-o outfile] [infile]\n", cmdname); -+ options_usage(); -+ exit(1); -+} -+ -+static void -+options_usage(void) -+{ -+ f_print(stderr, "options:\n"); -+ f_print(stderr, "-a\t\tgenerate all files, including samples\n"); -+ f_print(stderr, "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"); -+ f_print(stderr, "-c\t\tgenerate XDR routines\n"); -+ f_print(stderr, "-C\t\tANSI C mode\n"); -+ f_print(stderr, "-Dname[=value]\tdefine a symbol (same as #define)\n"); -+ f_print(stderr, "-h\t\tgenerate header file\n"); -+ f_print(stderr, "-i size\t\tsize at which to start generating inline code\n"); -+ f_print(stderr, "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"); -+ f_print(stderr, "-K seconds\tserver exits after K seconds of inactivity\n"); -+ f_print(stderr, "-l\t\tgenerate client side stubs\n"); -+ f_print(stderr, "-L\t\tserver errors will be printed to syslog\n"); -+ f_print(stderr, "-m\t\tgenerate server side stubs\n"); -+ f_print(stderr, "-n netid\tgenerate server code that supports named netid\n"); -+ f_print(stderr, "-N\t\tsupports multiple arguments and call-by-value\n"); -+ f_print(stderr, "-o outfile\tname of the output file\n"); -+ f_print(stderr, "-s nettype\tgenerate server code that supports named nettype\n"); -+ f_print(stderr, "-Sc\t\tgenerate sample client code that uses remote procedures\n"); -+ f_print(stderr, "-Ss\t\tgenerate sample server code that defines remote procedures\n"); -+ f_print(stderr, "-t\t\tgenerate RPC dispatch table\n"); -+ f_print(stderr, "-T\t\tgenerate code to support RPC dispatch tables\n"); -+ f_print(stderr, "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"); -+ -+ exit(1); -+} -diff --git a/rpcgen/rpc_output.h b/rpcgen/rpc_output.h -new file mode 100644 -index 0000000..eb25a60 ---- /dev/null -+++ b/rpcgen/rpc_output.h -@@ -0,0 +1,16 @@ -+/* -+ * rpc_output.h -+ * -+ * Declarations for output functions -+ * -+ */ -+ -+#ifndef RPCGEN_NEW_OUTPUT_H -+#define RPCGEN_NEW_OUTPUT_H -+ -+void write_msg_out(void); -+int nullproc(proc_list *); -+void printarglist(proc_list *, char *, char *); -+void pdeclaration(char *, declaration *, int, char *); -+ -+#endif /* RPCGEN_NEW_OUTPUT_H */ -diff --git a/rpcgen/rpc_parse.c b/rpcgen/rpc_parse.c -new file mode 100644 -index 0000000..b53a553 ---- /dev/null -+++ b/rpcgen/rpc_parse.c -@@ -0,0 +1,609 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_parse.c, Parser for the RPC protocol compiler -+ * Copyright (C) 1987 Sun Microsystems, Inc. -+ */ -+#include -+#include -+#include "rpc/types.h" -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+#define ARGNAME "arg" -+ -+/* -+extern char *make_argname(); -+extern char *strdup(); -+ */ -+ -+static void isdefined(definition *defp); -+static void def_struct(definition *defp); -+static void def_program(definition *defp); -+static void def_enum(definition *defp); -+static void def_const(definition *defp); -+static void def_union(definition *defp); -+static void check_type_name(char *name, int new_type); -+static void def_typedef(definition *defp); -+static void get_declaration(declaration *dec, defkind dkind); -+static void get_prog_declaration(declaration *dec, defkind dkind, int num); -+static void get_type(char **prefixp, char **typep, defkind dkind); -+static void unsigned_dec(char **typep); -+ -+/* -+ * return the next definition you see -+ */ -+definition * -+get_definition(void) -+{ -+ definition *defp; -+ token tok; -+ -+ defp = ALLOC(definition); -+ get_token(&tok); -+ switch (tok.kind) { -+ case TOK_STRUCT: -+ def_struct(defp); -+ break; -+ case TOK_UNION: -+ def_union(defp); -+ break; -+ case TOK_TYPEDEF: -+ def_typedef(defp); -+ break; -+ case TOK_ENUM: -+ def_enum(defp); -+ break; -+ case TOK_PROGRAM: -+ def_program(defp); -+ break; -+ case TOK_CONST: -+ def_const(defp); -+ break; -+ case TOK_EOF: -+ free(defp); -+ return (NULL); -+ default: -+ error("definition keyword expected"); -+ } -+ scan(TOK_SEMICOLON, &tok); -+ isdefined(defp); -+ return (defp); -+} -+ -+static void -+isdefined(definition *defp) -+{ -+ STOREVAL(&defined, defp); -+} -+ -+static void -+def_struct(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ decl_list *decls; -+ decl_list **tailp; -+ -+ defp->def_kind = DEF_STRUCT; -+ -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ tailp = &defp->def.st.decls; -+ do { -+ get_declaration(&dec, DEF_STRUCT); -+ decls = ALLOC(decl_list); -+ decls->decl = dec; -+ *tailp = decls; -+ tailp = &decls->next; -+ scan(TOK_SEMICOLON, &tok); -+ peek(&tok); -+ } while (tok.kind != TOK_RBRACE); -+ get_token(&tok); -+ *tailp = NULL; -+} -+ -+static void -+def_program(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ decl_list *decls; -+ decl_list **tailp; -+ version_list *vlist; -+ version_list **vtailp; -+ proc_list *plist; -+ proc_list **ptailp; -+ int num_args; -+ bool_t isvoid = FALSE; /* whether first argument is void */ -+ defp->def_kind = DEF_PROGRAM; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ vtailp = &defp->def.pr.versions; -+ tailp = &defp->def.st.decls; -+ scan(TOK_VERSION, &tok); -+ do { -+ scan(TOK_IDENT, &tok); -+ vlist = ALLOC(version_list); -+ vlist->vers_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ ptailp = &vlist->procs; -+ do { -+ /* get result type */ -+ plist = ALLOC(proc_list); -+ get_type(&plist->res_prefix, &plist->res_type, -+ DEF_PROGRAM); -+ if (streq(plist->res_type, "opaque")) { -+ error("illegal result type"); -+ } -+ scan(TOK_IDENT, &tok); -+ plist->proc_name = tok.str; -+ scan(TOK_LPAREN, &tok); -+ /* get args - first one*/ -+ num_args = 1; -+ isvoid = FALSE; -+ /* type of DEF_PROGRAM in the first -+ * get_prog_declaration and DEF_STURCT in the next -+ * allows void as argument if it is the only argument -+ */ -+ get_prog_declaration(&dec, DEF_PROGRAM, num_args); -+ if (streq(dec.type, "void")) -+ isvoid = TRUE; -+ decls = ALLOC(decl_list); -+ plist->args.decls = decls; -+ decls->decl = dec; -+ tailp = &decls->next; -+ /* get args */ -+ while(peekscan(TOK_COMMA, &tok)) { -+ num_args++; -+ get_prog_declaration(&dec, DEF_STRUCT, -+ num_args); -+ decls = ALLOC(decl_list); -+ decls->decl = dec; -+ *tailp = decls; -+ if (streq(dec.type, "void")) -+ isvoid = TRUE; -+ tailp = &decls->next; -+ } -+ /* multiple arguments are only allowed in newstyle */ -+ if( !newstyle && num_args > 1 ) { -+ error("only one argument is allowed" ); -+ } -+ if (isvoid && num_args > 1) { -+ error("illegal use of void in program definition"); -+ } -+ *tailp = NULL; -+ scan(TOK_RPAREN, &tok); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ scan(TOK_SEMICOLON, &tok); -+ plist->proc_num = tok.str; -+ plist->arg_num = num_args; -+ *ptailp = plist; -+ ptailp = &plist->next; -+ peek(&tok); -+ } while (tok.kind != TOK_RBRACE); -+ *ptailp = NULL; -+ *vtailp = vlist; -+ vtailp = &vlist->next; -+ scan(TOK_RBRACE, &tok); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ vlist->vers_num = tok.str; -+ /* make the argument structure name for each arg*/ -+ for(plist = vlist->procs; plist != NULL; -+ plist = plist->next) { -+ plist->args.argname = make_argname(plist->proc_name, -+ vlist->vers_num); -+ /* free the memory ??*/ -+ } -+ scan(TOK_SEMICOLON, &tok); -+ scan2(TOK_VERSION, TOK_RBRACE, &tok); -+ } while (tok.kind == TOK_VERSION); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ defp->def.pr.prog_num = tok.str; -+ *vtailp = NULL; -+} -+ -+ -+static void -+def_enum(definition *defp) -+{ -+ token tok; -+ enumval_list *elist; -+ enumval_list **tailp; -+ -+ defp->def_kind = DEF_ENUM; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ tailp = &defp->def.en.vals; -+ do { -+ scan(TOK_IDENT, &tok); -+ elist = ALLOC(enumval_list); -+ elist->name = tok.str; -+ elist->assignment = NULL; -+ scan3(TOK_COMMA, TOK_RBRACE, TOK_EQUAL, &tok); -+ if (tok.kind == TOK_EQUAL) { -+ scan_num(&tok); -+ elist->assignment = tok.str; -+ scan2(TOK_COMMA, TOK_RBRACE, &tok); -+ } -+ *tailp = elist; -+ tailp = &elist->next; -+ } while (tok.kind != TOK_RBRACE); -+ *tailp = NULL; -+} -+ -+static void -+def_const(definition *defp) -+{ -+ token tok; -+ -+ defp->def_kind = DEF_CONST; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_EQUAL, &tok); -+ scan2(TOK_IDENT, TOK_STRCONST, &tok); -+ defp->def.co = tok.str; -+} -+ -+static void -+def_union(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ case_list *cases; -+ case_list **tailp; -+ -+ defp->def_kind = DEF_UNION; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_SWITCH, &tok); -+ scan(TOK_LPAREN, &tok); -+ get_declaration(&dec, DEF_UNION); -+ defp->def.un.enum_decl = dec; -+ tailp = &defp->def.un.cases; -+ scan(TOK_RPAREN, &tok); -+ scan(TOK_LBRACE, &tok); -+ scan(TOK_CASE, &tok); -+ while (tok.kind == TOK_CASE) { -+ scan2(TOK_IDENT, TOK_CHARCONST, &tok); -+ cases = ALLOC(case_list); -+ cases->case_name = tok.str; -+ scan(TOK_COLON, &tok); -+ /* now peek at next token */ -+ if(peekscan(TOK_CASE,&tok)) -+ { -+ -+ do -+ { -+ scan2(TOK_IDENT, TOK_CHARCONST, &tok); -+ cases->contflag=1; /* continued case statement */ -+ *tailp = cases; -+ tailp = &cases->next; -+ cases = ALLOC(case_list); -+ cases->case_name = tok.str; -+ scan(TOK_COLON, &tok); -+ -+ }while(peekscan(TOK_CASE,&tok)); -+ } -+ -+ get_declaration(&dec, DEF_UNION); -+ cases->case_decl = dec; -+ cases->contflag=0; /* no continued case statement */ -+ *tailp = cases; -+ tailp = &cases->next; -+ scan(TOK_SEMICOLON, &tok); -+ -+ scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok); -+ } -+ *tailp = NULL; -+ if (tok.kind == TOK_DEFAULT) { -+ scan(TOK_COLON, &tok); -+ get_declaration(&dec, DEF_UNION); -+ defp->def.un.default_decl = ALLOC(declaration); -+ *defp->def.un.default_decl = dec; -+ scan(TOK_SEMICOLON, &tok); -+ scan(TOK_RBRACE, &tok); -+ } else { -+ defp->def.un.default_decl = NULL; -+ } -+} -+ -+static char* reserved_words[] = -+{ -+ "array", -+ "bytes", -+ "destroy", -+ "free", -+ "getpos", -+ "inline", -+ "pointer", -+ "reference", -+ "setpos", -+ "sizeof", -+ "union", -+ "vector", -+ NULL -+ }; -+ -+static char* reserved_types[] = -+{ -+ "opaque", -+ "string", -+ NULL -+ }; -+ -+/* check that the given name is not one that would eventually result in -+ xdr routines that would conflict with internal XDR routines. */ -+static void -+check_type_name(char *name, int new_type) -+{ -+ int i; -+ char tmp[100]; -+ -+ for( i = 0; reserved_words[i] != NULL; i++ ) { -+ if( strcmp( name, reserved_words[i] ) == 0 ) { -+ sprintf(tmp, -+ "illegal (reserved) name :\'%s\' in type definition", name ); -+ error(tmp); -+ } -+ } -+ if( new_type ) { -+ for( i = 0; reserved_types[i] != NULL; i++ ) { -+ if( strcmp( name, reserved_types[i] ) == 0 ) { -+ sprintf(tmp, -+ "illegal (reserved) name :\'%s\' in type definition", name ); -+ error(tmp); -+ } -+ } -+ } -+} -+ -+static void -+def_typedef(definition *defp) -+{ -+ declaration dec; -+ -+ defp->def_kind = DEF_TYPEDEF; -+ get_declaration(&dec, DEF_TYPEDEF); -+ defp->def_name = dec.name; -+ check_type_name( dec.name, 1 ); -+ defp->def.ty.old_prefix = dec.prefix; -+ defp->def.ty.old_type = dec.type; -+ defp->def.ty.rel = dec.rel; -+ defp->def.ty.array_max = dec.array_max; -+} -+ -+static void -+get_declaration(declaration *dec, defkind dkind) -+{ -+ token tok; -+ -+ get_type(&dec->prefix, &dec->type, dkind); -+ dec->rel = REL_ALIAS; -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ -+ check_type_name( dec->type, 0 ); -+ -+ scan2(TOK_STAR, TOK_IDENT, &tok); -+ if (tok.kind == TOK_STAR) { -+ dec->rel = REL_POINTER; -+ scan(TOK_IDENT, &tok); -+ } -+ dec->name = tok.str; -+ if (peekscan(TOK_LBRACKET, &tok)) { -+ if (dec->rel == REL_POINTER) { -+ error("no array-of-pointer declarations -- use typedef"); -+ } -+ dec->rel = REL_VECTOR; -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RBRACKET, &tok); -+ } else if (peekscan(TOK_LANGLE, &tok)) { -+ if (dec->rel == REL_POINTER) { -+ error("no array-of-pointer declarations -- use typedef"); -+ } -+ dec->rel = REL_ARRAY; -+ if (peekscan(TOK_RANGLE, &tok)) { -+ dec->array_max = "~0"; /* unspecified size, use max */ -+ } else { -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RANGLE, &tok); -+ } -+ } -+ if (streq(dec->type, "opaque")) { -+ if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) { -+ error("array declaration expected"); -+ } -+ } else if (streq(dec->type, "string")) { -+ if (dec->rel != REL_ARRAY) { -+ error("variable-length array declaration expected"); -+ } -+ } -+} -+ -+ -+static void -+get_prog_declaration(declaration *dec, defkind dkind, int num) -+{ -+ token tok; -+ char name[10]; /* argument name */ -+ -+ if (dkind == DEF_PROGRAM) { -+ peek(&tok); -+ if (tok.kind == TOK_RPAREN) { /* no arguments */ -+ dec->rel = REL_ALIAS; -+ dec->type = "void"; -+ dec->prefix = NULL; -+ dec->name = NULL; -+ return; -+ } -+ } -+ get_type(&dec->prefix, &dec->type, dkind); -+ dec->rel = REL_ALIAS; -+ if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */ -+ strcpy(name, tok.str); -+ else -+ sprintf(name, "%s%d", ARGNAME, num); /* default name of argument */ -+ -+ dec->name = (char *) strdup(name); -+ -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ -+ if (streq(dec->type, "opaque")) { -+ error("opaque -- illegal argument type"); -+ } -+ if (peekscan(TOK_STAR, &tok)) { -+ if (streq(dec->type, "string")) { -+ error("pointer to string not allowed in program arguments\n"); -+ } -+ dec->rel = REL_POINTER; -+ if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */ -+ dec->name = strdup(tok.str); -+ } -+ if (peekscan(TOK_LANGLE, &tok)) { -+ if (!streq(dec->type, "string")) { -+ error("arrays cannot be declared as arguments to procedures -- use typedef"); -+ } -+ dec->rel = REL_ARRAY; -+ if (peekscan(TOK_RANGLE, &tok)) { -+ dec->array_max = "~0";/* unspecified size, use max */ -+ } else { -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RANGLE, &tok); -+ } -+ } -+ if (streq(dec->type, "string")) { -+ if (dec->rel != REL_ARRAY) { /* .x specifies just string as -+ * type of argument -+ * - make it string<> -+ */ -+ dec->rel = REL_ARRAY; -+ dec->array_max = "~0";/* unspecified size, use max */ -+ } -+ } -+} -+ -+ -+ -+static void -+get_type(char **prefixp, char **typep, defkind dkind) -+{ -+ token tok; -+ -+ *prefixp = NULL; -+ get_token(&tok); -+ switch (tok.kind) { -+ case TOK_IDENT: -+ *typep = tok.str; -+ break; -+ case TOK_STRUCT: -+ case TOK_ENUM: -+ case TOK_UNION: -+ *prefixp = tok.str; -+ scan(TOK_IDENT, &tok); -+ *typep = tok.str; -+ break; -+ case TOK_UNSIGNED: -+ unsigned_dec(typep); -+ break; -+ case TOK_SHORT: -+ *typep = "short"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT32: -+ *typep = "int32_t"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_VOID: -+ if (dkind != DEF_UNION && dkind != DEF_PROGRAM) { -+ error("voids allowed only inside union and program definitions with one argument"); -+ } -+ *typep = tok.str; -+ break; -+ case TOK_STRING: -+ case TOK_OPAQUE: -+ case TOK_CHAR: -+ case TOK_INT: -+ case TOK_FLOAT: -+ case TOK_DOUBLE: -+ case TOK_BOOL: -+ *typep = tok.str; -+ break; -+ default: -+ error("expected type specifier"); -+ } -+} -+ -+static void -+unsigned_dec(char **typep) -+{ -+ token tok; -+ -+ peek(&tok); -+ switch (tok.kind) { -+ case TOK_CHAR: -+ get_token(&tok); -+ *typep = "u_char"; -+ break; -+ case TOK_SHORT: -+ get_token(&tok); -+ *typep = "u_short"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT32: -+ get_token(&tok); -+ *typep = "u_int32_"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT: -+ get_token(&tok); -+ *typep = "u_int"; -+ break; -+ default: -+ *typep = "u_int"; -+ break; -+ } -+} -diff --git a/rpcgen/rpc_parse.h b/rpcgen/rpc_parse.h -new file mode 100644 -index 0000000..2afae10 ---- /dev/null -+++ b/rpcgen/rpc_parse.h -@@ -0,0 +1,166 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_parse.h 1.3 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_parse.h, Definitions for the RPCL parser -+ */ -+ -+enum defkind { -+ DEF_CONST, -+ DEF_STRUCT, -+ DEF_UNION, -+ DEF_ENUM, -+ DEF_TYPEDEF, -+ DEF_PROGRAM -+}; -+typedef enum defkind defkind; -+ -+typedef char *const_def; -+ -+enum relation { -+ REL_VECTOR, /* fixed length array */ -+ REL_ARRAY, /* variable length array */ -+ REL_POINTER, /* pointer */ -+ REL_ALIAS, /* simple */ -+}; -+typedef enum relation relation; -+ -+struct typedef_def { -+ char *old_prefix; -+ char *old_type; -+ relation rel; -+ char *array_max; -+}; -+typedef struct typedef_def typedef_def; -+ -+struct enumval_list { -+ char *name; -+ char *assignment; -+ struct enumval_list *next; -+}; -+typedef struct enumval_list enumval_list; -+ -+struct enum_def { -+ enumval_list *vals; -+}; -+typedef struct enum_def enum_def; -+ -+struct declaration { -+ char *prefix; -+ char *type; -+ char *name; -+ relation rel; -+ char *array_max; -+}; -+typedef struct declaration declaration; -+ -+struct decl_list { -+ declaration decl; -+ struct decl_list *next; -+}; -+typedef struct decl_list decl_list; -+ -+struct struct_def { -+ decl_list *decls; -+}; -+typedef struct struct_def struct_def; -+ -+struct case_list { -+ char *case_name; -+ int contflag; -+ declaration case_decl; -+ struct case_list *next; -+}; -+typedef struct case_list case_list; -+ -+struct union_def { -+ declaration enum_decl; -+ case_list *cases; -+ declaration *default_decl; -+}; -+typedef struct union_def union_def; -+ -+struct arg_list { -+ char *argname; /* name of struct for arg*/ -+ decl_list *decls; -+}; -+ -+typedef struct arg_list arg_list; -+ -+struct proc_list { -+ char *proc_name; -+ char *proc_num; -+ arg_list args; -+ int arg_num; -+ char *res_type; -+ char *res_prefix; -+ struct proc_list *next; -+}; -+typedef struct proc_list proc_list; -+ -+struct version_list { -+ char *vers_name; -+ char *vers_num; -+ proc_list *procs; -+ struct version_list *next; -+}; -+typedef struct version_list version_list; -+ -+struct program_def { -+ char *prog_num; -+ version_list *versions; -+}; -+typedef struct program_def program_def; -+ -+struct definition { -+ char *def_name; -+ defkind def_kind; -+ union { -+ const_def co; -+ struct_def st; -+ union_def un; -+ enum_def en; -+ typedef_def ty; -+ program_def pr; -+ } def; -+}; -+typedef struct definition definition; -+ -+definition *get_definition(); -+ -+ -+struct bas_type -+{ -+ char *name; -+ int length; -+ struct bas_type *next; -+}; -+ -+typedef struct bas_type bas_type; -diff --git a/rpcgen/rpc_sample.c b/rpcgen/rpc_sample.c -new file mode 100644 -index 0000000..2b5c81b ---- /dev/null -+++ b/rpcgen/rpc_sample.c -@@ -0,0 +1,247 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI"; -+ -+#endif -+ -+/* -+ * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler -+ */ -+ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+ -+static char RQSTP[] = "rqstp"; -+ -+static void write_sample_client(char *program_name, version_list *vp); -+static void write_sample_server(definition * def); -+static void return_type(proc_list *plist); -+ -+void -+write_sample_svc(definition *def) -+{ -+ if (def->def_kind != DEF_PROGRAM) -+ return; -+ write_sample_server(def); -+} -+ -+ -+int -+write_sample_clnt(definition *def) -+{ -+ version_list *vp; -+ int count = 0; -+ -+ if (def->def_kind != DEF_PROGRAM) -+ return (0); -+ /* generate sample code for each version */ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ write_sample_client(def->def_name, vp); -+ ++count; -+ } -+ return (count); -+} -+ -+ -+static void -+write_sample_client(char *program_name, version_list *vp) -+{ -+ proc_list *proc; -+ int i; -+ decl_list *l; -+ -+ f_print(fout, "\n\nvoid\n"); -+ pvname(program_name, vp->vers_num); -+ if (Cflag) -+ f_print(fout, "( char* host )\n{\n"); -+ else -+ f_print(fout, "(host)\nchar *host;\n{\n"); -+ f_print(fout, "\tCLIENT *clnt;\n"); -+ -+ i = 0; -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\t"); -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, " *result_%d;\n", ++i); -+ /* print out declarations for arguments */ -+ if (proc->arg_num < 2 && !newstyle) { -+ f_print(fout, "\t"); -+ if (!streq(proc->args.decls->decl.type, "void")) -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ else -+ f_print(fout, "char* "); /* cannot have "void" type */ -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ } else if (!streq(proc->args.decls->decl.type, "void")) { -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ f_print(fout, "\t"); -+ ptype(l->decl.prefix, l->decl.type, 1); -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_%s;\n", l->decl.name); -+ /* pdeclaration(proc->args.argname, &l->decl, 1, ";\n" );*/ -+ } -+ } -+ } -+ -+ /* generate creation of client handle */ -+ f_print(fout, "\tclnt = clnt_create(host, %s, %s, \"%s\");\n", -+ program_name, vp->vers_name, tirpcflag ? "netpath" : "udp"); -+ f_print(fout, "\tif (clnt == NULL) {\n"); -+ f_print(fout, "\t\tclnt_pcreateerror(host);\n"); -+ f_print(fout, "\t\texit(1);\n\t}\n"); -+ -+ /* generate calls to procedures */ -+ i = 0; -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\tresult_%d = ", ++i); -+ pvname(proc->proc_name, vp->vers_num); -+ if (proc->arg_num < 2 && !newstyle) { -+ f_print(fout, "("); -+ if (streq(proc->args.decls->decl.type, "void")) /* cast to void* */ -+ f_print(fout, "(void*)"); -+ f_print(fout, "&"); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg, clnt);\n"); -+ } else if (streq(proc->args.decls->decl.type, "void")) { -+ f_print(fout, "(clnt);\n"); -+ } else { -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_%s, ", l->decl.name); -+ } -+ f_print(fout, "clnt);\n"); -+ } -+ f_print(fout, "\tif (result_%d == NULL) {\n", i); -+ f_print(fout, "\t\tclnt_perror(clnt, \"call failed:\");\n"); -+ f_print(fout, "\t}\n"); -+ } -+ -+ f_print(fout, "\tclnt_destroy( clnt );\n"); -+ f_print(fout, "}\n"); -+} -+ -+static void -+write_sample_server(definition * def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ /* if( Cflag ) -+ f_print( fout, "extern \"C\"{\n"); -+*/ -+ return_type(proc); -+ f_print(fout, "* \n"); -+ if (Cflag) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ printarglist(proc, RQSTP, "struct svc_req *"); -+ -+ f_print(fout, "{\n"); -+ f_print(fout, "\n\tstatic "); -+ if (!streq(proc->res_type, "void")) -+ return_type(proc); -+ else -+ f_print(fout, "char*"); /* cannot have void type */ -+ /* f_print(fout, " result;\n", proc->res_type); */ -+ f_print(fout, " result;\n"); -+ f_print(fout, -+ "\n\t/*\n\t * insert server code here\n\t */\n\n"); -+ if (!streq(proc->res_type, "void")) -+ f_print(fout, "\treturn(&result);\n}\n"); -+ else /* cast back to void * */ -+ f_print(fout, "\treturn((void*) &result);\n}\n"); -+ /* if( Cflag) -+ f_print( fout, "};\n"); -+*/ -+ -+ } -+ } -+} -+ -+ -+ -+static void -+return_type(proc_list *plist) -+{ -+ ptype( plist->res_prefix, plist->res_type, 1 ); -+} -+ -+void -+add_sample_msg(void) -+{ -+ f_print(fout, "/*\n"); -+ f_print(fout, " * This is sample code generated by rpcgen.\n"); -+ f_print(fout, " * These are only templates and you can use them\n"); -+ f_print(fout, " * as a guideline for developing your own functions.\n"); -+ f_print(fout, " */\n\n"); -+} -+ -+void -+write_sample_clnt_main(void) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ f_print(fout, "\n\n" ); -+ if( Cflag ) -+ f_print(fout,"main( int argc, char* argv[] )\n{\n" ); -+ else -+ f_print(fout, "main(argc, argv)\nint argc;\nchar *argv[];\n{\n" ); -+ -+ f_print(fout, "\tchar *host;"); -+ f_print(fout, "\n\n\tif(argc < 2) {"); -+ f_print(fout, "\n\t\tprintf(\"usage: %%s server_host\\n\", argv[0]);\n" ); -+ f_print(fout, "\t\texit(1);\n\t}"); -+ f_print(fout, "\n\thost = argv[1];\n"); -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print( fout, "\t" ); -+ pvname(def->def_name, vp->vers_num); -+ f_print( fout, "( host );\n" ); -+ } -+ } -+ f_print(fout, "}\n"); -+} -diff --git a/rpcgen/rpc_scan.c b/rpcgen/rpc_scan.c -new file mode 100644 -index 0000000..f58fa9f ---- /dev/null -+++ b/rpcgen/rpc_scan.c -@@ -0,0 +1,474 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_scan.c, Scanner for the RPC protocol compiler -+ * Copyright (C) 1987, Sun Microsystems, Inc. -+ */ -+#include -+#include -+#include -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static void unget_token(token *tokp); -+static void findstrconst(char **str, char **val); -+static void findchrconst(char **str, char **val); -+static void findconst(char **str, char **val); -+static void findkind(char **mark, token *tokp); -+static int cppline(char *line); -+static int directive(char *line); -+static void printdirective(char *line); -+static void docppline(char *line, int *lineno, char **fname); -+ -+#define startcomment(where) (where[0] == '/' && where[1] == '*') -+#define endcomment(where) (where[-1] == '*' && where[0] == '/') -+ -+static int pushed = 0; /* is a token pushed */ -+static token lasttok; /* last token, if pushed */ -+ -+/* -+ * scan expecting 1 given token -+ */ -+void -+scan(tok_kind expect, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect) { -+ expected1(expect); -+ } -+} -+ -+/* -+ * scan expecting any of the 2 given tokens -+ */ -+void -+scan2(tok_kind expect1, tok_kind expect2, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect1 && tokp->kind != expect2) { -+ expected2(expect1, expect2); -+ } -+} -+ -+/* -+ * scan expecting any of the 3 given token -+ */ -+void -+scan3(tok_kind expect1, tok_kind expect2, tok_kind expect3, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect1 && tokp->kind != expect2 -+ && tokp->kind != expect3) { -+ expected3(expect1, expect2, expect3); -+ } -+} -+ -+/* -+ * scan expecting a constant, possibly symbolic -+ */ -+void -+scan_num(token *tokp) -+{ -+ get_token(tokp); -+ switch (tokp->kind) { -+ case TOK_IDENT: -+ break; -+ default: -+ error("constant or identifier expected"); -+ } -+} -+ -+/* -+ * Peek at the next token -+ */ -+void -+peek(token *tokp) -+{ -+ get_token(tokp); -+ unget_token(tokp); -+} -+ -+/* -+ * Peek at the next token and scan it if it matches what you expect -+ */ -+int -+peekscan(tok_kind expect, token *tokp) -+{ -+ peek(tokp); -+ if (tokp->kind == expect) { -+ get_token(tokp); -+ return (1); -+ } -+ return (0); -+} -+ -+/* -+ * Get the next token, printing out any directive that are encountered. -+ */ -+void -+get_token(token *tokp) -+{ -+ int commenting; -+ -+ if (pushed) { -+ pushed = 0; -+ *tokp = lasttok; -+ return; -+ } -+ commenting = 0; -+ for (;;) { -+ if (*where == 0) { -+ for (;;) { -+ if (!fgets(curline, MAXLINESIZE, fin)) { -+ tokp->kind = TOK_EOF; -+ *where = 0; -+ return; -+ } -+ linenum++; -+ if (commenting) { -+ break; -+ } else if (cppline(curline)) { -+ docppline(curline, &linenum, -+ &infilename); -+ } else if (directive(curline)) { -+ printdirective(curline); -+ } else { -+ break; -+ } -+ } -+ where = curline; -+ } else if (isspace(*where)) { -+ while (isspace(*where)) { -+ where++; /* eat */ -+ } -+ } else if (commenting) { -+ for (where++; *where; where++) { -+ if (endcomment(where)) { -+ where++; -+ commenting--; -+ break; -+ } -+ } -+ } else if (startcomment(where)) { -+ where += 2; -+ commenting++; -+ } else { -+ break; -+ } -+ } -+ -+ /* -+ * 'where' is not whitespace, comment or directive Must be a token! -+ */ -+ switch (*where) { -+ case ':': -+ tokp->kind = TOK_COLON; -+ where++; -+ break; -+ case ';': -+ tokp->kind = TOK_SEMICOLON; -+ where++; -+ break; -+ case ',': -+ tokp->kind = TOK_COMMA; -+ where++; -+ break; -+ case '=': -+ tokp->kind = TOK_EQUAL; -+ where++; -+ break; -+ case '*': -+ tokp->kind = TOK_STAR; -+ where++; -+ break; -+ case '[': -+ tokp->kind = TOK_LBRACKET; -+ where++; -+ break; -+ case ']': -+ tokp->kind = TOK_RBRACKET; -+ where++; -+ break; -+ case '{': -+ tokp->kind = TOK_LBRACE; -+ where++; -+ break; -+ case '}': -+ tokp->kind = TOK_RBRACE; -+ where++; -+ break; -+ case '(': -+ tokp->kind = TOK_LPAREN; -+ where++; -+ break; -+ case ')': -+ tokp->kind = TOK_RPAREN; -+ where++; -+ break; -+ case '<': -+ tokp->kind = TOK_LANGLE; -+ where++; -+ break; -+ case '>': -+ tokp->kind = TOK_RANGLE; -+ where++; -+ break; -+ -+ case '"': -+ tokp->kind = TOK_STRCONST; -+ findstrconst(&where, &tokp->str); -+ break; -+ case '\'': -+ tokp->kind = TOK_CHARCONST; -+ findchrconst(&where, &tokp->str); -+ break; -+ -+ case '-': -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ case '4': -+ case '5': -+ case '6': -+ case '7': -+ case '8': -+ case '9': -+ tokp->kind = TOK_IDENT; -+ findconst(&where, &tokp->str); -+ break; -+ -+ default: -+ if (!(isalpha(*where) || *where == '_')) { -+ char buf[100]; -+ char *p; -+ -+ s_print(buf, "illegal character in file: "); -+ p = buf + strlen(buf); -+ if (isprint(*where)) { -+ s_print(p, "%c", *where); -+ } else { -+ s_print(p, "%d", *where); -+ } -+ error(buf); -+ } -+ findkind(&where, tokp); -+ break; -+ } -+} -+ -+static void -+unget_token(token *tokp) -+{ -+ lasttok = *tokp; -+ pushed = 1; -+} -+ -+static void -+findstrconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ do { -+ *p++; -+ } while (*p && *p != '"'); -+ if (*p == 0) { -+ error("unterminated string constant"); -+ } -+ p++; -+ size = p - *str; -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static void -+findchrconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ do { -+ *p++; -+ } while (*p && *p != '\''); -+ if (*p == 0) { -+ error("unterminated string constant"); -+ } -+ p++; -+ size = p - *str; -+ if (size != 3) { -+ error("empty char string"); -+ } -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static void -+findconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ if (*p == '0' && *(p + 1) == 'x') { -+ p++; -+ do { -+ p++; -+ } while (isxdigit(*p)); -+ } else { -+ do { -+ p++; -+ } while (isdigit(*p)); -+ } -+ size = p - *str; -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static token symbols[] = { -+ {TOK_CONST, "const"}, -+ {TOK_UNION, "union"}, -+ {TOK_SWITCH, "switch"}, -+ {TOK_CASE, "case"}, -+ {TOK_DEFAULT, "default"}, -+ {TOK_STRUCT, "struct"}, -+ {TOK_TYPEDEF, "typedef"}, -+ {TOK_ENUM, "enum"}, -+ {TOK_OPAQUE, "opaque"}, -+ {TOK_BOOL, "bool"}, -+ {TOK_VOID, "void"}, -+ {TOK_CHAR, "char"}, -+ {TOK_INT, "int"}, -+ {TOK_UNSIGNED, "unsigned"}, -+ {TOK_SHORT, "short"}, -+ {TOK_INT32, "int32"}, -+ {TOK_FLOAT, "float"}, -+ {TOK_DOUBLE, "double"}, -+ {TOK_STRING, "string"}, -+ {TOK_PROGRAM, "program"}, -+ {TOK_VERSION, "version"}, -+ {TOK_EOF, "??????"}, -+}; -+ -+static void -+findkind(char **mark, token *tokp) -+{ -+ int len; -+ token *s; -+ char *str; -+ -+ str = *mark; -+ for (s = symbols; s->kind != TOK_EOF; s++) { -+ len = strlen(s->str); -+ if (strncmp(str, s->str, len) == 0) { -+ if (!isalnum(str[len]) && str[len] != '_') { -+ tokp->kind = s->kind; -+ tokp->str = s->str; -+ *mark = str + len; -+ return; -+ } -+ } -+ } -+ tokp->kind = TOK_IDENT; -+ for (len = 0; isalnum(str[len]) || str[len] == '_'; len++); -+ tokp->str = alloc(len + 1); -+ (void) strncpy(tokp->str, str, len); -+ tokp->str[len] = 0; -+ *mark = str + len; -+} -+ -+static int -+cppline(char *line) -+{ -+ return (line == curline && *line == '#'); -+} -+ -+static int -+directive(char *line) -+{ -+ return (line == curline && *line == '%'); -+} -+ -+static void -+printdirective(char *line) -+{ -+ f_print(fout, "%s", line + 1); -+} -+ -+static void -+docppline(char *line, int *lineno, char **fname) -+{ -+ char *file; -+ int num; -+ char *p; -+ -+ line++; -+ while (isspace(*line)) { -+ line++; -+ } -+ num = atoi(line); -+ while (isdigit(*line)) { -+ line++; -+ } -+ while (isspace(*line)) { -+ line++; -+ } -+ if (*line != '"') { -+ error("preprocessor error"); -+ } -+ line++; -+ p = file = alloc(strlen(line) + 1); -+ while (*line && *line != '"') { -+ *p++ = *line++; -+ } -+ if (*line == 0) { -+ error("preprocessor error"); -+ } -+ *p = 0; -+ if (*file == 0) { -+ *fname = NULL; -+ free(file); -+ } else { -+ *fname = file; -+ } -+ *lineno = num - 1; -+} -diff --git a/rpcgen/rpc_scan.h b/rpcgen/rpc_scan.h -new file mode 100644 -index 0000000..16f688c ---- /dev/null -+++ b/rpcgen/rpc_scan.h -@@ -0,0 +1,103 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_scan.h 1.3 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_scan.h, Definitions for the RPCL scanner -+ */ -+ -+/* -+ * kinds of tokens -+ */ -+enum tok_kind { -+ TOK_IDENT, -+ TOK_CHARCONST, -+ TOK_STRCONST, -+ TOK_LPAREN, -+ TOK_RPAREN, -+ TOK_LBRACE, -+ TOK_RBRACE, -+ TOK_LBRACKET, -+ TOK_RBRACKET, -+ TOK_LANGLE, -+ TOK_RANGLE, -+ TOK_STAR, -+ TOK_COMMA, -+ TOK_EQUAL, -+ TOK_COLON, -+ TOK_SEMICOLON, -+ TOK_CONST, -+ TOK_STRUCT, -+ TOK_UNION, -+ TOK_SWITCH, -+ TOK_CASE, -+ TOK_DEFAULT, -+ TOK_ENUM, -+ TOK_TYPEDEF, -+ TOK_INT, -+ TOK_SHORT, -+ TOK_INT32, -+ TOK_UNSIGNED, -+ TOK_FLOAT, -+ TOK_DOUBLE, -+ TOK_OPAQUE, -+ TOK_CHAR, -+ TOK_STRING, -+ TOK_BOOL, -+ TOK_VOID, -+ TOK_PROGRAM, -+ TOK_VERSION, -+ TOK_EOF -+}; -+typedef enum tok_kind tok_kind; -+ -+/* -+ * a token -+ */ -+struct token { -+ tok_kind kind; -+ char *str; -+}; -+typedef struct token token; -+ -+ -+/* -+ * routine interface -+ */ -+void scan(); -+void scan2(); -+void scan3(); -+void scan_num(); -+void peek(); -+int peekscan(); -+void get_token(); -+void expected1(tok_kind); -+void expected2(tok_kind, tok_kind); -+void expected3(tok_kind, tok_kind, tok_kind); -+ -diff --git a/rpcgen/rpc_svcout.c b/rpcgen/rpc_svcout.c -new file mode 100644 -index 0000000..284a529 ---- /dev/null -+++ b/rpcgen/rpc_svcout.c -@@ -0,0 +1,882 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+static void write_real_program(definition *def); -+static void write_program(definition *def, char *storage); -+static void printerr(char *err, char *transp); -+static void printif(char *proc, char *transp, char *prefix, char *arg); -+static void write_inetmost(char *infile); -+static void print_return(char *space); -+static void print_pmapunset(char *space); -+static void print_err_message(char *space); -+static void write_timeout_func(void); -+static void write_pm_most(char *infile, int netflag); -+static void write_rpc_svc_fg(char *infile, char *sp); -+static void open_log_file(char *infile, char *sp); -+ -+static char RQSTP[] = "rqstp"; -+static char TRANSP[] = "transp"; -+static char ARG[] = "argument"; -+static char RESULT[] = "result"; -+static char ROUTINE[] = "local"; -+ -+char _errbuf[256]; /* For all messages */ -+ -+static void -+p_xdrfunc(char *rname, char *typename) -+{ -+ if (Cflag) -+ f_print(fout, "\t\txdr_%s = (xdrproc_t) xdr_%s;\n", rname, -+ stringfix(typename)); -+ else -+ f_print(fout, "\t\txdr_%s = xdr_%s;\n", rname, stringfix(typename)); -+} -+ -+void -+internal_proctype(proc_list *plist) -+{ -+ f_print(fout, "static "); -+ ptype( plist->res_prefix, plist->res_type, 1 ); -+ f_print( fout, "*" ); -+} -+ -+ -+/* -+ * write most of the service, that is, everything but the registrations. -+ */ -+void -+write_most(char *infile, int netflag, int nomain) -+{ -+ if (inetdflag || pmflag) { -+ char* var_type; -+ var_type = (nomain? "extern" : "static"); -+ f_print(fout, "%s int _rpcpmstart;", var_type ); -+ f_print(fout, "\t\t/* Started by a port monitor ? */\n"); -+ f_print(fout, "%s int _rpcfdtype;", var_type ); -+ f_print(fout, "\t\t/* Whether Stream or Datagram ? */\n"); -+ if (timerflag) { -+ f_print(fout, "%s int _rpcsvcdirty;", var_type ); -+ f_print(fout, "\t/* Still serving ? */\n"); -+ } -+ write_svc_aux( nomain ); -+ } -+ /* write out dispatcher and stubs */ -+ write_programs( nomain? (char *)NULL : "static" ); -+ -+ if( nomain ) -+ return; -+ -+ f_print(fout, "\nmain()\n"); -+ f_print(fout, "{\n"); -+ if (inetdflag) { -+ write_inetmost(infile); /* Includes call to write_rpc_svc_fg() */ -+ } else { -+ if( tirpcflag ) { -+ if (netflag) { -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\tstruct netconfig *nconf = NULL;\n"); -+ } -+ f_print(fout, "\tpid_t pid;\n"); -+ f_print(fout, "\tint i;\n"); -+ f_print(fout, "\tchar mname[FMNAMESZ + 1];\n\n"); -+ write_pm_most(infile, netflag); -+ f_print(fout, "\telse {\n"); -+ write_rpc_svc_fg(infile, "\t\t"); -+ f_print(fout, "\t}\n"); -+ } else { -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\n"); -+ print_pmapunset("\t"); -+ } -+ } -+ -+ if (logflag && !inetdflag) { -+ open_log_file(infile, "\t"); -+ } -+} -+ -+/* -+ * write a registration for the given transport -+ */ -+void -+write_netid_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ char *sp; -+ char tmpbuf[32]; -+ -+ sp = ""; -+ f_print(fout, "\n"); -+ f_print(fout, "%s\tnconf = getnetconfigent(\"%s\");\n", sp, transp); -+ f_print(fout, "%s\tif (nconf == NULL) {\n", sp); -+ (void) sprintf(_errbuf, "cannot find %s netid.", transp); -+ sprintf(tmpbuf, "%s\t\t", sp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ f_print(fout, "%s\t%s = svc_tli_create(RPC_ANYFD, nconf, 0, 0, 0);\n", -+ sp, TRANSP); -+ f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP); -+ (void) sprintf(_errbuf, "cannot create %s service.", transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, -+ "%s\t(void) rpcb_unset(%s, %s, nconf);\n", -+ sp, def->def_name, vp->vers_name); -+ f_print(fout, -+ "%s\tif (!svc_reg(%s, %s, %s, ", -+ sp, TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", nconf)) {\n"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s, %s).", -+ def->def_name, vp->vers_name, transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ } -+ } -+ f_print(fout, "%s\tfreenetconfigent(nconf);\n", sp); -+} -+ -+/* -+ * write a registration for the given transport for TLI -+ */ -+void -+write_nettype_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "\tif (!svc_create("); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", %s, %s, \"%s\")) {\n ", -+ def->def_name, vp->vers_name, transp); -+ (void) sprintf(_errbuf, -+ "unable to create (%s, %s) for %s.", -+ def->def_name, vp->vers_name, transp); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ } -+ } -+} -+ -+/* -+ * write the rest of the service -+ */ -+void -+write_rest(void) -+{ -+ f_print(fout, "\n"); -+ if (inetdflag) { -+ f_print(fout, "\tif (%s == (SVCXPRT *)NULL) {\n", TRANSP); -+ (void) sprintf(_errbuf, "could not create a handle"); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ if (timerflag) { -+ f_print(fout, "\tif (_rpcpmstart) {\n"); -+ f_print(fout, -+ "\t\t(void) signal(SIGALRM, %s closedown);\n", -+ Cflag? "(SIG_PF)" : "(void(*)())" ); -+ f_print(fout, "\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "\t}\n"); -+ } -+ } -+ f_print(fout, "\tsvc_run();\n"); -+ (void) sprintf(_errbuf, "svc_run returned"); -+ print_err_message("\t"); -+ f_print(fout, "\texit(1);\n"); -+ f_print(fout, "\t/* NOTREACHED */\n"); -+ f_print(fout, "}\n"); -+} -+ -+void -+write_programs(char *storage) -+{ -+ list *l; -+ definition *def; -+ -+ /* write out stubs for procedure definitions */ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_real_program(def); -+ } -+ } -+ -+ /* write out dispatcher for each program */ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_program(def, storage); -+ } -+ } -+ -+ -+} -+ -+/* write out definition of internal function (e.g. _printmsg_1(...)) -+ which calls server's defintion of actual function (e.g. printmsg_1(...)). -+ Unpacks single user argument of printmsg_1 to call-by-value format -+ expected by printmsg_1. */ -+static void -+write_real_program(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ decl_list *l; -+ -+ if( !newstyle ) return; /* not needed for old style */ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ internal_proctype(proc); -+ f_print(fout, "\n_"); -+ pvname(proc->proc_name, vp->vers_num); -+ if( Cflag ) { -+ f_print(fout, "(" ); -+ /* arg name */ -+ if (proc->arg_num > 1) -+ f_print(fout, proc->args.argname); -+ else -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ f_print(fout, " *argp, struct svc_req *%s)\n", -+ RQSTP); -+ } else { -+ f_print(fout, "(argp, %s)\n", RQSTP ); -+ /* arg name */ -+ if (proc->arg_num > 1) -+ f_print(fout, "\t%s *argp;\n", proc->args.argname); -+ else { -+ f_print(fout, "\t"); -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ f_print(fout, " *argp;\n"); -+ } -+ f_print(fout, " struct svc_req *%s;\n", RQSTP); -+ } -+ -+ f_print(fout, "{\n"); -+ f_print(fout, "\treturn("); -+ if( Cflag ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "("); -+ if (proc->arg_num < 2) { /* single argument */ -+ if (!streq( proc->args.decls->decl.type, "void")) -+ f_print(fout, "*argp, "); /* non-void */ -+ } else { -+ for (l = proc->args.decls; l != NULL; l = l->next) -+ f_print(fout, "argp->%s, ", l->decl.name); -+ } -+ f_print(fout, "%s));\n}\n", RQSTP); -+ } -+ } -+} -+ -+static void -+write_program(definition *def, char *storage) -+{ -+ version_list *vp; -+ proc_list *proc; -+ int filled; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "\n"); -+ if (storage != NULL) { -+ f_print(fout, "%s ", storage); -+ } -+ f_print(fout, "void\n"); -+ pvname(def->def_name, vp->vers_num); -+ -+ if (Cflag) { -+ f_print(fout, "(struct svc_req *%s, ", RQSTP); -+ f_print(fout, "register SVCXPRT *%s)\n", TRANSP); -+ } else { -+ f_print(fout, "(%s, %s)\n", RQSTP, TRANSP); -+ f_print(fout, " struct svc_req *%s;\n", RQSTP); -+ f_print(fout, " register SVCXPRT *%s;\n", TRANSP); -+ } -+ -+ f_print(fout, "{\n"); -+ -+ filled = 0; -+ f_print(fout, "\tunion {\n"); -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ if (proc->arg_num < 2) { /* single argument */ -+ if (streq(proc->args.decls->decl.type, -+ "void")) { -+ continue; -+ } -+ filled = 1; -+ f_print(fout, "\t\t"); -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ -+ } -+ else { -+ filled = 1; -+ f_print(fout, "\t\t%s", proc->args.argname); -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ } -+ } -+ if (!filled) { -+ f_print(fout, "\t\tint fill;\n"); -+ } -+ f_print(fout, "\t} %s;\n", ARG); -+ f_print(fout, "\tchar *%s;\n", RESULT); -+ -+ if (Cflag) { -+ f_print(fout, "\txdrproc_t xdr_%s, xdr_%s;\n", ARG, RESULT); -+ f_print(fout, -+ "\tchar *(*%s)(char *, struct svc_req *);\n", -+ ROUTINE); -+ } else { -+ f_print(fout, "\tbool_t (*xdr_%s)(), (*xdr_%s)();\n", ARG, RESULT); -+ f_print(fout, "\tchar *(*%s)();\n", ROUTINE); -+ } -+ -+ f_print(fout, "\n"); -+ -+ if (timerflag) -+ f_print(fout, "\t_rpcsvcdirty = 1;\n"); -+ f_print(fout, "\tswitch (%s->rq_proc) {\n", RQSTP); -+ if (!nullproc(vp->procs)) { -+ f_print(fout, "\tcase NULLPROC:\n"); -+ f_print(fout, -+ "\t\t(void) svc_sendreply(%s, (xdrproc_t) xdr_void, (char *)NULL);\n", -+ TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\n"); -+ } -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\tcase %s:\n", proc->proc_name); -+ if (proc->arg_num < 2) { /* single argument */ -+ p_xdrfunc( ARG, proc->args.decls->decl.type); -+ } else { -+ p_xdrfunc( ARG, proc->args.argname); -+ } -+ p_xdrfunc( RESULT, proc->res_type); -+ if( Cflag ) -+ f_print(fout, -+ "\t\t%s = (char *(*)(char *, struct svc_req *)) ", -+ ROUTINE); -+ else -+ f_print(fout, "\t\t%s = (char *(*)()) ", ROUTINE); -+ -+ if (newstyle) { /* new style: calls internal routine */ -+ f_print(fout,"_"); -+ } -+ /* Not sure about the following... -+ * rpc_hout always generates foobar_1_svc for -+ * the service procedure, so why should we use -+ * foobar_1 here?! --okir */ -+#if 0 -+ if( Cflag && !newstyle ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+#else -+ pvname_svc(proc->proc_name, vp->vers_num); -+#endif -+ f_print(fout, ";\n"); -+ f_print(fout, "\t\tbreak;\n\n"); -+ } -+ f_print(fout, "\tdefault:\n"); -+ printerr("noproc", TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\t}\n"); -+ -+ f_print(fout, "\t(void) memset((char *)&%s, 0, sizeof (%s));\n", ARG, ARG); -+ if (Cflag) -+ printif("getargs", TRANSP, "(caddr_t) &", ARG); -+ else -+ printif("getargs", TRANSP, "&", ARG); -+ printerr("decode", TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\t}\n"); -+ -+ if (Cflag) -+ f_print(fout, "\t%s = (*%s)((char *)&%s, %s);\n", -+ RESULT, ROUTINE, ARG, RQSTP); -+ else -+ f_print(fout, "\t%s = (*%s)(&%s, %s);\n", -+ RESULT, ROUTINE, ARG, RQSTP); -+ f_print(fout, -+ "\tif (%s != NULL && !svc_sendreply(%s, " -+ "(xdrproc_t) xdr_%s, %s)) {\n", -+ RESULT, TRANSP, RESULT, RESULT); -+ printerr("systemerr", TRANSP); -+ f_print(fout, "\t}\n"); -+ -+ if (Cflag) -+ printif("freeargs", TRANSP, "(caddr_t) &", ARG); -+ else -+ printif("freeargs", TRANSP, "&", ARG); -+ (void) sprintf(_errbuf, "unable to free arguments"); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ print_return("\t"); -+ f_print(fout, "}\n"); -+ } -+} -+ -+static void -+printerr(char *err, char *transp) -+{ -+ f_print(fout, "\t\tsvcerr_%s(%s);\n", err, transp); -+} -+ -+static void -+printif(char *proc, char *transp, char *prefix, char *arg) -+{ -+ f_print(fout, "\tif (!svc_%s(%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s)) {\n", -+ proc, transp, arg, prefix, arg); -+} -+ -+int -+nullproc(proc_list *proc) -+{ -+ for (; proc != NULL; proc = proc->next) { -+ if (streq(proc->proc_num, "0")) { -+ return (1); -+ } -+ } -+ return (0); -+} -+ -+static void -+write_inetmost(char *infile) -+{ -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\tint sock;\n"); -+ f_print(fout, "\tint proto;\n"); -+ f_print(fout, "\tstruct sockaddr_in saddr;\n"); -+ f_print(fout, "\tint asize = sizeof (saddr);\n"); -+ f_print(fout, "\n"); -+ f_print(fout, -+ "\tif (getsockname(0, (struct sockaddr *)&saddr, &asize) == 0) {\n"); -+ f_print(fout, "\t\tint ssize = sizeof (int);\n\n"); -+ f_print(fout, "\t\tif (saddr.sin_family != AF_INET)\n"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\tif (getsockopt(0, SOL_SOCKET, SO_TYPE,\n"); -+ f_print(fout, "\t\t\t\t(char *)&_rpcfdtype, &ssize) == -1)\n"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\tsock = 0;\n"); -+ f_print(fout, "\t\t_rpcpmstart = 1;\n"); -+ f_print(fout, "\t\tproto = 0;\n"); -+ open_log_file(infile, "\t\t"); -+ f_print(fout, "\t} else {\n"); -+ write_rpc_svc_fg(infile, "\t\t"); -+ f_print(fout, "\t\tsock = RPC_ANYSOCK;\n"); -+ print_pmapunset("\t\t"); -+ f_print(fout, "\t}\n"); -+} -+ -+static void -+print_return(char *space) -+{ -+ if (exitnow) -+ f_print(fout, "%sexit(0);\n", space); -+ else { -+ if (timerflag) -+ f_print(fout, "%s_rpcsvcdirty = 0;\n", space); -+ f_print(fout, "%sreturn;\n", space); -+ } -+} -+ -+static void -+print_pmapunset(char *space) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ for (vp = def->def.pr.versions; vp != NULL; -+ vp = vp->next) { -+ f_print(fout, "%s(void) pmap_unset(%s, %s);\n", -+ space, def->def_name, vp->vers_name); -+ } -+ } -+ } -+} -+ -+static void -+print_err_message(char *space) -+{ -+ if (logflag) -+ f_print(fout, "%ssyslog(LOG_ERR, \"%s\");\n", space, _errbuf); -+ else if (inetdflag || pmflag) -+ f_print(fout, "%s_msgout(\"%s\");\n", space, _errbuf); -+ else -+ f_print(fout, "%sfprintf(stderr, \"%s\");\n", space, _errbuf); -+} -+ -+/* -+ * Write the server auxiliary function ( _msgout, timeout) -+ */ -+void -+write_svc_aux(int nomain) -+{ -+ if (!logflag) -+ write_msg_out(); -+ if( !nomain ) -+ write_timeout_func(); -+} -+ -+/* -+ * Write the _msgout function -+ */ -+void -+write_msg_out(void) -+{ -+ f_print(fout, "\n"); -+ f_print(fout, "static\n"); -+ if( !Cflag ) { -+ f_print(fout, "void _msgout(msg)\n"); -+ f_print(fout, "\tchar *msg;\n"); -+ } else { -+ f_print(fout, "void _msgout(char* msg)\n"); -+ } -+ f_print(fout, "{\n"); -+ f_print(fout, "#ifdef RPC_SVC_FG\n"); -+ if (inetdflag || pmflag) -+ f_print(fout, "\tif (_rpcpmstart)\n"); -+ f_print(fout, "\t\tsyslog(LOG_ERR, \"%%s\", msg);\n"); -+ f_print(fout, "\telse\n"); -+ f_print(fout, "\t\t(void) fprintf(stderr, \"%%s\\n\", msg);\n"); -+ f_print(fout, "#else\n"); -+ f_print(fout, "\tsyslog(LOG_ERR, \"%%s\", msg);\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "}\n"); -+} -+ -+/* -+ * Write the timeout function -+ */ -+static void -+write_timeout_func(void) -+{ -+ if (!timerflag) -+ return; -+ f_print(fout, "\n"); -+ f_print(fout, "static void\n"); -+ f_print(fout, "closedown()\n"); -+ f_print(fout, "{\n"); -+ f_print(fout, "\tif (_rpcsvcdirty == 0) {\n"); -+ f_print(fout, "\t\tstatic int size;\n"); -+ f_print(fout, "\t\tint i, openfd;\n"); -+ if (tirpcflag && pmflag) { -+ f_print(fout, "\t\tstruct t_info tinfo;\n\n"); -+ f_print(fout, "\t\tif (!t_getinfo(0, &tinfo) && (tinfo.servtype == T_CLTS))\n"); -+ } else { -+ f_print(fout, "\n\t\tif (_rpcfdtype == SOCK_DGRAM)\n"); -+ } -+ f_print(fout, "\t\t\texit(0);\n"); -+ f_print(fout, "\t\tif (size == 0) {\n"); -+ if( tirpcflag ) { -+ f_print(fout, "\t\t\tstruct rlimit rl;\n\n"); -+ f_print(fout, "\t\t\trl.rlim_max = 0;\n"); -+ f_print(fout, "\t\t\tgetrlimit(RLIMIT_NOFILE, &rl);\n"); -+ f_print(fout, "\t\t\tif ((size = rl.rlim_max) == 0)\n"); -+ f_print(fout, "\t\t\t\treturn;\n"); -+ } else { -+ f_print(fout, "\t\t\tsize = getdtablesize();\n"); -+ } -+ f_print(fout, "\t\t}\n"); -+ f_print(fout, "\t\tfor (i = 0, openfd = 0; i < size && openfd < 2; i++)\n"); -+ f_print(fout, "\t\t\tif (FD_ISSET(i, &svc_fdset))\n"); -+ f_print(fout, "\t\t\t\topenfd++;\n"); -+ f_print(fout, "\t\tif (openfd <= 1)\n"); -+ f_print(fout, "\t\t\texit(0);\n"); -+ f_print(fout, "\t}\n"); -+ f_print(fout, "\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "}\n"); -+} -+ -+/* -+ * Write the most of port monitor support -+ */ -+static void -+write_pm_most(char *infile, int netflag) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ f_print(fout, "\tif (!ioctl(0, I_LOOK, mname) &&\n"); -+ f_print(fout, "\t\t(!strcmp(mname, \"sockmod\") ||"); -+ f_print(fout, " !strcmp(mname, \"timod\"))) {\n"); -+ f_print(fout, "\t\tchar *netid;\n"); -+ if (!netflag) { /* Not included by -n option */ -+ f_print(fout, "\t\tstruct netconfig *nconf = NULL;\n"); -+ f_print(fout, "\t\tSVCXPRT *%s;\n", TRANSP); -+ } -+ if( timerflag ) -+ f_print(fout, "\t\tint pmclose;\n"); -+/* not necessary, defined in /usr/include/stdlib */ -+/* f_print(fout, "\t\textern char *getenv();\n");*/ -+ f_print(fout, "\n"); -+ f_print(fout, "\t\t_rpcpmstart = 1;\n"); -+ if (logflag) -+ open_log_file(infile, "\t\t"); -+ f_print(fout, "\t\tif ((netid = getenv(\"NLSPROVIDER\")) == NULL) {\n"); -+ sprintf(_errbuf, "cannot get transport name"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t} else if ((nconf = getnetconfigent(netid)) == NULL) {\n"); -+ sprintf(_errbuf, "cannot get transport info"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t}\n"); -+ /* -+ * A kludgy support for inetd services. Inetd only works with -+ * sockmod, and RPC works only with timod, hence all this jugglery -+ */ -+ f_print(fout, "\t\tif (strcmp(mname, \"sockmod\") == 0) {\n"); -+ f_print(fout, "\t\t\tif (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, \"timod\")) {\n"); -+ sprintf(_errbuf, "could not get the right module"); -+ print_err_message("\t\t\t\t"); -+ f_print(fout, "\t\t\t\texit(1);\n"); -+ f_print(fout, "\t\t\t}\n"); -+ f_print(fout, "\t\t}\n"); -+ if( timerflag ) -+ f_print(fout, "\t\tpmclose = (t_getstate(0) != T_DATAXFER);\n"); -+ f_print(fout, "\t\tif ((%s = svc_tli_create(0, nconf, NULL, 0, 0)) == NULL) {\n", -+ TRANSP); -+ sprintf(_errbuf, "cannot create server handle"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\t}\n"); -+ f_print(fout, "\t\tif (nconf)\n"); -+ f_print(fout, "\t\t\tfreenetconfigent(nconf);\n"); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, -+ "\t\tif (!svc_reg(%s, %s, %s, ", -+ TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", 0)) {\n"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s).", -+ def->def_name, vp->vers_name); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\t}\n"); -+ } -+ } -+ if (timerflag) { -+ f_print(fout, "\t\tif (pmclose) {\n"); -+ f_print(fout, "\t\t\t(void) signal(SIGALRM, %s closedown);\n", -+ Cflag? "(SIG_PF)" : "(void(*)())" ); -+ f_print(fout, "\t\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "\t\t}\n"); -+ } -+ f_print(fout, "\t\tsvc_run();\n"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t\t/* NOTREACHED */\n"); -+ f_print(fout, "\t}\n"); -+} -+ -+/* -+ * Support for backgrounding the server if self started. -+ */ -+static void -+write_rpc_svc_fg(char *infile, char *sp) -+{ -+ f_print(fout, "#ifndef RPC_SVC_FG\n"); -+ f_print(fout, "%sint size;\n", sp); -+ if( tirpcflag ) -+ f_print(fout, "%sstruct rlimit rl;\n", sp); -+ if (inetdflag) -+ f_print(fout, "%sint pid, i;\n\n", sp); -+ f_print(fout, "%spid = fork();\n", sp); -+ f_print(fout, "%sif (pid < 0) {\n", sp); -+ f_print(fout, "%s\tperror(\"cannot fork\");\n", sp); -+ f_print(fout, "%s\texit(1);\n", sp); -+ f_print(fout, "%s}\n", sp); -+ f_print(fout, "%sif (pid)\n", sp); -+ f_print(fout, "%s\texit(0);\n", sp); -+ /* get number of file descriptors */ -+ if( tirpcflag ) { -+ f_print(fout, "%srl.rlim_max = 0;\n", sp); -+ f_print(fout, "%sgetrlimit(RLIMIT_NOFILE, &rl);\n", sp); -+ f_print(fout, "%sif ((size = rl.rlim_max) == 0)\n", sp); -+ f_print(fout, "%s\texit(1);\n", sp); -+ } else { -+ f_print(fout, "%ssize = getdtablesize();\n", sp); -+ } -+ -+ f_print(fout, "%sfor (i = 0; i < size; i++)\n", sp); -+ f_print(fout, "%s\t(void) close(i);\n", sp); -+ /* Redirect stderr and stdout to console */ -+ f_print(fout, "%si = open(\"/dev/console\", 2);\n", sp); -+ f_print(fout, "%s(void) dup2(i, 1);\n", sp); -+ f_print(fout, "%s(void) dup2(i, 2);\n", sp); -+ /* This removes control of the controlling terminal */ -+ if( tirpcflag ) -+ f_print(fout, "%ssetsid();\n", sp); -+ else { -+ f_print(fout, "%si = open(\"/dev/tty\", 2);\n", sp); -+ f_print(fout, "%sif (i >= 0) {\n", sp); -+ f_print(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);; -+ f_print(fout, "%s\t(void) close(i);\n", sp); -+ f_print(fout, "%s}\n", sp); -+ } -+ if (!logflag) -+ open_log_file(infile, sp); -+ f_print(fout, "#endif\n"); -+ if (logflag) -+ open_log_file(infile, sp); -+} -+ -+static void -+open_log_file(char *infile, char *sp) -+{ -+ char *s; -+ -+ s = strrchr(infile, '.'); -+ if (s) -+ *s = '\0'; -+ f_print(fout,"%sopenlog(\"%s\", LOG_PID, LOG_DAEMON);\n", sp, infile); -+ if (s) -+ *s = '.'; -+} -+ -+ -+ -+ -+/* -+ * write a registration for the given transport for Inetd -+ */ -+void -+write_inetd_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ char *sp; -+ int isudp; -+ char tmpbuf[32]; -+ -+ if (inetdflag) -+ sp = "\t"; -+ else -+ sp = ""; -+ if (streq(transp, "udp")) -+ isudp = 1; -+ else -+ isudp = 0; -+ f_print(fout, "\n"); -+ if (inetdflag) { -+ f_print(fout, "\tif ((_rpcfdtype == 0) || (_rpcfdtype == %s)) {\n", -+ isudp ? "SOCK_DGRAM" : "SOCK_STREAM"); -+ } -+ f_print(fout, "%s\t%s = svc%s_create(%s", -+ sp, TRANSP, transp, inetdflag? "sock": "RPC_ANYSOCK"); -+ if (!isudp) -+ f_print(fout, ", 0, 0"); -+ f_print(fout, ");\n"); -+ f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP); -+ (void) sprintf(_errbuf, "cannot create %s service.", transp); -+ (void) sprintf(tmpbuf, "%s\t\t", sp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ -+ if (inetdflag) { -+ f_print(fout, "%s\tif (!_rpcpmstart)\n\t", sp); -+ f_print(fout, "%s\tproto = IPPROTO_%s;\n", -+ sp, isudp ? "UDP": "TCP"); -+ } -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "%s\tif (!svc_register(%s, %s, %s, ", -+ sp, TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ if (inetdflag) -+ f_print(fout, ", proto)) {\n"); -+ else -+ f_print(fout, ", IPPROTO_%s)) {\n", -+ isudp ? "UDP": "TCP"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s, %s).", -+ def->def_name, vp->vers_name, transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ } -+ } -+ if (inetdflag) -+ f_print(fout, "\t}\n"); -+} -diff --git a/rpcgen/rpc_tblout.c b/rpcgen/rpc_tblout.c -new file mode 100644 -index 0000000..ae002f7 ---- /dev/null -+++ b/rpcgen/rpc_tblout.c -@@ -0,0 +1,165 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI"; -+#endif -+ -+/* -+ * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+static void write_table(definition *def); -+static void printit(char *prefix, char *type); -+ -+#define TABSIZE 8 -+#define TABCOUNT 5 -+#define TABSTOP (TABSIZE*TABCOUNT) -+ -+static char tabstr[TABCOUNT+1] = "\t\t\t\t\t"; -+ -+static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n"; -+static char tbl_end[] = "};\n"; -+ -+static char null_entry[] = "\n\t(char *(*)())0,\n\ -+ \t(xdrproc_t) xdr_void,\t\t\t0,\n\ -+ \t(xdrproc_t) xdr_void,\t\t\t0,\n"; -+ -+ -+static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n"; -+ -+void -+write_tables(void) -+{ -+ list *l; -+ definition *def; -+ -+ f_print(fout, "\n"); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_table(def); -+ } -+ } -+} -+ -+static void -+write_table(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ int current; -+ int expected; -+ char progvers[100]; -+ int warning; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ warning = 0; -+ s_print(progvers, "%s_%s", -+ locase(def->def_name), vp->vers_num); -+ /* print the table header */ -+ f_print(fout, tbl_hdr, progvers); -+ -+ if (nullproc(vp->procs)) { -+ expected = 0; -+ } else { -+ expected = 1; -+ f_print(fout, null_entry); -+ } -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ current = atoi(proc->proc_num); -+ if (current != expected++) { -+ f_print(fout, -+ "\n/*\n * WARNING: table out of order\n */\n"); -+ if (warning == 0) { -+ f_print(stderr, -+ "WARNING %s table is out of order\n", -+ progvers); -+ warning = 1; -+ nonfatalerrors = 1; -+ } -+ expected = current + 1; -+ } -+ f_print(fout, "\n\t(char *(*)())RPCGEN_ACTION("); -+ -+ /* routine to invoke */ -+ if( Cflag && !newstyle ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else { -+ if( newstyle ) -+ f_print( fout, "_"); /* calls internal func */ -+ pvname(proc->proc_name, vp->vers_num); -+ } -+ f_print(fout, "),\n"); -+ -+ /* argument info */ -+ if( proc->arg_num > 1 ) -+ printit((char*) NULL, proc->args.argname ); -+ else -+ /* do we have to do something special for newstyle */ -+ printit( proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type ); -+ /* result info */ -+ printit(proc->res_prefix, proc->res_type); -+ } -+ -+ /* print the table trailer */ -+ f_print(fout, tbl_end); -+ f_print(fout, tbl_nproc, progvers, progvers, progvers); -+ } -+} -+ -+static void -+printit(char *prefix, char *type) -+{ -+ int len; -+ int tabs; -+ -+ -+ len = fprintf(fout, "\txdr_%s,", stringfix(type)); -+ /* account for leading tab expansion */ -+ len += TABSIZE - 1; -+ /* round up to tabs required */ -+ tabs = (TABSTOP - len + TABSIZE - 1)/TABSIZE; -+ f_print(fout, "%s", &tabstr[TABCOUNT-tabs]); -+ -+ if (streq(type, "void")) { -+ f_print(fout, "0"); -+ } else { -+ f_print(fout, "sizeof ( "); -+ /* XXX: should "follow" be 1 ??? */ -+ ptype(prefix, type, 0); -+ f_print(fout, ")"); -+ } -+ f_print(fout, ",\n"); -+} -diff --git a/rpcgen/rpc_util.c b/rpcgen/rpc_util.c -new file mode 100644 -index 0000000..b67be57 ---- /dev/null -+++ b/rpcgen/rpc_util.c -@@ -0,0 +1,479 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_util.c, Utility routines for the RPC protocol compiler -+ */ -+#include -+#include -+#include -+#include -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static void printwhere(void); -+ -+ -+#define ARGEXT "argument" -+ -+char curline[MAXLINESIZE]; /* current read line */ -+char *where = curline; /* current point in line */ -+int linenum = 0; /* current line number */ -+ -+char *infilename; /* input filename */ -+ -+#define NFILES 7 -+char *outfiles[NFILES]; /* output file names */ -+int nfiles; -+ -+FILE *fout; /* file pointer of current output */ -+FILE *fin; /* file pointer of current input */ -+ -+list *defined; /* list of defined things */ -+ -+/* -+ * Reinitialize the world -+ */ -+void -+reinitialize(void) -+{ -+ memset(curline, 0, MAXLINESIZE); -+ where = curline; -+ linenum = 0; -+ defined = NULL; -+} -+ -+/* -+ * string equality -+ */ -+int -+streq(char *a, char *b) -+{ -+ return (strcmp(a, b) == 0); -+} -+ -+/* -+ * find a value in a list -+ */ -+definition * -+findval(list *lst, char *val, int (*cmp)(definition *, char *)) -+{ -+ -+ for (; lst != NULL; lst = lst->next) { -+ if ((*cmp) (lst->val, val)) { -+ return (lst->val); -+ } -+ } -+ return (NULL); -+} -+ -+/* -+ * store a value in a list -+ */ -+void -+storeval(lstp, val) -+ list **lstp; -+ definition *val; -+{ -+ list **l; -+ list *lst; -+ -+ -+ for (l = lstp; *l != NULL; l = (list **) & (*l)->next); -+ lst = ALLOC(list); -+ lst->val = val; -+ lst->next = NULL; -+ *l = lst; -+} -+ -+static int -+findit(definition *def, char *type) -+{ -+ return (streq(def->def_name, type)); -+} -+ -+static char * -+fixit(char *type, char *orig) -+{ -+ definition *def; -+ -+ def = (definition *) FINDVAL(defined, type, findit); -+ if (def == NULL || def->def_kind != DEF_TYPEDEF) { -+ return (orig); -+ } -+ switch (def->def.ty.rel) { -+ case REL_VECTOR: -+ return (def->def.ty.old_type); -+ case REL_ALIAS: -+ return (fixit(def->def.ty.old_type, orig)); -+ default: -+ return (orig); -+ } -+} -+ -+char * -+fixtype(char *type) -+{ -+ return (fixit(type, type)); -+} -+ -+char * -+stringfix(char *type) -+{ -+ if (streq(type, "string")) { -+ return ("wrapstring"); -+ } else { -+ return (type); -+ } -+} -+ -+void -+ptype(char *prefix, char *type, int follow) -+{ -+ if (prefix != NULL) { -+ if (streq(prefix, "enum")) { -+ f_print(fout, "enum "); -+ } else { -+ f_print(fout, "struct "); -+ } -+ } -+ if (streq(type, "bool")) { -+ f_print(fout, "bool_t "); -+ } else if (streq(type, "string")) { -+ f_print(fout, "char *"); -+ } else { -+ f_print(fout, "%s ", follow ? fixtype(type) : type); -+ } -+} -+ -+static int -+typedefed(definition *def, char *type) -+{ -+ if (def->def_kind != DEF_TYPEDEF || def->def.ty.old_prefix != NULL) { -+ return (0); -+ } else { -+ return (streq(def->def_name, type)); -+ } -+} -+ -+int -+isvectordef(char *type, relation rel) -+{ -+ definition *def; -+ -+ for (;;) { -+ switch (rel) { -+ case REL_VECTOR: -+ return (!streq(type, "string")); -+ case REL_ARRAY: -+ return (0); -+ case REL_POINTER: -+ return (0); -+ case REL_ALIAS: -+ def = (definition *) FINDVAL(defined, type, typedefed); -+ if (def == NULL) { -+ return (0); -+ } -+ type = def->def.ty.old_type; -+ rel = def->def.ty.rel; -+ } -+ } -+} -+ -+char * -+locase(char *str) -+{ -+ char c; -+ static char buf[100]; -+ char *p = buf; -+ -+ while ((c = *str++) != '\0') { -+ *p++ = (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c; -+ } -+ *p = 0; -+ return (buf); -+} -+ -+void -+pvname_svc(char *pname, char *vnum) -+{ -+ f_print(fout, "%s_%s_svc", locase(pname), vnum); -+} -+ -+void -+pvname(char *pname, char *vnum) -+{ -+ f_print(fout, "%s_%s", locase(pname), vnum); -+} -+ -+/* -+ * print a useful (?) error message, and then die -+ */ -+void -+error(char *msg) -+{ -+ printwhere(); -+ f_print(stderr, "%s, line %d: ", infilename, linenum); -+ f_print(stderr, "%s\n", msg); -+ crash(); -+} -+ -+/* -+ * Something went wrong, unlink any files that we may have created and then -+ * die. -+ */ -+void -+crash(void) -+{ -+ int i; -+ -+ for (i = 0; i < nfiles; i++) { -+ (void) unlink(outfiles[i]); -+ } -+ exit(1); -+} -+ -+void -+record_open(char *file) -+{ -+ if (nfiles < NFILES) { -+ outfiles[nfiles++] = file; -+ } else { -+ f_print(stderr, "too many files!\n"); -+ crash(); -+ } -+} -+ -+static char expectbuf[100]; -+static char *toktostr(); -+ -+/* -+ * error, token encountered was not the expected one -+ */ -+void -+expected1(exp1) -+ tok_kind exp1; -+{ -+ s_print(expectbuf, "expected '%s'", -+ toktostr(exp1)); -+ error(expectbuf); -+} -+ -+/* -+ * error, token encountered was not one of two expected ones -+ */ -+void -+expected2(exp1, exp2) -+ tok_kind exp1, exp2; -+{ -+ s_print(expectbuf, "expected '%s' or '%s'", -+ toktostr(exp1), -+ toktostr(exp2)); -+ error(expectbuf); -+} -+ -+/* -+ * error, token encountered was not one of 3 expected ones -+ */ -+void -+expected3(exp1, exp2, exp3) -+ tok_kind exp1, exp2, exp3; -+{ -+ s_print(expectbuf, "expected '%s', '%s' or '%s'", -+ toktostr(exp1), -+ toktostr(exp2), -+ toktostr(exp3)); -+ error(expectbuf); -+} -+ -+void -+tabify(f, tab) -+ FILE *f; -+ int tab; -+{ -+ while (tab--) { -+ (void) fputc('\t', f); -+ } -+} -+ -+ -+static token tokstrings[] = { -+ {TOK_IDENT, "identifier"}, -+ {TOK_CONST, "const"}, -+ {TOK_RPAREN, ")"}, -+ {TOK_LPAREN, "("}, -+ {TOK_RBRACE, "}"}, -+ {TOK_LBRACE, "{"}, -+ {TOK_LBRACKET, "["}, -+ {TOK_RBRACKET, "]"}, -+ {TOK_STAR, "*"}, -+ {TOK_COMMA, ","}, -+ {TOK_EQUAL, "="}, -+ {TOK_COLON, ":"}, -+ {TOK_SEMICOLON, ";"}, -+ {TOK_UNION, "union"}, -+ {TOK_STRUCT, "struct"}, -+ {TOK_SWITCH, "switch"}, -+ {TOK_CASE, "case"}, -+ {TOK_DEFAULT, "default"}, -+ {TOK_ENUM, "enum"}, -+ {TOK_TYPEDEF, "typedef"}, -+ {TOK_INT, "int"}, -+ {TOK_SHORT, "short"}, -+ {TOK_INT32, "int32"}, -+ {TOK_UNSIGNED, "unsigned"}, -+ {TOK_DOUBLE, "double"}, -+ {TOK_FLOAT, "float"}, -+ {TOK_CHAR, "char"}, -+ {TOK_STRING, "string"}, -+ {TOK_OPAQUE, "opaque"}, -+ {TOK_BOOL, "bool"}, -+ {TOK_VOID, "void"}, -+ {TOK_PROGRAM, "program"}, -+ {TOK_VERSION, "version"}, -+ {TOK_EOF, "??????"} -+}; -+ -+static char * -+toktostr(kind) -+ tok_kind kind; -+{ -+ token *sp; -+ -+ for (sp = tokstrings; sp->kind != TOK_EOF && sp->kind != kind; sp++); -+ return (sp->str); -+} -+ -+static void -+printbuf(void) -+{ -+ char c; -+ int i; -+ int cnt; -+ -+# define TABSIZE 4 -+ -+ for (i = 0; (c = curline[i]) != '\0'; i++) { -+ if (c == '\t') { -+ cnt = 8 - (i % TABSIZE); -+ c = ' '; -+ } else { -+ cnt = 1; -+ } -+ while (cnt--) { -+ (void) fputc(c, stderr); -+ } -+ } -+} -+ -+static void -+printwhere(void) -+{ -+ int i; -+ char c; -+ int cnt; -+ -+ printbuf(); -+ for (i = 0; i < where - curline; i++) { -+ c = curline[i]; -+ if (c == '\t') { -+ cnt = 8 - (i % TABSIZE); -+ } else { -+ cnt = 1; -+ } -+ while (cnt--) { -+ (void) fputc('^', stderr); -+ } -+ } -+ (void) fputc('\n', stderr); -+} -+ -+char * -+make_argname(char *pname, char *vname) -+{ -+ char *name; -+ -+ name = malloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3); -+ if (!name) { -+ fprintf(stderr, "failed in malloc"); -+ exit(1); -+ } -+ sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT); -+ return(name); -+} -+ -+bas_type *typ_list_h; -+bas_type *typ_list_t; -+ -+void -+add_type(int len, char *type) -+{ -+ bas_type *ptr; -+ -+ -+ if ((ptr = (bas_type *) malloc(sizeof(bas_type))) == (bas_type *) NULL) { -+ fprintf(stderr, "failed in malloc"); -+ exit(1); -+ } -+ ptr->name = type; -+ ptr->length = len; -+ ptr->next = NULL; -+ if (typ_list_t == NULL) { -+ -+ typ_list_t = ptr; -+ typ_list_h = ptr; -+ } else { -+ -+ typ_list_t->next = ptr; -+ typ_list_t = ptr; -+ } -+} -+ -+ -+bas_type * -+find_type(char *type) -+{ -+ bas_type *ptr; -+ -+ ptr = typ_list_h; -+ -+ -+ while (ptr != NULL) { -+ if (strcmp(ptr->name, type) == 0) -+ return (ptr); -+ else -+ ptr = ptr->next; -+ }; -+ return (NULL); -+} -+ -diff --git a/rpcgen/rpc_util.h b/rpcgen/rpc_util.h -new file mode 100644 -index 0000000..fa115be ---- /dev/null -+++ b/rpcgen/rpc_util.h -@@ -0,0 +1,166 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_util.h 1.5 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_util.h, Useful definitions for the RPC protocol compiler -+ */ -+ -+#include -+ -+#define alloc(size) malloc((unsigned)(size)) -+#define ALLOC(object) (object *) malloc(sizeof(object)) -+ -+#define s_print (void) sprintf -+#define f_print (void) fprintf -+ -+struct list { -+ definition *val; -+ struct list *next; -+}; -+typedef struct list list; -+ -+#define PUT 1 -+#define GET 2 -+ -+/* -+ * Global variables -+ */ -+#define MAXLINESIZE 1024 -+extern char curline[MAXLINESIZE]; -+extern char *where; -+extern int linenum; -+ -+extern char *infilename; -+extern FILE *fout; -+extern FILE *fin; -+ -+extern list *defined; -+ -+ -+extern bas_type *typ_list_h; -+extern bas_type *typ_list_t; -+ -+/* -+ * All the option flags -+ */ -+extern int inetdflag; -+extern int pmflag; -+extern int tblflag; -+extern int logflag; -+extern int newstyle; -+extern int Cflag; /* C++ flag */ -+extern int tirpcflag; /* flag for generating tirpc code */ -+extern int Inline; /* if this is 0, then do not generate inline code */ -+ -+/* -+ * Other flags related with inetd jumpstart. -+ */ -+extern int indefinitewait; -+extern int exitnow; -+extern int timerflag; -+ -+extern int nonfatalerrors; -+ -+/* -+ * rpc_util routines -+ */ -+void storeval(); -+ -+#define STOREVAL(list,item) \ -+ storeval(list,item) -+ -+definition *findval(); -+ -+#define FINDVAL(list,item,finder) \ -+ findval(list, item, finder) -+ -+ -+/* -+ * rpc_cout routines -+ */ -+void cprint(void); -+void emit(definition *); -+ -+/* -+ * rpc_hout routines -+ */ -+void print_datadef(definition *); -+void print_funcdef(definition *); -+ -+/* -+ * rpc_svcout routines -+ */ -+void write_most(char *, int, int); -+void write_register(void); -+void write_netid_register(char *); -+void write_nettype_register(char *); -+void write_inetd_register(char *); -+void write_rest(void); -+void write_programs(char *); -+void write_svc_aux(int); -+ -+/* -+ * rpc_clntout routines -+ */ -+void write_stubs(void); -+void printarglist(proc_list *, char *, char *); -+ -+/* -+ * rpc_tblout routines -+ */ -+void write_tables(void); -+ -+/* -+ * rpc_util -+ */ -+void pvname_svc(char *, char *); -+void pvname(char *, char *); -+void ptype(char *, char *, int); -+char * make_argname(char *, char *); -+void add_type(int, char *); -+void reinitialize(void); -+void crash(void); -+void error(char *); -+char *fixtype(char *); -+char *stringfix(char *); -+char *locase(char *); -+int isvectordef(char *, relation); -+int streq(char *, char *); -+void tabify(FILE *, int); -+void record_open(char *); -+bas_type *find_type(char *type); -+ -+/* -+ * rpc_sample -+ */ -+void write_sample_svc(definition *); -+int write_sample_clnt(definition *); -+void write_sample_clnt_main(void); -+void add_sample_msg(void); -diff --git a/rpcgen/rpcgen.1 b/rpcgen/rpcgen.1 -new file mode 100644 -index 0000000..89df7ed ---- /dev/null -+++ b/rpcgen/rpcgen.1 -@@ -0,0 +1,521 @@ -+.\" @(#)rpcgen.1 1.35 93/06/02 SMI -+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12.2.4 2002/06/21 15:28:50 charnier Exp $ -+.\" Copyright 1985-1993 Sun Microsystems, Inc. -+.Dd March 28, 1993 -+.Dt RPCGEN 1 -+.Os -+.Sh NAME -+.Nm rpcgen -+.Nd an RPC protocol compiler -+.Sh SYNOPSIS -+.Nm -+.Ar infile -+.Nm -+.Op Fl a -+.Op Fl b -+.Op Fl C -+.Oo -+.Fl D Ns Ar name Ns Op Ar =value -+.Oc -+.Op Fl i Ar size -+.Op Fl I Op Fl K Ar seconds -+.Op Fl L -+.Op Fl M -+.Op Fl N -+.Op Fl T -+.Op Fl Y Ar pathname -+.Ar infile -+.Nm -+.Oo -+.Fl c | -+.Fl h | -+.Fl l | -+.Fl m | -+.Fl t | -+.Fl \&Sc | -+.Fl \&Ss | -+.Fl \&Sm -+.Oc -+.Op Fl o Ar outfile -+.Op Ar infile -+.Nm -+.Op Fl s Ar nettype -+.Op Fl o Ar outfile -+.Op Ar infile -+.Nm -+.Op Fl n Ar netid -+.Op Fl o Ar outfile -+.Op Ar infile -+.\" .SH AVAILABILITY -+.\" .LP -+.\" SUNWcsu -+.Sh DESCRIPTION -+The -+.Nm -+utility is a tool that generates C code to implement an -+.Tn RPC -+protocol. -+The input to -+.Nm -+is a language similar to C known as -+.Tn RPC -+Language (Remote Procedure Call Language). -+.Pp -+The -+.Nm -+utility is normally used as in the first synopsis where -+it takes an input file and generates three output files. -+If the -+.Ar infile -+is named -+.Pa proto.x , -+then -+.Nm -+generates a header in -+.Pa proto.h , -+XDR routines in -+.Pa proto_xdr.c , -+server-side stubs in -+.Pa proto_svc.c , -+and client-side stubs in -+.Pa proto_clnt.c . -+With the -+.Fl T -+option, -+it also generates the -+.Tn RPC -+dispatch table in -+.Pa proto_tbl.i . -+.Pp -+The -+.Nm -+utility can also generate sample client and server files -+that can be customized to suit a particular application. -+The -+.Fl \&Sc , -+.Fl \&Ss -+and -+.Fl \&Sm -+options generate sample client, server and makefile, respectively. -+The -+.Fl a -+option generates all files, including sample files. -+If the -+.Ar infile -+is -+.Pa proto.x , -+then the client side sample file is written to -+.Pa proto_client.c , -+the server side sample file to -+.Pa proto_server.c -+and the sample makefile to -+.Pa makefile.proto . -+.Pp -+The server created can be started both by the port monitors -+(for example, -+.Xr inetd 8 ) -+or by itself. -+When it is started by a port monitor, -+it creates servers only for the transport for which -+the file descriptor -+.Em 0 -+was passed. -+The name of the transport must be specified -+by setting up the environment variable -+.Ev PM_TRANSPORT . -+When the server generated by -+.Nm -+is executed, -+it creates server handles for all the transports -+specified in -+.Ev NETPATH -+environment variable, -+or if it is unset, -+it creates server handles for all the visible transports from -+.Pa /etc/netconfig -+file. -+Note: -+the transports are chosen at run time and not at compile time. -+When the server is self-started, -+it backgrounds itself by default. -+A special define symbol -+.Em RPC_SVC_FG -+can be used to run the server process in foreground. -+.Pp -+The second synopsis provides special features which allow -+for the creation of more sophisticated -+.Tn RPC -+servers. -+These features include support for user provided -+.Em #defines -+and -+.Tn RPC -+dispatch tables. -+The entries in the -+.Tn RPC -+dispatch table contain: -+.Bl -bullet -offset indent -compact -+.It -+pointers to the service routine corresponding to that procedure, -+.It -+a pointer to the input and output arguments, -+.It -+the size of these routines. -+.El -+A server can use the dispatch table to check authorization -+and then to execute the service routine; -+a client library may use it to deal with the details of storage -+management and XDR data conversion. -+.Pp -+The other three synopses shown above are used when -+one does not want to generate all the output files, -+but only a particular one. -+See the -+.Sx EXAMPLES -+section below for examples of -+.Nm -+usage. -+When -+.Nm -+is executed with the -+.Fl s -+option, -+it creates servers for that particular class of transports. -+When -+executed with the -+.Fl n -+option, -+it creates a server for the transport specified by -+.Ar netid . -+If -+.Ar infile -+is not specified, -+.Nm -+accepts the standard input. -+.Pp -+The C preprocessor, -+.Em cc -E -+is run on the input file before it is actually interpreted by -+.Nm . -+For each type of output file, -+.Nm -+defines a special preprocessor symbol for use by the -+.Nm -+programmer: -+.Bl -tag -width indent -+.It RPC_HDR -+defined when compiling into headers -+.It RPC_XDR -+defined when compiling into XDR routines -+.It RPC_SVC -+defined when compiling into server-side stubs -+.It RPC_CLNT -+defined when compiling into client-side stubs -+.It RPC_TBL -+defined when compiling into RPC dispatch tables -+.El -+.Pp -+Any line beginning with -+.Dq % -+is passed directly into the output file, -+uninterpreted by -+.Nm . -+To specify the path name of the C preprocessor use -+.Fl Y -+flag. -+.Pp -+For every data type referred to in -+.Ar infile , -+.Nm -+assumes that there exists a -+routine with the string -+.Em xdr_ -+prepended to the name of the data type. -+If this routine does not exist in the -+.Tn RPC/XDR -+library, it must be provided. -+Providing an undefined data type -+allows customization of -+.Xr xdr 3 -+routines. -+.Sh OPTIONS -+The following options are available: -+.Bl -tag -width indent -+.It Fl a -+Generate all files, including sample files. -+.It Fl b -+Backward compatibility mode. -+Generate transport specific -+.Tn RPC -+code for older versions -+of the operating system. -+.Pp -+Note: in -+.Fx , -+this compatibility flag is turned on by -+default since -+.Fx -+supports only the older -+.Tn ONC RPC -+library. -+.It Fl c -+Compile into -+.Tn XDR -+routines. -+.It Fl C -+Generate header and stub files which can be used with -+.Tn ANSI -+C compilers. Headers generated with this flag can also be -+used with C++ programs. -+.It Fl D Ns Ar name -+.It Fl D Ns Ar name=value -+.\".It Fl D Ns Ar name Ns Op Ar =value -+Define a symbol -+.Ar name . -+Equivalent to the -+.Em #define -+directive in the source. -+If no -+.Ar value -+is given, -+.Ar value -+is defined as -+.Em 1 . -+This option may be specified more than once. -+.It Fl h -+Compile into C data-definitions (a header). -+.Fl T -+option can be used in conjunction to produce a -+header which supports -+.Tn RPC -+dispatch tables. -+.It Fl i Ar size -+Size at which to start generating inline code. -+This option is useful for optimization. -+The default size is 5. -+.Pp -+Note: in order to provide backwards compatibility with the older -+.Nm -+on the -+.Fx -+platform, the default is actually 0 (which means -+that inline code generation is disabled by default). You must specify -+a non-zero value explicitly to override this default. -+.It Fl I -+Compile support for -+.Xr inetd 8 -+in the server side stubs. -+Such servers can be self-started or can be started by -+.Nm inetd . -+When the server is self-started, it backgrounds itself by default. -+A special define symbol -+.Em RPC_SVC_FG -+can be used to run the -+server process in foreground, or the user may simply compile without -+the -+.Fl I -+option. -+.Pp -+If there are no pending client requests, the -+.Nm inetd -+servers exit after 120 seconds (default). -+The default can be changed with the -+.Fl K -+option. -+All the error messages for -+.Nm inetd -+servers -+are always logged with -+.Xr syslog 3 . -+.\" .IP -+.\" Note: -+.\" this option is supported for backward compatibility only. -+.\" By default, -+.\" .B rpcgen -+.\" generates servers that can be invoked through portmonitors. -+.Pp -+.It Fl K Ar seconds -+By default, services created using -+.Nm -+and invoked through -+port monitors wait 120 seconds -+after servicing a request before exiting. -+That interval can be changed using the -+.Fl K -+flag. -+To create a server that exits immediately upon servicing a request, -+use -+.Fl K Ar 0 . -+To create a server that never exits, the appropriate argument is -+.Fl k Ar -1 . -+.Pp -+When monitoring for a server, -+some portmonitors -+.Em always -+spawn a new process in response to a service request. -+If it is known that a server will be used with such a monitor, the -+server should exit immediately on completion. -+For such servers, -+.Nm -+should be used with -+.Fl K Ar 0 . -+.It Fl l -+Compile into client-side stubs. -+.It Fl L -+When the servers are started in foreground, use -+.Xr syslog 3 -+to log the server errors instead of printing them on the standard -+error. -+.It Fl m -+Compile into server-side stubs, -+but do not generate a -+.Qq main -+routine. -+This option is useful for doing callback-routines -+and for users who need to write their own -+.Qq main -+routine to do initialization. -+.It Fl M -+Generate multithread-safe stubs for passing arguments and results between -+rpcgen generated code and user written code. -+This option is useful -+for users who want to use threads in their code. -+However, the -+.Xr rpc_svc_calls 3 -+functions are not yet MT-safe, which means that rpcgen generated server-side -+code will not be MT-safe. -+.It Fl N -+This option allows procedures to have multiple arguments. -+It also uses the style of parameter passing that closely resembles C. -+So, when passing an argument to a remote procedure, you do not have to -+pass a pointer to the argument, but can pass the argument itself. -+This behavior is different from the old style of -+.Nm -+generated code. -+To maintain backward compatibility, -+this option is not the default. -+.It Fl n Ar netid -+Compile into server-side stubs for the transport -+specified by -+.Ar netid . -+There should be an entry for -+.Ar netid -+in the -+netconfig database. -+This option may be specified more than once, -+so as to compile a server that serves multiple transports. -+.It Fl o Ar outfile -+Specify the name of the output file. -+If none is specified, -+standard output is used -+( -+.Fl c , -+.Fl h , -+.Fl l , -+.Fl m , -+.Fl n , -+.Fl s , -+.Fl \&Sc , -+.Fl \&Sm , -+.Fl \&Ss , -+and -+.Fl t -+modes only). -+.It Fl s Ar nettype -+Compile into server-side stubs for all the -+transports belonging to the class -+.Ar nettype . -+The supported classes are -+.Em netpath , -+.Em visible , -+.Em circuit_n , -+.Em circuit_v , -+.Em datagram_n , -+.Em datagram_v , -+.Em tcp , -+and -+.Em udp -+(see -+.Xr rpc 3 -+for the meanings associated with these classes). -+This option may be specified more than once. -+Note: -+the transports are chosen at run time and not at compile time. -+.It Fl \&Sc -+Generate sample client code that uses remote procedure calls. -+.It Fl \&Sm -+Generate a sample -+.Pa Makefile -+which can be used for compiling the application. -+.It Fl \&Ss -+Generate sample server code that uses remote procedure calls. -+.It Fl t -+Compile into -+.Tn RPC -+dispatch table. -+.It Fl T -+Generate the code to support -+.Tn RPC -+dispatch tables. -+.Pp -+The options -+.Fl c , -+.Fl h , -+.Fl l , -+.Fl m , -+.Fl s , -+.Fl \&Sc , -+.Fl \&Sm , -+.Fl \&Ss , -+and -+.Fl t -+are used exclusively to generate a particular type of file, -+while the options -+.Fl D -+and -+.Fl T -+are global and can be used with the other options. -+.It Fl Y Ar pathname -+Give the name of the directory where -+.Nm -+will start looking for the C-preprocessor. -+.El -+.Sh EXAMPLES -+The following example: -+.Dl example% rpcgen -T prot.x -+.Pp -+generates all the five files: -+.Pa prot.h , -+.Pa prot_clnt.c , -+.Pa prot_svc.c , -+.Pa prot_xdr.c -+and -+.Pa prot_tbl.i . -+.Pp -+The following example sends the C data-definitions (header) -+to the standard output. -+.Dl example% rpcgen -h prot.x -+.Pp -+To send the test version of the -+.Fl D Ns Ar TEST , -+server side stubs for -+all the transport belonging to the class -+.Ar datagram_n -+to standard output, use: -+.Dl example% rpcgen -s datagram_n -DTEST prot.x -+.Pp -+To create the server side stubs for the transport indicated -+by -+.Ar netid -+tcp, -+use: -+.Dl example% rpcgen -n tcp -o prot_svc.c prot.x -+.Sh SEE ALSO -+.Xr cc 1 , -+.Xr rpc 3 , -+.Xr syslog 3 , -+.Xr inetd 8 -+.\" .BR rpc_svc_calls (3) -+.Rs -+.%T The rpcgen chapter in the NETP manual -+.Re --- -1.9.1 - diff --git a/package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch b/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch similarity index 98% rename from package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch rename to package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch index e302c5d1ce..2712f53c38 100644 --- a/package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch +++ b/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch @@ -1,4 +1,4 @@ -From eba198c27f2b8d3f0b27ea4a42f3dc79d397440c Mon Sep 17 00:00:00 2001 +From 001e3f26dc80b8f21bed7d9b5872fe10e8b4af04 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 10 Nov 2012 17:29:53 +0100 Subject: [PATCH] Automatically generate XDR header files from .x sources using @@ -8,21 +8,23 @@ Subject: [PATCH] Automatically generate XDR header files from .x sources using Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: update for 0.3.1] Signed-off-by: "Yann E. MORIN" +[baruch: use external rpcgen] +Signed-off-by: Baruch Siach --- - Makefile.am | 19 +- + Makefile.am | 16 +- src/Makefile.am | 2 +- - tirpc/rpc/rpcb_prot.h | 797 -------------------------------------------------- - tirpc/rpcsvc/crypt.h | 109 ------- - 4 files changed, 17 insertions(+), 910 deletions(-) + tirpc/rpc/rpcb_prot.h | 797 ------------------------------------------ + tirpc/rpcsvc/crypt.h | 109 ------ + 4 files changed, 14 insertions(+), 910 deletions(-) delete mode 100644 tirpc/rpc/rpcb_prot.h delete mode 100644 tirpc/rpcsvc/crypt.h diff --git a/Makefile.am b/Makefile.am -index 8558289..aa5908e 100644 +index 3f6063771faf..368fb8a1aed2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ - SUBDIRS = src man doc rpcgen + SUBDIRS = src man doc ACLOCAL_AMFLAGS = -I m4 +GENFILES = tirpc/rpcsvc/crypt.h \ @@ -39,7 +41,7 @@ index 8558289..aa5908e 100644 tirpc/rpc/xdr.h \ tirpc/rpc/types.h \ tirpc/rpc/svc_soc.h \ -@@ -20,7 +22,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \ +@@ -21,7 +23,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \ tirpc/rpc/rpcent.h \ tirpc/rpc/rpc_com.h \ tirpc/rpc/rpcb_prot.x \ @@ -47,7 +49,7 @@ index 8558289..aa5908e 100644 tirpc/rpc/rpcb_clnt.h \ tirpc/rpc/raw.h \ tirpc/rpc/pmap_rmt.h \ -@@ -51,5 +52,17 @@ endif +@@ -48,5 +49,14 @@ endif pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA = libtirpc.pc @@ -55,19 +57,16 @@ index 8558289..aa5908e 100644 +nobase_nodist_include_HEADERS = $(GENFILES) +BUILT_SOURCES = $(GENFILES) + -+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen ++$(GENFILES): %.h: %.x + mkdir -p $(dir $@) -+ $(top_builddir)/rpcgen/rpcgen -h -o $@ $< -+ -+$(top_builddir)/rpcgen/rpcgen: force -+ cd rpcgen && $(MAKE) ++ rpcgen -h -o $@ $< + +force: + +CLEANFILES = cscope.* *~ $(GENFILES) DISTCLEANFILES = Makefile.in libtirpc*.tar.gz diff --git a/src/Makefile.am b/src/Makefile.am -index 7428e92..0356171 100644 +index 2af40f16d03a..0b7e23835c36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ @@ -81,7 +80,7 @@ index 7428e92..0356171 100644 diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h deleted file mode 100644 -index 7ae48b8..0000000 +index 7ae48b805370..000000000000 --- a/tirpc/rpc/rpcb_prot.h +++ /dev/null @@ -1,797 +0,0 @@ @@ -884,7 +883,7 @@ index 7ae48b8..0000000 -#endif /* !_RPCB_PROT_H_RPCGEN */ diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h deleted file mode 100644 -index da1f9cc..0000000 +index da1f9ccb56ea..000000000000 --- a/tirpc/rpcsvc/crypt.h +++ /dev/null @@ -1,109 +0,0 @@ @@ -998,5 +997,5 @@ index da1f9cc..0000000 - -#endif /* !_CRYPT_H_RPCGEN */ -- -1.9.1 +2.17.0 diff --git a/package/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch similarity index 100% rename from package/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch rename to package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch diff --git a/package/libtirpc/0006-Disable-DES-authentification-support.patch b/package/libtirpc/0005-Disable-DES-authentification-support.patch similarity index 100% rename from package/libtirpc/0006-Disable-DES-authentification-support.patch rename to package/libtirpc/0005-Disable-DES-authentification-support.patch diff --git a/package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch b/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch similarity index 100% rename from package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch rename to package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 7bc361dc69..319b78c3f0 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -10,6 +10,7 @@ LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIB LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING +LIBTIRPC_DEPENDENCIES = host-nfs-utils LIBTIRPC_INSTALL_STAGING = YES LIBTIRPC_AUTORECONF = YES From 624603328ab3280374e88eb7d45806d24e933943 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 21 May 2018 13:41:08 +0200 Subject: [PATCH 1494/2640] libcurl: fix build with ssh2 and static mbedtls The ssh2 pkg-config file could contain the following lines when build with a static version of mbedtls: Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a Libs.private: /xxx/libmbedcrypto.a This static mbedtls library must be used to correctly detect ssh2 support and this library must be copied in libcurl.pc otherwise compilation of any application (such as upmpdcli) with libcurl will fail when trying to find mbedtls functions included in libssh2. So, replace pkg-config --libs-only-l by pkg-config --libs. Fixes: - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ith-ssh2-built-with-a-static-mbedtls.patch | 40 +++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 42 insertions(+) create mode 100644 package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch diff --git a/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch b/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch new file mode 100644 index 0000000000..9107fa7c8c --- /dev/null +++ b/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch @@ -0,0 +1,40 @@ +From b5fbc486e805805efb8400373ccec2a3dee1c81b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 May 2018 12:07:00 +0200 +Subject: [PATCH 1/1] Fix link with ssh2 built with a static mbedtls + +The ssh2 pkg-config file could contain the following lines when build +with a static version of mbedtls: + Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a + Libs.private: /xxx/libmbedcrypto.a + +This static mbedtls library must be used to correctly detect ssh2 +support and this library must be copied in libcurl.pc otherwise +compilation of any application (such as upmpdcli) with libcurl will fail +when trying to found mbedtls functions included in libssh2. +So, replace pkg-config --libs-only-l by pkg-config --libs. + +Fixes: + - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5569a26b4..9e2606885 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -2766,7 +2766,7 @@ if test X"$OPT_LIBSSH2" != Xno; then + CURL_CHECK_PKGCONFIG(libssh2) + + if test "$PKGCONFIG" != "no" ; then +- LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2` ++ LIB_SSH2=`$PKGCONFIG --libs libssh2` + LD_SSH2=`$PKGCONFIG --libs-only-L libssh2` + CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2` + version=`$PKGCONFIG --modversion libssh2` +-- +2.14.1 + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index fbaeaa8975..25d74394c7 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES +# We're patching configure.ac +LIBCURL_AUTORECONF = YES # We disable NTLM support because it uses fork(), which doesn't work # on non-MMU platforms. Moreover, this authentication method is From 065e7672e1e933f8b5257eddc9d1d8b7021a1687 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 May 2018 22:48:57 +0200 Subject: [PATCH 1495/2640] fs: ensure hard links in TARGET_DIR are correctly copied for filesystem input Fixes #11046 Commit bb2a57a17a7 (fs: run packages' filesystem hooks in a copy of target/) changed the file system logic to run file system hooks from packages on a copy of TARGET_DIR, and finally use this copy as input for the file system generation. This copy was done with rsync, which by default does not preserve hard links, leading to an expansion of the file system images when hard links are present. Fix it by passing the -H option to rsync (preserve hard links). Signed-off-by: Peter Korsgaard Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 9baf367729..abf35418cb 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -71,7 +71,7 @@ $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating common rootfs tarball") rm -rf $(FS_DIR) mkdir -p $(FS_DIR) - rsync -au $(BASE_TARGET_DIR)/ $(TARGET_DIR) + rsync -auH $(BASE_TARGET_DIR)/ $(TARGET_DIR) echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) echo "set -e" >> $(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) From 6505b06d47d0ec5669453c87d601477414586e13 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Fri, 25 May 2018 21:07:01 +0300 Subject: [PATCH 1496/2640] toolchain: Bump ARC tools to arc-2018.03-rc2 This commit bumps ARC toolchain to arc-2018.03-rc2, which includes significant changes since arc-2018.03-rc1. We want to test how new toolchain-rc2 builds packages, so we can make fixes before release of toolcain. This makes us closer to toolchain release which will be in a few weeks. Please note that it is a release candidate and it might contain some breakages, please don't use it for production builds. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Peter Korsgaard (cherry picked from commit 7aaabe8fc04006b15bb5f9aaf08ac07603fcf7fe) Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- .../0002-ld-makefile.patch | 0 .../0003-check-ldrunpath-length.patch | 0 .../0004-add-sysroot-fix-from-bug-3049.patch | 0 .../0005-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 4 ++-- package/gcc/Config.in.host | 2 +- .../0100-uclibc-conf.patch | 0 .../0860-cilk-fix-build-without-wchar.patch | 0 .../0900-remove-selftests.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0002-ld-makefile.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0003-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0004-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2018.03-rc1 => arc-2018.03-rc2}/0005-poison-system-directories.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0100-uclibc-conf.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0860-cilk-fix-build-without-wchar.patch (100%) rename package/gcc/{arc-2018.03-rc1 => arc-2018.03-rc2}/0900-remove-selftests.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 22478d917a..03b228168f 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -24,7 +24,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2018.03-rc1" if BR2_BINUTILS_VERSION_ARC + default "arc-2018.03-rc2" if BR2_BINUTILS_VERSION_ARC default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X diff --git a/package/binutils/arc-2018.03-rc1/0002-ld-makefile.patch b/package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0002-ld-makefile.patch rename to package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch diff --git a/package/binutils/arc-2018.03-rc1/0003-check-ldrunpath-length.patch b/package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0003-check-ldrunpath-length.patch rename to package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2018.03-rc1/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0004-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2018.03-rc1/0005-poison-system-directories.patch b/package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2018.03-rc1/0005-poison-system-directories.patch rename to package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index ebe1f2ee24..c938222804 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,4 +4,4 @@ sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e8262 sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz # Locally calculated (fetched from Github) -sha512 7b8c4a5ec38a234b3ca097ce38e0e60628561251085fc83a614c8cf476eec53ca77ab34088987c80ce79772d5e2cc513b28a7df45f3dc5d0d3a82296e1f6474f binutils-arc-2018.03-rc1.tar.gz +sha512 c9d41001bd41d96f1cd78748c1e8df9715aab1158c0a1c9c90a2010e335c357d0d6816202b7fcf7c7d8d4a65e25920b0b35af6a59edd0d29fd9edddd8be95a48 binutils-arc-2018.03-rc2.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index b24e4334c2..be9e652e10 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2018.03-rc1 +BINUTILS_VERSION = arc-2018.03-rc2 else BINUTILS_VERSION = 2.29.1 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2018.03-rc1) +ifeq ($(BINUTILS_VERSION),arc-2018.03-rc2) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 7c08fb3596..00e72db032 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -73,7 +73,7 @@ config BR2_GCC_VERSION default "5.5.0" if BR2_GCC_VERSION_5_X default "6.4.0" if BR2_GCC_VERSION_6_X default "7.3.0" if BR2_GCC_VERSION_7_X - default "arc-2018.03-rc1" if BR2_GCC_VERSION_ARC + default "arc-2018.03-rc2" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/arc-2018.03-rc1/0100-uclibc-conf.patch b/package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0100-uclibc-conf.patch rename to package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch diff --git a/package/gcc/arc-2018.03-rc1/0860-cilk-fix-build-without-wchar.patch b/package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0860-cilk-fix-build-without-wchar.patch rename to package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch diff --git a/package/gcc/arc-2018.03-rc1/0900-remove-selftests.patch b/package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch similarity index 100% rename from package/gcc/arc-2018.03-rc1/0900-remove-selftests.patch rename to package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index d9a651b547..817d04e390 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -8,6 +8,6 @@ sha512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bb sha512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 gcc-7.3.0.tar.xz # Locally calculated (fetched from Github) -sha512 16e5f9d1637be9a099a996074dc43803803497965c1eab6c0057f10d193d30dcc405ad852df82c4f8c61b195195ee797b788ba0b235d7b03e4410806ac5f94bc gcc-arc-2018.03-rc1.tar.gz +sha512 a0faf2bb34f6c72b6460c6432639d89915cfc63456cfdf016896b3ef075655b2e9f26e745d841bbc38e776bc7a3729359cca88f1e4fb83489fa6775a3ccb55b8 gcc-arc-2018.03-rc2.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index e8dd09e61c..0011966d88 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -74,7 +74,7 @@ endif # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2018.03-rc1-gdb" if BR2_arc + default "arc-2018.03-rc2-gdb" if BR2_arc default "7.10.1" if BR2_GDB_VERSION_7_10 default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB default "7.12.1" if BR2_GDB_VERSION_7_12 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index a2af7b35d9..cfbaac40f6 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,4 +5,4 @@ sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7 sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz # Locally calculated (fetched from Github) -sha512 975f0e09c9fd3ba1ca6aefdeb2da4b2804802606518c0cfdf7abe07c83a61341c1af5c2d2ddfd55ba6112fed420dedc529bc484d0c25b289bbed05edc99d0e72 gdb-arc-2018.03-rc1-gdb.tar.gz +sha512 0c58dd3e8fff8b51a459aba78f4acd1beaa3427e00a63a7242827f22c6af157e4aea91ab754cdc021e0075a5bf2b70df903dba67dbff2415fd0f82c8aab99087 gdb-arc-2018.03-rc2-gdb.tar.gz diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5a90e612b9..f19fa92af4 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) sha256 a74489d14f4017bee6a6c6fe76f1de0dbf7d66c8695116de5aadd141c4757892 glibc-glibc-2.27.tar.gz # Locally calculated (fetched from Github) -sha256 d88f60081285b639122a49425e5fcf8c8cbb0f05efde7a3cb206089fae53c232 glibc-arc-2018.03-rc1.tar.gz +sha256 ddc63360393ab88ab6a4a0c81d33481f34c5a9ebd758eec2e6bb35385058b4cb glibc-arc-2018.03-rc2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3ab673c0cc..717182b052 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2018.03-rc1 +GLIBC_VERSION = arc-2018.03-rc2 GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else # Generate version string using: From 9977053659cdc098b35ef0e9762707a53838209e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 May 2018 15:22:57 +0200 Subject: [PATCH 1497/2640] chrony: S49chrony: support a defaults file For specifying custom options to chrony. Signed-off-by: Peter Korsgaard --- package/chrony/S49chrony | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/chrony/S49chrony b/package/chrony/S49chrony index 6215acc4aa..5abb3b2582 100755 --- a/package/chrony/S49chrony +++ b/package/chrony/S49chrony @@ -2,12 +2,14 @@ # # Start chrony +[ -r /etc/default/chrony ] && . /etc/default/chrony + [ -f /etc/chrony.conf ] || exit 0 case "$1" in start) printf "Starting chrony: " - chronyd && echo "OK" || echo "FAIL" + chronyd $CHRONY_ARGS && echo "OK" || echo "FAIL" ;; stop) printf "Stopping chrony: " From 424db89a26c922e6a8e667b970a9863721371d68 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 May 2018 15:22:58 +0200 Subject: [PATCH 1498/2640] chrony: S49chrony: drop /etc/chrony.conf check With CHRONY_ARGS in /etc/default/chrony, chrony may asked to use an alternative configuration file (with the -f option), so drop the explicit /etc/chrony.conf check. In case the configuration file isn't present chrony will anyway loudly complain which is preferable to this silent failure: chronyd -f /non/existing/file.conf Could not open configuration file /non/existing/file.conf : No such file or directory Signed-off-by: Peter Korsgaard Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/chrony/S49chrony | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/chrony/S49chrony b/package/chrony/S49chrony index 5abb3b2582..f75233fe5e 100755 --- a/package/chrony/S49chrony +++ b/package/chrony/S49chrony @@ -4,8 +4,6 @@ [ -r /etc/default/chrony ] && . /etc/default/chrony -[ -f /etc/chrony.conf ] || exit 0 - case "$1" in start) printf "Starting chrony: " From 299bdf6df83bfb8a960963bb2e7d7bf8f99d47f0 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 28 May 2018 17:42:06 +0200 Subject: [PATCH 1499/2640] linux: bump Linux CIP to v4.4.130-cip23 This patch bump the Linux CIP kernel to version v4.4.130-cip23 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 33d879588c..b1691fe153 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -29,7 +29,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (4.16)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.112-cip18)" + bool "Latest CIP SLTS version (v4.4.130-cip23)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -117,7 +117,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "4.16.12" if BR2_LINUX_KERNEL_LATEST_VERSION - default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From d28591a2ee39704f6795c8aa1d0a3db7e909facc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 May 2018 20:19:53 +0200 Subject: [PATCH 1500/2640] poppler: link with libatomic when needed Following errors might occur on architectures required to use gcc libatomics: sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line This is often the case for sparcv8 32 bit toolchains. See 55a9d6d55888b04ec6c476399e5b98a2412995f5 and 03f6e005e6a9617767b24a9026da9477848020cc. Fixes: http://autobuild.buildroot.net/results/64a96663a48ab644bc03c9a3ec2d6a644119dee6 http://autobuild.buildroot.net/results/82e85e12478fc1972b70ad728ed7c1554920c9e3 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/poppler/poppler.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 5946cbec24..bad61a6613 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -14,6 +14,10 @@ POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ --enable-xpdf-headers +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" +endif + ifeq ($(BR2_PACKAGE_CAIRO),y) POPPLER_CONF_OPTS += --enable-cairo-output POPPLER_DEPENDENCIES += cairo From ef94c736ec460e56b82a5a45819f7adce787d488 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 8 May 2018 22:28:47 +0200 Subject: [PATCH 1501/2640] configs/socrates_cyclone5: change over to current upstream releases Since all cyclone5 development changes are upstream, change over to an upstream release of the Linux kernel and u-boot for buildroot. Signed-off-by: Florian La Roche Signed-off-by: Thomas Petazzoni --- configs/socrates_cyclone5_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/socrates_cyclone5_defconfig b/configs/socrates_cyclone5_defconfig index 7995f9acfb..4c659263df 100644 --- a/configs/socrates_cyclone5_defconfig +++ b/configs/socrates_cyclone5_defconfig @@ -3,12 +3,12 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/altera/socrates_cyclone5/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="socfpga" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates" @@ -16,9 +16,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="socfpga_socrates" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y From bb0164a8b191e5cbf656a4a6b4c5491d4fc167b6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 28 May 2018 21:45:17 +0200 Subject: [PATCH 1502/2640] package/binutils: switch from symlinks to copies to fix rpath Commit f9cffb6af464 (binutils: replace hard-links with soft-links to fix rpath) has a side effect that when we build for a noMMU target, elf2flt will in turn replace some of the programs installed by binutils, with its own wrappers. For example, it will rename host/TUPLE/bin/ld to ld.real, and add its own wrapper in place of the original. It does the same for host/bin/TUPLE-ld and host/bin/TUPLE-ld.real. However, we had already made ld a symlink to ../../bin/TUPLE-ld, so host/TUPLE/bin/ld.real will still point to host/bin/TUPLE-ld when we want it to point to ld.real instead... This ultimately confuses gcc later on. Of course, the culprit is also elf2flt, which also installs similar hardlinks that would ultimately exhibit the same rpath issue as the one fixed by f9cffb6af464. Note: we haven't had an issue so far with that, because those tools installed by elf2flt only link with libz, which is most often present on the host system. So, all seem well, but is nonetheless broken; this will be fixed in a subsequent commit. But back on topic. If we were to fix elf2flt with similar symlinks, gcc still gets confused. The underlying reason for this confusion is not entirely clear, though... It looks like something is trying to dereference symlinks and gets confused by the result somehow... So, in an attempt to restore some sanity in all this mess, we try to restore the previous behaviour, we no longer use symlinks but just copy the individual tools. Fixes: #11031. Signed-off-by: "Yann E. MORIN" Cc: Christophe Priouzeau Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/binutils/binutils.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index be9e652e10..1c05958f9c 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -132,12 +132,13 @@ endif # Hardlinks between binaries in different directories cause a problem # with rpath fixup, so we de-hardlink those binaries, and replace them -# with symbolic links. +# with copies instead. BINUTILS_TOOLS = ar as ld ld.bfd nm objcopy objdump ranlib readelf strip define HOST_BINUTILS_FIXUP_HARDLINKS $(foreach tool,$(BINUTILS_TOOLS),\ - rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) ; \ - ln -s ../../bin/$(GNU_TARGET_NAME)-$(tool) $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) + rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \ + cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \ + $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) ) endef HOST_BINUTILS_POST_INSTALL_HOOKS += HOST_BINUTILS_FIXUP_HARDLINKS From 895f04ebff3b301a0e1ae6f62b6b12b2c3869c7c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 3 May 2018 18:23:33 +0200 Subject: [PATCH 1503/2640] arm-trusted-firmware: simplify release dir path The path to the binary images is very long. Since we are about to make a larger use of it, let's use a variable to make it somewhat shorter. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 4bac916e31..212bb5049f 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,6 +25,7 @@ endif ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -82,7 +83,7 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpf $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release/*.bin $(BINARIES_DIR)/ + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ endef # Configuration check From b37069340010f4d26c3baa741f2dc996014b7c66 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 28 May 2018 21:45:18 +0200 Subject: [PATCH 1504/2640] package/elf2flt: replace hard-links with copies to fix rpath Do for elf2flt what we did for binutils: replace the hardlinks (which break rpath handling) with copies of the individaul tools. See previous commit (package/binutils: switch from symlinks to copies and commit f9cffb6af4 (binutils: replace hard-links with soft-links to fix rpath) for the complete story. Fixes: #11031. Reported-by: Christophe Priouzeau Signed-off-by: "Yann E. MORIN" Cc: Christophe Priouzeau Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/elf2flt/elf2flt.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 995dfedebd..557f94d338 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -29,4 +29,20 @@ endif HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)" +# Hardlinks between binaries in different directories cause a problem +# with rpath fixup, so we de-hardlink those binaries, and replace them +# with copies instead. Note that elf2flt will rename ld to ld.real +# before installing its own ld, but we already took care of the +# original ld from binutils so that it is already de-hardlinked. So +# ld is now the one from elf2flt, and we want to de-hardlinke it. +ELF2FLT_TOOLS = elf2flt flthdr ld +define HOST_ELF2FLT_FIXUP_HARDLINKS + $(foreach tool,$(ELF2FLT_TOOLS),\ + rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \ + cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \ + $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) + ) +endef +HOST_ELF2FLT_POST_INSTALL_HOOKS += HOST_ELF2FLT_FIXUP_HARDLINKS + $(eval $(host-autotools-package)) From 61447331bd5540b1d720fe06fdbec85ec297aaaf Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 3 May 2018 18:23:34 +0200 Subject: [PATCH 1505/2640] arm-trusted-firmware: generate atf-uboot.ub image of bl31.bin U-Boot SPL for the Xilinx ZynqMP SoCs needs ATF in this format to load it. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 8 +++++++ .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 7aef87cb74..885d93e62f 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -71,6 +71,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 typically used on platforms where another bootloader (e.g U-Boot) encapsulates ATF BL31. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT + bool "Build BL31 U-Boot image" + select BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 + help + Generates a U-Boot image named atf-uboot.ub containing + bl31.bin. This is used for example by the Xilinx version of + U-Boot SPL to load ATF on the ZynqMP SoC. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 212bb5049f..054a000a1d 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -75,15 +75,36 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31 endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT),y) +define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD +# Get the entry point address from the elf. + BASE_ADDR=$$($(TARGET_READELF) -h $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/bl31/bl31.elf | \ + sed -r '/^ Entry point address:\s*(.*)/!d; s//\1/') && \ + $(HOST_DIR)/bin/mkimage \ + -A arm64 -O arm-trusted-firmware -C none \ + -a $${BASE_ADDR} -e $${BASE_ADDR} \ + -d $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/bl31.bin \ + $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/atf-uboot.ub +endef +define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL + $(INSTALL) -m 0644 $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/atf-uboot.ub \ + $(BINARIES_DIR)/atf-uboot.ub +endef +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RESET_TO_BL31=1 +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-uboot-tools +endif + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) + $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD) endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ + $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) endef # Configuration check From 689c083f571e0c88463a451cb4e64c1470b67afb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 6 May 2018 11:42:29 +0200 Subject: [PATCH 1506/2640] libnice: add gstreamer support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnice/libnice.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index e023728f44..49c29f9a60 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -10,8 +10,19 @@ LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = gnutls libglib2 host-pkgconf LIBNICE_INSTALL_STAGING = YES -LIBNICE_CONF_OPTS = \ - --without-gstreamer \ - --without-gstreamer-0.10 + +ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) +LIBNICE_CONF_OPTS += --with-gstreamer-0.10 +LIBNICE_DEPENDENCIES += gst-plugins-base +else +LIBNICE_CONF_OPTS += --without-gstreamer-0.10 +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +LIBNICE_CONF_OPTS += --with-gstreamer +LIBNICE_DEPENDENCIES += gst1-plugins-base +else +LIBNICE_CONF_OPTS += --without-gstreamer +endif $(eval $(autotools-package)) From bea6b866efb52c3ff7745bbea4aba4562d6877bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 May 2018 23:02:21 +0200 Subject: [PATCH 1507/2640] Update for 2018.05-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 4a51dafab5..e48ac23adc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ +2018.05-rc3, Released May 28th, 2018 + + Fixes all over the tree. + + Toolchain: ARC tools updated to arc-2018.03-rc2. + + Fs: Ensure hard links in TARGET_DIR are correctly copied for + filesystem input. With the recent changes to the file system + generation logic, hard links were "expanded" in file system + images leading to bloated rootfs images for setups with hard + links. + + Infrastructure: Error out for packages using the 'local' + method but forgetting to specify _SITE. + + Build rpcgen for the host when needed to support distributions + no longer shipping rpcgen with glibc (E.G. recent Fedora). + + Updated/fixed packages: autofs, bash-completion, binutils, + busybox, cjson, elf2flt, libcoap, libcurl, libtirpc, lrzsz, + poppler, procps-ng, qt-webkit-kiosk, quota, samba4, xfsprogs + + Issues resolved (http://bugs.uclibc.org): + + #11031: ld-elf2flt: host/bin/ld.real': execvp: No such file.. + #11036: C compiler cannot create executables + #11046: Git package binaries are ~180MB (compared to ~20MB in.. + 2018.05-rc2, Released May 22nd, 2018 Fixes all over the tree. diff --git a/Makefile b/Makefile index 3415f994bd..7be8a6634b 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.05-rc2 +export BR2_VERSION := 2018.05-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1527024000 +BR2_VERSION_EPOCH = 1527540000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 1ae05e9c62..03f8e1818c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -77,37 +77,37 @@
      --> -

      Latest release candidate: 2018.05-rc2

      +

      Latest release candidate: 2018.05-rc3

      - +
      - +
      -

      buildroot-2018.05-rc2.tar.gz

      -

      PGP signature

      +

      buildroot-2018.05-rc3.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2018.05-rc2.tar.bz2

      -

      PGP signature

      +

      buildroot-2018.05-rc3.tar.bz2

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index c14b108d1c..b89e6e27ed 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

      News

        +
      • +
        +
        +
        +

        2018.05-rc3 released

        +

        28 May 2018

        +
        +
        +

        Release candidate 3 is out with more cleanups and security + / build fixes. See + the CHANGES + file for details.

        +

        Head to the downloads page to + pick up + the 2018.02-rc5 + release candidate, and report any problems found to + the mailing list + or bug tracker.

        +
        +
        +
        • +
      • From f6f2feec458460d18b10734d59f9c6a35244ff94 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 26 Apr 2018 16:10:37 +0200 Subject: [PATCH 1508/2640] package/corkscrew: new package Corkscrew is a tool for tunneling SSH through HTTP proxies Signed-off-by: Angelo Compagnucci [Thomas: add hash for license file, add entry in DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/corkscrew/Config.in | 7 +++++++ package/corkscrew/corkscrew.hash | 3 +++ package/corkscrew/corkscrew.mk | 13 +++++++++++++ 5 files changed, 25 insertions(+) create mode 100644 package/corkscrew/Config.in create mode 100644 package/corkscrew/corkscrew.hash create mode 100644 package/corkscrew/corkscrew.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3c2c032980..d2da9a2f80 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -143,6 +143,7 @@ N: Andy Kennedy F: package/libunwind/ N: Angelo Compagnucci +F: package/corkscrew/ F: package/i2c-tools/ F: package/mono/ F: package/mono-gtksharp3/ diff --git a/package/Config.in b/package/Config.in index 6cd19ec97f..6a1606e568 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1699,6 +1699,7 @@ menu "Networking applications" source "package/connman/Config.in" source "package/connman-gtk/Config.in" source "package/conntrack-tools/Config.in" + source "package/corkscrew/Config.in" source "package/crda/Config.in" source "package/ctorrent/Config.in" source "package/cups/Config.in" diff --git a/package/corkscrew/Config.in b/package/corkscrew/Config.in new file mode 100644 index 0000000000..1266f86e7e --- /dev/null +++ b/package/corkscrew/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_CORKSCREW + bool "corkscrew" + help + Corkscrew is a tool for tunneling SSH through HTTP proxies, + but... you might find another use for it. + + https://github.com/bryanpkc/corkscrew diff --git a/package/corkscrew/corkscrew.hash b/package/corkscrew/corkscrew.hash new file mode 100644 index 0000000000..5a580d1343 --- /dev/null +++ b/package/corkscrew/corkscrew.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 ba28a7d123fe607b87ff9d399b33e7549d9ef1a13ae3b61e8f61982e8ae5571d corkscrew-a94f745b40077172b8fe7d77e2d583b9cf900281.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/corkscrew/corkscrew.mk b/package/corkscrew/corkscrew.mk new file mode 100644 index 0000000000..13612d4448 --- /dev/null +++ b/package/corkscrew/corkscrew.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# corkscrew +# +################################################################################ + +CORKSCREW_VERSION = a94f745b40077172b8fe7d77e2d583b9cf900281 +CORKSCREW_SITE = $(call github,bryanpkc,corkscrew,$(CORKSCREW_VERSION)) +CORKSCREW_LICENSE = GPL-2.0 +CORKSCREW_LICENSE_FILES = COPYING +CORKSCREW_AUTORECONF = YES + +$(eval $(autotools-package)) From 8b03b2a6648db9978a3c89a41fda558035510e0a Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 6 May 2018 17:19:44 +0100 Subject: [PATCH 1509/2640] package/ca-certificates: bump version to 20180409 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update Mozilla certificate authority bundle to version 2.22. The following certificate authorities were added (+): + "GDCA TrustAUTH R5 ROOT" + "SSL.com EV Root Certification Authority ECC" + "SSL.com EV Root Certification Authority RSA R2" + "SSL.com Root Certification Authority ECC" + "SSL.com Root Certification Authority RSA" + "TrustCor ECA-1" + "TrustCor RootCert CA-1" + "TrustCor RootCert CA-2" The following certificate authorities were removed (-): - "ACEDICOM Root" - "AddTrust Low-Value Services Root" - "AddTrust Public Services Root" - "AddTrust Qualified Certificates Root" - "CA Disig Root R1" - "CNNIC ROOT" - "Camerfirma Chambers of Commerce Root" - "Camerfirma Global Chambersign Root" - "Certinomis - Autorité Racine" - "Certum Root CA" - "China Internet Network Information Center EV Certificates Root" - "Comodo Secure Services root" - "Comodo Trusted Services root" - "DST ACES CA X6" - "GeoTrust Global CA 2" - "PSCProcert" - "Security Communication EV RootCA1" - "Swisscom Root CA 1" - "Swisscom Root CA 2" - "Swisscom Root EV CA 2" - "TURKTRUST Certificate Services Provider Root 2007" - "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" - "UTN USERFirst Hardware Root CA" Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/ca-certificates/ca-certificates.hash | 4 ++-- package/ca-certificates/ca-certificates.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index 00296e2a8c..8100dde357 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,3 +1,3 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 4c093ceee1f1428d5aa7e9a5324b92961c0c0f06 ca-certificates_20170717.tar.xz -sha256 e487639b641fa75445174734dd6e9d600373e3248b3d86a7e3c6d0f6977decd2 ca-certificates_20170717.tar.xz +sha1 edf0ec04b02fcbc90cc65906ff83fb042894a3b7 ca-certificates_20180409.tar.xz +sha256 7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 ca-certificates_20180409.tar.xz diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index cb0e961465..c19d37788b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20170717 +CA_CERTIFICATES_VERSION = 20180409 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20170814T210836Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20180411T111033Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl # ca-certificates can be built with either python 2 or python 3 # but it must be at least python 2.7 From 986fcc6cc7a153f82e95d0db418341ba318ca263 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 14:47:10 +0300 Subject: [PATCH 1510/2640] ethtool: bump to version 4.16 Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 9704a54b0d..bac7401d3c 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 71f7fd32483ffdc7c6c4d882e230714eb101df0a46cbe396dbeb8ac78f1ef91a ethtool-4.15.tar.xz +sha256 fe967a6722db2099fa63d847b6628e3e31cf9f53571a37503347dcc3e4015a03 ethtool-4.16.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index be587f5083..b974b5f76e 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 4.15 +ETHTOOL_VERSION = 4.16 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From 488052edffeb20f86b6d3d4bdd1f4f58511c8abf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 17:37:54 +0300 Subject: [PATCH 1511/2640] glibc: security bump to latest 2.27 branch Fixed issues are listed in the 2.27 branch NEWS file: CVE-2017-18269: An SSE2-based memmove implementation for the i386 architecture could corrupt memory. Reported by Max Horn. CVE-2018-11236: Very long pathname arguments to realpath function could result in an integer overflow and buffer overflow. Reported by Alexey Izbyshev. CVE-2018-11237: The mempcpy implementation for the Intel Xeon Phi architecture could write beyond the target buffer, resulting in a buffer overflow. Reported by Andreas Schwab. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index f19fa92af4..1fab3a245c 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 a74489d14f4017bee6a6c6fe76f1de0dbf7d66c8695116de5aadd141c4757892 glibc-glibc-2.27.tar.gz +sha256 33189b3f10c88730a1f686fac794bc01f31765f12ffd75bc5e8a0f2a690d217a glibc-glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e.tar.gz # Locally calculated (fetched from Github) sha256 ddc63360393ab88ab6a4a0c81d33481f34c5a9ebd758eec2e6bb35385058b4cb glibc-arc-2018.03-rc2.tar.gz diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 717182b052..8e82eaa1ee 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master -GLIBC_VERSION = glibc-2.27 +GLIBC_VERSION = glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. From cbe43fd417d77f846f1ca47cdacd51a73be1aaec Mon Sep 17 00:00:00 2001 From: Christophe PRIOUZEAU Date: Tue, 29 May 2018 12:09:27 +0000 Subject: [PATCH 1512/2640] configs/stm32f429: force usage of binutils 2.28.x Fixes #11051 Due to runtime issue with the usage of binutils 2.29.x, we need to use the version 2.28.x Signed-off-by: Christophe Priouzeau Acked-by: Romain Naour Signed-off-by: Peter Korsgaard --- configs/stm32f429_disco_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32f429_disco_defconfig b/configs/stm32f429_disco_defconfig index 5237e9adb5..fc167d0270 100644 --- a/configs/stm32f429_disco_defconfig +++ b/configs/stm32f429_disco_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +BR2_BINUTILS_VERSION_2_28_X=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From 12049cc8b8972a9d0f1e27f1382cc5752d45312f Mon Sep 17 00:00:00 2001 From: Christophe PRIOUZEAU Date: Tue, 29 May 2018 12:09:27 +0000 Subject: [PATCH 1513/2640] configs/stm32f469: force usage of binutils 2.28.x Fixes #11051 Due to runtime issue with the usage of binutils 2.29.x, we need to use the version 2.28.x Signed-off-by: Christophe Priouzeau Acked-by: Romain Naour Signed-off-by: Peter Korsgaard --- configs/stm32f469_disco_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32f469_disco_defconfig b/configs/stm32f469_disco_defconfig index 8b77d8c1a2..e5cacafb46 100644 --- a/configs/stm32f469_disco_defconfig +++ b/configs/stm32f469_disco_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +BR2_BINUTILS_VERSION_2_28_X=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From fd0b79dba90c1562cd3a48df1aa33a72f92db78c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 15:35:07 +0300 Subject: [PATCH 1514/2640] usbutils: bump to version 010 Add GPL-3.0 license for the lsusb.py script. Update license file location. The tar archive does not contain the license files from the git tree. Add a patch adding the license files. This patch is not git formatted because it only applies to the tar archive. Upstream fixed tar archive generation for the next release. Add license files hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../usbutils/0001-add-gpl-license-files.patch | 1030 +++++++++++++++++ package/usbutils/usbutils.hash | 5 +- package/usbutils/usbutils.mk | 6 +- 3 files changed, 1037 insertions(+), 4 deletions(-) create mode 100644 package/usbutils/0001-add-gpl-license-files.patch diff --git a/package/usbutils/0001-add-gpl-license-files.patch b/package/usbutils/0001-add-gpl-license-files.patch new file mode 100644 index 0000000000..e6e335f14d --- /dev/null +++ b/package/usbutils/0001-add-gpl-license-files.patch @@ -0,0 +1,1030 @@ +Add GPL-2.0 and GPL-3.0 license files + +This patch is equivalent to upstream commit 747db4bc75e1 (Makefile.am: add +files with licenses to archive). The license files are in upstream commit, but +missing from the tar archive. + +Signed-off-by: Baruch Siach +--- + +diff -Nuar usbutils-010.orig/LICENSES/GPL-2.0.txt usbutils-010/LICENSES/GPL-2.0.txt +--- usbutils-010.orig/LICENSES/GPL-2.0.txt 1970-01-01 02:00:00.000000000 +0200 ++++ usbutils-010/LICENSES/GPL-2.0.txt 2018-05-29 14:49:22.351783751 +0300 +@@ -0,0 +1,339 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Lesser General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Lesser General ++Public License instead of this License. +diff -Nuar usbutils-010.orig/LICENSES/GPL-3.0.txt usbutils-010/LICENSES/GPL-3.0.txt +--- usbutils-010.orig/LICENSES/GPL-3.0.txt 1970-01-01 02:00:00.000000000 +0200 ++++ usbutils-010/LICENSES/GPL-3.0.txt 2018-05-29 15:21:15.923738330 +0300 +@@ -0,0 +1,674 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 3, 29 June 2007 ++ ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The GNU General Public License is a free, copyleft license for ++software and other kinds of works. ++ ++ The licenses for most software and other practical works are designed ++to take away your freedom to share and change the works. By contrast, ++the GNU General Public License is intended to guarantee your freedom to ++share and change all versions of a program--to make sure it remains free ++software for all its users. We, the Free Software Foundation, use the ++GNU General Public License for most of our software; it applies also to ++any other work released this way by its authors. You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++them if you wish), that you receive source code or can get it if you ++want it, that you can change the software or use pieces of it in new ++free programs, and that you know you can do these things. ++ ++ To protect your rights, we need to prevent others from denying you ++these rights or asking you to surrender the rights. Therefore, you have ++certain responsibilities if you distribute copies of the software, or if ++you modify it: responsibilities to respect the freedom of others. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must pass on to the recipients the same ++freedoms that you received. You must make sure that they, too, receive ++or can get the source code. And you must show them these terms so they ++know their rights. ++ ++ Developers that use the GNU GPL protect your rights with two steps: ++(1) assert copyright on the software, and (2) offer you this License ++giving you legal permission to copy, distribute and/or modify it. ++ ++ For the developers' and authors' protection, the GPL clearly explains ++that there is no warranty for this free software. For both users' and ++authors' sake, the GPL requires that modified versions be marked as ++changed, so that their problems will not be attributed erroneously to ++authors of previous versions. ++ ++ Some devices are designed to deny users access to install or run ++modified versions of the software inside them, although the manufacturer ++can do so. This is fundamentally incompatible with the aim of ++protecting users' freedom to change the software. The systematic ++pattern of such abuse occurs in the area of products for individuals to ++use, which is precisely where it is most unacceptable. Therefore, we ++have designed this version of the GPL to prohibit the practice for those ++products. If such problems arise substantially in other domains, we ++stand ready to extend this provision to those domains in future versions ++of the GPL, as needed to protect the freedom of users. ++ ++ Finally, every program is threatened constantly by software patents. ++States should not allow patents to restrict development and use of ++software on general-purpose computers, but in those that do, we wish to ++avoid the special danger that patents applied to a free program could ++make it effectively proprietary. To prevent this, the GPL assures that ++patents cannot be used to render the program non-free. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ TERMS AND CONDITIONS ++ ++ 0. Definitions. ++ ++ "This License" refers to version 3 of the GNU General Public License. ++ ++ "Copyright" also means copyright-like laws that apply to other kinds of ++works, such as semiconductor masks. ++ ++ "The Program" refers to any copyrightable work licensed under this ++License. Each licensee is addressed as "you". "Licensees" and ++"recipients" may be individuals or organizations. ++ ++ To "modify" a work means to copy from or adapt all or part of the work ++in a fashion requiring copyright permission, other than the making of an ++exact copy. The resulting work is called a "modified version" of the ++earlier work or a work "based on" the earlier work. ++ ++ A "covered work" means either the unmodified Program or a work based ++on the Program. ++ ++ To "propagate" a work means to do anything with it that, without ++permission, would make you directly or secondarily liable for ++infringement under applicable copyright law, except executing it on a ++computer or modifying a private copy. Propagation includes copying, ++distribution (with or without modification), making available to the ++public, and in some countries other activities as well. ++ ++ To "convey" a work means any kind of propagation that enables other ++parties to make or receive copies. Mere interaction with a user through ++a computer network, with no transfer of a copy, is not conveying. ++ ++ An interactive user interface displays "Appropriate Legal Notices" ++to the extent that it includes a convenient and prominently visible ++feature that (1) displays an appropriate copyright notice, and (2) ++tells the user that there is no warranty for the work (except to the ++extent that warranties are provided), that licensees may convey the ++work under this License, and how to view a copy of this License. If ++the interface presents a list of user commands or options, such as a ++menu, a prominent item in the list meets this criterion. ++ ++ 1. Source Code. ++ ++ The "source code" for a work means the preferred form of the work ++for making modifications to it. "Object code" means any non-source ++form of a work. ++ ++ A "Standard Interface" means an interface that either is an official ++standard defined by a recognized standards body, or, in the case of ++interfaces specified for a particular programming language, one that ++is widely used among developers working in that language. ++ ++ The "System Libraries" of an executable work include anything, other ++than the work as a whole, that (a) is included in the normal form of ++packaging a Major Component, but which is not part of that Major ++Component, and (b) serves only to enable use of the work with that ++Major Component, or to implement a Standard Interface for which an ++implementation is available to the public in source code form. A ++"Major Component", in this context, means a major essential component ++(kernel, window system, and so on) of the specific operating system ++(if any) on which the executable work runs, or a compiler used to ++produce the work, or an object code interpreter used to run it. ++ ++ The "Corresponding Source" for a work in object code form means all ++the source code needed to generate, install, and (for an executable ++work) run the object code and to modify the work, including scripts to ++control those activities. However, it does not include the work's ++System Libraries, or general-purpose tools or generally available free ++programs which are used unmodified in performing those activities but ++which are not part of the work. For example, Corresponding Source ++includes interface definition files associated with source files for ++the work, and the source code for shared libraries and dynamically ++linked subprograms that the work is specifically designed to require, ++such as by intimate data communication or control flow between those ++subprograms and other parts of the work. ++ ++ The Corresponding Source need not include anything that users ++can regenerate automatically from other parts of the Corresponding ++Source. ++ ++ The Corresponding Source for a work in source code form is that ++same work. ++ ++ 2. Basic Permissions. ++ ++ All rights granted under this License are granted for the term of ++copyright on the Program, and are irrevocable provided the stated ++conditions are met. This License explicitly affirms your unlimited ++permission to run the unmodified Program. The output from running a ++covered work is covered by this License only if the output, given its ++content, constitutes a covered work. This License acknowledges your ++rights of fair use or other equivalent, as provided by copyright law. ++ ++ You may make, run and propagate covered works that you do not ++convey, without conditions so long as your license otherwise remains ++in force. You may convey covered works to others for the sole purpose ++of having them make modifications exclusively for you, or provide you ++with facilities for running those works, provided that you comply with ++the terms of this License in conveying all material for which you do ++not control copyright. Those thus making or running the covered works ++for you must do so exclusively on your behalf, under your direction ++and control, on terms that prohibit them from making any copies of ++your copyrighted material outside their relationship with you. ++ ++ Conveying under any other circumstances is permitted solely under ++the conditions stated below. Sublicensing is not allowed; section 10 ++makes it unnecessary. ++ ++ 3. Protecting Users' Legal Rights From Anti-Circumvention Law. ++ ++ No covered work shall be deemed part of an effective technological ++measure under any applicable law fulfilling obligations under article ++11 of the WIPO copyright treaty adopted on 20 December 1996, or ++similar laws prohibiting or restricting circumvention of such ++measures. ++ ++ When you convey a covered work, you waive any legal power to forbid ++circumvention of technological measures to the extent such circumvention ++is effected by exercising rights under this License with respect to ++the covered work, and you disclaim any intention to limit operation or ++modification of the work as a means of enforcing, against the work's ++users, your or third parties' legal rights to forbid circumvention of ++technological measures. ++ ++ 4. Conveying Verbatim Copies. ++ ++ You may convey verbatim copies of the Program's source code as you ++receive it, in any medium, provided that you conspicuously and ++appropriately publish on each copy an appropriate copyright notice; ++keep intact all notices stating that this License and any ++non-permissive terms added in accord with section 7 apply to the code; ++keep intact all notices of the absence of any warranty; and give all ++recipients a copy of this License along with the Program. ++ ++ You may charge any price or no price for each copy that you convey, ++and you may offer support or warranty protection for a fee. ++ ++ 5. Conveying Modified Source Versions. ++ ++ You may convey a work based on the Program, or the modifications to ++produce it from the Program, in the form of source code under the ++terms of section 4, provided that you also meet all of these conditions: ++ ++ a) The work must carry prominent notices stating that you modified ++ it, and giving a relevant date. ++ ++ b) The work must carry prominent notices stating that it is ++ released under this License and any conditions added under section ++ 7. This requirement modifies the requirement in section 4 to ++ "keep intact all notices". ++ ++ c) You must license the entire work, as a whole, under this ++ License to anyone who comes into possession of a copy. This ++ License will therefore apply, along with any applicable section 7 ++ additional terms, to the whole of the work, and all its parts, ++ regardless of how they are packaged. This License gives no ++ permission to license the work in any other way, but it does not ++ invalidate such permission if you have separately received it. ++ ++ d) If the work has interactive user interfaces, each must display ++ Appropriate Legal Notices; however, if the Program has interactive ++ interfaces that do not display Appropriate Legal Notices, your ++ work need not make them do so. ++ ++ A compilation of a covered work with other separate and independent ++works, which are not by their nature extensions of the covered work, ++and which are not combined with it such as to form a larger program, ++in or on a volume of a storage or distribution medium, is called an ++"aggregate" if the compilation and its resulting copyright are not ++used to limit the access or legal rights of the compilation's users ++beyond what the individual works permit. Inclusion of a covered work ++in an aggregate does not cause this License to apply to the other ++parts of the aggregate. ++ ++ 6. Conveying Non-Source Forms. ++ ++ You may convey a covered work in object code form under the terms ++of sections 4 and 5, provided that you also convey the ++machine-readable Corresponding Source under the terms of this License, ++in one of these ways: ++ ++ a) Convey the object code in, or embodied in, a physical product ++ (including a physical distribution medium), accompanied by the ++ Corresponding Source fixed on a durable physical medium ++ customarily used for software interchange. ++ ++ b) Convey the object code in, or embodied in, a physical product ++ (including a physical distribution medium), accompanied by a ++ written offer, valid for at least three years and valid for as ++ long as you offer spare parts or customer support for that product ++ model, to give anyone who possesses the object code either (1) a ++ copy of the Corresponding Source for all the software in the ++ product that is covered by this License, on a durable physical ++ medium customarily used for software interchange, for a price no ++ more than your reasonable cost of physically performing this ++ conveying of source, or (2) access to copy the ++ Corresponding Source from a network server at no charge. ++ ++ c) Convey individual copies of the object code with a copy of the ++ written offer to provide the Corresponding Source. This ++ alternative is allowed only occasionally and noncommercially, and ++ only if you received the object code with such an offer, in accord ++ with subsection 6b. ++ ++ d) Convey the object code by offering access from a designated ++ place (gratis or for a charge), and offer equivalent access to the ++ Corresponding Source in the same way through the same place at no ++ further charge. You need not require recipients to copy the ++ Corresponding Source along with the object code. If the place to ++ copy the object code is a network server, the Corresponding Source ++ may be on a different server (operated by you or a third party) ++ that supports equivalent copying facilities, provided you maintain ++ clear directions next to the object code saying where to find the ++ Corresponding Source. Regardless of what server hosts the ++ Corresponding Source, you remain obligated to ensure that it is ++ available for as long as needed to satisfy these requirements. ++ ++ e) Convey the object code using peer-to-peer transmission, provided ++ you inform other peers where the object code and Corresponding ++ Source of the work are being offered to the general public at no ++ charge under subsection 6d. ++ ++ A separable portion of the object code, whose source code is excluded ++from the Corresponding Source as a System Library, need not be ++included in conveying the object code work. ++ ++ A "User Product" is either (1) a "consumer product", which means any ++tangible personal property which is normally used for personal, family, ++or household purposes, or (2) anything designed or sold for incorporation ++into a dwelling. In determining whether a product is a consumer product, ++doubtful cases shall be resolved in favor of coverage. For a particular ++product received by a particular user, "normally used" refers to a ++typical or common use of that class of product, regardless of the status ++of the particular user or of the way in which the particular user ++actually uses, or expects or is expected to use, the product. A product ++is a consumer product regardless of whether the product has substantial ++commercial, industrial or non-consumer uses, unless such uses represent ++the only significant mode of use of the product. ++ ++ "Installation Information" for a User Product means any methods, ++procedures, authorization keys, or other information required to install ++and execute modified versions of a covered work in that User Product from ++a modified version of its Corresponding Source. The information must ++suffice to ensure that the continued functioning of the modified object ++code is in no case prevented or interfered with solely because ++modification has been made. ++ ++ If you convey an object code work under this section in, or with, or ++specifically for use in, a User Product, and the conveying occurs as ++part of a transaction in which the right of possession and use of the ++User Product is transferred to the recipient in perpetuity or for a ++fixed term (regardless of how the transaction is characterized), the ++Corresponding Source conveyed under this section must be accompanied ++by the Installation Information. But this requirement does not apply ++if neither you nor any third party retains the ability to install ++modified object code on the User Product (for example, the work has ++been installed in ROM). ++ ++ The requirement to provide Installation Information does not include a ++requirement to continue to provide support service, warranty, or updates ++for a work that has been modified or installed by the recipient, or for ++the User Product in which it has been modified or installed. Access to a ++network may be denied when the modification itself materially and ++adversely affects the operation of the network or violates the rules and ++protocols for communication across the network. ++ ++ Corresponding Source conveyed, and Installation Information provided, ++in accord with this section must be in a format that is publicly ++documented (and with an implementation available to the public in ++source code form), and must require no special password or key for ++unpacking, reading or copying. ++ ++ 7. Additional Terms. ++ ++ "Additional permissions" are terms that supplement the terms of this ++License by making exceptions from one or more of its conditions. ++Additional permissions that are applicable to the entire Program shall ++be treated as though they were included in this License, to the extent ++that they are valid under applicable law. If additional permissions ++apply only to part of the Program, that part may be used separately ++under those permissions, but the entire Program remains governed by ++this License without regard to the additional permissions. ++ ++ When you convey a copy of a covered work, you may at your option ++remove any additional permissions from that copy, or from any part of ++it. (Additional permissions may be written to require their own ++removal in certain cases when you modify the work.) You may place ++additional permissions on material, added by you to a covered work, ++for which you have or can give appropriate copyright permission. ++ ++ Notwithstanding any other provision of this License, for material you ++add to a covered work, you may (if authorized by the copyright holders of ++that material) supplement the terms of this License with terms: ++ ++ a) Disclaiming warranty or limiting liability differently from the ++ terms of sections 15 and 16 of this License; or ++ ++ b) Requiring preservation of specified reasonable legal notices or ++ author attributions in that material or in the Appropriate Legal ++ Notices displayed by works containing it; or ++ ++ c) Prohibiting misrepresentation of the origin of that material, or ++ requiring that modified versions of such material be marked in ++ reasonable ways as different from the original version; or ++ ++ d) Limiting the use for publicity purposes of names of licensors or ++ authors of the material; or ++ ++ e) Declining to grant rights under trademark law for use of some ++ trade names, trademarks, or service marks; or ++ ++ f) Requiring indemnification of licensors and authors of that ++ material by anyone who conveys the material (or modified versions of ++ it) with contractual assumptions of liability to the recipient, for ++ any liability that these contractual assumptions directly impose on ++ those licensors and authors. ++ ++ All other non-permissive additional terms are considered "further ++restrictions" within the meaning of section 10. If the Program as you ++received it, or any part of it, contains a notice stating that it is ++governed by this License along with a term that is a further ++restriction, you may remove that term. If a license document contains ++a further restriction but permits relicensing or conveying under this ++License, you may add to a covered work material governed by the terms ++of that license document, provided that the further restriction does ++not survive such relicensing or conveying. ++ ++ If you add terms to a covered work in accord with this section, you ++must place, in the relevant source files, a statement of the ++additional terms that apply to those files, or a notice indicating ++where to find the applicable terms. ++ ++ Additional terms, permissive or non-permissive, may be stated in the ++form of a separately written license, or stated as exceptions; ++the above requirements apply either way. ++ ++ 8. Termination. ++ ++ You may not propagate or modify a covered work except as expressly ++provided under this License. Any attempt otherwise to propagate or ++modify it is void, and will automatically terminate your rights under ++this License (including any patent licenses granted under the third ++paragraph of section 11). ++ ++ However, if you cease all violation of this License, then your ++license from a particular copyright holder is reinstated (a) ++provisionally, unless and until the copyright holder explicitly and ++finally terminates your license, and (b) permanently, if the copyright ++holder fails to notify you of the violation by some reasonable means ++prior to 60 days after the cessation. ++ ++ Moreover, your license from a particular copyright holder is ++reinstated permanently if the copyright holder notifies you of the ++violation by some reasonable means, this is the first time you have ++received notice of violation of this License (for any work) from that ++copyright holder, and you cure the violation prior to 30 days after ++your receipt of the notice. ++ ++ Termination of your rights under this section does not terminate the ++licenses of parties who have received copies or rights from you under ++this License. If your rights have been terminated and not permanently ++reinstated, you do not qualify to receive new licenses for the same ++material under section 10. ++ ++ 9. Acceptance Not Required for Having Copies. ++ ++ You are not required to accept this License in order to receive or ++run a copy of the Program. Ancillary propagation of a covered work ++occurring solely as a consequence of using peer-to-peer transmission ++to receive a copy likewise does not require acceptance. However, ++nothing other than this License grants you permission to propagate or ++modify any covered work. These actions infringe copyright if you do ++not accept this License. Therefore, by modifying or propagating a ++covered work, you indicate your acceptance of this License to do so. ++ ++ 10. Automatic Licensing of Downstream Recipients. ++ ++ Each time you convey a covered work, the recipient automatically ++receives a license from the original licensors, to run, modify and ++propagate that work, subject to this License. You are not responsible ++for enforcing compliance by third parties with this License. ++ ++ An "entity transaction" is a transaction transferring control of an ++organization, or substantially all assets of one, or subdividing an ++organization, or merging organizations. If propagation of a covered ++work results from an entity transaction, each party to that ++transaction who receives a copy of the work also receives whatever ++licenses to the work the party's predecessor in interest had or could ++give under the previous paragraph, plus a right to possession of the ++Corresponding Source of the work from the predecessor in interest, if ++the predecessor has it or can get it with reasonable efforts. ++ ++ You may not impose any further restrictions on the exercise of the ++rights granted or affirmed under this License. For example, you may ++not impose a license fee, royalty, or other charge for exercise of ++rights granted under this License, and you may not initiate litigation ++(including a cross-claim or counterclaim in a lawsuit) alleging that ++any patent claim is infringed by making, using, selling, offering for ++sale, or importing the Program or any portion of it. ++ ++ 11. Patents. ++ ++ A "contributor" is a copyright holder who authorizes use under this ++License of the Program or a work on which the Program is based. The ++work thus licensed is called the contributor's "contributor version". ++ ++ A contributor's "essential patent claims" are all patent claims ++owned or controlled by the contributor, whether already acquired or ++hereafter acquired, that would be infringed by some manner, permitted ++by this License, of making, using, or selling its contributor version, ++but do not include claims that would be infringed only as a ++consequence of further modification of the contributor version. For ++purposes of this definition, "control" includes the right to grant ++patent sublicenses in a manner consistent with the requirements of ++this License. ++ ++ Each contributor grants you a non-exclusive, worldwide, royalty-free ++patent license under the contributor's essential patent claims, to ++make, use, sell, offer for sale, import and otherwise run, modify and ++propagate the contents of its contributor version. ++ ++ In the following three paragraphs, a "patent license" is any express ++agreement or commitment, however denominated, not to enforce a patent ++(such as an express permission to practice a patent or covenant not to ++sue for patent infringement). To "grant" such a patent license to a ++party means to make such an agreement or commitment not to enforce a ++patent against the party. ++ ++ If you convey a covered work, knowingly relying on a patent license, ++and the Corresponding Source of the work is not available for anyone ++to copy, free of charge and under the terms of this License, through a ++publicly available network server or other readily accessible means, ++then you must either (1) cause the Corresponding Source to be so ++available, or (2) arrange to deprive yourself of the benefit of the ++patent license for this particular work, or (3) arrange, in a manner ++consistent with the requirements of this License, to extend the patent ++license to downstream recipients. "Knowingly relying" means you have ++actual knowledge that, but for the patent license, your conveying the ++covered work in a country, or your recipient's use of the covered work ++in a country, would infringe one or more identifiable patents in that ++country that you have reason to believe are valid. ++ ++ If, pursuant to or in connection with a single transaction or ++arrangement, you convey, or propagate by procuring conveyance of, a ++covered work, and grant a patent license to some of the parties ++receiving the covered work authorizing them to use, propagate, modify ++or convey a specific copy of the covered work, then the patent license ++you grant is automatically extended to all recipients of the covered ++work and works based on it. ++ ++ A patent license is "discriminatory" if it does not include within ++the scope of its coverage, prohibits the exercise of, or is ++conditioned on the non-exercise of one or more of the rights that are ++specifically granted under this License. You may not convey a covered ++work if you are a party to an arrangement with a third party that is ++in the business of distributing software, under which you make payment ++to the third party based on the extent of your activity of conveying ++the work, and under which the third party grants, to any of the ++parties who would receive the covered work from you, a discriminatory ++patent license (a) in connection with copies of the covered work ++conveyed by you (or copies made from those copies), or (b) primarily ++for and in connection with specific products or compilations that ++contain the covered work, unless you entered into that arrangement, ++or that patent license was granted, prior to 28 March 2007. ++ ++ Nothing in this License shall be construed as excluding or limiting ++any implied license or other defenses to infringement that may ++otherwise be available to you under applicable patent law. ++ ++ 12. No Surrender of Others' Freedom. ++ ++ If conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot convey a ++covered work so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you may ++not convey it at all. For example, if you agree to terms that obligate you ++to collect a royalty for further conveying from those to whom you convey ++the Program, the only way you could satisfy both those terms and this ++License would be to refrain entirely from conveying the Program. ++ ++ 13. Use with the GNU Affero General Public License. ++ ++ Notwithstanding any other provision of this License, you have ++permission to link or combine any covered work with a work licensed ++under version 3 of the GNU Affero General Public License into a single ++combined work, and to convey the resulting work. The terms of this ++License will continue to apply to the part which is the covered work, ++but the special requirements of the GNU Affero General Public License, ++section 13, concerning interaction through a network will apply to the ++combination as such. ++ ++ 14. Revised Versions of this License. ++ ++ The Free Software Foundation may publish revised and/or new versions of ++the GNU General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++ Each version is given a distinguishing version number. If the ++Program specifies that a certain numbered version of the GNU General ++Public License "or any later version" applies to it, you have the ++option of following the terms and conditions either of that numbered ++version or of any later version published by the Free Software ++Foundation. If the Program does not specify a version number of the ++GNU General Public License, you may choose any version ever published ++by the Free Software Foundation. ++ ++ If the Program specifies that a proxy can decide which future ++versions of the GNU General Public License can be used, that proxy's ++public statement of acceptance of a version permanently authorizes you ++to choose that version for the Program. ++ ++ Later license versions may give you additional or different ++permissions. However, no additional obligations are imposed on any ++author or copyright holder as a result of your choosing to follow a ++later version. ++ ++ 15. Disclaimer of Warranty. ++ ++ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY ++APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT ++HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY ++OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM ++IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ++ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ++ ++ 16. Limitation of Liability. ++ ++ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS ++THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY ++GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE ++USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF ++DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD ++PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), ++EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF ++SUCH DAMAGES. ++ ++ 17. Interpretation of Sections 15 and 16. ++ ++ If the disclaimer of warranty and limitation of liability provided ++above cannot be given local legal effect according to their terms, ++reviewing courts shall apply local law that most closely approximates ++an absolute waiver of all civil liability in connection with the ++Program, unless a warranty or assumption of liability accompanies a ++copy of the Program in return for a fee. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++state the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++ If the program does terminal interaction, make it output a short ++notice like this when it starts in an interactive mode: ++ ++ Copyright (C) ++ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, your program's commands ++might be different; for a GUI interface, you would use an "about box". ++ ++ You should also get your employer (if you work as a programmer) or school, ++if any, to sign a "copyright disclaimer" for the program, if necessary. ++For more information on this, and how to apply and follow the GNU GPL, see ++. ++ ++ The GNU General Public License does not permit incorporating your program ++into proprietary programs. If your program is a subroutine library, you ++may consider it more useful to permit linking proprietary applications with ++the library. If this is what you want to do, use the GNU Lesser General ++Public License instead of this License. But first, please read ++. diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index 4e55c9b101..3bdb657f81 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,2 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 8bbff0e54cb5f65a52be4feb9162fc0b022a97eb841b44784f7a89a9ea567160 usbutils-009.tar.xz +sha256 61c7364bb4986fb05e5067e4ac5585b1299b664c57f761caecd2e9e724794a19 usbutils-010.tar.xz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 84702ebc1f..98b7894ae7 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -USBUTILS_VERSION = 009 +USBUTILS_VERSION = 010 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev -USBUTILS_LICENSE = GPL-2.0+ -USBUTILS_LICENSE_FILES = COPYING +USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py) +USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt # Build after busybox since it's got a lightweight lsusb ifeq ($(BR2_PACKAGE_BUSYBOX),y) From 78b9f9c393e58590d8e416fb0ac34b947cab0bad Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 19:12:14 +0300 Subject: [PATCH 1515/2640] usbutils: lsusb.py is for python 3.x only usbutils version 010 converted the lsusb.py script to Python 3. Keep the lsusb.py script on target only when Python 3.x is enabled. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/usbutils/usbutils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 98b7894ae7..43322e4a65 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) USBUTILS_DEPENDENCIES += busybox endif -# Nice lsusb.py script only if there's python -ifeq ($(BR2_PACKAGE_PYTHON),) +# Nice lsusb.py script only if there's python 3.x +ifeq ($(BR2_PACKAGE_PYTHON3),) define USBUTILS_REMOVE_PYTHON rm -f $(TARGET_DIR)/usr/bin/lsusb.py endef From a853849e4d50ef7e126a1da524be37aeb878a6de Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 29 May 2018 19:20:55 +0200 Subject: [PATCH 1516/2640] libpwquality: bump to version 1.4.0 - Remove both patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...isable-nls-on-platforms-without-libi.patch | 47 ------------------- ...in-settings-when-using-bad-word-list.patch | 26 ---------- package/libpwquality/libpwquality.hash | 3 +- package/libpwquality/libpwquality.mk | 2 +- 4 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch delete mode 100644 package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch diff --git a/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch b/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch deleted file mode 100644 index 3bae15c221..0000000000 --- a/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fd1694c9d85666a39fe39e76518581b1ccd5a6c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Thu, 2 Feb 2017 11:16:49 +0100 -Subject: [PATCH] Fix build with --disable-nls on platforms without libintl - included in libc. - -Signed-off-by: Stefan Sørensen - ---- - -Status: accepted upstream, not yet released. - -diff --git a/src/pwmake.c b/src/pwmake.c -index 5b8cfb8..81f7cd3 100644 ---- a/src/pwmake.c -+++ b/src/pwmake.c -@@ -33,9 +33,11 @@ main(int argc, char *argv[]) - int bits; - void *auxerror; - -+#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain("libpwquality", "/usr/share/locale"); - textdomain("libpwquality"); -+#endif - - if (argc != 2) { - usage(basename(argv[0])); -diff --git a/src/pwscore.c b/src/pwscore.c -index 219a175..24c13f2 100644 ---- a/src/pwscore.c -+++ b/src/pwscore.c -@@ -34,9 +34,11 @@ main(int argc, char *argv[]) - size_t len; - char *user = NULL; - -+#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain("libpwquality", "/usr/share/locale"); - textdomain("libpwquality"); -+#endif - - if (argc > 2) { - usage(basename(argv[0])); --- -2.9.3 - diff --git a/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch b/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch deleted file mode 100644 index 1b4f24264c..0000000000 --- a/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b1f2f1f71894fa0af92041fb4d5b6146101d63e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Thu, 2 Feb 2017 11:17:26 +0100 -Subject: [PATCH] Fix memory leak in settings when using bad word list. - -Signed-off-by: Stefan Sørensen - ---- - -Status: accepted upstream, not yet released. - -diff --git a/src/settings.c b/src/settings.c -index 5c38b30..4b026b1 100644 ---- a/src/settings.c -+++ b/src/settings.c -@@ -46,6 +46,7 @@ pwquality_free_settings(pwquality_settings_t *pwq) - { - if (pwq) { - free(pwq->dict_path); -+ free(pwq->bad_words); - free(pwq); - } - } --- -2.9.3 - diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index 0e3f9e30fd..97490f818a 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a libpwquality-1.3.0.tar.bz2 +sha256 1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b libpwquality-1.4.0.tar.bz2 +sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index 697af0b0b2..59b0e955fd 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.3.0 +LIBPWQUALITY_VERSION = 1.4.0 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ From 4e4dd94dec988557c07bc7c30f12acf5e5a61489 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 29 May 2018 19:22:37 +0200 Subject: [PATCH 1517/2640] libqrencode: bump to version 4.0.0 - Use new --with[out]-png option - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libqrencode/libqrencode.hash | 7 +++++-- package/libqrencode/libqrencode.mk | 10 ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/libqrencode/libqrencode.hash b/package/libqrencode/libqrencode.hash index 8c94ccd35d..1418413135 100644 --- a/package/libqrencode/libqrencode.hash +++ b/package/libqrencode/libqrencode.hash @@ -1,2 +1,5 @@ -# From http://fukuchi.org/works/qrencode/qrencode-3.4.2.tar.gz.sha1 -sha1 7daaad61f333ff6cdabfb0d925c3ab668d16dee2 qrencode-3.4.2.tar.gz +# From http://fukuchi.org/works/qrencode/qrencode-4.0.0.tar.gz.sha +sha512 fdbcee3ef90abf780dcbe495cef3e6ac5449a4a0aaa87d1a1a4f71d97fe6d96974d8132f7e227133cddb5ab73600e968821634752fc0d75113ca0959aae9a5d0 qrencode-4.0.0.tar.gz + +# Hash for license file: +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk index 8f17b895e0..62ca2ed11d 100644 --- a/package/libqrencode/libqrencode.mk +++ b/package/libqrencode/libqrencode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQRENCODE_VERSION = 3.4.2 +LIBQRENCODE_VERSION = 4.0.0 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode LIBQRENCODE_DEPENDENCIES = host-pkgconf @@ -18,9 +18,15 @@ else LIBQRENCODE_CONF_OPTS += --disable-thread-safety endif +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBQRENCODE_CONF_OPTS += --with-png +LIBQRENCODE_DEPENDENCIES += libpng +else +LIBQRENCODE_CONF_OPTS += --without-png +endif + ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y) LIBQRENCODE_CONF_OPTS += --with-tools=yes -LIBQRENCODE_DEPENDENCIES += libpng else LIBQRENCODE_CONF_OPTS += --with-tools=no endif From b3057380b9417fce6f1da6c0ab33da70909e93fb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 21:32:00 +0300 Subject: [PATCH 1518/2640] conntrack-tools: bump to version 1.4.5 Drop the musl workaround. musl can handle the suppression of conflicting kernel headers definitions. Add license file hash. This bump fixes compatibility with newer versions of libnetfilter_conntrack. Fixes: http://autobuild.buildroot.net/results/0ae/0aee137c9977e0fb33e7e557b75481780b90edcc/ http://autobuild.buildroot.net/results/9c1/9c178ec5ad84224a385c3184f09ea9b65867a302/ http://autobuild.buildroot.net/results/5e1/5e1ea89e01a9cc13bd384c97903e1726df6d2228/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/conntrack-tools/conntrack-tools.hash | 7 ++++--- package/conntrack-tools/conntrack-tools.mk | 11 +---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash index 9d6817721d..cd95a06dc1 100644 --- a/package/conntrack-tools/conntrack-tools.hash +++ b/package/conntrack-tools/conntrack-tools.hash @@ -1,3 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.4.tar.bz2.{md5sum,sha1sum} -md5 acd9e0b27cf16ae3092ba900e4d7560e conntrack-tools-1.4.4.tar.bz2 -sha1 25b36fb6832373ef899bade3b82adf5382b9a05b conntrack-tools-1.4.4.tar.bz2 +# From https://netfilter.org/projects/conntrack-tools/downloads.html +sha256 36c6d99c7684851d4d72e75bd07ff3f0ff1baaf4b6f069eb7244990cd1a9a462 conntrack-tools-1.4.5.tar.bz2 +# Locally calculated +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 2f4ea5f2ae..77fcb52956 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.4 +CONNTRACK_TOOLS_VERSION = 1.4.5 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ @@ -15,15 +15,6 @@ CONNTRACK_TOOLS_LICENSE_FILES = COPYING CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS) -# Some of conntrack-tools source files include both linux/in.h (via -# linux/netfilter.h for kernel headers >= 4.2) and netinet/in.h, which -# causes some symbol conflicts when musl is used. Defining __GLIBC__ -# works around that issue since the kernel headers are prepared to -# avoid redefinition of certain symbols when they see __GLIBC__. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -CONNTRACK_TOOLS_CFLAGS += -D__GLIBC__ -endif - ifeq ($(BR2_PACKAGE_LIBTIRPC),y) CONNTRACK_TOOLS_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` CONNTRACK_TOOLS_DEPENDENCIES += libtirpc host-pkgconf From f5d68512c2ff6b197f9f49432505b016a637f35a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 29 May 2018 19:19:29 +0200 Subject: [PATCH 1519/2640] log4cplus: needs gcc >= 4.8 log4cplus needs std::map::emplace Fixes: - http://autobuild.buildroot.net/results/ef0d8d7fae835ff555202f6de320945226ec00bf Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/log4cplus/Config.in b/package/log4cplus/Config.in index fd224dd270..cd5476a086 100644 --- a/package/log4cplus/Config.in +++ b/package/log4cplus/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LOG4CPLUS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future help log4cplus is a simple to use C++ logging API providing @@ -13,9 +13,9 @@ config BR2_PACKAGE_LOG4CPLUS http://sourceforge.net/projects/log4cplus -comment "log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "log4cplus needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From 50d443cbf72fc7940c2970b309de535004173966 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 29 May 2018 19:42:37 +0200 Subject: [PATCH 1520/2640] package/dash: don't build in paralle dash has races in its Makefile, but upstream is not too keen in fixing those, and just suggests that dash not be built in parallel: https://www.mail-archive.com/dash@vger.kernel.org/msg01675.html Fixes: http://autobuild.buildroot.org/results/793/7934c815a3009af688c2f1183e67dfe542c9a009/ http://autobuild.buildroot.org/results/fc4/fc4e4ab47455ac47dd4a3a60083cec2848e74dbb/ http://autobuild.buildroot.org/results/6bf/6bfdd44ea5d55a6ca3ef92254eab18c7c0416b7b/ [...] Reported-by: Baruch Siach Signed-off-by: "Yann E. MORIN" Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/dash/dash.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 9a26ebb642..80f0ea8cf3 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -9,6 +9,9 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# dash does not build in parallel +DASH_MAKE = $(MAKE1) + ifeq ($(BR2_PACKAGE_LIBEDIT),y) DASH_DEPENDENCIES += libedit host-pkgconf DASH_CONF_OPTS += --with-libedit From ae1f0472957c40d67d316cd741467ed5d85fcf40 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 May 2018 20:38:39 +0300 Subject: [PATCH 1521/2640] git: security bump to version 2.16.4 Forward port of security fixes from the 2.13.7 release. The 2.13.7 release notes say this: * Submodule "names" come from the untrusted .gitmodules file, but we blindly append them to $GIT_DIR/modules to create our on-disk repo paths. This means you can do bad things by putting "../" into the name. We now enforce some rules for submodule names which will cause Git to ignore these malicious names (CVE-2018-11235). Credit for finding this vulnerability and the proof of concept from which the test script was adapted goes to Etienne Stalmans. * It was possible to trick the code that sanity-checks paths on NTFS into reading random piece of memory (CVE-2018-11233). Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index fea1a1e904..4bcc5ee5d3 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48 git-2.16.3.tar.xz +sha256 6e69b0e9c487e5da52a14d4829f0b6a28b2c18a0bb6fb67c0dc8b5b5658bd532 git-2.16.4.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 2115e04e31..ac7b8f2e8c 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.16.3 +GIT_VERSION = 2.16.4 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 80821d3ed8e5607d259386abe5e3f98625614d11 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 29 May 2018 22:50:03 +0200 Subject: [PATCH 1522/2640] package/mono: bump to version 5.12.0.226 This patch bumps mono to version 5.12.0.226 and it's monolite dependency to version 1051200002, doing so it removes also a couple of upstreamed patches. This new mono version requires also a different option for managing aot, so this patch refactors also the configure options. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- ...ing-initialization-of-have-vasprintf.patch | 29 ------------------- ...ove-unit-tests-from-mono-compilation.patch | 29 ------------------- package/mono/mono.hash | 2 +- package/mono/mono.mk | 21 ++++++-------- package/monolite/monolite.hash | 2 +- package/monolite/monolite.mk | 2 +- 6 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 package/mono/0004-fixing-initialization-of-have-vasprintf.patch delete mode 100644 package/mono/0006-Remove-unit-tests-from-mono-compilation.patch diff --git a/package/mono/0004-fixing-initialization-of-have-vasprintf.patch b/package/mono/0004-fixing-initialization-of-have-vasprintf.patch deleted file mode 100644 index 55648593a5..0000000000 --- a/package/mono/0004-fixing-initialization-of-have-vasprintf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1c3d615d93b20d10c2729478d5104977dd9af23f Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Wed, 5 Aug 2015 12:59:45 +0200 -Subject: [PATCH] Fixing initialization of have_vasprintf - -This patch initialize properly have_vasprintf in case vasprint function is found. -Solves multiple definition of `vasprintf' error in case vasprint is not properly detected. - -Patch is upstream: - - https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e - -Signed-off-by: Angelo Compagnucci ---- - eglib/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eglib/configure.ac b/eglib/configure.ac -index 5281419..4bf91e5 100644 ---- a/eglib/configure.ac -+++ b/eglib/configure.ac -@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf) -+AC_CHECK_FUNC(vasprintf, have_vasprintf=yes) - AC_CHECK_FUNCS(getrlimit) - - # diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch deleted file mode 100644 index a3e88e73a2..0000000000 --- a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 26e31fc54af591bdd88d6a4a79b7fa91c57f4b0c Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Thu, 10 Aug 2017 23:30:05 +0200 -Subject: [PATCH] Remove unit-tests from mono compilation - -This patch fixes compiling errors with unit-tests under linux. - -Signed-off-by: Angelo Compagnucci ---- - mono/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mono/Makefile.am b/mono/Makefile.am -index 8c9c2cb..7af36ec 100644 ---- a/mono/Makefile.am -+++ b/mono/Makefile.am -@@ -34,7 +34,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ - done; - else --SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler - endif - endif --DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler --- -2.7.4 - diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 850395022f..47e34424ad 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 2a2f5c2a214a9980c086ac7561a5dd106f13d823a630de218eabafe1d995c5b4 mono-5.4.0.201.tar.bz2 +sha256 f0636baa0c1399805526142e799cb697ddccf736e506cf1a30a870eaa2830a89 mono-5.12.0.226.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 802c1d4402..2d60fc68fd 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 5.4.0.201 +MONO_VERSION = 5.12.0.226 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial @@ -17,13 +17,15 @@ MONO_INSTALL_STAGING = YES # patching configure.ac MONO_AUTORECONF = YES -# Disable managed code (mcs folder) from building -MONO_CONF_OPTS = --with-mcs-docs=no \ +MONO_COMMON_CONF_OPTS = --with-mcs-docs=no \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug,aot \ - --disable-mcs-build \ + --enable-minimal=profiler,debug \ --enable-static \ - --disable-btls + --disable-btls \ + --disable-system-aot + +# Disable managed code (mcs folder) from building +MONO_CONF_OPTS = $(MONO_COMMON_CONF_OPTS) --disable-mcs-build # The libraries have been built by the host-mono build. Since they are # architecture-independent, we simply copy them to the target. @@ -42,12 +44,7 @@ MONO_DEPENDENCIES += host-mono ## Mono managed -HOST_MONO_CONF_OPTS = --with-mcs-docs=no \ - --disable-libraries \ - --with-ikvm-native=no \ - --enable-minimal=profiler,debug,aot \ - --enable-static \ - --disable-btls +HOST_MONO_CONF_OPTS = $(MONO_COMMON_CONF_OPTS) --disable-libraries # ensure monolite is used HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index 76f54678d3..77810a9511 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 8c893c3eb3efb5006e19fb45a878860265c3f47fbaf2470be47612e84725d9fd monolite-linux-1050400003-latest.tar.gz +sha256 fece21adc06118fa5d79d3621a5fc702ec354abf83be29a36f8718645a2dc058 monolite-linux-1051200002-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index 80b2af9544..4e1d548994 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = 1050400003 +MONOLITE_VERSION = 1051200002 MONOLITE_SITE = http://download.mono-project.com/monolite MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial From 30d52c67a77931495a51e9a27b98ec67a96cde54 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 30 May 2018 17:55:28 +0200 Subject: [PATCH 1523/2640] docs/website/news.html: fix s/2018.05/2018.02/ typos Reported-by: Andreas Naumann Signed-off-by: Peter Korsgaard --- docs/website/news.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/news.html b/docs/website/news.html index b89e6e27ed..a4d83e144d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -23,7 +23,7 @@ file for details.

        Head to the downloads page to pick up - the 2018.02-rc5 + the 2018.05-rc3 release candidate, and report any problems found to the mailing list or bug tracker.

        @@ -69,7 +69,7 @@

        Head to the downloads page to pick up the - 2018.05-rc1 + 2018.05-rc1 release candidate, and report any problems found to the mailing list or bug tracker.

        From df2497336d14b17edfec6462caf1b9bafbe5d032 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 30 May 2018 14:10:48 -0300 Subject: [PATCH 1524/2640] kexec: bump to version v2.0.17 Also add license hash for "make legal-info". Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.hash | 4 +++- package/kexec/kexec.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index eaa9d7b96e..24294909ee 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 5b103351ad752c9badd1d65b00eb6de4bce579f944f4df4e3ef3a755ba567010 kexec-tools-2.0.16.tar.xz +sha256 504c816b769da573167b63f3b6d4fce3740f231c98d8db0c4fda47a4b90482a9 kexec-tools-2.0.17.tar.xz +# locally calculated +sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 3ce1ed2eac..b0f4367ddd 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.16 +KEXEC_VERSION = 2.0.17 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From 242227dd86efaaec7c785b32a14e8133f2e86dec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 29 May 2018 23:56:47 +0200 Subject: [PATCH 1525/2640] aircrack-ng: bump to version 1.2 - Remove patch (already in version) - Add three patches (first one sent and merged upstream, second and third patchs retrieved upstream) - Move to autotools-package - Remove workaround for static handling of pthread as it isn't needed anymore - Remove deactivation of libnl in static build as it isn't needed anymore - Set libnl and zlib dependencies as optional and not mandatory - Add duma and libgcrypt optional dependencies - Update workaround for static handling of libpcap - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-Fix-compilation-without-getauxval.patch | 81 ++++++++++++++++++ .../aircrack-ng/0001-stack-protector.patch | 58 ------------- ...hout-opt-should-skip-stack-protector.patch | 52 ++++++++++++ ...utoconf-Added-NEON-intrinsic-support.patch | 64 ++++++++++++++ package/aircrack-ng/Config.in | 6 +- package/aircrack-ng/aircrack-ng.hash | 7 +- package/aircrack-ng/aircrack-ng.mk | 85 ++++++++----------- 7 files changed, 240 insertions(+), 113 deletions(-) create mode 100644 package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch delete mode 100644 package/aircrack-ng/0001-stack-protector.patch create mode 100644 package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch create mode 100644 package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch diff --git a/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch b/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch new file mode 100644 index 0000000000..8a291356ca --- /dev/null +++ b/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch @@ -0,0 +1,81 @@ +From 0017bae95dbcf336495e36ac83c868ca1d7f2846 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 26 May 2018 22:52:30 +0200 +Subject: [PATCH] Fix compilation without getauxval + +Protect getauxval call and sys/auxv.h include by #ifdef HAS_AUXV in +trampoline_arm.c and trampoline_ppc.c. +Indeed, auxv is not available on some toolchains such as uclibc + +Signed-off-by: Fabrice Fontaine +[Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1896)] +--- + src/trampoline_arm.c | 4 ++++ + src/trampoline_ppc.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/trampoline_arm.c b/src/trampoline_arm.c +index 45db82db..e653109a 100644 +--- a/src/trampoline_arm.c ++++ b/src/trampoline_arm.c +@@ -17,8 +17,10 @@ + */ + + #if defined(__arm__) || defined(__aarch64__) ++#ifdef HAS_AUXV + #include + #include ++#endif + #else + #error "The wrong CPU architecture file has been included." + #endif +@@ -39,6 +41,7 @@ int + simd_get_supported_features (void) + { + int result = 0; ++#ifdef HAS_AUXV + long hwcaps = getauxval (AT_HWCAP); + + #if defined(HWCAP_ASIMD) +@@ -53,6 +56,7 @@ simd_get_supported_features (void) + { + result |= SIMD_SUPPORTS_NEON; + } ++#endif + #endif + + return (result); +diff --git a/src/trampoline_ppc.c b/src/trampoline_ppc.c +index 0d439776..b5c0cb2b 100644 +--- a/src/trampoline_ppc.c ++++ b/src/trampoline_ppc.c +@@ -17,8 +17,10 @@ + */ + + #if defined(__ppc__) || defined(__PPC__) ++#ifdef HAS_AUXV + #include + #include ++#endif + #else + #error "The wrong CPU architecture file has been included." + #endif +@@ -39,6 +41,7 @@ int + simd_get_supported_features (void) + { + int result = 0; ++#ifdef HAS_AUXV + long hwcaps = getauxval (AT_HWCAP2); + + #if defined(PPC_FEATURE2_ARCH_2_07) +@@ -46,6 +49,7 @@ simd_get_supported_features (void) + { + result |= SIMD_SUPPORTS_POWER8; + } ++#endif + #endif + + return (result); +-- +2.14.1 + diff --git a/package/aircrack-ng/0001-stack-protector.patch b/package/aircrack-ng/0001-stack-protector.patch deleted file mode 100644 index 5f2bd1b18f..0000000000 --- a/package/aircrack-ng/0001-stack-protector.patch +++ /dev/null @@ -1,58 +0,0 @@ -Added option to disable stack-protector support auto-detection in gcc. - -Downloaded from upstream commit: -http://trac.aircrack-ng.org/changeset/2889/ - -Signed-off-by: Bernd Kuhls - -Index: /trunk/INSTALLING -=================================================================== ---- trunk/INSTALLING (revision 2888) -+++ trunk/INSTALLING (revision 2889) -@@ -83,4 +83,6 @@ - * macport: Set this flag to true to compile on OS X with macports. - -+* stackprotector: Allows to enable/disable auto-detection of stack-protector support in gcc -+ - Example: - -Index: /trunk/common.mak -=================================================================== ---- trunk/common.mak (revision 2888) -+++ trunk/common.mak (revision 2889) -@@ -64,4 +64,13 @@ - ifeq ($(PCRE), true) - COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE -+endif -+ -+STACK_PROTECTOR = true -+ifeq ($(stackprotector), false) -+ STACK_PROTECTOR = false -+endif -+ -+ifeq ($(STACKPROTECTOR), false) -+ STACK_PROTECTOR = false - endif - -@@ -235,12 +244,14 @@ - endif - --ifeq ($(GCC_OVER49), 0) -- ifeq ($(GCC_OVER41), 1) -- COMMON_CFLAGS += -fstack-protector -+ifeq ($(STACK_PROTECTOR), true) -+ ifeq ($(GCC_OVER49), 0) -+ ifeq ($(GCC_OVER41), 1) -+ COMMON_CFLAGS += -fstack-protector -+ endif - endif --endif -- --ifeq ($(GCC_OVER49), 1) -- COMMON_CFLAGS += -fstack-protector-strong -+ -+ ifeq ($(GCC_OVER49), 1) -+ COMMON_CFLAGS += -fstack-protector-strong -+ endif - endif - diff --git a/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch b/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch new file mode 100644 index 0000000000..8563c78d33 --- /dev/null +++ b/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch @@ -0,0 +1,52 @@ +From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Mon, 16 Apr 2018 11:26:23 -0700 +Subject: [PATCH] autotools: The flag --without-opt should skip stack protector + flags. (#1864) + +Signed-off-by: Fabrice Fontaine +[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/58fe40daf3e082d9e63d689d795a3bbecf72fedb] +--- + build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) + +diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4 +index 0fb19726..8a973dbf 100644 +--- a/build/m4/aircrack_ng_compiler.m4 ++++ b/build/m4/aircrack_ng_compiler.m4 +@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in + CYGWIN*|MSYS*|cygwin*|msys*) + ;; + *) +- AS_IF([test "x$gcc_over49" = "xno"], [ +- AS_IF([test "x$gcc_over41" = "xyes"], [ +- AX_CHECK_COMPILE_FLAG([-fstack-protector], [ +- AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) +- ]) +- ], []) +- ], []) ++ case $with_opt in ++ yes | "") ++ AS_IF([test "x$gcc_over49" = "xno"], [ ++ AS_IF([test "x$gcc_over41" = "xyes"], [ ++ AX_CHECK_COMPILE_FLAG([-fstack-protector], [ ++ AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) ++ ]) ++ ], []) ++ ], []) + +- AS_IF([test "x$gcc_over49" = "xyes"], [ +- AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ +- AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) +- ]) +- ], []) ++ AS_IF([test "x$gcc_over49" = "xyes"], [ ++ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ ++ AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) ++ ]) ++ ], []) ++ ;; ++ esac + ;; + esac + ;; diff --git a/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch b/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch new file mode 100644 index 0000000000..59c7ade4e9 --- /dev/null +++ b/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch @@ -0,0 +1,64 @@ +From 149929109eab1f79c4b90aa423f6d6eb4ee0e882 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Tue, 8 May 2018 11:49:22 -0700 +Subject: [PATCH] Autoconf: Added NEON intrinsic support. (#1879, #1872) + +Perform NEON intrinsic support using Autoconf, instead of failing to build on older ARM processors without NEON features. + +Signed-off-by: Fabrice Fontaine +[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/149929109eab1f79c4b90aa423f6d6eb4ee0e882] +--- + build/m4/aircrack_ng_simd.m4 | 16 ++++++++++++++++ + src/Makefile.am | 2 ++ + 2 files changed, 18 insertions(+) + +diff --git a/build/m4/aircrack_ng_simd.m4 b/build/m4/aircrack_ng_simd.m4 +index 9d13031e..74135f32 100644 +--- a/build/m4/aircrack_ng_simd.m4 ++++ b/build/m4/aircrack_ng_simd.m4 +@@ -95,6 +95,21 @@ then + AX_APPEND_FLAG(-mfpu=neon, [arm_neon_[]_AC_LANG_ABBREV[]flags]) + AC_SUBST(arm_neon_[]_AC_LANG_ABBREV[]flags) + ]) ++ ++ AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_neon_[]_AC_LANG_ABBREV[]flags]) ++ AC_CACHE_CHECK([whether _AC_LANG compiler supports NEON instructions], CACHEVAR, [ ++ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS ++ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $arm_neon_[]_AC_LANG_ABBREV[]flags" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#if !defined(__ARM_NEON) && !defined(__ARM_NEON__) && !defined(__aarch64) && !defined(__aarch64__) ++#error macro not defined ++#endif ++ ]])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])]) ++ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags ++ ]) ++ AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], ++ [NEON_FOUND=1], [NEON_FOUND=0]) ++ AS_VAR_POPDEF([CACHEVAR]) + fi + + if test $IS_PPC -eq 1 +@@ -185,6 +200,7 @@ fi + AM_CONDITIONAL([X86], [test "$IS_X86" = 1]) + AM_CONDITIONAL([ARM], [test "$IS_ARM" = 1]) + AM_CONDITIONAL([PPC], [test "$IS_PPC" = 1]) ++AM_CONDITIONAL([NEON], [test "$NEON_FOUND" = 1]) + ]) + + AC_DEFUN([AIRCRACK_NG_SIMD_C], [ +diff --git a/src/Makefile.am b/src/Makefile.am +index 3cc8ebdc..beac9dce 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -116,9 +116,11 @@ endif + pkglibexec_PROGRAMS = aircrack-ng--generic + + if ARM ++if NEON + pkglibexec_PROGRAMS += aircrack-ng--neon \ + aircrack-ng--asimd + endif ++endif + + if PPC + pkglibexec_PROGRAMS += aircrack-ng--altivec \ diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in index 12fda1cbf2..9e691e7f89 100644 --- a/package/aircrack-ng/Config.in +++ b/package/aircrack-ng/Config.in @@ -3,11 +3,7 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_USE_MMU # uses fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - # libnl has issues when linking statically - # they need fixing in libnl itself - select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help A set of tools for auditing wireless networks diff --git a/package/aircrack-ng/aircrack-ng.hash b/package/aircrack-ng/aircrack-ng.hash index e210ad2e4a..a5fbbcfd31 100644 --- a/package/aircrack-ng/aircrack-ng.hash +++ b/package/aircrack-ng/aircrack-ng.hash @@ -1,3 +1,6 @@ # From http://www.aircrack-ng.org/downloads.html -sha1 2b2fbe50fedb606b3bd96a34d49f07760e8e618a aircrack-ng-1.2-rc4.tar.gz -md5 3bbc7d5035a98ec01e78774d05c3fcce aircrack-ng-1.2-rc4.tar.gz +sha1 ccc7a44ad2243c66b9a45fe133514485a72d674f aircrack-ng-1.2.tar.gz +md5 bb11ec14e1fe505d8d0d51cee0c54df9 aircrack-ng-1.2.tar.gz + +# Hash for license file: +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index 6b384c0720..fe0f504ed1 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -4,69 +4,58 @@ # ################################################################################ -AIRCRACK_NG_VERSION = 1.2-rc4 +AIRCRACK_NG_VERSION = 1.2 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE -AIRCRACK_NG_DEPENDENCIES = openssl zlib host-pkgconf +AIRCRACK_NG_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LIBNL),libnl) \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_PCRE),pcre) \ + $(if $(BR2_PACKAGE_ZLIB),zlib) \ + host-pkgconf +AIRCRACK_NG_AUTORECONF = YES # Enable buddy-ng, easside-ng, tkiptun-ng, wesside-ng -AIRCRACK_NG_MAKE_OPTS = unstable=true - -# Account for libpthread in static -AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) \ - $(if $(BR2_STATIC_LIBS),-lpthread -lz) - -# libnl support has issues when building static -ifeq ($(BR2_STATIC_LIBS),y) -AIRCRACK_NG_MAKE_OPTS += libnl=false -else -AIRCRACK_NG_MAKE_OPTS += libnl=true -AIRCRACK_NG_DEPENDENCIES += libnl -endif +AIRCRACK_NG_CONF_OPTS = --with-experimental ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) -AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=true +AIRCRACK_NG_CONF_OPTS += --with-opt else -AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=false +AIRCRACK_NG_CONF_OPTS += --without-opt +endif + +ifeq ($(BR2_PACKAGE_DUMA),y) +AIRCRACK_NG_DEPENDENCIES += duma +AIRCRACK_NG_CONF_OPTS += --with-duma +else +AIRCRACK_NG_CONF_OPTS += --without-duma +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +AIRCRACK_NG_DEPENDENCIES += libgcrypt +AIRCRACK_NG_CONF_OPTS += \ + --with-gcrypt \ + --with-libgcrypt-prefix=$(STAGING_DIR)/usr +else +AIRCRACK_NG_CONF_OPTS += --without-gcrypt endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) AIRCRACK_NG_DEPENDENCIES += libpcap -AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \ - $(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`") -else -AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no +AIRCRACK_NG_CONF_OPTS += \ + --with-libpcap-include=$(STAGING_DIR)/usr/include \ + --with-libpcap-lib=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_STATIC_LIBS),y) +AIRCRACK_NG_CONF_ENV += \ + LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" +endif endif -ifeq ($(BR2_PACKAGE_PCRE),y) -AIRCRACK_NG_DEPENDENCIES += pcre -AIRCRACK_NG_MAKE_OPTS += pcre=true -else -AIRCRACK_NG_MAKE_OPTS += pcre=false -endif - -# Duplicate -lpthread, because it is also needed by sqlite ifeq ($(BR2_PACKAGE_SQLITE),y) AIRCRACK_NG_DEPENDENCIES += sqlite -AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_STATIC_LIBS),-lpthread)" +AIRCRACK_NG_CONF_OPTS += --with-sqlite3 else -AIRCRACK_NG_MAKE_OPTS += sqlite=false +AIRCRACK_NG_CONF_OPTS += --without-sqlite3 endif -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -AIRCRACK_NG_MAKE_OPTS += NEWSSE=true -else -AIRCRACK_NG_MAKE_OPTS += NEWSSE=false -endif - -define AIRCRACK_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \ - $(MAKE) -C $(@D) $(AIRCRACK_NG_MAKE_OPTS) -endef - -define AIRCRACK_NG_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - prefix=/usr $(AIRCRACK_NG_MAKE_OPTS) install -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) From c9216bc1d01983be22ce2119efb98b5684cd714a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 May 2018 23:52:53 +0200 Subject: [PATCH 1526/2640] arch: add BR2_ARCH_NEEDS_GCC_AT_LEAST_8 This new symbol will be used by architectures introduced with gcc 8 and by external toolchains based on gcc 8. [1] https://gcc.gnu.org/gcc-8/changes.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/Config.in b/arch/Config.in index a66ea0d03b..a16012bdfd 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -282,6 +282,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_7 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_8 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH From 0eb91bf1d1a716e2345d68ef4bc18c03f092cf93 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 May 2018 23:52:54 +0200 Subject: [PATCH 1527/2640] toolchain: add gcc 8 entry In order to add gcc 8 support for internal and external toolchain in follow-up commits, introduce BR2_TOOLCHAIN_GCC_AT_LEAST_8 symbol. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index 77f95ee1c3..064bd4c28c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -404,10 +404,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_7 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_6 +config BR2_TOOLCHAIN_GCC_AT_LEAST_8 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "8" if BR2_TOOLCHAIN_GCC_AT_LEAST_8 default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5 From 91b1fbb766fafe080e0f46f738725c561b74cbbb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 May 2018 23:52:55 +0200 Subject: [PATCH 1528/2640] package/gcc: add support for gcc 8.1.0 Remove 0860-cilk-fix-build-without-wchar.patch since cilk has been removed from gcc. Rebase 0900-remove-selftests.patch on gcc 8.1.0 Remove upstream patches 0001-m68k-coldfire-pr68467.patch and 0892-microblaze-Revert.patch. Use bz2 release tarball only for gcc 4.9 since all other version now use xz tarball. Runtime tested on x86_64 with binutils 2.30, gcc 8.1.0, kernel headers 4.14 and glibc 2.27. Buildtime tested with glibc with all supported architectures. Buildtime tested on x86_64 with musl and uClibc-ng Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/gcc/8.1.0/0001-uclibc-conf.patch | 29 ++++ .../gcc/8.1.0/0002-arm-softfloat-libgcc.patch | 45 ++++++ package/gcc/8.1.0/0003-remove-selftests.patch | 149 ++++++++++++++++++ package/gcc/Config.in.host | 8 + package/gcc/gcc.hash | 2 + package/gcc/gcc.mk | 10 +- 6 files changed, 238 insertions(+), 5 deletions(-) create mode 100644 package/gcc/8.1.0/0001-uclibc-conf.patch create mode 100644 package/gcc/8.1.0/0002-arm-softfloat-libgcc.patch create mode 100644 package/gcc/8.1.0/0003-remove-selftests.patch diff --git a/package/gcc/8.1.0/0001-uclibc-conf.patch b/package/gcc/8.1.0/0001-uclibc-conf.patch new file mode 100644 index 0000000000..dc223f9653 --- /dev/null +++ b/package/gcc/8.1.0/0001-uclibc-conf.patch @@ -0,0 +1,29 @@ +From 897881dfdf6a922957c40cbbe9f96bbbe5374770 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:36:15 +0200 +Subject: [PATCH] uclibc-conf + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + contrib/regression/objs-gcc.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh +index 60b0497fea2..6dc7eadff36 100755 +--- a/contrib/regression/objs-gcc.sh ++++ b/contrib/regression/objs-gcc.sh +@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 +-- +2.14.3 + diff --git a/package/gcc/8.1.0/0002-arm-softfloat-libgcc.patch b/package/gcc/8.1.0/0002-arm-softfloat-libgcc.patch new file mode 100644 index 0000000000..a72e57dff4 --- /dev/null +++ b/package/gcc/8.1.0/0002-arm-softfloat-libgcc.patch @@ -0,0 +1,45 @@ +From b05e2b0942d49f9611a92fd2bb2b292f3d486285 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:46:18 +0200 +Subject: [PATCH] arm softfloat libgcc + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + gcc/config/arm/linux-elf.h | 2 +- + libgcc/config/arm/t-linux | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index cfcd9cb1a5c..b8a9a9ca4ae 100644 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h +@@ -58,7 +58,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + +diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux +index 3d520decafb..e7bc042d4e4 100644 +--- a/libgcc/config/arm/t-linux ++++ b/libgcc/config/arm/t-linux +@@ -1,6 +1,11 @@ + LIB1ASMSRC = arm/lib1funcs.S + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ ++ _arm_fixsfsi _arm_fixunssfsi + + # Just for these, we omit the frame pointer since it makes such a big + # difference. +-- +2.14.3 + diff --git a/package/gcc/8.1.0/0003-remove-selftests.patch b/package/gcc/8.1.0/0003-remove-selftests.patch new file mode 100644 index 0000000000..83bd9f26db --- /dev/null +++ b/package/gcc/8.1.0/0003-remove-selftests.patch @@ -0,0 +1,149 @@ +From dd29f38f3271bad3f0209113158c89dd8738a274 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 3 May 2017 00:37:06 +0200 +Subject: [PATCH] remove selftests + +When the gcc archive is extracted by the gcc.mk, the gcc/testsuite +is excluded: + +HOST_GCC_EXCLUDES = \ + libjava/* libgo/* \ + gcc/testsuite/* libstdc++-v3/testsuite/* + +The new Makefile target from the "Selftest framework" [1] added a dependency +on the gcc/testsuite/Makefile. +Revert partially the commit [1] to allow building gcc without selftest. + +[1] https://github.com/gcc-mirror/gcc/commit/99b4f3a2d5bf2c137de9731e27b483eb6b462fd9 + +[Rebased on gcc 8.1] +Signed-off-by: Romain Naour +--- + gcc/Makefile.in | 83 ++++----------------------------------------------------- + 1 file changed, 5 insertions(+), 78 deletions(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 20bee0494b1..1ae5fb382b5 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -1610,14 +1610,13 @@ OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \ + edit-context.o \ + pretty-print.o intl.o \ + sbitmap.o \ +- vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \ +- selftest.o selftest-diagnostic.o ++ vec.o input.o version.o hash-table.o ggc-none.o memory-block.o + + # Objects in libcommon-target.a, used by drivers and by the core + # compiler and containing target-dependent code. + OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \ + opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \ +- hash-table.o file-find.o spellcheck.o selftest.o ++ hash-table.o file-find.o spellcheck.o + + # This lists all host objects for the front ends. + ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS)) +@@ -1894,10 +1893,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc + quickstrap: all + cd $(toplevel_builddir) && $(MAKE) all-target-libgcc + +-all.internal: start.encap rest.encap doc selftest ++all.internal: start.encap rest.encap doc + # This is what to compile if making a cross-compiler. + all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \ +- libgcc-support lang.all.cross doc selftest @GENINSRC@ srcextra ++ libgcc-support lang.all.cross doc @GENINSRC@ srcextra + # This is what must be made before installing GCC and converting libraries. + start.encap: native xgcc$(exeext) cpp$(exeext) specs \ + libgcc-support lang.start.encap @GENINSRC@ srcextra +@@ -1917,78 +1916,6 @@ endif + # This does the things that can't be done on the host machine. + rest.cross: specs + +-# GCC's selftests. +-# Specify a dummy input file to placate the driver. +-# Specify -nostdinc to work around missing WIND_BASE environment variable +-# required for *-wrs-vxworks-* targets. +-# Specify -o /dev/null so the output of -S is discarded. More importantly +-# It does not try to create a file with the name "null.s" on POSIX and +-# "nul.s" on Windows. Because on Windows "nul" is a reserved file name. +-# Beware that /dev/null is not available to mingw tools, so directly use +-# "nul" instead of "/dev/null" if we're building on a mingw machine. +-# Specify the path to gcc/testsuite/selftests within the srcdir +-# as an argument to -fself-test. +-DEVNULL=$(if $(findstring mingw,$(build)),nul,/dev/null) +-SELFTEST_FLAGS = -nostdinc $(DEVNULL) -S -o $(DEVNULL) \ +- -fself-test=$(srcdir)/testsuite/selftests +- +-C_SELFTEST_FLAGS = -xc $(SELFTEST_FLAGS) +-CPP_SELFTEST_FLAGS = -xc++ $(SELFTEST_FLAGS) +- +-SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests +- +-C_SELFTEST_DEPS = cc1$(exeext) $(SELFTEST_DEPS) +-CPP_SELFTEST_DEPS = cc1plus$(exeext) $(SELFTEST_DEPS) +- +-# Run the selftests during the build once we have a driver and the frontend, +-# so that self-test failures are caught as early as possible. +-# Use "s-selftest-FE" to ensure that we only run the selftests if the +-# driver, frontend, or selftest data change. +-.PHONY: selftest +- +-# By default, only run the selftests within the C frontend +-selftest: s-selftest-c +- +-# C selftests +-s-selftest-c: $(C_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(C_SELFTEST_FLAGS) +- $(STAMP) $@ +- +-# Convenience methods for running C selftests under gdb: +-.PHONY: selftest-c-gdb +-selftest-c-gdb: $(C_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(C_SELFTEST_FLAGS) \ +- -wrapper gdb,--args +- +-.PHONY: selftest-gdb +-selftest-gdb: selftest-c-gdb +- +-# Convenience methods for running C selftests under valgrind: +-.PHONY: selftest-c-valgrind +-selftest-c-valgrind: $(C_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(C_SELFTEST_FLAGS) \ +- -wrapper valgrind,--leak-check=full +- +-.PHONY: selftest-valgrind +-selftest-valgrind: selftest-c-valgrind +- +-# C++ selftests +-s-selftest-c++: $(CPP_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(CPP_SELFTEST_FLAGS) +- $(STAMP) $@ +- +-# Convenience method for running C++ selftests under gdb: +-.PHONY: selftest-c++-gdb +-selftest-c++-gdb: $(CPP_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(CPP_SELFTEST_FLAGS) \ +- -wrapper gdb,--args +- +-# Convenience method for running C++ selftests under valgrind: +-.PHONY: selftest-c++-valgrind +-selftest-c++-valgrind: $(CPP_SELFTEST_DEPS) +- $(GCC_FOR_TARGET) $(CPP_SELFTEST_FLAGS) \ +- -wrapper valgrind,--leak-check=full +- + # Recompile all the language-independent object files. + # This is used only if the user explicitly asks for it. + compilations: $(BACKEND) +@@ -2142,7 +2069,7 @@ gcc-nm.c: gcc-ar.c + cp $^ $@ + + COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \ +- collect-utils.o file-find.o hash-table.o selftest.o ++ collect-utils.o file-find.o hash-table.o + COLLECT2_LIBS = @COLLECT2_LIBS@ + collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) + # Don't try modifying collect2 (aka ld) in place--it might be linking this. +-- +2.14.3 + diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 00e72db032..09d88fc929 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -57,10 +57,17 @@ config BR2_GCC_VERSION_6_X config BR2_GCC_VERSION_7_X bool "gcc 7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 # Broken or unsupported architectures depends on !BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_7 +config BR2_GCC_VERSION_8_X + bool "gcc 8.x" + # Broken or unsupported architectures + depends on !BR2_or1k + select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + endchoice config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE @@ -73,6 +80,7 @@ config BR2_GCC_VERSION default "5.5.0" if BR2_GCC_VERSION_5_X default "6.4.0" if BR2_GCC_VERSION_6_X default "7.3.0" if BR2_GCC_VERSION_7_X + default "8.1.0" if BR2_GCC_VERSION_8_X default "arc-2018.03-rc2" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 817d04e390..6d2fcda13e 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -6,6 +6,8 @@ sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe7 sha512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.3.0/sha512.sum sha512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 gcc-7.3.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.1.0/sha512.sum +sha512 c96246f34a7aeb404c4525b754dc7f7708a18e06271aadb2b32fef00e6e0940f584e52430bfe2ab01e699c93e3cb418adc113d2622fa826facbec0ec8ce3eb2c gcc-8.1.0.tar.xz # Locally calculated (fetched from Github) sha512 a0faf2bb34f6c72b6460c6432639d89915cfc63456cfdf016896b3ef075655b2e9f26e745d841bbc38e776bc7a3729359cca88f1e4fb83489fa6775a3ccb55b8 gcc-arc-2018.03-rc2.tar.gz diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 0afb06a57e..1ae9b7edd9 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -18,13 +18,13 @@ GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz else GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION) -# From version 5.5.0, 6.4.0 and 7.2.0 a bz2 release tarball is not +# From version 5.5.0, 6.4.0, 7.2.0 and 8.1.0 a bz2 release tarball is not # provided anymore. Use the xz tarball instead. -ifeq ($(BR2_GCC_VERSION_5_X)$(BR2_GCC_VERSION_6_X)$(BR2_GCC_VERSION_7_X),y) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz -else +ifeq ($(BR2_GCC_VERSION_4_9_X),y) GCC_SOURCE = gcc-$(GCC_VERSION).tar.bz2 -endif # BR2_GCC_VERSION_6_X +else +GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz +endif endif # From 86220d0973bbf24113fa57368bf2d8bbc57e98a9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 May 2018 23:52:56 +0200 Subject: [PATCH 1529/2640] toolchain-external: add gcc 8 entry This patch allows to use an external toolchain based on gcc 8. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../toolchain-external-custom/Config.in.options | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 55370e967a..2ef1126740 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -27,6 +27,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX choice bool "External toolchain gcc version" + default BR2_TOOLCHAIN_EXTERNAL_GCC_8 if BR2_ARCH_NEEDS_GCC_AT_LEAST_8 default BR2_TOOLCHAIN_EXTERNAL_GCC_7 if BR2_ARCH_NEEDS_GCC_AT_LEAST_7 default BR2_TOOLCHAIN_EXTERNAL_GCC_6 if BR2_ARCH_NEEDS_GCC_AT_LEAST_6 default BR2_TOOLCHAIN_EXTERNAL_GCC_5 if BR2_ARCH_NEEDS_GCC_AT_LEAST_5 @@ -37,8 +38,13 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_8 + bool "8.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + config BR2_TOOLCHAIN_EXTERNAL_GCC_7 bool "7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_6 From ce67f68882f14ac5c7bd5cfefe5bb18f856756d7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 May 2018 23:52:57 +0200 Subject: [PATCH 1530/2640] package/gcc: switch to gcc 6.x as the default Even if gcc 6 is still maintained for some time (gcc 6.5 is pending), switch to gcc 7.x since it has been released since 2017-05-02 and gcc 8.x is available since 2018-05-02. We have been having toolchains in the autobuilders with gcc 7.x for a while, so the vast majority of the problems should have already been solved. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 09d88fc929..c9a20f6d77 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -4,7 +4,7 @@ choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_OR1K if BR2_or1k - default BR2_GCC_VERSION_6_X + default BR2_GCC_VERSION_7_X help Select the version of gcc you wish to use. From 91f7f381063c3d1dba36ff47ab31fe404a03042c Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:52 +0200 Subject: [PATCH 1531/2640] pkg-meson: new infrastructure Add a new infrastructure to ease the development of packages that use Meson as their build system. Signed-off-by: Eric Le Bihan [Thomas: - move global variables definition outside of the inner-meson-package macro - for consistency, remove double quote around value passed to meson in the host configure step. - minor formatting fixes.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Makefile.in | 1 + package/pkg-meson.mk | 160 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 package/pkg-meson.mk diff --git a/DEVELOPERS b/DEVELOPERS index d2da9a2f80..a8b98407c3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -578,6 +578,7 @@ F: package/hicolor-icon-theme/ F: package/jemalloc/ F: package/meson/ F: package/ninja/ +F: package/pkg-meson.mk F: package/rust-bin/ F: package/rust/ F: package/s6/ diff --git a/package/Makefile.in b/package/Makefile.in index 4325f7b3a9..a268016cdf 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -447,3 +447,4 @@ include package/pkg-rebar.mk include package/pkg-kernel-module.mk include package/pkg-waf.mk include package/pkg-golang.mk +include package/pkg-meson.mk diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk new file mode 100644 index 0000000000..507e686068 --- /dev/null +++ b/package/pkg-meson.mk @@ -0,0 +1,160 @@ +################################################################################ +# Meson package infrastructure +# +# This file implements an infrastructure that eases development of +# package .mk files for Meson packages. It should be used for all +# packages that use Meson as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this Meson infrastructure requires +# the .mk file to only specify metadata information about the +# package: name, version, download URL, etc. +# +# We still allow the package .mk file to override what the different +# steps are doing, if needed. For example, if _BUILD_CMDS is +# already defined, it is used as the list of commands to perform to +# build the package, instead of the default Meson behaviour. The +# package can also define some post operation hooks. +# +################################################################################ + +# +# Pass PYTHONNOUSERSITE environment variable when invoking Meson or Ninja, so +# $(HOST_DIR)/bin/python3 will not look for Meson modules in +# $HOME/.local/lib/python3.x/site-packages +# +MESON = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/meson +NINJA = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/ninja +NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) + +################################################################################ +# inner-meson-package -- defines how the configuration, compilation and +# installation of a Meson package should be done, implements a few hooks to +# tune the build process and calls the generic package infrastructure to +# generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-meson-package + +$(2)_CONF_ENV ?= +$(2)_CONF_OPTS ?= +$(2)_NINJA_ENV ?= +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) + +# +# Configure step. Only define it if not already defined by the package +# .mk file. And take care of the differences between host and target +# packages. +# +ifndef $(2)_CONFIGURE_CMDS +ifeq ($(4),target) + +# Configure package for target +# +# +define $(2)_CONFIGURE_CMDS + rm -rf $$($$(PKG)_SRCDIR)/build + mkdir -p $$($$(PKG)_SRCDIR)/build + PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ + --prefix=/usr \ + --libdir=lib \ + --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ + --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \ + $$($$(PKG)_CONF_OPTS) \ + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build +endef +else + +# Configure package for host +define $(2)_CONFIGURE_CMDS + rm -rf $$($$(PKG)_SRCDIR)/build + mkdir -p $$($$(PKG)_SRCDIR)/build + $$(HOST_CONFIGURE_OPTS) \ + $$($$(PKG)_CONF_ENV) $$(MESON) \ + --prefix=$$(HOST_DIR) \ + --libdir=lib \ + --sysconfdir=$$(HOST_DIR)/etc \ + --localstatedir=$$(HOST_DIR)/var \ + --default-library=shared \ + --buildtype=release \ + $$($$(PKG)_CONF_OPTS) \ + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build +endef +endif +endif + +$(2)_DEPENDENCIES += host-meson + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build +endef +else +define $(2)_BUILD_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build +endef +endif +endif + +# +# Host installation step. Only define it if not already defined by the +# package .mk file. +# +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install +endef +endif + +# +# Staging installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_STAGING_CMDS +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install +endef +endif + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# meson-package -- the target generator macro for Meson packages +################################################################################ + +meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) From 12e56136e24b76d153950afe27e13bbf5f11eebc Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:53 +0200 Subject: [PATCH 1532/2640] docs/manual: document pkg-meson infra Update documentation about adding meson-based packages with instructions for using pkg-meson infrastructure. Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-meson.txt | 117 ++++++++++++-------------- 1 file changed, 56 insertions(+), 61 deletions(-) diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt index f8aa08fa91..c52fe10506 100644 --- a/docs/manual/adding-packages-meson.txt +++ b/docs/manual/adding-packages-meson.txt @@ -1,18 +1,18 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -=== Integration of Meson-based packages +=== Infrastructure for Meson-based packages [[meson-package-tutorial]] ==== +meson-package+ tutorial http://mesonbuild.com[Meson] is an open source build system meant to be both -extremely fast, and, even more importantly, as user friendly as possible. +extremely fast, and, even more importantly, as user friendly as possible. It +uses https://ninja-build.org[Ninja] as a companion tool to perform the actual +build operations. -Buildroot does not (yet) provide a dedicated package infrastructure for -meson-based packages. So, we will explain how to write a +.mk+ file for such a -package. Let's start with an example: +Let's see how to write a +.mk+ file for a Meson-based package, with an example: ------------------------------ 01: ################################################################################ @@ -28,74 +28,69 @@ package. Let's start with an example: 11: FOO_LICENSE_FILES = COPYING 12: FOO_INSTALL_STAGING = YES 13: -14: FOO_DEPENDENCIES = host-meson host-pkgconf bar +14: FOO_DEPENDENCIES = host-pkgconf bar 15: -16: FOO_CONF_OPTS += \ -17: --prefix=/usr \ -18: --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ -19: --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf -20: -21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +16: ifeq ($(BR2_PACKAGE_BAZ),y) +17: FOO_CONF_OPTS += -Dbaz=true +18: FOO_DEPENDENCIES += baz +19: else +20: FOO_CONF_OPTS += -Dbaz=false +21: endif 22: -23: ifeq ($(BR2_PACKAGE_BAZ),y) -24: FOO_CONF_OPTS += -Dbaz -25: endif -26: -27: define FOO_CONFIGURE_CMDS -28: rm -rf $(@D)/build -29: mkdir -p $(@D)/build -30: $(TARGET_MAKE_ENV) meson $(FOO_CONF_OPTS) $(@D) $(@D)/build -31: endef -32: -33: define FOO_BUILD_CMDS -34: $(TARGET_MAKE_ENV) ninja $(FOO_NINJA_OPTS) -C $(@D)/build -35: endef -36: -37: define FOO_INSTALL_TARGET_CMDS -38: $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(FOO_NINJA_OPTS) \ -39: -C $(@D)/build install -40: endef -41: -42: define FOO_INSTALL_STAGING_CMDS -43: $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) ninja $(FOO_NINJA_OPTS) \ -44: -C $(@D)/build install -45: endef -46: -47: $(eval $(generic-package)) +23: $(eval $(meson-package)) -------------------------------- The Makefile starts with the definition of the standard variables for package declaration (lines 7 to 11). -As seen in line 47, it is based on the -xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines -the variables required by this particular infrastructure, where Meson and its -companion tool, Ninja, are invoked: +On line line 23, we invoke the +meson-package+ macro that generates all the +Makefile rules that actually allows the package to be built. -* +FOO_CONFIGURE_CMDS+: the build directory required by Meson is created, and - Meson is invoked to generate the Ninja build file. The options required to - configure the cross-compilation of the package are passed via - +FOO_CONF_OPTS+. +In the example, +host-pkgconf+ and +bar+ are declared as dependencies in ++FOO_DEPENDENCIES+ at line 14 because the Meson build file of +foo+ uses +`pkg-config` to determine the compilation flags and libraries of package +bar+. -* +FOO_BUILD_CMDS+: Ninja is invoked to perform the build. +Note that it is not necessary to add +host-meson+ in the +FOO_DEPENDENCIES+ +variable of a package, since this basic dependency is automatically added as +needed by the Meson package infrastructure. -* +FOO_INSTALL_TARGET_CMDS+: Ninja is invoked to install the files generated - during the build step in the target directory. - -* +FOO_INSTALL_STAGING_CMDS+: Ninja is invoked to install the files generated - during the build step in the staging directory, as +FOO_INSTALL_STAGING+ is - set to "YES". - -In order to have Meson available for the build, +FOO_DEPENDENCIES+ needs to -contain +host-meson+. In the example, +host-pkgconf+ and +bar+ are also -declared as dependencies because the Meson build file of +foo+ uses `pkg-config` -to determine the compilation flags and libraries of package +bar+. - -If the "baz" package is selected, then support for the "baz" feature in "foo" -is activated by adding +-Dbaz+ to +FOO_CONF_OPTS+, as specified in the -+meson_options.txt+ file in "foo" source tree. +If the "baz" package is selected, then support for the "baz" feature in "foo" is +activated by adding +-Dbaz=true+ to +FOO_CONF_OPTS+ at line 17, as specified in +the +meson_options.txt+ file in "foo" source tree. The "baz" package is also +added to +FOO_DEPENDENCIES+. Note that the support for +baz+ is explicitly +disabled at line 20, if the package is not selected. To sum it up, to add a new meson-based package, the Makefile example can be copied verbatim then edited to replace all occurences of +FOO+ with the uppercase name of the new package and update the values of the standard variables. + +[[meson-package-reference]] + +==== +meson-package+ reference + +The main macro of the Meson package infrastructure is +meson-package+. It is +similar to the +generic-package+ macro. The ability to have target and host +packages is also available, with the +host-meson-package+ macro. + +Just like the generic infrastructure, the Meson infrastructure works by defining +a number of variables before calling the +meson-package+ macro. + +First, all the package metadata information variables that exist in the generic +infrastructure also exist in the Meson infrastructure: +FOO_VERSION+, ++FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, +FOO_SUBDIR+, +FOO_DEPENDENCIES+, ++FOO_INSTALL_STAGING+, +FOO_INSTALL_TARGET+. + +A few additional variables, specific to the Meson infrastructure, can also be +defined. Many of them are only useful in very specific cases, typical packages +will therefore only use a few of them. + +* +FOO_CONF_ENV+, to specify additional environment variables to pass to + +meson+ for the configuration step. By default, empty. + +* +FOO_CONF_OPTS+, to specify additional options to pass to +meson+ for the + configuration step. By default, empty. + +* +FOO_NINJA_ENV+, to specify additional environment variables to pass to + +ninja+, meson companion tool in charge of the build operations. By default, + empty. From 7a23af4773665d2ee40e2d4e525746ebe38456dd Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:54 +0200 Subject: [PATCH 1533/2640] meson: prevent RPATH stripping By default, Meson strips RPATH from the executable it builds [1,2], unless explicitly set via install_rpath. This will make support/scripts/check-host-rpath fail when building the host variant of a Meson-based package. So add a patch to prevent RPATH from being stripped if install_rpath is not set and notify user about it. [1] https://github.com/mesonbuild/meson/issues/2567 [2] https://github.com/mesonbuild/meson/issues/314#issuecomment-157658562 Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- ...-RPATH-if-install_rpath-is-not-empty.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch diff --git a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch new file mode 100644 index 0000000000..03c1944258 --- /dev/null +++ b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch @@ -0,0 +1,32 @@ +From 53e4920038d5562b7b672fec8b9469fc02eef4ad Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Thu, 10 May 2018 21:57:49 +0200 +Subject: [PATCH] Only fix RPATH if install_rpath is not empty + +Signed-off-by: Eric Le Bihan +--- + mesonbuild/scripts/meson_install.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py +index 013f2a00..f7ff1dcc 100644 +--- a/mesonbuild/scripts/meson_install.py ++++ b/mesonbuild/scripts/meson_install.py +@@ -368,7 +368,13 @@ def install_targets(d): + printed_symlink_error = True + if os.path.isfile(outname): + try: +- depfixer.fix_rpath(outname, install_rpath, False) ++ # Buildroot check-host-rpath script expects RPATH ++ # But if install_rpath is empty, it will stripped. ++ # So, preserve it in this case ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, False) ++ else: ++ print("Skipping RPATH fixing") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass +-- +2.14.3 + From 2f0dbd1afb9be62abb68a94128928110122e3666 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:55 +0200 Subject: [PATCH 1534/2640] libmpdclient: convert to pkg-meson infra Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/libmpdclient/libmpdclient.mk | 32 +--------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 6ff27241c0..c04536eb88 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -11,35 +11,5 @@ LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_ LIBMPDCLIENT_INSTALL_STAGING = YES LIBMPDCLIENT_LICENSE = BSD-3-Clause LIBMPDCLIENT_LICENSE_FILES = COPYING -LIBMPDCLIENT_DEPENDENCIES = host-meson -LIBMPDCLIENT_CONF_OPTS += \ - --prefix=/usr \ - --libdir=/usr/lib \ - --default-library $(if $(BR2_STATIC_LIBS),static,shared) \ - --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ - --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf - -LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) - -define LIBMPDCLIENT_CONFIGURE_CMDS - rm -rf $(@D)/build - mkdir -p $(@D)/build - $(TARGET_MAKE_ENV) meson $(LIBMPDCLIENT_CONF_OPTS) $(@D) $(@D)/build -endef - -define LIBMPDCLIENT_BUILD_CMDS - $(TARGET_MAKE_ENV) ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build -endef - -define LIBMPDCLIENT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ - ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install -endef - -define LIBMPDCLIENT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) \ - ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From ebcf58ad07da318904399fad3f304c7e91195b66 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:56 +0200 Subject: [PATCH 1535/2640] systemd: convert to pkg-meson infra Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 8f7a9fa93c..82d0e1a027 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -12,7 +12,6 @@ SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ host-gperf \ host-intltool \ - host-meson \ kmod \ libcap \ util-linux @@ -26,10 +25,6 @@ SYSTEMD_DEPENDENCIES += busybox endif SYSTEMD_CONF_OPTS += \ - --prefix=/usr \ - --libdir='/usr/lib' \ - --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ - --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf \ -Drootlibdir='/usr/lib' \ -Dblkid=true \ -Dman=false \ @@ -403,28 +398,7 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD $(SYSTEMD_INSTALL_NETWORK_CONFS) endef -SYSTEMD_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) +SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) -SYSTEMD_ENV = $(TARGET_MAKE_ENV) $(HOST_UTF8_LOCALE_ENV) - -define SYSTEMD_CONFIGURE_CMDS - rm -rf $(@D)/build - mkdir -p $(@D)/build - $(SYSTEMD_ENV) meson $(SYSTEMD_CONF_OPTS) $(@D) $(@D)/build -endef - -define SYSTEMD_BUILD_CMDS - $(SYSTEMD_ENV) ninja $(SYSTEMD_NINJA_OPTS) -C $(@D)/build -endef - -define SYSTEMD_INSTALL_TARGET_CMDS - $(SYSTEMD_ENV) DESTDIR=$(TARGET_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ - -C $(@D)/build install -endef - -define SYSTEMD_INSTALL_STAGING_CMDS - $(SYSTEMD_ENV) DESTDIR=$(STAGING_DIR) ninja $(SYSTEMD_NINJA_OPTS) \ - -C $(@D)/build install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From cd2d47477f9c29d00805785fe130da08ec012350 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:57 +0200 Subject: [PATCH 1536/2640] ncmpc: convert to pkg-meson infra Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/ncmpc/ncmpc.mk | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 1d464b72de..d70ed46ea9 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -8,15 +8,11 @@ NCMPC_VERSION_MAJOR = 0 NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).29 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) -NCMPC_DEPENDENCIES = host-meson host-pkgconf libglib2 libmpdclient ncurses +NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -NCMPC_CONF_OPTS += \ - --prefix=/usr \ - -Dcurses=ncurses \ - --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ - --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf +NCMPC_CONF_OPTS = -Dcurses=ncurses ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools @@ -25,21 +21,4 @@ else NCMPC_CONF_OPTS += -Dlirc=false endif -NCMPC_NINJA_OPTS = $(if $(VERBOSE),-v) - -define NCMPC_CONFIGURE_CMDS - rm -rf $(@D)/build - mkdir -p $(@D)/build - $(TARGET_MAKE_ENV) meson $(NCMPC_CONF_OPTS) $(@D) $(@D)/build -endef - -define NCMPC_BUILD_CMDS - $(TARGET_MAKE_ENV) ninja $(NCMPC_NINJA_OPTS) -C $(@D)/build -endef - -define NCMPC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ - ninja $(NCMPC_NINJA_OPTS) -C $(@D)/build install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From 166949e5dd8c70826613fb366a860caf60f35778 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:58 +0200 Subject: [PATCH 1537/2640] mpd-mpc: convert to pkg-meson infra Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/mpd-mpc/mpd-mpc.mk | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 942530a561..0666339ff9 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -10,28 +10,6 @@ MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING -MPD_MPC_DEPENDENCIES = host-meson host-pkgconf libmpdclient +MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient -MPD_MPC_CONF_OPTS += \ - --prefix=/usr \ - --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \ - --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf - -MPD_MPC_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) - -define MPD_MPC_CONFIGURE_CMDS - rm -rf $(@D)/build - mkdir -p $(@D)/build - $(TARGET_MAKE_ENV) meson $(MPD_MPC_CONF_OPTS) $(@D) $(@D)/build -endef - -define MPD_MPC_BUILD_CMDS - $(TARGET_MAKE_ENV) ninja $(MPD_MPC_NINJA_OPTS) -C $(@D)/build -endef - -define MPD_MPC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(MPD_MPC_NINJA_OPTS) \ - -C $(@D)/build install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From 25179df46f2eeec8b17a2e930ab681015f8ebd12 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 15 May 2018 21:51:59 +0200 Subject: [PATCH 1538/2640] enlightenment: convert to pkg-meson infra Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.mk | 30 ++++++-------------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 480e9e9da8..5bc1c5d6de 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -13,14 +13,10 @@ ENLIGHTENMENT_LICENSE_FILES = COPYING ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ host-efl \ - host-meson \ efl \ xcb-util-keysyms -ENLIGHTENMENT_MESON_OPTS += \ - --prefix=/usr \ - --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ - --cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \ +ENLIGHTENMENT_CONF_OPTS = \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ -Deet=$(HOST_DIR)/bin/eet \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ @@ -30,38 +26,24 @@ ENLIGHTENMENT_MESON_OPTS += \ ENLIGHTENMENT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_SYSTEMD),y) -ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true +ENLIGHTENMENT_CONF_OPTS += -Dsystemd=true ENLIGHTENMENT_DEPENDENCIES += systemd else -ENLIGHTENMENT_MESON_OPTS += -Dsystemd=false +ENLIGHTENMENT_CONF_OPTS += -Dsystemd=false endif # alsa backend needs mixer support ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) -ENLIGHTENMENT_MESON_OPTS += -Dmixer=true +ENLIGHTENMENT_CONF_OPTS += -Dmixer=true ENLIGHTENMENT_DEPENDENCIES += alsa-lib else -ENLIGHTENMENT_MESON_OPTS += -Dmixer=false +ENLIGHTENMENT_CONF_OPTS += -Dmixer=false endif ifeq ($(BR2_PACKAGE_XKEYBOARD_CONFIG),y) ENLIGHTENMENT_DEPENDENCIES += xkeyboard-config endif -define ENLIGHTENMENT_CONFIGURE_CMDS - rm -rf $(@D)/build - mkdir -p $(@D)/build - $(TARGET_MAKE_ENV) meson $(ENLIGHTENMENT_MESON_OPTS) $(@D) $(@D)/build -endef - -define ENLIGHTENMENT_BUILD_CMDS - $(TARGET_MAKE_ENV) ninja -C $(@D)/build -endef - -define ENLIGHTENMENT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install -endef - define ENLIGHTENMENT_REMOVE_DOCUMENTATION rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/ rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING @@ -69,4 +51,4 @@ define ENLIGHTENMENT_REMOVE_DOCUMENTATION endef ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION -$(eval $(generic-package)) +$(eval $(meson-package)) From ebcb46f5605200e1b6f220c22fab125ca8ed105d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 30 May 2018 22:29:58 +0200 Subject: [PATCH 1539/2640] toolchain-external: bump CodeSourcery NIOSII to 2018.05 Re-add BR2_TOOLCHAIN_HAS_SSP since the toolchain support SSP. Tested with qemu_nios2_10m50_defconfig and Qemu 2.10.1-3.fc27 release. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../Config.in | 13 +++++++------ .../toolchain-external-codesourcery-niosII.hash | 10 +++++----- .../toolchain-external-codesourcery-niosII.mk | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in index 4ac9c95c86..9d785a4b6b 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -1,16 +1,17 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2017.05" + bool "Sourcery CodeBench Nios-II 2018.05" depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 help Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 6.3, binutils 2.26, - glibc 2.25, gdb 7.11 and kernel headers 4.7. + from Mentor Graphics. It uses gcc 7.3, binutils 2.28, + glibc 2.27, gdb 8.0.1 and kernel headers 4.15.5. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash index 3643f921b3..518e677f31 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash @@ -1,6 +1,6 @@ -# From https://sourcery.mentor.com/GNUToolchain/release3302 -md5 54b7f7056c2159f3a9ddeca8ca775ed1 sourceryg++-2017.05-4-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -md5 529a7fecf33d0d113a446413b9d1e173 sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2 +# From https://sourcery.mentor.com/GNUToolchain/release3374 +md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 # Locally calculated -sha256 3f0307da3c0770b7cc3ed4a845038e6e438d3e3a96ce880f9a86b3d35f948a07 sourceryg++-2017.05-4-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 6e65878d0453708ee19098d3d68985bda244938d35999f3859915a2f5574fa08 sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2 +sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk index dfa4ea4258..cb0fe760ff 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2017.05-4 +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2018.05-5 TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 From fd97bc80c5b87a2e76e535c1b200fab9276446fc Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 28 May 2018 10:35:10 -0500 Subject: [PATCH 1540/2640] toolchain: allow disabling packages affected by gcc bug 85180 Works around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180 which is an issue where the Microblaze architecture had code that caused a infinite recursion while optimizing in versions of GCC earlier than 8.x. More BR discussion can be found on this thread. http://buildroot-busybox.2317881.n4.nabble.com/autobuild-buildroot-net-Build-results-for-2018-04-25-td192721.html Resolves: http://autobuild.buildroot.net/results/b42d68c66d8ea035845a28c5530ef0682fd95713 (boost) http://autobuild.buildroot.net/results/af976a4805fb8b3f0c17a8e3a1f901b2255caa0b (flare-engine) http://autobuild.buildroot.net/results/d20/d20700bd538ba1e9d45ab8a61ecbbba1a320ef38 (gst-ffmpeg) CC: Romain Naour Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 4 ++++ package/flare-engine/Config.in | 4 ++++ package/gstreamer/gst-ffmpeg/Config.in | 4 ++++ toolchain/Config.in | 6 ++++++ 4 files changed, 18 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 0755d9c010..ec0e19ccb5 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -104,12 +104,16 @@ config BR2_PACKAGE_BOOST_FIBER # mips support uses the "pause" instruction, only available # since mips32r2/mips64r2. depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 help C++11 userland threads library. comment "boost-fiber needs a toolchain w/ NPTL" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL +comment "boost-fiber needs a toolchain not affected by GCC bug 85180" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180 + config BR2_PACKAGE_BOOST_FILESYSTEM bool "boost-filesystem" help diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index cdcb018948..e299a6b7de 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLARE_ENGINE bool "flare-engine" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # SDL2 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER @@ -17,3 +18,6 @@ config BR2_PACKAGE_FLARE_ENGINE comment "flare-engine needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS + +comment "flare-engine needs a toolchain not affected by GCC bug 85180" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180 diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in index 32bfdd53c6..1e95d016f6 100644 --- a/package/gstreamer/gst-ffmpeg/Config.in +++ b/package/gstreamer/gst-ffmpeg/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GST_FFMPEG depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 select BR2_PACKAGE_GST_PLUGINS_BASE help GStreamer plugin containing one plugin with a set of @@ -28,3 +29,6 @@ endif comment "gst-ffmpeg needs a toolchain w/ gcc >= 5" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh + +comment "gst-ffmpeg needs a toolchain not affected by GCC bug 85180" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180 diff --git a/toolchain/Config.in b/toolchain/Config.in index 2479a6587c..ebd84509fd 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -84,6 +84,12 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 default y if BR2_m68k_cf5208 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no +# longer exists in gcc 8.x. +config BR2_TOOLCHAIN_HAS_GCC_BUG_85180 + bool + default y if BR2_microblaze + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862 # An infinite loop exists in the find_base_term() logic of 6.x # on microblaze. http://autobuild.buildroot.net/results/158e8ebb39713e1b436a5cc1a1916f46c30694df/ From 8519dea4b91b61cf7767c281a68e8a0c46fdc9d5 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 28 May 2018 20:10:00 +0200 Subject: [PATCH 1541/2640] package/python-can: bump to version 2.1.0 This patch bumps python-can to version 2.1.0. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index bd19d194b6..8a70bb42b7 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/python-can/json, sha256 locally computed -md5 f653aecf8b9034bbba32cc04ca6a7b6d python-can-1.5.2.tar.gz -sha256 edabb426e6cd11c2dc7a98980340135aa0eb02143b0d51bf14e3e6178c131cc3 python-can-1.5.2.tar.gz +md5 3310f0aa2a8492d0ff614ecf636ec8a8 python-can-2.1.0.tar.gz +sha256 4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc python-can-2.1.0.tar.gz diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index a271baea00..9a7e903303 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 1.5.2 -PYTHON_CAN_SITE = https://pypi.python.org/packages/a1/b1/80f023e2b728c7ebccbf989aec777f3add3dd4cee650573ce5d38132a07c +PYTHON_CAN_VERSION = 2.1.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/04/87/0d5b0f2f4e5d7f64a44f74b7f0bc1668457e6aa7e90b04ad15c3b9a44411 PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt PYTHON_CAN_SETUP_TYPE = setuptools From 243627efbd53241127b6384a47ac89f2d73226e4 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 28 May 2018 20:18:05 +0200 Subject: [PATCH 1542/2640] package/python-pillow: bump to version 5.1.0 This patch bumps python-pillow to version 5.1.0. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 5 ++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d8c083b4f5..463b5620ce 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,3 +1,2 @@ -# md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed -md5 11e5e2046cf41586716a6042d89abeeb Pillow-4.2.1.tar.gz -sha256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073 Pillow-4.2.1.tar.gz +# sha256 from https://pypi.org/project/Pillow/5.1.0/#files +sha256 cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef Pillow-5.1.0.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 79d6a77cad..c9b3e316f9 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 4.2.1 +PYTHON_PILLOW_VERSION = 5.1.0 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/55/aa/f7f983fb72710a9daa4b3374b7c160091d3f94f5c09221f9336ade9027f3 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/89/b8/2f49bf71cbd0e9485bb36f72d438421b69b7356180695ae10bd4fd3066f5 PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools From 754bf0d07ab9a4cbd103abeb061dff6dd867f2f8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 30 May 2018 15:31:57 -0300 Subject: [PATCH 1543/2640] linux: bump default to version 4.16.13 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index b1691fe153..73a3299b8f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.16.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 6b02b8210acb18773f2c4b26cfc11d1f9bc4fb88 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 30 May 2018 23:27:02 +0200 Subject: [PATCH 1544/2640] package/openvmtools: depend on host-nfs-utils host-nfs-utils provides the host rpcgen utility. This fixes the build on recent Fedora systems that removed rpcgen from the glibc package. Fixes: http://autobuild.buildroot.net/results/e21/e219b8bacb52bb661eb6663b82f549ed941f26fe Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/openvmtools/openvmtools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk index cc71324ff0..9501ef3361 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -17,7 +17,7 @@ OPENVMTOOLS_CONF_OPTS = --with-dnet \ --without-gtkmm --without-kernel-modules \ --disable-deploypkg --without-xerces OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" " -OPENVMTOOLS_DEPENDENCIES = libglib2 libdnet +OPENVMTOOLS_DEPENDENCIES = host-nfs-utils libglib2 libdnet # When libfuse is available, openvmtools can build vmblock-fuse, so # make sure that libfuse gets built first From 002348de68617a05b187c995675e5c3b7f829ecc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 May 2018 00:17:13 +0200 Subject: [PATCH 1545/2640] xen: security bump to version 4.10.1 The 4.10.1 version brings a large number of fixes: https://www.xenproject.org/downloads/xen-archives/xen-project-410-series/xen-4101.html Including a number of security fixes: XSA-252: DoS via non-preemptable L3/L4 pagetable freeing (CVE-2018-7540) XSA-253: x86: memory leak with MSR emulation (CVE-2018-5244) XSA-254: Information leak via side effects of speculative execution (CVE-2017-5753 CVE-2017-5715 CVE-2017-5754) XSA-255: grant table v2 -> v1 transition may crash Xen (CVE-2018-7541) XSA-256: x86 PVH guest without LAPIC may DoS the host (CVE-2018-7542) XSA-258: Information leak via crafted user-supplied CDROM (CVE-2018-10472) XSA-259: x86: PV guest may crash Xen with XPTI (CVE-2018-10471) Also add a hash for the license file while we are at it. Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 3 ++- package/xen/xen.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index fa4d25bab2..5daebd4d65 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844 xen-4.10.0.tar.gz +sha256 570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf xen-4.10.1.tar.gz +sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 1b741a90f6..29699cf0f9 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.10.0 +XEN_VERSION = 4.10.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING From 8f038e6b30a20a387ba3c80912dd15b3d2023078 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 30 May 2018 15:31:58 -0300 Subject: [PATCH 1546/2640] linux-headers: bump 4.{1, 4, 9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 74ea33c5b7..b99b36e83d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -249,14 +249,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.101" if BR2_KERNEL_HEADERS_3_2 - default "4.1.51" if BR2_KERNEL_HEADERS_4_1 - default "4.4.133" if BR2_KERNEL_HEADERS_4_4 - default "4.9.103" if BR2_KERNEL_HEADERS_4_9 + default "4.1.52" if BR2_KERNEL_HEADERS_4_1 + default "4.4.134" if BR2_KERNEL_HEADERS_4_4 + default "4.9.104" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.44" if BR2_KERNEL_HEADERS_4_14 + default "4.14.46" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.12" if BR2_KERNEL_HEADERS_4_16 + default "4.16.13" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 66f40a7242cb98cae765648af568b4b77b318365 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 31 May 2018 09:05:19 +0200 Subject: [PATCH 1547/2640] download/cvs: add a 10 minute timeout Apparently, CVS servers can be deadlocked and in that case clients will retry connecting to them indefinitely. Cfr. http://autobuild.buildroot.net/results/23d/23d1034b33d0354de15de2ec4a8ccd0603e8db78/build-end.log Apparently, the sf.net CVS server got in such a deadlock on 2018-05-18, and almost 2 weeks later it is still not fixed. Instead of just hanging, we should fall back on BR2_SECONDARY_SITE. To achieve this, it's sufficient to add a timeout to the CVS command. The timeout value is of course arbitrary. However, we can assume that nobody will be putting large projects under CVS any more. So if the download takes more than 5 minutes, it's probably broken. Let's put the timeout at 10 minutes then. Fixes: http://autobuild.buildroot.net/results/db3/db33d4fa507fb3b4132423cd0a7e25a1fe6e4105 http://autobuild.buildroot.net/results/b6d/b6d927dcc73ac8d754422577dacefff4ff918a5c http://autobuild.buildroot.net/results/23d/23d1034b33d0354de15de2ec4a8ccd0603e8db78 http://autobuild.buildroot.net/results/127/1272a3aa3077e434c9805ec3034f35e6fcc330d4 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/download/cvs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/support/download/cvs b/support/download/cvs index 3f77b849e4..9d0dc3cb3a 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -33,9 +33,13 @@ done shift $((OPTIND-1)) # Get rid of our options # Caller needs to single-quote its arguments to prevent them from -# being expanded a second time (in case there are spaces in them) +# being expanded a second time (in case there are spaces in them). +# If the CVS server is deadlocked, the client will never return (cfr. +# http://autobuild.buildroot.net/results/23d/23d1034b33d0354de15de2ec4a8ccd0603e8db78/build-end.log +# ). Since nobody sane will put large code bases in CVS, a timeout of +# 10 minutes should do the trick. _cvs() { - eval ${CVS} "${@}" + eval timeout 10m ${CVS} "${@}" } if [[ ${rev} =~ ^[0-9] ]]; then From 23ab6cb162b7456925e2c3df4917cf9b45868d55 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 31 May 2018 09:05:20 +0200 Subject: [PATCH 1548/2640] package/expect: download tarball instead of cvs More than 3 years after the 5.45.3 release, a tarball for that release was uploaded to sourceforge.net. The differences between this tarball and the CVS checkout are minimal: - There are no CVS directories, of course, but we don't need them. - File timestamps are different. - expect.tests is missing, but we don't execute tests anyway. - configure script is different, but we AUTORECONF anyway. - 'fixcat' script is missing, but it is not called anywhere. Since sourceforge.net has broken CVS downloads, now is a good time to switch away from it. While we're at it, add a hash file including license. Fixes: http://autobuild.buildroot.net/results/db3/db33d4fa507fb3b4132423cd0a7e25a1fe6e4105 http://autobuild.buildroot.net/results/b6d/b6d927dcc73ac8d754422577dacefff4ff918a5c http://autobuild.buildroot.net/results/23d/23d1034b33d0354de15de2ec4a8ccd0603e8db78 http://autobuild.buildroot.net/results/127/1272a3aa3077e434c9805ec3034f35e6fcc330d4 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Fabio Porcedda Signed-off-by: Peter Korsgaard --- package/expect/expect.hash | 4 ++++ package/expect/expect.mk | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 package/expect/expect.hash diff --git a/package/expect/expect.hash b/package/expect/expect.hash new file mode 100644 index 0000000000..c89f323906 --- /dev/null +++ b/package/expect/expect.hash @@ -0,0 +1,4 @@ +# From https://sourceforge.net/projects/expect/files/Expect/5.45.3/expect5.45.3.tar.gz.SHA256 +sha256 c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9 expect5.45.3.tar.gz +# Locally calculated +sha256 b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab README diff --git a/package/expect/expect.mk b/package/expect/expect.mk index d78ff6c208..ccde33a71b 100644 --- a/package/expect/expect.mk +++ b/package/expect/expect.mk @@ -4,12 +4,13 @@ # ################################################################################ -# Version 5.45.3 -EXPECT_VERSION = 2014-05-02 -EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect +EXPECT_VERSION = 5.45.3 +EXPECT_SITE = https://sourceforge.net/projects/expect/files/Expect/$(EXPECT_VERSION) +EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz EXPECT_LICENSE = Public domain EXPECT_LICENSE_FILES = README +# 0001-enable-cross-compilation.patch EXPECT_AUTORECONF = YES EXPECT_DEPENDENCIES = tcl EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix From 1350678212495925e9800772a82ed6a5894d2da7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 31 May 2018 19:02:12 +0200 Subject: [PATCH 1549/2640] libjpeg: use SPDX short identifier Use IJG instead of jpeg-license Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libjpeg/libjpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index edda2a5a1b..ab09881fc1 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -7,7 +7,7 @@ LIBJPEG_VERSION = 9c LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz -LIBJPEG_LICENSE = jpeg-license (BSD-3-Clause-like) +LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README LIBJPEG_INSTALL_STAGING = YES LIBJPEG_PROVIDES = jpeg From ca668476b3aa0ce42e7ffb79f484c5eadbcc99d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 31 May 2018 19:08:19 +0200 Subject: [PATCH 1550/2640] jpeg-turbo: add license details - jpeg-turbo is covered by 3 licenses: IJG (libjpeg), BSD-3-Clause (TurboJPEG) and Zlib (SIMD) - Add README.ijg - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.hash | 2 ++ package/jpeg-turbo/jpeg-turbo.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 320bbb2a94..11b323b8bf 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -3,3 +3,5 @@ sha1 e788f6defa58b4393a5e1685c018f3b962971457 libjpeg-turbo-1.5.2.tar.gz md5 6b4923e297a7eaa255f08511017a8818 libjpeg-turbo-1.5.2.tar.gz # Locally computed sha256 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 libjpeg-turbo-1.5.2.tar.gz +sha256 5c08657eda60b7946a913ee22ac73603335a468a6aa95204506a1586a8d677ee LICENSE.md +sha256 53a3e3c299e08856964f4c5986e242c3695837b73c64625092f70c774e8af5d2 README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index bb1278f8b2..d52ab916e0 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -7,8 +7,8 @@ JPEG_TURBO_VERSION = 1.5.2 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) -JPEG_TURBO_LICENSE = jpeg-license (BSD-3-Clause-like) -JPEG_TURBO_LICENSE_FILES = LICENSE.md +JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) +JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg JPEG_TURBO_DEPENDENCIES = host-pkgconf From 17f352acdebd4a825903807f8a2d60ebea223afb Mon Sep 17 00:00:00 2001 From: Laurent GONZALEZ Date: Thu, 31 May 2018 13:21:33 +0000 Subject: [PATCH 1551/2640] package/binutils: default to 2.29 for Cortex-M targets binutils 2.29 changed the implementation of adr pseudo instruction it breaks linux kernel and impacts Cortex-M targets (eg. stm32) [Peter: simplify Config.in logic, adjust message to make it clear this is just a default] Signed-off-by: Laurent GONZALEZ Signed-off-by: Christophe Priouzeau Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 03b228168f..4e578ef2ef 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -2,6 +2,7 @@ comment "Binutils Options" choice prompt "Binutils Version" + default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_CPU_ARMV7M default BR2_BINUTILS_VERSION_2_29_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help From f13477b68fc228709764262431faf3458c28ccab Mon Sep 17 00:00:00 2001 From: Christophe PRIOUZEAU Date: Thu, 31 May 2018 13:21:34 +0000 Subject: [PATCH 1552/2640] linux: config.in: add comment for Arm Cortex-M When binutils > 2.28 are selected on Arm Cortex-M cpu, linux kernel does not boot due to a new implementation of 'adr pseudo instruction' on binutils. Bugzilla thread: https://bugs.busybox.net/show_bug.cgi?id=11051 Signed-off-by: Christophe Priouzeau Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 73a3299b8f..b5957b61d3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -8,6 +8,10 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL +comment "Linux kernel will not boot with binutils >= 2.29" + depends on BR2_ARM_CPU_ARMV7M + depends on !BR2_BINUTILS_VERSION_2_28_X + # Packages that need to have a kernel with support for loadable modules, # but do not use the kernel-modules infrastructure, should select that # option. From 371b45fe4aaf8ba5ad46223d947cf7f9b851785f Mon Sep 17 00:00:00 2001 From: Christophe PRIOUZEAU Date: Thu, 31 May 2018 13:21:32 +0000 Subject: [PATCH 1553/2640] Revert "configs/stm32f429: force usage of binutils 2.28.x" This reverts commit cbe43fd417d77f846f1ca47cdacd51a73be1aaec. Now that the binutils default has been changed for ARMv7M, this is no longer needed. Signed-off-by: Christophe Priouzeau Signed-off-by: Peter Korsgaard --- configs/stm32f429_disco_defconfig | 1 - linux/Config.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_defconfig b/configs/stm32f429_disco_defconfig index fc167d0270..5237e9adb5 100644 --- a/configs/stm32f429_disco_defconfig +++ b/configs/stm32f429_disco_defconfig @@ -2,7 +2,6 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y -BR2_BINUTILS_VERSION_2_28_X=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y diff --git a/linux/Config.in b/linux/Config.in index b5957b61d3..bffb52fd18 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -8,7 +8,7 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL -comment "Linux kernel will not boot with binutils >= 2.29" +comment "Linux kernel may fail to boot with binutils >= 2.29" depends on BR2_ARM_CPU_ARMV7M depends on !BR2_BINUTILS_VERSION_2_28_X From 714d9e61c9c11d37471eedb88736ba75c6056a1d Mon Sep 17 00:00:00 2001 From: Christophe PRIOUZEAU Date: Thu, 31 May 2018 13:21:33 +0000 Subject: [PATCH 1554/2640] Revert "configs/stm32f469: force usage of binutils 2.28.x" This reverts commit 12049cc8b8972a9d0f1e27f1382cc5752d45312f. Now that the binutils default has been changed for ARMv7M, this is no longer needed. Signed-off-by: Christophe Priouzeau Signed-off-by: Peter Korsgaard --- configs/stm32f469_disco_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_defconfig b/configs/stm32f469_disco_defconfig index e5cacafb46..8b77d8c1a2 100644 --- a/configs/stm32f469_disco_defconfig +++ b/configs/stm32f469_disco_defconfig @@ -2,7 +2,6 @@ BR2_arm=y BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y -BR2_BINUTILS_VERSION_2_28_X=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From 09ebf6f316e108dcbce0bde89699937e68dee325 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 8 May 2018 22:28:47 +0200 Subject: [PATCH 1555/2640] configs/socrates_cyclone5: change over to current upstream releases Since all cyclone5 development changes are upstream, change over to an upstream release of the Linux kernel and u-boot for buildroot. Signed-off-by: Florian La Roche Signed-off-by: Thomas Petazzoni (cherry picked from commit ef94c736ec460e56b82a5a45819f7adce787d488) Signed-off-by: Peter Korsgaard --- configs/socrates_cyclone5_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/socrates_cyclone5_defconfig b/configs/socrates_cyclone5_defconfig index 7995f9acfb..4c659263df 100644 --- a/configs/socrates_cyclone5_defconfig +++ b/configs/socrates_cyclone5_defconfig @@ -3,12 +3,12 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/altera/socrates_cyclone5/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="socfpga" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates" @@ -16,9 +16,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="socfpga_socrates" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y From 71b3df1cbbfeb69d9f9a39af9a1ae5722215a9a3 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Wed, 30 May 2018 13:46:51 +0200 Subject: [PATCH 1556/2640] package/clang: fix host-clang binaries This patch fixes the following error when trying to execute clang compiler (host-variant): CommandLine Error: Option 'x86-use-base-pointer' registered more than once! LLVM ERROR: inconsistency in registered CommandLine options The same happens for the other binaries, such as clang-format: ./clang-format : CommandLine Error: Option 'help-list' registered more than once! LLVM ERROR: inconsistency in registered CommandLine options Clang binaries are tools, and given that DLLVM_LINK_LLVM_DYLIB is set, they are linked against libLLVM.so. The problem is that binaries are also linking against some LLVM static libraries, resulting in the error shown above. However, it is not the same case for libclang, which is also a tool but links only against libLLVM.so. To fix this problem, add LLVM_DYLIB_COMPONENTS=all. Signed-off-by: Valentin Korenblit Tested-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- package/clang/clang.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/clang/clang.mk b/package/clang/clang.mk index ae0140c783..dc086c6eed 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -89,5 +89,9 @@ HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON +# Prevent clang binaries from linking against LLVM static libs +HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all +CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From 3dbc5a62798d0f804a9a931b5dbd1c3a2a419ab2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Jun 2018 19:26:29 +0200 Subject: [PATCH 1557/2640] package/binutils: extend the 2.28 default to thumb mode Commit 17f352ac (package/binutils: default to 2.29 for Cortex-M targets) made the default version 2.28 (and not 2.29!) when the target is an arm-v7m CPU. However, the real trigger is compilation in Thumb mode, not the fact that the target is v7m. The fact that it was noticed on a v7m target is because Thumb is the only mode valid on those CPUs. Tighten the defaults to 2.28 for Thumb and Thumb2 modes. Signed-off-by: "Yann E. MORIN" Cc: Laurent GONZALEZ Cc: Christophe Priouzeau Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 4e578ef2ef..de229895c1 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -2,7 +2,8 @@ comment "Binutils Options" choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_CPU_ARMV7M + default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB + default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB2 default BR2_BINUTILS_VERSION_2_29_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help From c2c0623bff4a93120642d68dcec247ac2729fa09 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 Jun 2018 20:01:57 +0200 Subject: [PATCH 1558/2640] linux: may fail to boot for binutils 2.29+ even without armv7m Commit f13477b (linux: config.in: add comment for Arm Cortex-M) added a comment so that the user that the linux kernel may miscompile with binutils 2.29+, when the target is an armv7m CPU. However, the real trigger is a compilation in thumb2 mode, which happens to be the only option for armv7m CPUs. We can't know whether the kernel will be built in arm or thumb2 mode, though, because we do not have that information: it is only available in the Linux' .config file, which we don;t have access to at the time we run our menuconfig. So, relax the conditions under which the comment is made, so that it appears as soon as binutils are >= 2.29 (i.e. not 2.28, which is the oldest we support) for ARM CPUs. [Peter: reword comment] Signed-off-by: "Yann E. MORIN" Cc: Christophe Priouzeau Cc: Laurent GONZALEZ Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index bffb52fd18..c29b1f6c88 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -9,7 +9,7 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL comment "Linux kernel may fail to boot with binutils >= 2.29" - depends on BR2_ARM_CPU_ARMV7M + depends on BR2_arm || BR2_armeb depends on !BR2_BINUTILS_VERSION_2_28_X # Packages that need to have a kernel with support for loadable modules, From d937f908f12f80349089e60e418afbb714e86f7e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Jun 2018 21:43:06 +0200 Subject: [PATCH 1559/2640] linux: reword binutils 2.29+ comment This issue only applies to kernels built with CONFIG_THUMB2=y, so reword the comment to make that more clear. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index c29b1f6c88..58d2286685 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -8,7 +8,7 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL -comment "Linux kernel may fail to boot with binutils >= 2.29" +comment "Linux kernel in thumb mode may be broken with binutils >= 2.29" depends on BR2_arm || BR2_armeb depends on !BR2_BINUTILS_VERSION_2_28_X From f3d114a1effd8a6ef773bee14fe49ea6d8d7c350 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Jun 2018 22:22:57 +0200 Subject: [PATCH 1560/2640] Update for 2018.05 Signed-off-by: Peter Korsgaard --- CHANGES | 14 ++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 27 +++++++++++++-------------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 48 insertions(+), 17 deletions(-) diff --git a/CHANGES b/CHANGES index e48ac23adc..baa85622ae 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +2018.05, Released June 1st, 2018 + + Minor fixes. + + Download: Work around for hanging connections for packages + from CVS, by adding a 10 minute max timeout. + + Updated/fixed packages: binutils, clang, dash, expect, git, + glibc, jpeg-turbo, libjpeg, log4cplus, openvmtools, xen, + + Issues resolved (http://bugs.uclibc.org): + + #11051: runtime issue on STM32 with usage of binutils 2.29.x + 2018.05-rc3, Released May 28th, 2018 Fixes all over the tree. diff --git a/Makefile b/Makefile index 7be8a6634b..9f32c96001 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.05-rc3 +export BR2_VERSION := 2018.05 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1527540000 +BR2_VERSION_EPOCH = 1527884000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 03f8e1818c..fd08093783 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,7 +8,7 @@
        Download
        -

        Latest stable / long term support release: 2018.02.2

        +

        Latest long term support release: 2018.02.2

        @@ -41,42 +41,41 @@

        PGP signature

        - - +
        Source code
        diff --git a/docs/website/news.html b/docs/website/news.html index a4d83e144d..b2d097b1df 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

        News

          +
        • +
          +
          +
          +

          2018.05 released

          +

          1 June 2018

          +
          +
          +

          The stable 2018.05 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2018.05 release.

          +
          +
          +
          • +
        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 54b45da69e..cca0a3db3d 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2018.02' +RELEASE='2018.05' ### Change here for more memory/cores ### VM_MEMORY=2048 From 67009fd2692f1a32329c11d4b112663bcee22028 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Jun 2018 22:53:36 +0200 Subject: [PATCH 1561/2640] docs/website/news.html: add 2018.05 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index b2d097b1df..042051936c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

          The stable 2018.05 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2018.05 release.

          From ef01260b3d4852e7f1b760c1e0f5073ce342f2c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 2 Jun 2018 11:11:56 +0200 Subject: [PATCH 1562/2640] Kickoff 2018.08 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9f32c96001..8d25c8a239 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.05 +export BR2_VERSION := 2018.08-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1527884000 From 000f8a63ed4953f9d6c0d40abec1c10641839364 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Jun 2018 18:24:38 +0200 Subject: [PATCH 1563/2640] perl-libwww-perl: fix SITE Fixes: http://autobuild.buildroot.net/results/6f7745010ca589876a24d522bc0cb4a0dca26768/ Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl-libwww-perl/perl-libwww-perl.hash | 5 +++-- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 59164a83f2..a9f3a34615 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,5 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 2e15c1c789ac9036c99d094e47e3da23 libwww-perl-6.33.tar.gz sha256 97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99 libwww-perl-6.33.tar.gz -# Locally computed -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE + +# computed by scancpan +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 9624929a92..427e4c1a97 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -6,7 +6,7 @@ PERL_LIBWWW_PERL_VERSION = 6.33 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz -PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER +PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_DEPENDENCIES = \ perl-encode-locale \ perl-file-listing \ From 16d29ab852a9507d5aa87cc04c8ea25bafa03d3c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Jun 2018 22:29:51 +0200 Subject: [PATCH 1564/2640] cairo: bump to version 1.15.12 - Remove second patch (LTO support removed since 1.14.0 in August 2014: https://cgit.freedesktop.org/cairo/commit/?id=c7ff9bb32e20679d6da4e8a2856be716e5bd9e12 - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cairo/0002-fix-gcc-49-build.patch | 38 ----------------------- package/cairo/cairo.hash | 11 +++++-- package/cairo/cairo.mk | 5 ++- 3 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 package/cairo/0002-fix-gcc-49-build.patch diff --git a/package/cairo/0002-fix-gcc-49-build.patch b/package/cairo/0002-fix-gcc-49-build.patch deleted file mode 100644 index 112c9ea053..0000000000 --- a/package/cairo/0002-fix-gcc-49-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix build with gcc 4.9 - -cairo fails to build with gcc 4.9 due to a bad interaction of cairo -modules with the LTO mechanism. The suggested workaround is to pass --ffat-lto-objects. See -https://bugs.freedesktop.org/show_bug.cgi?id=77060 for the upstream -bug report, and -https://bugs.archlinux.org/task/40313?project=1&openedfrom=-1+week for -the ArchLinux bug report. - -This patch passes -ffat-lto-objects when gcc understands this option, -in order to provide compatibility with gcc versions older than 4.8, -which did not provide this option, but are anyway unaffected by the -issue. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -37,6 +37,16 @@ - m4_include(build/configure.ac.pthread) dnl checks for pthreads - AC_CACHE_SAVE - -+old_cflags=$CFLAGS -+CFLAGS=-ffat-lto-objects -+AC_MSG_CHECKING([whether CC supports -ffat-lto-objects]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -+ [AC_MSG_RESULT([yes])] -+ [LTO_CFLAGS=-ffat-lto-objects], -+ [AC_MSG_RESULT([no])] -+) -+CFLAGS="${old_CFLAGS} ${LTO_CFLAGS}" -+ - dnl =========================================================================== - - AC_CHECK_LIB(z, compress, diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index f3aa01f2cd..795a2eeea5 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,4 +1,9 @@ -# From http://cairographics.org/releases/cairo-1.14.10.tar.xz.sha1 -sha1 28c59d85d6b790c21b8b59ece73a6a1dda28d69a cairo-1.14.10.tar.xz +# From https://www.cairographics.org/snapshots/cairo-1.15.12.tar.xz.sha1 +sha1 4e64c6a48789edb4c60bc3fa95bd3992cc388b88 cairo-1.15.12.tar.xz # Calculated based on the hash above -sha256 7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09 cairo-1.14.10.tar.xz +sha256 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9 cairo-1.15.12.tar.xz + +# Hash for license files: +sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING +sha256 9e9e8608c4cdda51a78cc3a385f4ec9a2e4c96d5ecad74ac8bca5fca3e563b7d COPYING-LGPL-2.1 +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 9749056776..6dffff4b81 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,13 +4,12 @@ # ################################################################################ -CAIRO_VERSION = 1.14.10 +CAIRO_VERSION = 1.15.12 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 -CAIRO_SITE = http://cairographics.org/releases +CAIRO_SITE = http://cairographics.org/snapshots CAIRO_INSTALL_STAGING = YES -CAIRO_AUTORECONF = YES # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) From 2e0e7b90fc2d33f102b68e156a63c7abb325a9e8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 1 Jun 2018 11:06:44 +0300 Subject: [PATCH 1565/2640] sysstat: bump to version 11.6.3 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.hash | 4 ++-- package/sysstat/sysstat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index a35631076a..3bbefac189 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 2eb3d20016084c9e6ff94c9b2f3b2ada7e8d26c6 sysstat-11.6.1.tar.xz +sha1 5300345489e455ac62547b072bb8531414758fdf sysstat-11.6.3.tar.xz # Locally calculated -sha256 4b2a2cfa8c8fe6ae0155e168ed9a7066caebc3ecb903b0e64a9ede28ecb68fcb sysstat-11.6.1.tar.xz +sha256 54b306a1634e39710767936d4d1be17e8b65062aa04c837b41479c4b28b511bd sysstat-11.6.3.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index bdc0610ea3..490e8f1b28 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 11.6.1 +SYSSTAT_VERSION = 11.6.3 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors From dcebf84c9ea430c75f52c28ef75e3f03b56dac17 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 1 Jun 2018 14:44:38 +0300 Subject: [PATCH 1566/2640] ipset: bump to version 6.38 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ipset/ipset.hash | 6 +++--- package/ipset/ipset.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index 9185d94d85..f41111c022 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,6 +1,6 @@ -# From http://ftp.netfilter.org/pub/ipset/ipset-6.36.tar.bz2.md5sum.txt -md5 fda041afefd581464e445b87beeb0681 ipset-6.36.tar.bz2 +# From http://ftp.netfilter.org/pub/ipset/ipset-6.38.tar.bz2.md5sum.txt +md5 0e5d9c85f6b78e7dff0c996e2900574b ipset-6.38.tar.bz2 # Calculated based on the hash above -sha256 22224a90dc6c7d97b7a7addedd0740c3841e3d9a7ff8c8d2123bae0c3620d30d ipset-6.36.tar.bz2 +sha256 ceef625ba31fe0aaa422926c7231a819de0b07644c02c17ebdd3022a29e3e244 ipset-6.38.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index e9f8165fab..3ec9448941 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 6.36 +IPSET_VERSION = 6.38 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From 2647c7797d1460855dfcda566c6b7c0edaf56b7a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 1 Jun 2018 15:03:48 +0300 Subject: [PATCH 1567/2640] dash: bump to version 0.5.10.2 Drop upstream patch. Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...02-histedit-fix-build-with-musl-libc.patch | 35 ------------------- package/dash/dash.hash | 6 ++-- package/dash/dash.mk | 2 +- 3 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 package/dash/0002-histedit-fix-build-with-musl-libc.patch diff --git a/package/dash/0002-histedit-fix-build-with-musl-libc.patch b/package/dash/0002-histedit-fix-build-with-musl-libc.patch deleted file mode 100644 index a9e4c5aea1..0000000000 --- a/package/dash/0002-histedit-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2da5b72c704fed10f1b04b5432ac6b078d016fae Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Mar 2018 08:25:36 +0200 -Subject: [PATCH] histedit: fix build with musl libc - -musl libc defines the optreset BSD extension only in getopt.h. This -fixes the following build failure: - -histedit.c: In function 'histcmd': -histedit.c:220:2: error: 'optreset' undeclared (first use in this function) - optreset = 1; optind = 1; /* initialize getopt */ - ^~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://www.mail-archive.com/dash@vger.kernel.org/msg01389.html - - src/histedit.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/histedit.c b/src/histedit.c -index 94465d785cc9..f5c90aba873b 100644 ---- a/src/histedit.c -+++ b/src/histedit.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - /* - * Editline and history functions (and glue). - */ --- -2.16.1 - diff --git a/package/dash/dash.hash b/package/dash/dash.hash index b5a37b61d7..a2e131536a 100644 --- a/package/dash/dash.hash +++ b/package/dash/dash.hash @@ -1,2 +1,4 @@ -# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz.sha256sum -sha256 5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 dash-0.5.9.1.tar.gz +# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz.sha256sum +sha256 3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 dash-0.5.10.2.tar.gz +# Locally calculated +sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 80f0ea8cf3..f699f40686 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -4,7 +4,7 @@ # ################################################################################ -DASH_VERSION = 0.5.9.1 +DASH_VERSION = 0.5.10.2 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING From 6a29c8ae3ee2f2ef1a7bdac48fa96d29d9e9b62f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Jun 2018 12:34:01 +0200 Subject: [PATCH 1568/2640] librsync: bump to version 2.0.2 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...Lists.txt-Don-t-require-a-C-compiler.patch | 33 ------------------- package/librsync/librsync.hash | 3 +- package/librsync/librsync.mk | 2 +- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch diff --git a/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch deleted file mode 100644 index af5d28c5dc..0000000000 --- a/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c1af3e1b926fa04dbddc2d30586ff26026083134 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Tue, 26 Sep 2017 19:06:43 +0200 -Subject: [PATCH] CMakeLists.txt: Don't require a C++ compiler - -By default, CMake assumes that the project is using both C and C++. By -explicitly passing 'C' as argument of the project() macro, we tell CMake -that only C is used, which prevents CMake from erroring out if a C++ -compiler doesn't exist. - -Patch sent upstream: https://github.com/librsync/librsync/pull/116 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85536e3..7fe1eda 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,7 +16,7 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - --project(librsync) -+project(librsync C) - cmake_minimum_required(VERSION 2.6) - - INCLUDE(CMakeDependentOption) --- -2.11.0 - diff --git a/package/librsync/librsync.hash b/package/librsync/librsync.hash index 2d5e2e0028..63e14b1059 100644 --- a/package/librsync/librsync.hash +++ b/package/librsync/librsync.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 librsync-v2.0.0.tar.gz +sha256 e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4af1 librsync-v2.0.2.tar.gz +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index 07b684a264..3b38e0a27a 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRSYNC_VERSION = v2.0.0 +LIBRSYNC_VERSION = v2.0.2 LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING From 800aefb1822f8d9a30b5a116f523cd573744ea2d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 2 Jun 2018 22:52:20 +0300 Subject: [PATCH 1569/2640] libnss: remove upstream patch The merge of the next branch failed to remove an upstream applied patch. Fixes: http://autobuild.buildroot.net/results/31f/31fe428584ada680f30d11e5d1abfbc533c0a70e/ http://autobuild.buildroot.net/results/bb2/bb25363497dfd7fd5f8a81c28110fab87d5c2dc8/ http://autobuild.buildroot.net/results/70a/70adacf85154d2a663808cf0db69849b6a490457/ Cc: Joseph Kogut Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...d-stringop-truncation-warning-r-fran.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch diff --git a/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch b/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch deleted file mode 100644 index c14880b117..0000000000 --- a/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f0ce70989526fc9a0223398c99ea0d09777ea5df Mon Sep 17 00:00:00 2001 -From: Martin Thomson -Date: Thu, 15 Feb 2018 16:34:02 +1100 -Subject: [PATCH] Bug 1438426 - Avoid stringop-truncation warning, r=franziskus - ---HG-- -extra : rebase_source : 4ea1630d0da0ce3523309e3da33ee50961682242 - -Upstream-commit: https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df -[Thomas: edited after git format-patch to add the nss/ prefix needed -for the patch to apply properly on the source code extracted by the -tarball.] -Signed-off-by: Thomas Petazzoni ---- - nss/coreconf/nsinstall/pathsub.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nss/coreconf/nsinstall/pathsub.c b/nss/coreconf/nsinstall/pathsub.c -index a42a9f30a..c31a946f0 100644 ---- a/nss/coreconf/nsinstall/pathsub.c -+++ b/nss/coreconf/nsinstall/pathsub.c -@@ -212,7 +212,7 @@ reversepath(char *inpath, char *name, int len, char *outpath) - xchdir(".."); - } else { - cp -= 3; -- strncpy(cp, "../", 3); -+ memcpy(cp, "../", 3); - xchdir(buf); - } - } --- -2.14.3 - From 03fb00f2175cdb4565e26fcb9b3da1c1059de1bd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 2 Jun 2018 22:07:20 +0200 Subject: [PATCH 1570/2640] qemu: update defconfigs to Linux 4.16.7 All linux configs are renamed to a version neutral filename to avoid further renaming on kernel bumps. Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.16.7 2.12.0 YES OK arm_versatile 4.16.7 2.12.0 YES OK arm_versatile_nommu 4.16.7 2.12.0 YES OK (3) arm_vexpress 4.16.7 2.12.0 YES OK m68k_mcf5208 4.16.7 2.12.0 YES OK m68k_q800 4.16.7 q800-v2.11.0 NO (2) OK microblazebe 4.16.7 2.12.0 YES OK microblazeel 4.16.7 2.12.0 YES OK mips32r2el_malta 4.16.7 2.12.0 YES OK mips32r2_malta 4.16.7 2.12.0 YES OK mips32r6el_malta 4.16.7 2.12.0 YES OK mips32r6_malta 4.16.7 2.12.0 YES OK mips64el_malta 4.16.7 2.12.0 YES OK mips64_malta 4.16.7 2.12.0 YES OK mips64r6el_malta 4.16.7 2.12.0 YES OK mips64r6_malta 4.16.7 2.12.0 YES OK nios2-10m50 4.16.7 2.12.0 NO OK or1k 4.16.7 2.12.0 NO OK ppc_g3beige 4.16.7 2.12.0 YES OK ppc_mpc8544ds 4.16.7 2.12.0 YES OK ppc_virtex_ml507 4.16.7 2.12.0 NO OK ppc64_pseries 4.16.7 2.12.0 YES OK ppc64le_pseries 4.16.7 2.12.0 YES OK ppc64_e5500 4.16.7 2.12.0 YES OK sh4 4.16.7 2.12.0 YES OK sh4eb 4.16.7 2.12.0 NO (1) OK sparc_ss10 4.16.7 2.12.0 YES OK sparc64_sun4u 4.16.7 2.12.0 YES OK x86 4.16.7 2.12.0 YES OK x86_64 4.16.7 2.12.0 YES OK xtensa_lx60 4.16.7 2.12.0 YES OK xtensa_lx60_nommu 4.16.7 2.12.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Kernel patch required, switched to devicetree usage Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../{linux-4.15.config => linux.config} | 0 board/qemu/aarch64-virt/readme.txt | 2 +- ...ux-4.4-nommu.config => linux-nommu.config} | 3 +- .../{linux-4.13.config => linux.config} | 0 .../patches/linux/versatile-nommu.patch | 96 +++++++++++++++---- board/qemu/arm-versatile/readme.txt | 4 +- board/qemu/arm-vexpress/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/m68k-mcf5208/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/m68k-q800/readme.txt | 4 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/microblazebe-mmu/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/microblazeel-mmu/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips32r2-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips32r2el-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips32r6-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips32r6el-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips64-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips64el-malta/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips64r6-malta/readme.txt | 5 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/mips64r6el-malta/readme.txt | 2 +- .../{linux-4.11.fragment => linux.fragment} | 0 board/qemu/nios2-10m50/readme.txt | 2 +- board/qemu/or1k/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/ppc-g3beige/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/ppc-mpc8544ds/readme.txt | 2 +- .../{linux-4.9.config => linux.config} | 0 board/qemu/ppc-virtex-ml507/readme.txt | 2 +- board/qemu/ppc64-e5500/readme.txt | 2 +- board/qemu/ppc64-pseries/readme.txt | 2 +- board/qemu/ppc64le-pseries/readme.txt | 2 +- .../{linux-4.9.config => linux.config} | 0 board/qemu/sh4-r2d/readme.txt | 2 +- .../{linux-4.9.config => linux.config} | 0 board/qemu/sh4eb-r2d/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/sparc-ss10/readme.txt | 2 +- .../{linux-4.11.config => linux.config} | 0 board/qemu/sparc64-sun4u/readme.txt | 2 +- .../x86/{linux-4.15.config => linux.config} | 0 board/qemu/x86/readme.txt | 2 +- .../{linux-4.15.config => linux.config} | 0 board/qemu/x86_64/readme.txt | 2 +- ...x-4.11-nommu.config => linux-nommu.config} | 0 .../{linux-4.11.config => linux.config} | 0 board/qemu/xtensa-lx60/readme.txt | 2 +- configs/qemu_aarch64_virt_defconfig | 8 +- configs/qemu_arm_versatile_defconfig | 8 +- configs/qemu_arm_versatile_nommu_defconfig | 10 +- configs/qemu_m68k_mcf5208_defconfig | 8 +- configs/qemu_m68k_q800_defconfig | 8 +- configs/qemu_microblazebe_mmu_defconfig | 8 +- configs/qemu_microblazeel_mmu_defconfig | 8 +- configs/qemu_mips32r2_malta_defconfig | 8 +- configs/qemu_mips32r2el_malta_defconfig | 8 +- configs/qemu_mips32r6_malta_defconfig | 8 +- configs/qemu_mips32r6el_malta_defconfig | 8 +- configs/qemu_mips64_malta_defconfig | 8 +- configs/qemu_mips64el_malta_defconfig | 8 +- configs/qemu_mips64r6_malta_defconfig | 8 +- configs/qemu_mips64r6el_malta_defconfig | 8 +- configs/qemu_nios2_10m50_defconfig | 8 +- configs/qemu_or1k_defconfig | 6 +- configs/qemu_ppc64_e5500_defconfig | 4 +- configs/qemu_ppc64_pseries_defconfig | 6 +- configs/qemu_ppc64le_pseries_defconfig | 6 +- configs/qemu_ppc_g3beige_defconfig | 8 +- configs/qemu_ppc_mpc8544ds_defconfig | 8 +- configs/qemu_ppc_virtex_ml507_defconfig | 8 +- configs/qemu_sh4_r2d_defconfig | 8 +- configs/qemu_sh4eb_r2d_defconfig | 8 +- configs/qemu_sparc64_sun4u_defconfig | 8 +- configs/qemu_sparc_ss10_defconfig | 8 +- configs/qemu_x86_64_defconfig | 8 +- configs/qemu_x86_defconfig | 8 +- configs/qemu_xtensa_lx60_defconfig | 8 +- configs/qemu_xtensa_lx60_nommu_defconfig | 8 +- 89 files changed, 230 insertions(+), 176 deletions(-) rename board/qemu/aarch64-virt/{linux-4.15.config => linux.config} (100%) rename board/qemu/arm-versatile/{linux-4.4-nommu.config => linux-nommu.config} (94%) rename board/qemu/arm-versatile/{linux-4.13.config => linux.config} (100%) rename board/qemu/m68k-mcf5208/{linux-4.11.config => linux.config} (100%) rename board/qemu/m68k-q800/{linux-4.11.config => linux.config} (100%) rename board/qemu/microblazebe-mmu/{linux-4.11.config => linux.config} (100%) rename board/qemu/microblazeel-mmu/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips32r2-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips32r2el-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips32r6-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips32r6el-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips64-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips64el-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips64r6-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/mips64r6el-malta/{linux-4.11.config => linux.config} (100%) rename board/qemu/nios2-10m50/{linux-4.11.fragment => linux.fragment} (100%) rename board/qemu/ppc-g3beige/{linux-4.11.config => linux.config} (100%) rename board/qemu/ppc-mpc8544ds/{linux-4.11.config => linux.config} (100%) rename board/qemu/ppc-virtex-ml507/{linux-4.9.config => linux.config} (100%) rename board/qemu/sh4-r2d/{linux-4.9.config => linux.config} (100%) rename board/qemu/sh4eb-r2d/{linux-4.9.config => linux.config} (100%) rename board/qemu/sparc-ss10/{linux-4.11.config => linux.config} (100%) rename board/qemu/sparc64-sun4u/{linux-4.11.config => linux.config} (100%) rename board/qemu/x86/{linux-4.15.config => linux.config} (100%) rename board/qemu/x86_64/{linux-4.15.config => linux.config} (100%) rename board/qemu/xtensa-lx60/{linux-4.11-nommu.config => linux-nommu.config} (100%) rename board/qemu/xtensa-lx60/{linux-4.11.config => linux.config} (100%) diff --git a/board/qemu/aarch64-virt/linux-4.15.config b/board/qemu/aarch64-virt/linux.config similarity index 100% rename from board/qemu/aarch64-virt/linux-4.15.config rename to board/qemu/aarch64-virt/linux.config diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt index ce0b621366..76fc2d6f32 100644 --- a/board/qemu/aarch64-virt/readme.txt +++ b/board/qemu/aarch64-virt/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.11.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/arm-versatile/linux-4.4-nommu.config b/board/qemu/arm-versatile/linux-nommu.config similarity index 94% rename from board/qemu/arm-versatile/linux-4.4-nommu.config rename to board/qemu/arm-versatile/linux-nommu.config index e1264dca00..1d91d51a14 100644 --- a/board/qemu/arm-versatile/linux-4.4-nommu.config +++ b/board/qemu/arm-versatile/linux-nommu.config @@ -1,11 +1,12 @@ # CONFIG_MMU is not set CONFIG_ARCH_VERSATILE=y +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y CONFIG_SET_MEM_PARAM=y CONFIG_DRAM_BASE=0x00000000 CONFIG_DRAM_SIZE=0x08000000 CONFIG_ARCH_VERSATILE_PB=y CONFIG_MACH_VERSATILE_AB=y -# CONFIG_MACH_VERSATILE_DT is not set +CONFIG_MACH_VERSATILE_DT=y CONFIG_BINFMT_FLAT=y CONFIG_SYSVIPC=y CONFIG_MODULES=y diff --git a/board/qemu/arm-versatile/linux-4.13.config b/board/qemu/arm-versatile/linux.config similarity index 100% rename from board/qemu/arm-versatile/linux-4.13.config rename to board/qemu/arm-versatile/linux.config diff --git a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch index 961b6c3dd1..883bd0de6e 100644 --- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch @@ -1,30 +1,84 @@ -From b7c1666813424d329868335c8faf8886b0f85b6c Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Thu, 11 Aug 2016 21:33:11 +1000 -Subject: [PATCH] arm: fix versatile platform to work in no-MMU mode +Signed-Off-by: Waldemar Brodkorb +From LKML. -If CONFIG_MMU is disabled then do not carry out the virtual memory address -translation for IO devices. - -With this fix in place we can run the ARM Versatile board (including its -qemu emulation) as a no-MMU Linux system. - -Signed-off-by: Greg Ungerer -Signed-off-by: Waldemar Brodkorb - -diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h ---- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-10 11:49:43.000000000 +0200 -+++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-25 23:19:03.691716292 +0200 -@@ -30,8 +30,12 @@ - #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul - #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul +diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig +--- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100 +@@ -355,6 +355,17 @@ + select SPARSE_IRQ + select USE_OF + ++config ARM_SINGLE_ARCH_VERSATILE ++ bool "ARM Ltd. Versatile family" ++ depends on !MMU ++ select AUTO_ZRELADDR ++ select CLKSRC_OF ++ select COMMON_CLK ++ select GENERIC_CLOCKEVENTS ++ select GPIOLIB ++ select SPARSE_IRQ ++ select USE_OF ++ + config ARCH_EBSA110 + bool "EBSA-110" + select ARCH_USES_GETTIMEOFFSET +diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug +--- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100 +@@ -1795,7 +1795,8 @@ + config UNCOMPRESS_INCLUDE + string + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ +- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M ++ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ ++ ARM_SINGLE_ARCH_VERSATILE + default "mach/uncompress.h" + + config EARLY_PRINTK +diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h +--- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100 +@@ -62,6 +62,7 @@ + #else + #define iotable_init(map,num) do { } while (0) + #define vm_reserve_area_early(a,s,c) do { } while (0) ++#define debug_ll_io_init() do { } while (0) + #endif + + #endif +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig +--- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100 +@@ -1,7 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + config ARCH_VERSATILE +- bool "ARM Ltd. Versatile family" +- depends on ARCH_MULTI_V5 ++ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 ++ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE ++ default y if ARM_SINGLE_ARCH_VERSATILE + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot +--- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100 +@@ -0,0 +1,3 @@ ++# Empty file waiting for deletion once Makefile.boot isn't needed any more. ++# Patch waits for application at ++# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c +--- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100 +@@ -37,7 +37,11 @@ + #include -+#ifdef CONFIG_MMU /* macro to get at MMIO space when running virtually */ ++#ifdef CONFIG_MMU #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) +#else +#define IO_ADDRESS(x) (x) +#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + /* diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt index 6e899f4b5f..33cdb7b81e 100644 --- a/board/qemu/arm-versatile/readme.txt +++ b/board/qemu/arm-versatile/readme.txt @@ -4,9 +4,9 @@ Run the emulation with: Or for the noMMU emulation: - qemu-system-arm -M versatilepb -kernel output/images/zImage -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 + qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt index 57bb814198..35137e050c 100644 --- a/board/qemu/arm-vexpress/readme.txt +++ b/board/qemu/arm-vexpress/readme.txt @@ -8,4 +8,4 @@ graphical window is the framebuffer. If you want to emulate more cores change "-smp 1" to "-smp 2" for dual-core or even "smp -4" for a quad-core configuration. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/m68k-mcf5208/linux-4.11.config b/board/qemu/m68k-mcf5208/linux.config similarity index 100% rename from board/qemu/m68k-mcf5208/linux-4.11.config rename to board/qemu/m68k-mcf5208/linux.config diff --git a/board/qemu/m68k-mcf5208/readme.txt b/board/qemu/m68k-mcf5208/readme.txt index 014a0dc09f..d1c9086805 100644 --- a/board/qemu/m68k-mcf5208/readme.txt +++ b/board/qemu/m68k-mcf5208/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/m68k-q800/linux-4.11.config b/board/qemu/m68k-q800/linux.config similarity index 100% rename from board/qemu/m68k-q800/linux-4.11.config rename to board/qemu/m68k-q800/linux.config diff --git a/board/qemu/m68k-q800/readme.txt b/board/qemu/m68k-q800/readme.txt index 78267a318f..bead8cdde2 100644 --- a/board/qemu/m68k-q800/readme.txt +++ b/board/qemu/m68k-q800/readme.txt @@ -4,5 +4,5 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.4.0 from https://github.com/vivier/qemu-m68k -You need following branch: q800-v2.4.0 +Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k +You need following branch: q800-v2.11.0 diff --git a/board/qemu/microblazebe-mmu/linux-4.11.config b/board/qemu/microblazebe-mmu/linux.config similarity index 100% rename from board/qemu/microblazebe-mmu/linux-4.11.config rename to board/qemu/microblazebe-mmu/linux.config diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt index cf0afdaff8..4f52baff1f 100644 --- a/board/qemu/microblazebe-mmu/readme.txt +++ b/board/qemu/microblazebe-mmu/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/microblazeel-mmu/linux-4.11.config b/board/qemu/microblazeel-mmu/linux.config similarity index 100% rename from board/qemu/microblazeel-mmu/linux-4.11.config rename to board/qemu/microblazeel-mmu/linux.config diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt index 9edf101afd..0b0f330a5e 100644 --- a/board/qemu/microblazeel-mmu/readme.txt +++ b/board/qemu/microblazeel-mmu/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r2-malta/linux-4.11.config b/board/qemu/mips32r2-malta/linux.config similarity index 100% rename from board/qemu/mips32r2-malta/linux-4.11.config rename to board/qemu/mips32r2-malta/linux.config diff --git a/board/qemu/mips32r2-malta/readme.txt b/board/qemu/mips32r2-malta/readme.txt index 7002ab1d86..d1bbcc4749 100644 --- a/board/qemu/mips32r2-malta/readme.txt +++ b/board/qemu/mips32r2-malta/readme.txt @@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r2el-malta/linux-4.11.config b/board/qemu/mips32r2el-malta/linux.config similarity index 100% rename from board/qemu/mips32r2el-malta/linux-4.11.config rename to board/qemu/mips32r2el-malta/linux.config diff --git a/board/qemu/mips32r2el-malta/readme.txt b/board/qemu/mips32r2el-malta/readme.txt index bfc9c49d5a..4f59d34308 100644 --- a/board/qemu/mips32r2el-malta/readme.txt +++ b/board/qemu/mips32r2el-malta/readme.txt @@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r6-malta/linux-4.11.config b/board/qemu/mips32r6-malta/linux.config similarity index 100% rename from board/qemu/mips32r6-malta/linux-4.11.config rename to board/qemu/mips32r6-malta/linux.config diff --git a/board/qemu/mips32r6-malta/readme.txt b/board/qemu/mips32r6-malta/readme.txt index 7d79c6602c..04de7e5c3e 100644 --- a/board/qemu/mips32r6-malta/readme.txt +++ b/board/qemu/mips32r6-malta/readme.txt @@ -4,4 +4,4 @@ qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -d The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips32r6el-malta/linux-4.11.config b/board/qemu/mips32r6el-malta/linux.config similarity index 100% rename from board/qemu/mips32r6el-malta/linux-4.11.config rename to board/qemu/mips32r6el-malta/linux.config diff --git a/board/qemu/mips32r6el-malta/readme.txt b/board/qemu/mips32r6el-malta/readme.txt index 78f8350506..88602de0bb 100644 --- a/board/qemu/mips32r6el-malta/readme.txt +++ b/board/qemu/mips32r6el-malta/readme.txt @@ -4,4 +4,4 @@ qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64-malta/linux-4.11.config b/board/qemu/mips64-malta/linux.config similarity index 100% rename from board/qemu/mips64-malta/linux-4.11.config rename to board/qemu/mips64-malta/linux.config diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt index 8a732101a8..f0e7fef795 100644 --- a/board/qemu/mips64-malta/readme.txt +++ b/board/qemu/mips64-malta/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64el-malta/linux-4.11.config b/board/qemu/mips64el-malta/linux.config similarity index 100% rename from board/qemu/mips64el-malta/linux-4.11.config rename to board/qemu/mips64el-malta/linux.config diff --git a/board/qemu/mips64el-malta/readme.txt b/board/qemu/mips64el-malta/readme.txt index 25fc9ee172..03b149bc8f 100644 --- a/board/qemu/mips64el-malta/readme.txt +++ b/board/qemu/mips64el-malta/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.5.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64r6-malta/linux-4.11.config b/board/qemu/mips64r6-malta/linux.config similarity index 100% rename from board/qemu/mips64r6-malta/linux-4.11.config rename to board/qemu/mips64r6-malta/linux.config diff --git a/board/qemu/mips64r6-malta/readme.txt b/board/qemu/mips64r6-malta/readme.txt index 4a6c5fe798..bf5b517a32 100644 --- a/board/qemu/mips64r6-malta/readme.txt +++ b/board/qemu/mips64r6-malta/readme.txt @@ -4,7 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.7.0 - -Might work with 2.6.0 by changing the -cpu entry to MIPS64R6-generic -since the naming was updated and the old name removed in 2.7.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/mips64r6el-malta/linux-4.11.config b/board/qemu/mips64r6el-malta/linux.config similarity index 100% rename from board/qemu/mips64r6el-malta/linux-4.11.config rename to board/qemu/mips64r6el-malta/linux.config diff --git a/board/qemu/mips64r6el-malta/readme.txt b/board/qemu/mips64r6el-malta/readme.txt index 9250cf3791..d51bffd08a 100644 --- a/board/qemu/mips64r6el-malta/readme.txt +++ b/board/qemu/mips64r6el-malta/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/nios2-10m50/linux-4.11.fragment b/board/qemu/nios2-10m50/linux.fragment similarity index 100% rename from board/qemu/nios2-10m50/linux-4.11.fragment rename to board/qemu/nios2-10m50/linux.fragment diff --git a/board/qemu/nios2-10m50/readme.txt b/board/qemu/nios2-10m50/readme.txt index f7dee370f7..44cbcb08a2 100644 --- a/board/qemu/nios2-10m50/readme.txt +++ b/board/qemu/nios2-10m50/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0. +Tested with QEMU 2.12.0. diff --git a/board/qemu/or1k/readme.txt b/board/qemu/or1k/readme.txt index a04314e750..df6b467e82 100644 --- a/board/qemu/or1k/readme.txt +++ b/board/qemu/or1k/readme.txt @@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. Ethernet support is not working, yet. -Tested with QEMU 2.9.0. +Tested with QEMU 2.12.0. diff --git a/board/qemu/ppc-g3beige/linux-4.11.config b/board/qemu/ppc-g3beige/linux.config similarity index 100% rename from board/qemu/ppc-g3beige/linux-4.11.config rename to board/qemu/ppc-g3beige/linux.config diff --git a/board/qemu/ppc-g3beige/readme.txt b/board/qemu/ppc-g3beige/readme.txt index 42c97a0c14..1c3b515396 100644 --- a/board/qemu/ppc-g3beige/readme.txt +++ b/board/qemu/ppc-g3beige/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc-mpc8544ds/linux-4.11.config b/board/qemu/ppc-mpc8544ds/linux.config similarity index 100% rename from board/qemu/ppc-mpc8544ds/linux-4.11.config rename to board/qemu/ppc-mpc8544ds/linux.config diff --git a/board/qemu/ppc-mpc8544ds/readme.txt b/board/qemu/ppc-mpc8544ds/readme.txt index 0008c84b20..172aad5626 100644 --- a/board/qemu/ppc-mpc8544ds/readme.txt +++ b/board/qemu/ppc-mpc8544ds/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc-virtex-ml507/linux-4.9.config b/board/qemu/ppc-virtex-ml507/linux.config similarity index 100% rename from board/qemu/ppc-virtex-ml507/linux-4.9.config rename to board/qemu/ppc-virtex-ml507/linux.config diff --git a/board/qemu/ppc-virtex-ml507/readme.txt b/board/qemu/ppc-virtex-ml507/readme.txt index 42aa204bd7..6178ace816 100644 --- a/board/qemu/ppc-virtex-ml507/readme.txt +++ b/board/qemu/ppc-virtex-ml507/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.5.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64-e5500/readme.txt b/board/qemu/ppc64-e5500/readme.txt index a6ad893b4d..cfc563974d 100644 --- a/board/qemu/ppc64-e5500/readme.txt +++ b/board/qemu/ppc64-e5500/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.0.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64-pseries/readme.txt b/board/qemu/ppc64-pseries/readme.txt index 9de13779d0..5069df9e5b 100644 --- a/board/qemu/ppc64-pseries/readme.txt +++ b/board/qemu/ppc64-pseries/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/ppc64le-pseries/readme.txt b/board/qemu/ppc64le-pseries/readme.txt index 95455e9478..c23da70df0 100644 --- a/board/qemu/ppc64le-pseries/readme.txt +++ b/board/qemu/ppc64le-pseries/readme.txt @@ -4,4 +4,4 @@ qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -a The login prompt will appear in the terminal window. -Tested with QEMU 2.10.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/sh4-r2d/linux-4.9.config b/board/qemu/sh4-r2d/linux.config similarity index 100% rename from board/qemu/sh4-r2d/linux-4.9.config rename to board/qemu/sh4-r2d/linux.config diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index aa0e369d89..d22af73ae3 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.5.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/sh4eb-r2d/linux-4.9.config b/board/qemu/sh4eb-r2d/linux.config similarity index 100% rename from board/qemu/sh4eb-r2d/linux-4.9.config rename to board/qemu/sh4eb-r2d/linux.config diff --git a/board/qemu/sh4eb-r2d/readme.txt b/board/qemu/sh4eb-r2d/readme.txt index 147adc6e2e..daf515ab2b 100644 --- a/board/qemu/sh4eb-r2d/readme.txt +++ b/board/qemu/sh4eb-r2d/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 2.5.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/sparc-ss10/linux-4.11.config b/board/qemu/sparc-ss10/linux.config similarity index 100% rename from board/qemu/sparc-ss10/linux-4.11.config rename to board/qemu/sparc-ss10/linux.config diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt index 0ce461d2ea..df6a75a3fb 100644 --- a/board/qemu/sparc-ss10/readme.txt +++ b/board/qemu/sparc-ss10/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/sparc64-sun4u/linux-4.11.config b/board/qemu/sparc64-sun4u/linux.config similarity index 100% rename from board/qemu/sparc64-sun4u/linux-4.11.config rename to board/qemu/sparc64-sun4u/linux.config diff --git a/board/qemu/sparc64-sun4u/readme.txt b/board/qemu/sparc64-sun4u/readme.txt index adfff7089e..24d5bbaffe 100644 --- a/board/qemu/sparc64-sun4u/readme.txt +++ b/board/qemu/sparc64-sun4u/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/x86/linux-4.15.config b/board/qemu/x86/linux.config similarity index 100% rename from board/qemu/x86/linux-4.15.config rename to board/qemu/x86/linux.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index b003ad5373..c5e687734c 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -6,4 +6,4 @@ Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/x86_64/linux-4.15.config b/board/qemu/x86_64/linux.config similarity index 100% rename from board/qemu/x86_64/linux-4.15.config rename to board/qemu/x86_64/linux.config diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt index ed7b5f5532..425e34b12c 100644 --- a/board/qemu/x86_64/readme.txt +++ b/board/qemu/x86_64/readme.txt @@ -6,4 +6,4 @@ Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/board/qemu/xtensa-lx60/linux-4.11-nommu.config b/board/qemu/xtensa-lx60/linux-nommu.config similarity index 100% rename from board/qemu/xtensa-lx60/linux-4.11-nommu.config rename to board/qemu/xtensa-lx60/linux-nommu.config diff --git a/board/qemu/xtensa-lx60/linux-4.11.config b/board/qemu/xtensa-lx60/linux.config similarity index 100% rename from board/qemu/xtensa-lx60/linux-4.11.config rename to board/qemu/xtensa-lx60/linux.config diff --git a/board/qemu/xtensa-lx60/readme.txt b/board/qemu/xtensa-lx60/readme.txt index 9a82c53752..4287e1f09e 100644 --- a/board/qemu/xtensa-lx60/readme.txt +++ b/board/qemu/xtensa-lx60/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.9.0 +Tested with QEMU 2.12.0 diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 076773302d..2706544e52 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.15.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 0423dc06c5..348b91bc96 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.13.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 9c48172e40..910c382439 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -21,12 +21,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.4-nommu.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index ccbdcfa3b7..8f8d0a048a 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 6dc50a7c05..d9238b650f 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index ae736ff101..3055a0f8cd 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 3dedecf710..073a7173fa 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index db408b0e72..d07bc11003 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index ccec419add..55e68b1fdc 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index 3aee84c53a..5802393368 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index aa43dce945..93e2a86509 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 52e42992a6..99b457a9f8 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 2b35c1a016..f2dacbd760 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 06c0133f9f..d291213db7 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index e80e728486..4740bdee28 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index a9eaf0800a..cff219257a 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,10 +1,10 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="10m50" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux-4.11.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index c667142185..636a0d25b1 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -5,12 +5,12 @@ BR2_or1k=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4,14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4,16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 8173a0251b..7a325a5070 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_e5500=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 84076314d9..d2d69f1c3c 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 62e729d302..9a85f76dd9 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -10,12 +10,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 9482aaa874..451a9b52d8 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index d2d92b6652..38e41a7fa2 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index 84cb329872..6824afca3c 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -6,8 +6,8 @@ BR2_powerpc_440=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Use soft float BR2_SOFT_FLOAT=y @@ -15,9 +15,9 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux-4.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index becce23ee1..8ddcb80b02 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-4.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 61d9ac9dde..79e8c38e8a 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux-4.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 072fba79bc..baa8dbfb59 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 8c6b563a85..9943781a5b 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index b92ae17ae6..12b30bf764 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.15.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index ed6c198ac2..985ff32b44 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.15.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index d8614ef244..a735c991c7 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -11,15 +11,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 174ebd3d5f..f4d6837bc1 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -15,15 +15,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.11-nommu.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" From 2055dcd22748837928074435348606f39c54b9c8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 2 Jun 2018 18:15:03 +0200 Subject: [PATCH 1571/2640] package/mesa3d: fix typo in file hash Fix typo introduced with the bump to 18.0.4. Commit f18ca0e7bb0e522846296139cdf0f8039d7dca1c Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 9b9f01703c..b6ce272c1c 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -2,7 +2,7 @@ md5 ef525adaff7f31bedd4c5134bc313da9 mesa-18.0.4.tar.xz sha1 4bbee07d8eb42625f215f49d39a657fabdc2f29d mesa-18.0.4.tar.xz sha256 1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f mesa-18.0.4.tar.xz -sha512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c mesa-18.0.3.tar.xz +sha512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c mesa-18.0.4.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt From 5379504d700c18693c7ff981431c6b76ba2a5bf8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 2 Jun 2018 18:15:04 +0200 Subject: [PATCH 1572/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.1.1 Rebase the two patches on 18.1.1. Convert 0001-musl.patch to git patch. See: https://lists.freedesktop.org/archives/mesa-dev/2018-June/196523.html Signed-off-by: Romain Naour Cc: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/0001-musl.patch | 26 ++++++++++++-- ...vert-order-for-wayland-scanner-check.patch | 34 +++++++++---------- package/mesa3d/mesa3d.hash | 10 +++--- package/mesa3d/mesa3d.mk | 2 +- 5 files changed, 47 insertions(+), 27 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 18c98a7f9e..1ce30f7dcf 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.0.4 +MESA3D_HEADERS_VERSION = 18.1.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0001-musl.patch b/package/mesa3d/0001-musl.patch index 8f7ba773aa..44c7f5b96d 100644 --- a/package/mesa3d/0001-musl.patch +++ b/package/mesa3d/0001-musl.patch @@ -1,12 +1,29 @@ -Fix musl build +From 25e20c2e288e1d482f479eca863bc4aaa374b782 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 22 Apr 2018 15:58:38 +0200 +Subject: [PATCH] Fix musl build + +Fix musl build when svga gallium driver is enabled. + +In file included from vmw_fence.c:34:0: +vmw_screen.h:100:4: error: unknown type name ‘dev_t’ + dev_t device; + ^~~~~ Downloaded from http://git.alpinelinux.org/cgit/aports/plain/main/mesa/musl-fixes.patch Signed-off-by: Bernd Kuhls +[Romain: rebase on 18.1] +Signed-off-by: Romain Naour +--- + src/gallium/winsys/svga/drm/vmw_screen.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h +diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h +index f21cabb51f..20d03f8b53 100644 +--- a/src/gallium/winsys/svga/drm/vmw_screen.h ++++ b/src/gallium/winsys/svga/drm/vmw_screen.h @@ -34,7 +34,7 @@ #ifndef VMW_SCREEN_H_ #define VMW_SCREEN_H_ @@ -16,3 +33,6 @@ Signed-off-by: Bernd Kuhls #include "pipe/p_compiler.h" #include "pipe/p_state.h" +-- +2.14.3 + diff --git a/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch b/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch index bfb6376555..337ad642a5 100644 --- a/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch +++ b/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch @@ -1,4 +1,4 @@ -From 11a759c33160db6e887e7640071ba84482e6164f Mon Sep 17 00:00:00 2001 +From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 17 Nov 2016 15:36:54 -0300 Subject: [PATCH] configure.ac: invert order for wayland-scanner check @@ -13,32 +13,32 @@ pkg-config. Signed-off-by: Gustavo Zacarias Signed-off-by: Vicente Olivert Riera -[Romain: rebase on 17.3.1] +[Romain: rebase on 18.1] Signed-off-by: Romain Naour --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index ee03d6f582..786b7214b9 100644 +index f1fbdcc6c7..dcf87e7dd6 100644 --- a/configure.ac +++ b/configure.ac -@@ -1695,11 +1695,11 @@ if test "x$with_platforms" = xauto; then - with_platforms=$with_egl_platforms - fi +@@ -1796,11 +1796,11 @@ for plat in $platforms; do + PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) + WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') -+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -+ WAYLAND_SCANNER='') - fi +- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') ++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) ++ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], ++ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, ++ WAYLAND_SCANNER='') + fi - PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) + if test "x$WAYLAND_SCANNER" = "x:"; then -- 2.14.3 diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b6ce272c1c..fb72f4f683 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-May/000429.html -md5 ef525adaff7f31bedd4c5134bc313da9 mesa-18.0.4.tar.xz -sha1 4bbee07d8eb42625f215f49d39a657fabdc2f29d mesa-18.0.4.tar.xz -sha256 1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f mesa-18.0.4.tar.xz -sha512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c mesa-18.0.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2018-June/196523.html +md5 063468c930ff61d211ece0191874fa95 mesa-18.1.1.tar.xz +sha1 60d6b58f8f119b3731de587bdad30c1ecbb52678 mesa-18.1.1.tar.xz +sha256 d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781 mesa-18.1.1.tar.xz +sha512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 mesa-18.1.1.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1b2fca1f90..a323747e61 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.0.4 +MESA3D_VERSION = 18.1.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 9cf528cd8306c4e12e663fbbbab9b94c457c48a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Jun 2018 21:30:08 +0200 Subject: [PATCH 1573/2640] aircrack-ng: fix build on powerpc64 with libgcrypt Retrieved patch from upstream: https://github.com/aircrack-ng/aircrack-ng/issues/1874 Fixes: - http://autobuild.buildroot.net/results/3d92343342b51e710765866d6dd9383d26ba98e7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...lation-with-gcrypt-on-some-platforms.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch diff --git a/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch b/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch new file mode 100644 index 0000000000..b32f29f800 --- /dev/null +++ b/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch @@ -0,0 +1,53 @@ +From 208c0d4810f24e03b4def637ebe130f8777ef3e1 Mon Sep 17 00:00:00 2001 +From: Mister X <3520734+Mister-X-@users.noreply.github.com> +Date: Sat, 5 May 2018 00:28:30 +0000 +Subject: [PATCH] Fixed compilation with gcrypt on some platforms. + +Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/208c0d4810f24e03b4def637ebe130f8777ef3e1 + +Signed-off-by: Fabrice Fontaine +--- + src/gcrypt-openssl-wrapper.h | 13 +++++++++++++ + src/md5.h | 6 +++++- + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/src/gcrypt-openssl-wrapper.h b/src/gcrypt-openssl-wrapper.h +index 79a0376e..db3e0462 100644 +--- a/src/gcrypt-openssl-wrapper.h ++++ b/src/gcrypt-openssl-wrapper.h +@@ -82,5 +82,18 @@ + gcry_md_get_algo_dlen (algo)); \ + gcry_md_close(mdh); \ + } while (0) ++// MD5 ++#define MD5_CTX gcry_md_hd_t ++#define MD5_Init(ctx) gcry_md_open(ctx, GCRY_MD_MD5, 0) ++#define MD5_Update(ctx, data, len) gcry_md_write(*ctx, data, len) ++ // HMAC_Update(ctx, data, len) ++#define MD5_Final(ctx, md) do { \ ++ memcpy( md, \ ++ gcry_md_read(*(gcry_md_hd_t*)ctx, GCRY_MD_MD5), \ ++ gcry_md_get_algo_dlen(gcry_md_get_algo(*(gcry_md_hd_t*)ctx)) \ ++ ); \ ++ gcry_md_close(*(gcry_md_hd_t*)ctx); \ ++ } while (0) ++ + // http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros + #endif // _GCRYPT_OPENSSL_WRAPPER_H +diff --git a/src/md5.h b/src/md5.h +index e9edeb81..d8d3d6b3 100644 +--- a/src/md5.h ++++ b/src/md5.h +@@ -61,7 +61,11 @@ typedef unsigned int MD5_u32plus; + + #include "arch.h" + #ifdef SIMD_PARA_MD5 +-#include ++ #ifndef USE_GCRYPT ++ #include ++ #else ++ #include "gcrypt-openssl-wrapper.h" ++ #endif + #endif + + #endif /* _MD5_H */ From d897e6f3632ac8c779eb21f62b783dad33a92db5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Jun 2018 20:16:31 +0200 Subject: [PATCH 1574/2640] lxc: bump to version 3.0.1 Remove both patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...lxc_monitor-include-missing-stddef.h.patch | 40 ---------- ...with-static-libcap-and-shared-gnutls.patch | 73 ------------------- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch delete mode 100644 package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch diff --git a/package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch b/package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch deleted file mode 100644 index 525d5d72b0..0000000000 --- a/package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77d407537f57c3fb92787bdda1eeaec7941d344f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 20 Apr 2018 12:26:33 +0200 -Subject: [PATCH] lxc/tools/lxc_monitor: include missing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -lxc_monitor.c uses offsetof(), so it should include -. Otherwise the build fails with the musl C library: - -tools/lxc_monitor.c: In function ‘lxc_abstract_unix_connect’: -tools/lxc_monitor.c:324:9: warning: implicit declaration of function ‘offsetof’ [-Wimplicit-function-declaration] - offsetof(struct sockaddr_un, sun_path) + len + 1); - ^~~~~~~~ -tools/lxc_monitor.c:324:18: error: expected expression before ‘struct’ - offsetof(struct sockaddr_un, sun_path) + len + 1); - ^~~~~~ - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/lxc/lxc/pull/2285 ---- - src/lxc/tools/lxc_monitor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c -index 72dca8e2..c60e14ff 100644 ---- a/src/lxc/tools/lxc_monitor.c -+++ b/src/lxc/tools/lxc_monitor.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.3 - diff --git a/package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch b/package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch deleted file mode 100644 index 04837b3eef..0000000000 --- a/package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 49bc916b1daa79cffe38fae32059bcdd985c8c8e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 7 Apr 2018 15:48:46 +0200 -Subject: [PATCH] Fix compilation with static libcap and shared gnutls - -Commit c06ed219c47098f34485d408410b6ecc94a40877 has broken -compilation with a static libcap and a shared gnutls. -This results in a build failure on init_lxc_static if gnutls is -a shared library as init_lxc_static is built with -all-static option -(see src/lxc/Makefile.am) and AC_CHECK_LIB adds gnutls to LIBS. - -This commit fix the issue by removing default behavior of AC_CHECK_LIB -and handling manually GNUTLS_LIBS and HAVE_LIBGNUTLS - -Fixes: - - http://autobuild.buildroot.net/results/b655d6853c25a195df28d91512b3ffb6c654fc90 - -Signed-off-by: Fabrice Fontaine -Upstream-status: https://github.com/lxc/lxc/commit/49bc916b1daa79cffe38fae32059bcdd985c8c8e ---- - configure.ac | 2 +- - src/lxc/Makefile.am | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 50c99836..2467bb54 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -263,7 +263,7 @@ AM_CONDITIONAL([ENABLE_GNUTLS], [test "x$enable_gnutls" = "xyes"]) - - AM_COND_IF([ENABLE_GNUTLS], - [AC_CHECK_HEADER([gnutls/gnutls.h],[],[AC_MSG_ERROR([You must install the GnuTLS development package in order to compile lxc])]) -- AC_CHECK_LIB([gnutls], [gnutls_hash_fast],[],[AC_MSG_ERROR([You must install the GnuTLS development package in order to compile lxc])]) -+ AC_CHECK_LIB([gnutls], [gnutls_hash_fast],[true],[AC_MSG_ERROR([You must install the GnuTLS development package in order to compile lxc])]) - AC_SUBST([GNUTLS_LIBS], [-lgnutls])]) - - # SELinux -diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am -index c8d76836..0662d83d 100644 ---- a/src/lxc/Makefile.am -+++ b/src/lxc/Makefile.am -@@ -175,6 +175,10 @@ if ENABLE_APPARMOR - AM_CFLAGS += -DHAVE_APPARMOR - endif - -+if ENABLE_GNUTLS -+AM_CFLAGS += -DHAVE_LIBGNUTLS -+endif -+ - if ENABLE_SELINUX - AM_CFLAGS += -DHAVE_SELINUX - endif -@@ -196,7 +200,7 @@ liblxc_la_LDFLAGS = \ - -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) \ - -version-info @LXC_ABI_MAJOR@ - --liblxc_la_LIBADD = $(CAP_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS) -+liblxc_la_LIBADD = $(CAP_LIBS) $(GNUTLS_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS) - - bin_SCRIPTS= - -@@ -243,7 +247,7 @@ AM_LDFLAGS = -Wl,-E - if ENABLE_RPATH - AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir) - endif --LDADD=liblxc.la @CAP_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@ -+LDADD=liblxc.la @CAP_LIBS@ @GNUTLS_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@ - - if ENABLE_TOOLS - lxc_attach_SOURCES = tools/lxc_attach.c tools/arguments.c tools/tool_utils.c --- -2.14.1 - diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index e2f9108507..f46b1e1f5e 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6230224c27f050201b372b18a9f39cd220ed584899c5f0cf73c6b313dabc8d8a lxc-3.0.0.tar.gz +sha256 45986c49be1c048fa127bd3e7ea1bd3347e25765c008a09a2e4c233151a2d5db lxc-3.0.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 5a7038f88f..d1487e0e59 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 3.0.0 +LXC_VERSION = 3.0.1 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPL-2.1+ LXC_LICENSE_FILES = COPYING From 8ac477681f13324812fd613794499e0da5f58963 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 2 Jun 2018 21:16:59 +0300 Subject: [PATCH 1575/2640] monit: bump to version 5.25.2 Bump the version and add hash for COPYING Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/monit/monit.hash | 6 ++++-- package/monit/monit.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/monit/monit.hash b/package/monit/monit.hash index 611d3e18a6..d1c09f137c 100644 --- a/package/monit/monit.hash +++ b/package/monit/monit.hash @@ -1,2 +1,4 @@ -# From https://mmonit.com/monit/dist/monit-5.24.0.tar.gz.sha256: -sha256 754d1f0e165e5a26d4639a6a83f44ccf839e381f2622e0946d5302fa1f2d2414 monit-5.24.0.tar.gz +# From https://mmonit.com/monit/dist/monit-5.25.2.tar.gz.sha256: +sha256 aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a monit-5.25.2.tar.gz +# Locally computed +sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/package/monit/monit.mk b/package/monit/monit.mk index 260bb5b7a5..906ed842d6 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.24.0 +MONIT_VERSION = 5.25.2 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING From 9ff035839eef68eb16e90ae70c3e70dc7f57cae5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Jun 2018 16:17:51 +0200 Subject: [PATCH 1576/2640] librtlsdr: fix static build When bumping to version 0.5.4, first patch was wrongly removed. Put back an enhanced version of this patch (sent upstream) Fixes: - http://autobuild.buildroot.net/results/bea78bf580be6fe109b827b72af9587c5324daad Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...sable_shared_library_target_in_build.patch | 105 ++++++++++++++++++ package/librtlsdr/librtlsdr.mk | 9 ++ 2 files changed, 114 insertions(+) create mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch new file mode 100644 index 0000000000..b9f53d2393 --- /dev/null +++ b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch @@ -0,0 +1,105 @@ +From d47e3aed12414be59bf77177c93853ec4b24d705 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 Jun 2018 16:53:36 +0200 +Subject: [PATCH] disable shared library target in build + +Disable shared library target if BUILD_SHARED_LIBS if OFF. + +Patch retrieved from +https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2018.05 + +Patch has been updated to work with 0.5.4 and to be able to keep current +behavior of building shared and static version of library if +BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. +Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library +will be install. + +[Upstream status: https://github.com/steve-m/librtlsdr/pull/46] + +Signed-off-by: Yuvaraj Patil +Signed-off-by: Fabrice Fontaine +--- + src/CMakeLists.txt | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 07d64ab..2b7cbae 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -47,16 +47,22 @@ ENDIF(MSVC) + ######################################################################## + # Setup shared library variant + ######################################################################## ++option(BUILD_SHARED_LIBS "Build shared library" ON) ++if(BUILD_SHARED_LIBS) + add_library(rtlsdr_shared SHARED ${rtlsdr_srcs}) + target_link_libraries(rtlsdr_shared ${LIBUSB_LIBRARIES}) + set_target_properties(rtlsdr_shared PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS") + set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) + set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) + set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) ++list(APPEND rtlsdr_lib rtlsdr_shared) ++endif() + + ######################################################################## + # Setup static library variant + ######################################################################## ++option(BUILD_STATIC_LIBS "Build static library" ON) ++if(BUILD_STATIC_LIBS) + add_library(rtlsdr_static STATIC ${rtlsdr_srcs}) + target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) + set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) +@@ -64,6 +70,8 @@ if(NOT WIN32) + # Force same library filename for static and shared variants of the library + set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) + endif() ++list(APPEND rtlsdr_lib rtlsdr_static) ++endif() + + ######################################################################## + # Setup libraries used in executables +@@ -91,33 +99,33 @@ add_executable(rtl_fm rtl_fm.c) + add_executable(rtl_eeprom rtl_eeprom.c) + add_executable(rtl_adsb rtl_adsb.c) + add_executable(rtl_power rtl_power.c) +-set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) ++set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) + +-target_link_libraries(rtl_sdr rtlsdr_shared convenience_static ++target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_tcp rtlsdr_shared convenience_static ++target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_test rtlsdr_shared convenience_static ++target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_fm rtlsdr_shared convenience_static ++target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static ++target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_adsb rtlsdr_shared convenience_static ++target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_power rtlsdr_shared convenience_static ++target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-- +2.14.1 + diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 02b3d31fd9..ba8a1af104 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -11,6 +11,15 @@ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES LIBRTLSDR_DEPENDENCIES = libusb +# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable +ifeq ($(BR2_STATIC_LIBS),y) +LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBRTLSDRCONF_OPTS += -DBUILD_STATIC_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON endif From 57d16fd480d3eb57822e634e409fb0bbc4dd475b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 3 Jun 2018 20:28:24 +0300 Subject: [PATCH 1577/2640] cifs-utils: disable man page generation Buildroot does not generate documentation for target. This fixes the build on hosts where the rst2man command does not support the --syntax-highlight parameter. Fixes: http://autobuild.buildroot.net/results/265/2655c0e1fa3ad0a10b4aed39a17feead94e47bfb/ http://autobuild.buildroot.net/results/92d/92d7c608f717bbfe01ecfb9bc9604cb303d8594c/ http://autobuild.buildroot.net/results/4b9/4b95404a89a595ca9c1e3df912169e9d36ff2bd7/ Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/cifs-utils/cifs-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index bfbdd56923..3456cd9198 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -15,7 +15,7 @@ CIFS_UTILS_DEPENDENCIES = host-pkgconf # Let's disable PIE unconditionally. We want PIE to be enabled only by # the global BR2_RELRO_FULL option. -CIFS_UTILS_CONF_OPTS = --disable-pie +CIFS_UTILS_CONF_OPTS = --disable-pie --disable-man ifeq ($(BR2_PACKAGE_KEYUTILS),y) CIFS_UTILS_DEPENDENCIES += keyutils From b0fdf587ba9b454c83b36a80320d803be191190e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Jun 2018 17:00:25 +0200 Subject: [PATCH 1578/2640] package/mesa3d: update patents.txt file hash Google patent url has been updated with 18.1 mesa3d release [1]. Fixes: http://autobuild.buildroot.net/results/00f/00fd8fbc1e89a29b60ed9c6906035dbe4f0a3eb8 [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=ac731531a1e43e4fa3e10099380a3bba68d65bfd Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index fb72f4f683..d8c7105fe7 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -5,4 +5,4 @@ sha256 d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781 mesa-18 sha512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 mesa-18.1.1.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html -sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366 docs/patents.txt +sha256 3a0cf6c7835f98f86d5579b2cc517f84254da7411f764fb0095a383fb0759771 docs/patents.txt From 2ab3f47c83e561827d689caf0860951ab933bdce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Jun 2018 12:11:14 +0200 Subject: [PATCH 1579/2640] zmqpp: depends on exception_ptr Fixes: - http://autobuild.buildroot.net/results/20475346bfcb0cff019ad2e98a0e0ab432a6e5bf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zmqpp/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in index b9d4dcfd64..e9209543a6 100644 --- a/package/zmqpp/Config.in +++ b/package/zmqpp/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_ZMQPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_ZEROMQ help C++ binding for zeromq (ZeroMQ, 0MQ, zmq). @@ -17,6 +18,9 @@ comment "zmqpp needs a toolchain w/ C++, NPTL, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 +comment "zmqpp needs exception_ptr" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + if BR2_PACKAGE_ZMQPP config BR2_PACKAGE_ZMQPP_CLIENT From 0a0812db05ee5585e52f88d4cb9bbb5b68e9e5e5 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sat, 2 Jun 2018 23:11:13 +0200 Subject: [PATCH 1580/2640] DEVELOPERS: update my e-mail address Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 413f37f1c3..1dc3dd5c2c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2098,7 +2098,7 @@ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ F: utils/scanpypi -N: Zoltan Gyarmati +N: Zoltan Gyarmati F: package/crudini/ F: package/grantlee/ F: package/proj/ From a19a6b0de350f27e1b46364a850490a58974dac8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Jun 2018 16:43:15 +0200 Subject: [PATCH 1581/2640] librtas: bump to version 2.0.1 - Switch site to github - Move to autotools infrastructure - Remove patch (not needed anymore) - Since version 1.4 (January 2016), license is now LGPL-2.1+ - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...librtas-install-librtas.so.1-symlink.patch | 31 ------------------- package/librtas/librtas.hash | 3 +- package/librtas/librtas.mk | 24 +++++--------- 3 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 package/librtas/0001-librtas-install-librtas.so.1-symlink.patch diff --git a/package/librtas/0001-librtas-install-librtas.so.1-symlink.patch b/package/librtas/0001-librtas-install-librtas.so.1-symlink.patch deleted file mode 100644 index 2150c3f508..0000000000 --- a/package/librtas/0001-librtas-install-librtas.so.1-symlink.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add a line to the librtas Makefile to create librtas.so.1 when -performing "make install". - -Without this patch programs linked with librtas will fail at run time: - -error while loading shared libraries: librtas.so.1: cannot open shared -object file: No such file or directory - -A patch has been submitted upstream so it is likely that this patch -can be dropped after the next release of librtas. - -Signed-off-by: Sam Bobroff ---- - librtas_src/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/librtas_src/Makefile b/librtas_src/Makefile -index 3a10222..deba29d 100644 ---- a/librtas_src/Makefile -+++ b/librtas_src/Makefile -@@ -33,6 +33,7 @@ install: - @$(call install_lib,$(LIBRTAS),$(DESTDIR)) - @$(call install_inc,$(HEADERS),$(DESTDIR)) - @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) -+ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1 - - uninstall: - @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR)) --- -1.7.10.4 - diff --git a/package/librtas/librtas.hash b/package/librtas/librtas.hash index c81b583147..0f3d902226 100644 --- a/package/librtas/librtas.hash +++ b/package/librtas/librtas.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d5f2951b0934ffbd82bebf26acfa103cc21d89f4c90c7c41472acf7b4ec6d907 librtas-1.3.13.tar.gz +sha256 a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 librtas-v2.0.1.tar.gz +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER diff --git a/package/librtas/librtas.mk b/package/librtas/librtas.mk index 46c4cb4bb7..f89394a6af 100644 --- a/package/librtas/librtas.mk +++ b/package/librtas/librtas.mk @@ -4,22 +4,12 @@ # ################################################################################ -LIBRTAS_VERSION = 1.3.13 -LIBRTAS_SITE = http://downloads.sourceforge.net/project/librtas -LIBRTAS_LICENSE = Common Public License Version 1.0 -LIBRTAS_LICENSE_FILES = COPYRIGHT +LIBRTAS_VERSION = v2.0.1 +LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,$(LIBRTAS_VERSION)) +LIBRTAS_LICENSE = LGPL-2.1+ +LIBRTAS_LICENSE_FILES = COPYING.LESSER LIBRTAS_INSTALL_STAGING = YES +# From git +LIBRTAS_AUTORECONF = YES -define LIBRTAS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define LIBRTAS_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define LIBRTAS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) From c4f844ff3212266f845ea812da2a8647a9f1e136 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Jun 2018 11:08:18 +0200 Subject: [PATCH 1582/2640] support/docker: run apt-get update and apt-get install in two RUNs In commit 7517aef4d (support/docker: limit the number of layers), we reduced the number of layers by coalescing multiple RUN commands into less commands. In doing so, we especially coalesced "apt-get update" with "apt-get install". However, the distribution we used is a pinned version of stretch, so we know that running apt-get update will always yield the same apt database. If we split the two apt-get commands, then we can re-use any local intermediate image when we need to update the list of packages to install; this helps quite a bit when testing the docker files over and over again, with just slight variants in the packages list. Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Cc: Peter Korsgaard Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index f01ac25f93..8c525f7cf1 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y && \ - apt-get install -y --no-install-recommends \ + apt-get update -y +RUN apt-get install -y --no-install-recommends \ build-essential cmake libc6:i386 g++-multilib \ bc ca-certificates file locales rsync \ cvs bzr git mercurial subversion wget \ From 6232e9f894e01781c54430f843e63c53c62ab564 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 30 May 2018 22:05:19 +0200 Subject: [PATCH 1583/2640] libraw: bump to version 0.18.11 - Remove all patches (already in version) - Since version 0.18 (2016-12-07), there is no 'LibRaw Software License 27032010' licensing anymore (and all signed agreements have expired). LibRaw is now dual-licensed: LGPL 2.1 or CDDL 1.0 - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-paths-which-break-cross-compilation.patch | 29 -- ...ibraw_x3f.cpp-remove-Byte-order-mark.patch | 39 -- ...-dcraw_common-rename-internal-powf64.patch | 348 ------------------ package/libraw/libraw.hash | 6 +- package/libraw/libraw.mk | 11 +- 5 files changed, 7 insertions(+), 426 deletions(-) delete mode 100644 package/libraw/0001-Remove-paths-which-break-cross-compilation.patch delete mode 100644 package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch delete mode 100644 package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch diff --git a/package/libraw/0001-Remove-paths-which-break-cross-compilation.patch b/package/libraw/0001-Remove-paths-which-break-cross-compilation.patch deleted file mode 100644 index 0f0eee1a64..0000000000 --- a/package/libraw/0001-Remove-paths-which-break-cross-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1f9c2ebc9c65e8ce7fdbece55d578cf00c6c4b46 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 17:06:04 +0100 -Subject: [PATCH 1/1] Remove paths which break cross-compilation - -Patch sent upstream: https://github.com/LibRaw/LibRaw/pull/57 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bb07b2..78064d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,9 +16,6 @@ AC_SUBST(LIBTOOL_DEPS) - - # Config files to generate - --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --LDFLAGS="$LDFLAGS -L/usr/local/lib" -- - AC_CONFIG_FILES([ - Makefile - libraw.pc --- -2.7.0.rc3 - diff --git a/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch b/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch deleted file mode 100644 index 24f0eb1897..0000000000 --- a/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0f2507bfe30f2df10dfc38b94cdfde5594902b8e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 12 Feb 2016 10:00:12 +0100 -Subject: [PATCH] libraw_x3f.cpp: remove Byte order mark - -The U+FEFF character, which is a Byte order mark, at the beginning of -libraw_x3f.cpp, prevents gcc 4.3.x from building this file: - -src/../internal/libraw_x3f.cpp:1: error: stray '\357' in program -src/../internal/libraw_x3f.cpp:1: error: stray '\273' in program -src/../internal/libraw_x3f.cpp:1: error: stray '\277' in program - -Support in gcc for the Byte order mark has been added in gcc -4.4.x. Since anyway this Byte order mark is not useful, we simply -remove it. - -See https://en.wikipedia.org/wiki/Byte_order_mark for more details. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream at: -https://github.com/LibRaw/LibRaw/pull/61 - - internal/libraw_x3f.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/libraw_x3f.cpp b/internal/libraw_x3f.cpp -index dbf28c1..67047ab 100644 ---- a/internal/libraw_x3f.cpp -+++ b/internal/libraw_x3f.cpp -@@ -1,4 +1,4 @@ --/* Library for accessing X3F Files -+/* Library for accessing X3F Files - ---------------------------------------------------------------- - BSD-style License - ---------------------------------------------------------------- --- -2.6.4 - diff --git a/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch b/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch deleted file mode 100644 index ef3b81aa24..0000000000 --- a/package/libraw/0003-internal-dcraw_common-rename-internal-powf64.patch +++ /dev/null @@ -1,348 +0,0 @@ -From 045c57d9d030075575409cf50cd7f6ee635df5c0 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 5 Feb 2018 16:22:39 +0100 -Subject: [PATCH] internal/dcraw_common: rename internal powf64() - -Starting with Glibc 2.27, powf64() is provided by the C library -and colide with the one defined dy libraw. - -Rename internal powf64 to libraw_powf64. - -Signed-off-by: Romain Naour ---- - internal/dcraw_common.cpp | 98 +++++++++++++++++++++++------------------------ - 1 file changed, 49 insertions(+), 49 deletions(-) - -diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp -index 0c7c07a..cf26865 100644 ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -5537,7 +5537,7 @@ static float powf_lim(float a, float b, float limup) - { - return (b>limup || b < -limup)?0.f:powf(a,b); - } --static float powf64(float a, float b) -+static float libraw_powf64(float a, float b) - { - return powf_lim(a,b,64.f); - } -@@ -5561,7 +5561,7 @@ static float my_roundf(float x) { - static float _CanonConvertAperture(ushort in) - { - if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f; -- return powf64(2.0, in/64.0); -+ return libraw_powf64(2.0, in/64.0); - } - - void CLASS setCanonBodyFeatures (unsigned id) -@@ -5902,21 +5902,21 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len) - if (fabsf(imgdata.lens.makernotes.MinFocal) < 1.1f) - { - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 2]) -- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); -+ imgdata.lens.makernotes.MinFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 2] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 3]) -- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); -+ imgdata.lens.makernotes.MaxFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 3] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 4]) -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(2.0f, (float)LensData[i + 4] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 5]) -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(2.0f, (float)LensData[i + 5] / 24.0f); - } - imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; - if (i != 2) - { - if ((LensData[i - 1]) && - (fabsf(imgdata.lens.makernotes.CurFocal) < 1.1f)) -- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); -- if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); -+ imgdata.lens.makernotes.CurFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i - 1] / 24.0f); -+ if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = libraw_powf64(2.0f, (float)LensData[i + 7] / 24.0f); - } - imgdata.lens.makernotes.LensID = - (unsigned long long) LensData[i] << 56 | -@@ -6088,13 +6088,13 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 - if (table_buf[iLensData+9] && - (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * libraw_powf64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - - if (iLensData != 12) - { -@@ -6111,14 +6111,14 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((id != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -6525,11 +6525,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - { - if (buf[0]) - imgdata.lens.makernotes.MaxAp4CurFocal = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - - if (buf[1]) - imgdata.lens.makernotes.MinAp4CurFocal = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - } - - if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) -@@ -6539,7 +6539,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - lid = SonySubstitution[buf[0x3d]] << 8 | - SonySubstitution[buf[0x3c]]; - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); -+ libraw_powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); - } - if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF)) - imgdata.lens.makernotes.LensMount = -@@ -6924,7 +6924,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - { - unsigned char cc; - fread(&cc, 1, 1, ifp); -- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); -+ iso_speed = (int)(100.0 * libraw_powf64(2.0, (double)(cc) / 12.0 - 5.0)); - break; - } - } -@@ -6957,7 +6957,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); - break; - case 0x20100201: - imgdata.lens.makernotes.LensID = -@@ -6977,10 +6977,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - fread(imgdata.lens.makernotes.Lens, MIN(len,127), 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -6991,7 +6991,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -7195,7 +7195,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -7669,7 +7669,7 @@ void CLASS parse_makernote (int base, int uptag) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); - break; - case 0x20100201: - { -@@ -7694,10 +7694,10 @@ void CLASS parse_makernote (int base, int uptag) - fread(imgdata.lens.makernotes.Lens, MIN(len,127), 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -7708,7 +7708,7 @@ void CLASS parse_makernote (int base, int uptag) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -7977,7 +7977,7 @@ void CLASS parse_makernote (int base, int uptag) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -8064,19 +8064,19 @@ void CLASS parse_makernote (int base, int uptag) - { - unsigned char cc; - fread(&cc,1,1,ifp); -- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); -+ iso_speed = int(100.0 * libraw_powf64(2.0f,float(cc)/12.0-5.0)); - } - if (tag == 4 && len > 26 && len < 35) { - if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) -- iso_speed = 50 * powf64(2.0, i/32.0 - 4); -+ iso_speed = 50 * libraw_powf64(2.0, i/32.0 - 4); - #ifdef LIBRAW_LIBRARY_BUILD - get4(); - #else - if ((i=(get2(),get2())) != 0x7fff && !aperture) -- aperture = powf64(2.0, i/64.0); -+ aperture = libraw_powf64(2.0, i/64.0); - #endif - if ((i=get2()) != 0xffff && !shutter) -- shutter = powf64(2.0, (short) i/-32.0); -+ shutter = libraw_powf64(2.0, (short) i/-32.0); - wbi = (get2(),get2()); - shot_order = (get2(),get2()); - } -@@ -8579,7 +8579,7 @@ void CLASS parse_exif (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - break; - #endif - case 33434: shutter = getreal(type); break; -@@ -8592,10 +8592,10 @@ void CLASS parse_exif (int base) - case 36867: - case 36868: get_timestamp(0); break; - case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) -- shutter = powf64(2.0, expo); break; -+ shutter = libraw_powf64(2.0, expo); break; - case 37378: // 0x9202 ApertureValue - if ((fabs(ape = getreal(type))<256.0) && (!aperture)) -- aperture = powf64(2.0, ape/2); -+ aperture = libraw_powf64(2.0, ape/2); - break; - case 37385: flash_used = getreal(type); break; - case 37386: focal_len = getreal(type); break; -@@ -9196,7 +9196,7 @@ int CLASS parse_tiff_ifd (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - break; - // IB end - #endif -@@ -9970,22 +9970,22 @@ void CLASS parse_ciff (int offset, int length, int depth) - thumb_length = len; - } - if (type == 0x1818) { -- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); -- aperture = powf64(2.0f, int_to_float(get4())/2); -+ shutter = libraw_powf64(2.0f, -int_to_float((get4(),get4()))); -+ aperture = libraw_powf64(2.0f, int_to_float(get4())/2); - #ifdef LIBRAW_LIBRARY_BUILD - imgdata.lens.makernotes.CurAp = aperture; - #endif - } - if (type == 0x102a) { - // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; -- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; -+ iso_speed = libraw_powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; - #ifdef LIBRAW_LIBRARY_BUILD - aperture = _CanonConvertAperture((get2(),get2())); - imgdata.lens.makernotes.CurAp = aperture; - #else -- aperture = powf64(2.0, (get2(),(short)get2())/64.0); -+ aperture = libraw_powf64(2.0, (get2(),(short)get2())/64.0); - #endif -- shutter = powf64(2.0,-((short)get2())/32.0); -+ shutter = libraw_powf64(2.0,-((short)get2())/32.0); - wbi = (get2(),get2()); - if (wbi > 17) wbi = 0; - fseek (ifp, 32, SEEK_CUR); -@@ -10189,8 +10189,8 @@ void CLASS parse_phase_one (int base) - setPhaseOneFeatures(unique_id); - break; - case 0x0401: -- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); -- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); -+ if (type == 4) imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); -+ else imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (getreal(type)/2.0f)); - break; - case 0x0403: - if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); -@@ -10204,16 +10204,16 @@ void CLASS parse_phase_one (int base) - break; - case 0x0414: - if (type == 4) { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0415: - if (type == 4) { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0416: -@@ -12119,15 +12119,15 @@ void CLASS identify() - case 18: iso_speed = 320; break; - case 19: iso_speed = 400; break; - } -- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; -+ shutter = libraw_powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; - FORC4 cam_mul[c ^ (c >> 1)] = get4(); - fseek (ifp, 88, SEEK_SET); -- aperture = powf64(2.0f, ((float)get4())/16.0f); -+ aperture = libraw_powf64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 112, SEEK_SET); - focal_len = get4(); - #ifdef LIBRAW_LIBRARY_BUILD - fseek (ifp, 104, SEEK_SET); -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 124, SEEK_SET); - fread(imgdata.lens.makernotes.Lens, 32, 1, ifp); - imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; --- -2.14.3 - diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 29794252f1..c546b1bee5 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,3 +1,5 @@ # Locally calculated -sha256 e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1 LibRaw-0.17.1.tar.gz -sha256 3c09bc4d70268e78798696c5ea3a8cc65fe4e161811d5321fc3ef2ca012d8fd1 0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823 +sha256 7cf724a40a0d8915869498f51062a952167e4f5bae2b6920542c9e0e079a471d LibRaw-0.18.11.tar.gz +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL +sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL +sha256 7fe7564c5d48c5d353d7c1966dcddada3791586a4c2eedbc68ad56e96955e75d README diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 589ff891be..4ff7462647 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,22 +4,17 @@ # ################################################################################ -LIBRAW_VERSION = 0.17.1 +LIBRAW_VERSION = 0.18.11 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data -LIBRAW_PATCH = \ - https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823 - LIBRAW_INSTALL_STAGING = YES -# we patch configure.ac -LIBRAW_AUTORECONF = YES LIBRAW_CONF_OPTS += \ --disable-examples \ --disable-openmp \ --disable-demosaic-pack-gpl2 \ --disable-demosaic-pack-gpl3 -LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 or LibRaw Software License 27032010 -LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README +LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 +LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README LIBRAW_DEPENDENCIES = host-pkgconf LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" From 938b7bb816a950b2cd55bfcdc9ff22aed5bd4122 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 30 May 2018 22:22:11 +0200 Subject: [PATCH 1584/2640] libraw1394: bump to version 2.1.2 - Remove patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-the-CLOCK_MONOTONIC_RAW-test-condit.patch | 38 ------------------- package/libraw1394/libraw1394.hash | 4 +- package/libraw1394/libraw1394.mk | 3 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch diff --git a/package/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch b/package/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch deleted file mode 100644 index b87ef715de..0000000000 --- a/package/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 94c66ade15d7fc468b52c72dfe76a8c10b1910a7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 12 Feb 2016 10:13:45 +0100 -Subject: [PATCH] testlibraw: build the CLOCK_MONOTONIC_RAW test conditionally - -CLOCK_MONOTONIC_RAW is a somewhat recent addition, and some older -toolchains/kernels may not have the support for it. Therefore, we -build the part of the test that uses CLOCK_MONOTONIC_RAW only when -this definition is available. - -Signed-off-by: Thomas Petazzoni ---- - tools/testlibraw.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/testlibraw.c b/tools/testlibraw.c -index d8a0702..ae37157 100644 ---- a/tools/testlibraw.c -+++ b/tools/testlibraw.c -@@ -211,6 +211,7 @@ read_cycle_timer(raw1394handle_t handle) - printf(" local time from CLOCK_MONOTONIC: %lld us\n", - (unsigned long long)local_time); - -+#if defined(CLOCK_MONOTONIC_RAW) - retval = raw1394_read_cycle_timer_and_clock(handle, &ct, &local_time, - CLOCK_MONOTONIC_RAW); - if (retval < 0) { -@@ -221,6 +222,7 @@ read_cycle_timer(raw1394handle_t handle) - ct >> 25, (ct >> 12) & 0x1fff, ct & 0xfff); - printf(" local time from CLOCK_MONOTONIC_RAW: %lld us\n", - (unsigned long long)local_time); -+#endif - } - - int test_card(int card) --- -2.6.4 - diff --git a/package/libraw1394/libraw1394.hash b/package/libraw1394/libraw1394.hash index b785995db1..9a44ab7d41 100644 --- a/package/libraw1394/libraw1394.hash +++ b/package/libraw1394/libraw1394.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/libs/ieee1394/sha256sums.asc -sha256 1bab9780189f9d1eb4e973df12679c04f979c21e024240fc98e536ff5b680ee9 libraw1394-2.1.1.tar.xz +sha256 03ccc69761d22c7deb1127fc301010dd13e70e44bb7134b8ff0d07590259a55e libraw1394-2.1.2.tar.xz # Locally computed -sha256 39369c65fbed7fccc2e6d8e645f258f101c414107d67238f10996e6c2009f20d fix-types.patch +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index 73517ed2f5..7aa4a3ae01 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -4,10 +4,9 @@ # ################################################################################ -LIBRAW1394_VERSION = 2.1.1 +LIBRAW1394_VERSION = 2.1.2 LIBRAW1394_SOURCE = libraw1394-$(LIBRAW1394_VERSION).tar.xz LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394 -LIBRAW1394_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/libraw1394/fix-types.patch LIBRAW1394_INSTALL_STAGING = YES LIBRAW1394_LICENSE = LGPL-2.1+ LIBRAW1394_LICENSE_FILES = COPYING.LIB From 407fb2fe202aaeb273e4986dc88c30596a7fe8db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 30 May 2018 23:42:24 +0200 Subject: [PATCH 1585/2640] libroxml: bump to version 3.0.1 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libroxml/libroxml.hash | 3 ++- package/libroxml/libroxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libroxml/libroxml.hash b/package/libroxml/libroxml.hash index 32482e65de..897030ed73 100644 --- a/package/libroxml/libroxml.hash +++ b/package/libroxml/libroxml.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1da8f20b530eba4409f2b217587d2f1281ff5d9ba45b24aeac71b94c6c621b78 libroxml-2.3.0.tar.gz +sha256 b55fd616a2be4e9747173b8dfa4bbab64f5ddfafd7d7a529aa91ab7755bc0ce6 libroxml-3.0.1.tar.gz +sha256 fe11466c265ad0a6c3896ea113af9403c0a8372b1fdd78712db64f0f1bac6387 License.txt diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk index 5582b387d4..fef3c2795f 100644 --- a/package/libroxml/libroxml.mk +++ b/package/libroxml/libroxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBROXML_VERSION = 2.3.0 -LIBROXML_SITE = http://download.libroxml.net/pool/v2.x +LIBROXML_VERSION = 3.0.1 +LIBROXML_SITE = http://download.libroxml.net/pool/v3.x LIBROXML_INSTALL_STAGING = YES LIBROXML_LICENSE = LGPL-2.1+ with static link exception LIBROXML_LICENSE_FILES = License.txt From d93305744b1dc758a3d86088473d571194762e19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 19:03:29 +0200 Subject: [PATCH 1586/2640] php-amqp: needs openssl support in rabbitmq-c Since version 1.8.0, php-amqp needs a rabbitmq-c with openssl support: https://github.com/pdezwart/php-amqp/issues/310 SSL support is disabled in rabbitmq-c if BR2_STATIC_LIBS is set however don't add an unneeded !BR2_STATIC_LIBS dependency in Config.in as all PHP External Extensions depends on !BR2_STATIC_LIBS (see package/Config.in) Fixes: - http://autobuild.buildroot.net/results/b7c89bbbd0ca1df08dd7cbfc90c7b45dcf1fad05 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/php-amqp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/php-amqp/Config.in b/package/php-amqp/Config.in index 0aa2021f5a..dc779f0ee0 100644 --- a/package/php-amqp/Config.in +++ b/package/php-amqp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PHP_AMQP bool "php-amqp" depends on BR2_PACKAGE_PHP depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c + select BR2_PACKAGE_OPENSSL # rabbitmq-c: amqp_ssl_socket.h select BR2_PACKAGE_RABBITMQ_C help Communicate with any AMQP compliant server. From 46706ced359300b2cad65d630e8485c9f8136645 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 19:09:26 +0200 Subject: [PATCH 1587/2640] libnss: fix build without int128 Patch retrieved from upstream, more info here: https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1459739 Fixes: - http://autobuild.buildroot.net/results/093113829d7ce19d578a920e76caa10822774139 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...hen-not-building-with-int128-support.patch | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch diff --git a/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch b/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch new file mode 100644 index 0000000000..1216429696 --- /dev/null +++ b/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch @@ -0,0 +1,143 @@ + +# HG changeset patch +# User Mike Hommey +# Date 1527430800 -7200 +# Node ID 3d3e34bb75172462c7b4bbe7bd5e3e47ed65e464 +# Parent 8e600e2af5bf0c29e88f928471e6aba1a734d05b +Bug 1432455 - Build FStar.c when not building with int128 support. r=fkiefer + +Patch retrieved and slightly updated (to add nss path) from: +https://hg.mozilla.org/projects/nss/rev/3d3e34bb75172462c7b4bbe7bd5e3e47ed65e464 + +Signed-off-by: Fabrice Fontaine + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -530,22 +530,26 @@ ifndef NSS_DISABLE_CHACHAPOLY + VERIFIED_SRCS += Hacl_Chacha20.c + VERIFIED_SRCS += Hacl_Chacha20_Vec128.c + endif # NSS_DISABLE_CHACHAPOLY + + ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) + # All intel architectures get the 64 bit version + # With custom uint128 if necessary (faster than generic 32 bit version). + ECL_SRCS += curve25519_64.c +- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c ++ VERIFIED_SRCS += Hacl_Curve25519.c + else + # All non intel architectures get the generic 32 bit implementation (slow!) + ECL_SRCS += curve25519_32.c + endif + ++ifndef HAVE_INT128_SUPPORT ++ VERIFIED_SRCS += FStar.c ++endif ++ + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # + ####################################################################### + + include $(CORE_DEPTH)/coreconf/rules.mk + + ####################################################################### + # (6) Execute "component" rules. (OPTIONAL) # +diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp +--- a/nss/lib/freebl/freebl.gyp ++++ b/nss/lib/freebl/freebl.gyp +@@ -272,28 +272,20 @@ + }, + }], + [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', { + # mingw x64 + 'defines': [ + 'MP_IS_LITTLE_ENDIAN', + ], + }], +- [ 'OS!="win"', { +- 'conditions': [ +- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { +- 'defines': [ +- # The Makefile does version-tests on GCC, but we're not doing that here. +- 'HAVE_INT128_SUPPORT', +- ], +- }, { +- 'defines': [ +- 'KRML_NOUINT128', +- ], +- }], ++ [ 'have_int128_support==1', { ++ 'defines': [ ++ # The Makefile does version-tests on GCC, but we're not doing that here. ++ 'HAVE_INT128_SUPPORT', + ], + }, { + 'defines': [ + 'KRML_NOUINT128', + ], + }], + [ 'OS=="linux"', { + 'defines': [ +@@ -345,10 +337,23 @@ + ], + }], + ], + }], + ], + }, + 'variables': { + 'module': 'nss', ++ 'conditions': [ ++ [ 'OS!="win"', { ++ 'conditions': [ ++ [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { ++ 'have_int128_support%': 1, ++ }, { ++ 'have_int128_support%': 0, ++ }], ++ ], ++ }, { ++ 'have_int128_support%': 0, ++ }], ++ ], + } + } +diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi +--- a/nss/lib/freebl/freebl_base.gypi ++++ b/nss/lib/freebl/freebl_base.gypi +@@ -55,17 +55,16 @@ + 'rsa.c', + 'rsapkcs.c', + 'seed.c', + 'sha512.c', + 'sha_fast.c', + 'shvfy.c', + 'sysrand.c', + 'tlsprfalg.c', +- 'verified/FStar.c', + ], + 'conditions': [ + [ 'OS=="linux" or OS=="android"', { + 'conditions': [ + [ 'target_arch=="x64"', { + 'sources': [ + 'arcfour-amd64-gas.s', + 'intel-aes.s', +@@ -215,13 +214,16 @@ + 'MP_USE_UINT_DIGIT', + 'MP_ASSEMBLY_MULTIPLY', + 'MP_ASSEMBLY_SQUARE', + 'MP_ASSEMBLY_DIV_2DX1D', + ], + }], + ], + }], ++ [ 'have_int128_support==0', { ++ 'sources': [ 'verified/FStar.c' ], ++ }], + ], + 'ldflags': [ + '-Wl,-Bsymbolic' + ], + } + From b61bf77263ba5fd770a056d89ef4072e896189ea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Jun 2018 21:19:31 +0200 Subject: [PATCH 1588/2640] DEVELOPERS: add myself to some packages Add my entry to cairo, liboping, libpfm4, libraw, libraw1394, libroxml, librsvg, librsync, mbedtls and oprofile Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1dc3dd5c2c..1a8440759e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -674,6 +674,7 @@ F: package/alljoyn-base/ F: package/alljoyn-tcl/ F: package/alljoyn-tcl-base/ F: package/boinc/ +F: package/cairo/ F: package/flatbuffers/ F: package/gtksourceview/ F: package/gssdp/ @@ -703,12 +704,21 @@ F: package/libmatroska/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ +F: package/liboping/ +F: package/libpfm4/ +F: package/libraw/ +F: package/libraw1394/ +F: package/libroxml/ +F: package/librsvg/ +F: package/librsync/ F: package/libupnp/ F: package/libupnp18/ +F: package/mbedtls/ F: package/minissdpd/ F: package/motion/ F: package/mutt/ F: package/ncmpc/ +F: package/oprofile/ F: package/pcmanfm/ F: package/rygel/ F: package/safeclib/ From 1f47aa89f9fc3d4a8f59c4890a1174c6db1e222b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 3 Jun 2018 23:31:00 +0200 Subject: [PATCH 1589/2640] wireshark: security bump to version 2.2.15 Fixes the following security issues: CVE-2018-11362: LDSS dissector crash https://www.wireshark.org/security/wnpa-sec-2018-25.html CVE-2018-11357: Multiple dissectors could consume excessive memory https://www.wireshark.org/security/wnpa-sec-2018-28.html CVE-2018-11356: DNS dissector crash https://www.wireshark.org/security/wnpa-sec-2018-29.html CVE-2018-11360: GSM A DTAP dissector crash https://www.wireshark.org/security/wnpa-sec-2018-30.html CVE-2018-11358: Q.931 dissector crash https://www.wireshark.org/security/wnpa-sec-2018-31.html CVE-2018-11359: Multiple dissectors could crash https://www.wireshark.org/security/wnpa-sec-2018-33.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 2b44cc0757..4b9c646fa9 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.14.txt -sha256 e7a3d4f9bbde20ea5ee09103f9f6dba38e3666dfe1d6a6a1c004602b5fac378b wireshark-2.2.14.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.15.txt +sha256 d73583e9282d47c42b69fc3a1ac9cafb6047d1305f5027d4cf18e95922d11844 wireshark-2.2.15.tar.bz2 # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ad475803b7..c9a4ef202d 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.14 +WIRESHARK_VERSION = 2.2.15 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From a5ba72946ebf597a163bae9b12453dfa68993d54 Mon Sep 17 00:00:00 2001 From: Robert Beckett Date: Mon, 4 Jun 2018 14:32:30 +0100 Subject: [PATCH 1590/2640] dl-wrapper: Fix support for URIs containing '+' '+' is a valid character in a url. The current dl-wrapper gets the URI scheme by dropping everything after the last '+' character, with the intension of finding 'git' from e.g. 'git+https://uri'. If a uri has a '+' anywhere in it, it ends up using too much of the string as a scheme, and fails to match the handler properly. An example of where this form of URI is used is when using deploy tokens in gitlab. It uses a form like https://:@gitlab.com// where username for deploy token is of the form 'gitlab+deploy-token-'. Use the %% operator to search backwards until the last '+' character when dropping the rest of the string as we know that the first '+' in the string should be the scheme. Signed-off-by: Robert Beckett Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/dl-wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 8d6365e08d..4059c37ebc 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -88,7 +88,7 @@ main() { download_and_check=0 rc=1 for uri in "${uris[@]}"; do - backend=${uri%+*} + backend=${uri%%+*} case "${backend}" in git|svn|cvs|bzr|file|scp|hg) ;; *) backend="wget" ;; From f8d44394777fb9b45befaee3333d974dfe5e745d Mon Sep 17 00:00:00 2001 From: Min Xu Date: Mon, 4 Jun 2018 00:16:26 -0700 Subject: [PATCH 1591/2640] shadowsocks-libev: new package Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. https://github.com/shadowsocks/shadowsocks-libev Signed-off-by: Min Xu [Thomas: - drop patch adding license file for libipset - drop --disable-documentation, it's passed by autotools-package - add entry in DEVELOPERS file - pass --disable-ssp because the SSP check uses AC_COMPILE_IFELSE() so with some toolchains, it think SSP support is available, while it's not. And anyway we want SSP to be controlled by Buildroot global options, not on a per-package basis. - add depends on BR2_USE_MMU, because the code uses fork().] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/shadowsocks-libev/Config.in | 13 +++++++++++++ .../shadowsocks-libev/shadowsocks-libev.hash | 8 ++++++++ package/shadowsocks-libev/shadowsocks-libev.mk | 17 +++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 package/shadowsocks-libev/Config.in create mode 100644 package/shadowsocks-libev/shadowsocks-libev.hash create mode 100644 package/shadowsocks-libev/shadowsocks-libev.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1a8440759e..1ad3edcd78 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1391,6 +1391,9 @@ F: configs/socrates_cyclone5_defconfig N: Mikhail Boiko F: package/libfribidi/ +N: Min Xu +F: package/shadowsocks-libev/ + N: Morgan Delestre F: package/monkey/ diff --git a/package/Config.in b/package/Config.in index 6a1606e568..1730201bf3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1854,6 +1854,7 @@ endif source "package/samba4/Config.in" source "package/sconeserver/Config.in" source "package/ser2net/Config.in" + source "package/shadowsocks-libev/Config.in" source "package/shairport-sync/Config.in" source "package/shellinabox/Config.in" source "package/smcroute/Config.in" diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in new file mode 100644 index 0000000000..d02e5a93ef --- /dev/null +++ b/package/shadowsocks-libev/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_SHADOWSOCKS_LIBEV + bool "shadowsocks-libev" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_PCRE + help + Shadowsocks-libev is a lightweight secured SOCKS5 proxy for + embedded devices and low-end boxes. + + https://github.com/shadowsocks/shadowsocks-libev diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash new file mode 100644 index 0000000000..e8be8a8a71 --- /dev/null +++ b/package/shadowsocks-libev/shadowsocks-libev.hash @@ -0,0 +1,8 @@ +# Locally computed +sha256 5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 shadowsocks-libev-3.2.0.tar.gz + +# License files, locally calculated +sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING +sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb libbloom/LICENSE +sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93 libcork/COPYING +sha256 4b3adc9ce620fa868f1dda328203dbccbd3e9f5fbafb49c581edc386a504ee1a libipset/LICENSE.txt diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk new file mode 100644 index 0000000000..caae2176b4 --- /dev/null +++ b/package/shadowsocks-libev/shadowsocks-libev.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# shadowsocks-libev +# +################################################################################ + +SHADOWSOCKS_LIBEV_VERSION = 3.2.0 +SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) +SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset) +SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING +SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre +SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES +SHADOWSOCKS_LIBEV_CONF_OPTS = \ + --with-pcre=$(STAGING_DIR)/usr \ + --disable-ssp + +$(eval $(autotools-package)) From 77fd06a1d6aa3819bc898010cf0956ad32f77400 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 4 Jun 2018 09:48:25 -0300 Subject: [PATCH 1592/2640] toolchain: add 4.17.x choice for headers Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index 3936fc4511..3a53a32a6d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -336,10 +336,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 2ef1126740..6a9921c149 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,6 +123,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_17 + bool "4.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16 bool "4.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 From 8bc7ad074a9256215e77721250d86324e576e459 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 4 Jun 2018 09:48:26 -0300 Subject: [PATCH 1593/2640] linux-headers: bump to 4.17 kernel version Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index b99b36e83d..f6229c065e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_16 + default BR2_KERNEL_HEADERS_4_17 help Select the kernel version to get headers from. @@ -71,6 +71,10 @@ config BR2_KERNEL_HEADERS_4_16 bool "Linux 4.16.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 +config BR2_KERNEL_HEADERS_4_17 + bool "Linux 4.17.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -93,6 +97,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17 + bool "4.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 bool "4.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 @@ -259,4 +267,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.46" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.13" if BR2_KERNEL_HEADERS_4_16 + default "4.17" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 8719882e76923d2d950bd6706a507870a6c06a52 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 4 Jun 2018 09:48:27 -0300 Subject: [PATCH 1594/2640] linux: bump default to version 4.17 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 58d2286685..07888e2f96 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -30,7 +30,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.16)" + bool "Latest version (4.17)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (v4.4.130-cip23)" @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.16.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From f9aa66788062bae9e220700e6a778319b882b34f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 4 Jun 2018 09:48:28 -0300 Subject: [PATCH 1595/2640] configs/mx53loco: Bump to 4.17 kernel Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx53loco_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index ae56fcad8c..b42b280f80 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" From 15c3ffabeaa6bbf26749f7667cbe53eca56c00a0 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 1 Jun 2018 17:41:58 +0200 Subject: [PATCH 1596/2640] libgit2: do not use a bundled zlib libgit2 depends on zlib. If libgit2's build system does not find a system zlib, then it compiles a bundled version of it, which is not really great. So instead, add zlib as a mandatory dependency. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/Config.in | 1 + package/libgit2/libgit2.mk | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index 24a1f3b5a9..53ba4d4245 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGIT2 bool "libgit2" + select BR2_PACKAGE_ZLIB help libgit2 is a portable, pure C implementation of the Git core methods provided as a linkable library with a solid API, diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 277a8d46ac..fcace39290 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -16,6 +16,8 @@ LIBGIT2_CONF_OPTS = \ -DUSE_ICONV=ON \ -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) +LIBGIT2_DEPENDENCIES = zlib + # If libiconv is available (for !locale toolchains), then we can use # it for iconv support. Note that USE_ICONV=ON is still correct even # without libiconv because (1) most toolchain have iconv support @@ -25,11 +27,6 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBGIT2_DEPENDENCIES += libiconv endif -# No option to explicitly enable/disable zlib -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBGIT2_DEPENDENCIES += zlib -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBGIT2_DEPENDENCIES += libssh2 LIBGIT2_CONF_OPTS += -DUSE_SSH=ON From d1e383d365c0eeb327312823e67c3c2ae92e0e8f Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 1 Jun 2018 17:41:59 +0200 Subject: [PATCH 1597/2640] libgit2: bump version to 0.27.1 Fixes a security vulnerability similar to git's CVE-2018-11235 This release changes some configuration options, so tweak them accordingly. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index cc09af3627..43d8f9930e 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6a62393e0ceb37d02fe0d5707713f504e7acac9006ef33da1e88960bd78b6eac libgit2-v0.26.0.tar.gz +sha256 837b11927bc5f64e7f9ab0376f57cfe3ca5aa52ffd2007ac41184b21124fb086 libgit2-v0.27.1.tar.gz sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index fcace39290..8b7b9f6d77 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = v0.26.0 +LIBGIT2_VERSION = v0.27.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception LIBGIT2_LICENSE_FILES = COPYING @@ -36,9 +36,9 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBGIT2_DEPENDENCIES += openssl -LIBGIT2_CONF_OPTS += -DUSE_OPENSSL=ON +LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OpenSSL else -LIBGIT2_CONF_OPTS += -DUSE_OPENSSL=OFF +LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif ifeq ($(BR2_PACKAGE_LIBCURL),y) From bd30292bd3b6a979e43095079d13fb94d74bdb34 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 1 Jun 2018 17:42:00 +0200 Subject: [PATCH 1598/2640] libgit2: fix build with LibreSSL 2.7 By using a patch from upstream's master branch. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-with-LibreSSL-2.7.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch diff --git a/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch b/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch new file mode 100644 index 0000000000..f0be0f0d2f --- /dev/null +++ b/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch @@ -0,0 +1,45 @@ +From 7490d449b518115a1ae86b01397e95c38e39cff1 Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Mon, 2 Apr 2018 20:00:07 +0200 +Subject: [PATCH] Fix build with LibreSSL 2.7 + +LibreSSL 2.7 adds OpenSSL 1.1 API + +Signed-off-by: Bernard Spil +Signed-off-by: Nicolas Cavallari +--- + src/streams/openssl.c | 3 ++- + src/streams/openssl.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/streams/openssl.c b/src/streams/openssl.c +index 9cbb2746f..adcb7f14e 100644 +--- a/src/streams/openssl.c ++++ b/src/streams/openssl.c +@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void) + ssl_opts |= SSL_OP_NO_COMPRESSION; + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + #else +diff --git a/src/streams/openssl.h b/src/streams/openssl.h +index 2bbad7c68..44329ec90 100644 +--- a/src/streams/openssl.h ++++ b/src/streams/openssl.h +@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *file, const char *path); + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + { +-- +2.17.0 + From 49844baf2f4c0d89954ccd0c138aea39f23c51f1 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 4 Jun 2018 23:08:42 -0300 Subject: [PATCH 1599/2640] audit: do not remove file installed by netplug The package recipe uses a post-install hook to remove useless files from $(TARGET_DIR)/etc/rc.d/init.d and $(TARGET_DIR)/etc/sysconfig. This may damage packages that install useful files on those directories (such as netplug, which installs $(TARGET_DIR)/etc/rc.d/init.d/netplugd). In the future[1] we will reorganize the init scripts and possibly get rid of /etc/rc.d and /etc/sysconfig but for the moment let's restrict the file removal to those installed by audit. 1. http://lists.busybox.net/pipermail/buildroot/2018-May/221549.html Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/audit/audit.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index f5aa00d2f0..2f6e6653b3 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -51,8 +51,8 @@ define AUDIT_INSTALL_INIT_SYSTEMD endef define AUDIT_INSTALL_CLEANUP - $(RM) -rf $(TARGET_DIR)/etc/rc.d - $(RM) -rf $(TARGET_DIR)/etc/sysconfig + $(RM) $(TARGET_DIR)/etc/rc.d/init.d/auditd + $(RM) $(TARGET_DIR)/etc/sysconfig/auditd endef AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP From 4adaa581b27dc27298eb7cc421ee8f530f88e18e Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 4 Jun 2018 23:11:56 -0300 Subject: [PATCH 1600/2640] netplug: look for init script configurations in /etc/default/ We are working to make all sysvinit scripts conformant to a pattern and /etc/default/ seems to be a good choice, since 34 packages already get optional configurations from files at that directory. netplug still installs an init script at /etc/rc.d/init.d/. This will be fixed in a future patch that will refactor the init scripts. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/netplug/S29netplug | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/netplug/S29netplug b/package/netplug/S29netplug index 03422499d6..04cac9f07c 100755 --- a/package/netplug/S29netplug +++ b/package/netplug/S29netplug @@ -22,8 +22,8 @@ elif [ -f /etc/rc.d/init.d/functions ]; then fi # Source networking configuration. -if [ -f /etc/sysconfig/network ]; then - . /etc/sysconfig/network +if [ -f /etc/default/network ]; then + . /etc/default/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 @@ -32,8 +32,8 @@ elif [ ! -f /etc/network/interfaces ]; then exit 0 fi -if [ -f /etc/sysconfig/netplugd ]; then - . /etc/sysconfig/netplugd +if [ -f /etc/default/netplugd ]; then + . /etc/default/netplugd fi # See how we were called. From 1f058dcdff290aea00d0fc95134cf68fdd35e710 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 22:56:31 +0200 Subject: [PATCH 1601/2640] boinc: bump to version 7.10.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boinc/boinc.hash | 2 +- package/boinc/boinc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash index 564096c745..8dc0575dd3 100644 --- a/package/boinc/boinc.hash +++ b/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5c77752a5cbb69b2dc0343c5aea331f2ec73410d9f33f5f50867e4071e799609 boinc-7.10.1.tar.gz +sha256 aacce87543354c8aeaf8a2f8d4885ab25f994dbaa8a372adf8a3d5d5854a97df boinc-7.10.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 04aacc2c3d..09407cf8f0 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -4,8 +4,8 @@ # ################################################################################ -BOINC_VERSION_MAJOR = 7.10 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).1 +BOINC_VERSION_MAJOR = 7 +BOINC_VERSION = $(BOINC_VERSION_MAJOR).10.2 # client_release can be used to build the Client and Manager but not the Server # part. The Server currently has no versioning (see # https://github.com/BOINC/boinc/pull/1798). From 3b053f9b5c0235ffc692df9b1e59a4f97a1f0e26 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 22:57:06 +0200 Subject: [PATCH 1602/2640] libsecret: bump to version 0.18.6 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libsecret/libsecret.hash | 7 +++++-- package/libsecret/libsecret.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index a637cbecf4..808b1741f3 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,2 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.5.sha256sum -sha256 9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3 libsecret-0.18.5.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.6.sha256sum +sha256 5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f libsecret-0.18.6.tar.xz + +# Hash for license file: +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 111b553f2c..adc7c508df 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.18 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).6 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES From 7d4303383c8f7bf1dc892be9df07346130a68802 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 22:57:51 +0200 Subject: [PATCH 1603/2640] php-amqp: bump to version 1.9.3 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/php-amqp/php-amqp.hash | 3 ++- package/php-amqp/php-amqp.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash index 4b3b19726f..10b16f1b48 100644 --- a/package/php-amqp/php-amqp.hash +++ b/package/php-amqp/php-amqp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f45831d498b8fa47a151c31f6abdc0530aa6eabda6e2e10514aca3bdc76a5098 amqp-1.9.0.tgz +sha256 c79e52db33bf907dad7da8f350dbdf2937b0679a3dc44fb2a941efb6d4808da9 amqp-1.9.3.tgz +sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index 6a8c52c4cf..e9de4825a9 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_AMQP_VERSION = 1.9.0 +PHP_AMQP_VERSION = 1.9.3 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From 6b8447fa68052f5d6531de73e77847fc911ff0d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Jun 2018 22:59:48 +0200 Subject: [PATCH 1604/2640] rabbitmq-c: bump to version 0.9.0 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rabbitmq-c/rabbitmq-c.hash | 3 ++- package/rabbitmq-c/rabbitmq-c.mk | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/rabbitmq-c/rabbitmq-c.hash b/package/rabbitmq-c/rabbitmq-c.hash index 45e8cbd822..0af88774e6 100644 --- a/package/rabbitmq-c/rabbitmq-c.hash +++ b/package/rabbitmq-c/rabbitmq-c.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b rabbitmq-c-v0.8.0.tar.gz +sha256 316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024 rabbitmq-c-v0.9.0.tar.gz +sha256 94a12c906acb31a66c2c8a6c1b6e46cab52bc5694c5ada2a06d86b05d3d3f422 LICENSE-MIT diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index d496a4c09b..a3c4f8219f 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -RABBITMQ_C_VERSION = v0.8.0 +RABBITMQ_C_VERSION = v0.9.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE-MIT @@ -13,6 +13,11 @@ RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ -DBUILD_TOOLS_DOCS=OFF +# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to +# disable a try_run() call in the FindThreads tests, which caused a +# build failure when cross-compiling. +RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF + # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_STATIC_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON From 413fb2af727100b5c0842b856405a93f5528ccc3 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 5 Jun 2018 10:15:22 +0200 Subject: [PATCH 1605/2640] python-websockets: bump to version 5.0.1 Remove upstream patch. Fixes: http://autobuild.buildroot.net/results/0b59939faaefc12cd7da4f26ab86659ac031b008/ http://autobuild.buildroot.net/results/c0196693cfdbf10b429c5c03684d5308a68c8509/ Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- ...ehavior-of-recv-in-the-CLOSING-state.patch | 261 ------------------ .../python-websockets/python-websockets.hash | 4 +- .../python-websockets/python-websockets.mk | 4 +- 3 files changed, 4 insertions(+), 265 deletions(-) delete mode 100644 package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch diff --git a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch b/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch deleted file mode 100644 index cb97b36bde..0000000000 --- a/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 402059e4a46a764632eba8a669f5b012f173ee7b Mon Sep 17 00:00:00 2001 -From: Aymeric Augustin -Date: Tue, 1 May 2018 17:05:05 +0200 -Subject: [PATCH] Fix behavior of recv() in the CLOSING state. - -The behavior wasn't tested correctly: in some test cases, the connection -had already moved to the CLOSED state, where the close code and reason -are already known. - -Refactor half_close_connection_{local,remote} to allow multiple runs of -the event loop while remaining in the CLOSING state. Refactor affected -tests accordingly. - -I verified that all tests in the CLOSING state were behaving is intended -by inserting debug statements in recv/send/ping/pong and running: - -$ PYTHONASYNCIODEBUG=1 python -m unittest -v websockets.test_protocol.{Client,Server}Tests.test_{recv,send,ping,pong}_on_closing_connection_{local,remote} - -Fix #317, #327, #350, #357. - -Signed-off-by: Joseph Kogut ---- - websockets/protocol.py | 10 ++--- - websockets/test_protocol.py | 78 +++++++++++++++++++++++++++++-------- - 2 files changed, 66 insertions(+), 22 deletions(-) - -diff --git a/websockets/protocol.py b/websockets/protocol.py -index f8121a1..7583fe9 100644 ---- a/websockets/protocol.py -+++ b/websockets/protocol.py -@@ -303,7 +303,7 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): - # Don't yield from self.ensure_open() here because messages could be - # received before the closing frame even if the connection is closing. - -- # Wait for a message until the connection is closed -+ # Wait for a message until the connection is closed. - next_message = asyncio_ensure_future( - self.messages.get(), loop=self.loop) - try: -@@ -315,15 +315,15 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol): - next_message.cancel() - raise - -- # Now there's no need to yield from self.ensure_open(). Either a -- # message was received or the connection was closed. -- - if next_message in done: - return next_message.result() - else: - next_message.cancel() - if not self.legacy_recv: -- raise ConnectionClosed(self.close_code, self.close_reason) -+ assert self.state in [State.CLOSING, State.CLOSED] -+ # Wait until the connection is closed to raise -+ # ConnectionClosed with the correct code and reason. -+ yield from self.ensure_open() - - @asyncio.coroutine - def send(self, data): -diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py -index 70348fb..bfd4e3b 100644 ---- a/websockets/test_protocol.py -+++ b/websockets/test_protocol.py -@@ -105,7 +105,7 @@ class CommonTests: - self.loop.call_soon(self.loop.stop) - self.loop.run_forever() - -- def make_drain_slow(self, delay=3 * MS): -+ def make_drain_slow(self, delay=MS): - # Process connection_made in order to initialize self.protocol.writer. - self.run_loop_once() - -@@ -174,6 +174,8 @@ class CommonTests: - # Empty the outgoing data stream so we can make assertions later on. - self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) - -+ assert self.protocol.state is State.CLOSED -+ - def half_close_connection_local(self, code=1000, reason='close'): - """ - Start a closing handshake but do not complete it. -@@ -181,31 +183,56 @@ class CommonTests: - The main difference with `close_connection` is that the connection is - left in the CLOSING state until the event loop runs again. - -+ The current implementation returns a task that must be awaited or -+ cancelled, else asyncio complains about destroying a pending task. -+ - """ - close_frame_data = serialize_close(code, reason) -- # Trigger the closing handshake from the local side. -- self.ensure_future(self.protocol.close(code, reason)) -+ # Trigger the closing handshake from the local endpoint. -+ close_task = self.ensure_future(self.protocol.close(code, reason)) - self.run_loop_once() # wait_for executes - self.run_loop_once() # write_frame executes - # Empty the outgoing data stream so we can make assertions later on. - self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) -- # Prepare the response to the closing handshake from the remote side. -- self.loop.call_soon( -- self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) -- self.loop.call_soon(self.receive_eof_if_client) -+ -+ assert self.protocol.state is State.CLOSING -+ -+ # Complete the closing sequence at 1ms intervals so the test can run -+ # at each point even it goes back to the event loop several times. -+ self.loop.call_later( -+ MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)) -+ self.loop.call_later(2 * MS, self.receive_eof_if_client) -+ -+ # This task must be awaited or cancelled by the caller. -+ return close_task - - def half_close_connection_remote(self, code=1000, reason='close'): - """ -- Receive a closing handshake. -+ Receive a closing handshake but do not complete it. - - The main difference with `close_connection` is that the connection is - left in the CLOSING state until the event loop runs again. - - """ -+ # On the server side, websockets completes the closing handshake and -+ # closes the TCP connection immediately. Yield to the event loop after -+ # sending the close frame to run the test while the connection is in -+ # the CLOSING state. -+ if not self.protocol.is_client: -+ self.make_drain_slow() -+ - close_frame_data = serialize_close(code, reason) -- # Trigger the closing handshake from the remote side. -+ # Trigger the closing handshake from the remote endpoint. - self.receive_frame(Frame(True, OP_CLOSE, close_frame_data)) -- self.receive_eof_if_client() -+ self.run_loop_once() # read_frame executes -+ # Empty the outgoing data stream so we can make assertions later on. -+ self.assertOneFrameSent(True, OP_CLOSE, close_frame_data) -+ -+ assert self.protocol.state is State.CLOSING -+ -+ # Complete the closing sequence at 1ms intervals so the test can run -+ # at each point even it goes back to the event loop several times. -+ self.loop.call_later(2 * MS, self.receive_eof_if_client) - - def process_invalid_frames(self): - """ -@@ -335,11 +362,13 @@ class CommonTests: - self.assertEqual(data, b'tea') - - def test_recv_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.recv()) - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_recv_on_closing_connection_remote(self): - self.half_close_connection_remote() - -@@ -421,24 +450,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_send_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_send_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_send_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.send('foobar')) -+ - self.assertNoFrameSent() - - # Test the ping coroutine. -@@ -466,24 +500,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_ping_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_ping_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_ping_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.ping()) -+ - self.assertNoFrameSent() - - # Test the pong coroutine. -@@ -506,24 +545,29 @@ class CommonTests: - self.assertNoFrameSent() - - def test_pong_on_closing_connection_local(self): -- self.half_close_connection_local() -+ close_task = self.half_close_connection_local() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -+ - self.assertNoFrameSent() - -+ self.loop.run_until_complete(close_task) # cleanup -+ - def test_pong_on_closing_connection_remote(self): - self.half_close_connection_remote() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -- self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close')) -+ -+ self.assertNoFrameSent() - - def test_pong_on_closed_connection(self): - self.close_connection() - - with self.assertRaises(ConnectionClosed): - self.loop.run_until_complete(self.protocol.pong()) -+ - self.assertNoFrameSent() - - # Test the protocol's logic for acknowledging pings with pongs. --- -2.17.0 - diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 2805e8a534..0fbe144173 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 fde30398f43401731ba38340a7031ab0 websockets-5.0.tar.gz -sha256 4ea90a598b546233a4c61bef98db4171ac30f1302826729af30001ac1f471098 websockets-5.0.tar.gz +md5 cd2f92f07bca588acd9238b18f6cfbcf websockets-5.0.1.tar.gz +sha256 a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674 websockets-5.0.1.tar.gz # Locally computed sha256 checksums sha256 2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index f7f2caaf0b..0e225b90f1 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 5.0 +PYTHON_WEBSOCKETS_VERSION = 5.0.1 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/0d/ea/0cc41f9ab63b4af08840a667b047d6fab6406aebb076932ef877a4511f78 +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/4b/c6/026da2eeed75a49dd0b72a0c7ed6ee5cb2943e396ca9753eabff7359b27b PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE From 444d13ca52a112a5a433aedd8619d0eef9541165 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 5 Jun 2018 18:30:59 +0200 Subject: [PATCH 1606/2640] mono: remove eglib/COPYING from license files When bumping Mono to 5.12.0.226 in commit 80821d3ed8e5607d259386abe5e3f98625614d11, the license files variable was not updated to take into account that "eglib" is no longer part of Mono, and therefore eglib/COPYING doesn't exist anymore. This commit therefore fixes the license files variable following this change. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mono/mono.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 2d60fc68fd..d1fe9bb0b1 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -8,7 +8,7 @@ MONO_VERSION = 5.12.0.226 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial -MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \ +MONO_LICENSE_FILES = LICENSE mcs/COPYING \ external/Newtonsoft.Json/Tools/7-zip/copying.txt MONO_INSTALL_STAGING = YES From b8594bef06bb1e680137bf1963a3d63363a47415 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 5 Jun 2018 18:32:23 +0200 Subject: [PATCH 1607/2640] mono: add hashes for license files Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mono/mono.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 47e34424ad..2cde7b6b21 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,5 @@ # sha256 locally computed sha256 f0636baa0c1399805526142e799cb697ddccf736e506cf1a30a870eaa2830a89 mono-5.12.0.226.tar.bz2 +sha256 3b40a54878b5ac2767a764bd082f8772ab27c03b9da9c7328c4c4935725556f7 LICENSE +sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING +sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt From c4cfdd0faa0c13fab5ec12ee5263d6f30e781d66 Mon Sep 17 00:00:00 2001 From: Oleksandr Zhadan Date: Tue, 5 Jun 2018 10:02:50 -0400 Subject: [PATCH 1608/2640] configs/arcturus_ucls1012a: bump U-Boot version This new u-boot custom repo version should fix the arcturus_ucls1012a_defconfig build failures on master. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/71726827 Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Signed-off-by: Thomas Petazzoni --- configs/arcturus_ucls1012a_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index 9d1da8c2cc..7fb980479a 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ArcturusNetworks/uCLS1012A-uboot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v0.2.1811" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v0.2.1823" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools From 0bfeef622291697d25dafd5836bef6bbbd277240 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Tue, 5 Jun 2018 15:06:32 +0530 Subject: [PATCH 1609/2640] configs/orangepi_zero_plus2: bump linux to v4.16 Bump linux as well headers to v4.16 version, this eventually drop the wifi patch since it has been merged to Linux v4.16. Signed-off-by: Jagan Teki Signed-off-by: Thomas Petazzoni --- ...s-orange-pi-zero-plus2-enable-ap6212.patch | 73 ------------------- configs/orangepi_zero_plus2_defconfig | 5 +- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch deleted file mode 100644 index 282e2171f2..0000000000 --- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Sergey Matyukevich -Date: Sun, 11 Feb 2018 16:21:43 +0300 -Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT combo - -Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board: -- WiFi SDIO interface is connected to MMC1 -- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq -- WiFi HOST_WAKE pin connected to gpio PL7 -- BT is connected to UART1 - -Signed-off-by: Sergey Matyukevich -Signed-off-by: Maxime Ripard ---- - .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 32 ++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -index a42fd79a62a3..d415b7b67cce 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -@@ -64,6 +64,13 @@ - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ -+ post-power-on-delay-ms = <200>; -+ }; - }; - - &mmc0 { -@@ -75,6 +82,25 @@ - status = "okay"; - }; - -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins_a>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ brcmf: wifi@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&r_pio>; -+ interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>; /* PL7 */ -+ interrupt-names = "host-wake"; -+ }; -+}; -+ - &mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; -@@ -90,3 +116,9 @@ - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; - }; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; -+ status = "okay"; -+}; --- -2.16.1 - diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 5ca6cf0fe2..8c83b3acd1 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,9 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches" BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" # Firmware @@ -33,7 +32,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" From 3bb11b80252607a99a7a79455d900f60f8fcab25 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Jun 2018 15:10:36 +0300 Subject: [PATCH 1610/2640] btrfs-progs: bump to version 4.16.1 Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...0003-btrfs.static-needs-libbtrfsutil.patch | 39 ------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch diff --git a/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch b/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch deleted file mode 100644 index 30ab75ae57..0000000000 --- a/package/btrfs-progs/0003-btrfs.static-needs-libbtrfsutil.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5023fdf9a4524106ef6fe1d0fdd75ade16dec62c Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 10 Apr 2018 22:56:31 +0300 -Subject: [PATCH] btrfs.static: needs libbtrfsutil - -Add libbtrfsutil objects to btrfs.static link command. This fixes static -build failure: - -utils.static.o: In function `parse_qgroupid': -utils.c:(.text.parse_qgroupid+0xb0): undefined reference to `btrfs_util_is_subvolume' -props.static.o: In function `prop_read_only': -props.c:(.text.prop_read_only+0x70): undefined reference to `btrfs_util_set_subvolume_read_only' -... -Makefile:457: recipe for target 'btrfs.static' failed -make[1]: *** [btrfs.static] Error 1 - -Signed-off-by: Baruch Siach ---- -Upstream status: https://patchwork.kernel.org/patch/10333795/ - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5ba76d2eee40..9b97c36a44a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -453,7 +453,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) - @echo " [LD] $@" - $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) - --btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) -+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(libbtrfsutil_objects) - @echo " [LD] $@" - $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) - --- -2.16.3 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 79aee129f7..71793d1c68 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 f3e0ec4864b7b89db1a6a36fa48bf8a9217117714a04b13c84d0fea1eac154b2 btrfs-progs-v4.16.tar.xz +sha256 013403fb67b17975b21408fa9eb7523b0ecf94f84f8a4397cf972e8e254d2246 btrfs-progs-v4.16.1.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index ec2eae707c..b4cc839352 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.16 +BTRFS_PROGS_VERSION = 4.16.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From b8b78099f25696a8197d3be519a93ab35b45e301 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Jun 2018 15:30:49 +0300 Subject: [PATCH 1611/2640] e2fsprogs: bump to version 1.44.2 Update license file hash; FSF address update. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/e2fsprogs/e2fsprogs.hash | 6 +++--- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 60498db8e4..65a6e199c9 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,6 +1,6 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.1/sha256sums.asc -sha256 0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef e2fsprogs-1.44.1.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.2/sha256sums.asc +sha256 8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c e2fsprogs-1.44.2.tar.xz # Locally calculated -sha256 680f852df303874fe9c722283a7da571ae9a0477768df8af1e363298e2adc51e NOTICE +sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h sha256 47182fe6631a32f271a15bbe210751b3825b7199f588879aac7d4804fc8b4b8f lib/et/internal.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index ce7736c1cd..316546a8d7 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.44.1 +E2FSPROGS_VERSION = 1.44.2 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From 231841fda196faa1bb987047ae7a0bf83a768ff4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Jun 2018 14:42:10 +0300 Subject: [PATCH 1612/2640] libusb: fix clock_gettime librt dependency check The detection of the librt dependency of clock_gettime in glibc before 2.17 is broken. We do not support glibc older than 2.17 for target, but we still need to support hosts using old glibc. Add a patch fixing that. Should fix (host-imx-usb-loader): http://autobuild.buildroot.net/results/0a1/0a156449e5f38a6092ab9c88e3e3f5ea9abc0f03/ http://autobuild.buildroot.net/results/347/347f1b9bce2f0854e8ca6d49b9a9b3fa55de24b1/ http://autobuild.buildroot.net/results/f6a/f6a3a62909ccb500ca122ec3f03119d7706fb88a/ Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...x-detection-of-clock_gettime-library.patch | 36 +++++++++++++++++++ package/libusb/libusb.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch diff --git a/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch b/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch new file mode 100644 index 0000000000..89b89bb596 --- /dev/null +++ b/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch @@ -0,0 +1,36 @@ +From 7cc67ed294ad8566f2877d6f71649f1bd36f69a4 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 5 Jun 2018 14:22:21 +0300 +Subject: [PATCH] configure.ac: fix detection of clock_gettime library + +glibc before 2.17 requires link with librt for clock_gettime(). The +AC_SEARCH_LIBS check in configure.ac should detect this dependency. +Unfortunately commit cb77a25e51 (configure.ac: Remove obsolete AC_ERROR +and make formatting consistent) inadvertently renamed to clock_gettime2, +thus breaking librt detection. + +Restore the correct clock_gettime() name. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/libusb/libusb/pull/439 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5b16c6825d4b..63590d1351a4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -107,7 +107,7 @@ case $backend in + linux) + AC_DEFINE(OS_LINUX, 1, [Linux backend]) + AC_SUBST(OS_LINUX) +- AC_SEARCH_LIBS([clock_gettime2], [rt], [], [], [-pthread]) ++ AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread]) + AC_ARG_ENABLE([udev], + [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])], + [], [enable_udev=yes]) +-- +2.17.1 + diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 8d7aed1619..aee3622f8d 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -12,6 +12,8 @@ LIBUSB_LICENSE = LGPL-2.1+ LIBUSB_LICENSE_FILES = COPYING LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# Patching configure.ac +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev From c7963858ed64bfc1b0b257c41e0058b684810632 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 5 Jun 2018 15:46:52 +0200 Subject: [PATCH 1613/2640] busybox: fix usage string in S01logging In busybox fix the S01logging usage text to document the "reload" target. Signed-off-by: Florian La Roche Signed-off-by: Thomas Petazzoni --- package/busybox/S01logging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/S01logging b/package/busybox/S01logging index 4632a4cc99..fcb3e7d236 100644 --- a/package/busybox/S01logging +++ b/package/busybox/S01logging @@ -33,7 +33,7 @@ case "$1" in start ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|restart|reload}" exit 1 esac From 13dbe73782c3555b382ea8ebd9cda34ac9ef5744 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 5 Jun 2018 15:47:09 +0200 Subject: [PATCH 1614/2640] busybox: reduce number of mkdir calls in inittab The default busybox inittab does two separate mkdir calls to create /dev/pts and /dev/shm. Reduce this to call mkdir only once for both directories. Signed-off-by: Florian La Roche Signed-off-by: Thomas Petazzoni --- package/busybox/inittab | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/busybox/inittab b/package/busybox/inittab index ef58c32f0d..7cd203de0b 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -16,8 +16,7 @@ # Startup the system ::sysinit:/bin/mount -t proc proc /proc ::sysinit:/bin/mount -o remount,rw / -::sysinit:/bin/mkdir -p /dev/pts -::sysinit:/bin/mkdir -p /dev/shm +::sysinit:/bin/mkdir -p /dev/pts /dev/shm ::sysinit:/bin/mount -a null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin From 903b8446a8db2aff042cdefd398d3598023bed0c Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Tue, 5 Jun 2018 15:47:45 +0200 Subject: [PATCH 1615/2640] skeleton: PAGER without blank and unset at end of for loop The PAGER environment variable is including a blank character at the end. Remove this. A for loop has been unsetting the variable inside the loop, this is only needed once at the end of the loop. Signed-off-by: Florian La Roche Signed-off-by: Thomas Petazzoni --- system/skeleton/etc/profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile index 3a97427fdf..1255d23ff4 100644 --- a/system/skeleton/etc/profile +++ b/system/skeleton/etc/profile @@ -8,7 +8,7 @@ if [ "$PS1" ]; then fi fi -export PAGER='/bin/more ' +export PAGER='/bin/more' export EDITOR='/bin/vi' # Source configuration files from /etc/profile.d @@ -16,5 +16,5 @@ for i in /etc/profile.d/*.sh ; do if [ -r "$i" ]; then . $i fi - unset i done +unset i From bfbfa5b8e2abcea6f18ee439660321f1788a7e82 Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Thu, 31 May 2018 11:04:29 -0600 Subject: [PATCH 1616/2640] flatcc: new package This adds flatcc as a new package, pulling v0.5.1 from github. flatcc has both a host tool (the compiler), and libraries for the target. Signed-off-by: Steve deRosier Signed-off-by: Joel Carlson Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: add entry in DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/flatcc/Config.in | 8 ++++++++ package/flatcc/flatcc.hash | 2 ++ package/flatcc/flatcc.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/flatcc/Config.in create mode 100644 package/flatcc/flatcc.hash create mode 100644 package/flatcc/flatcc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1ad3edcd78..e5d5a26e1f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -949,6 +949,9 @@ F: package/batctl/ N: Jeremy Rosen F: package/fxload/ +N: Joel Carlson +F: package/flatcc/ + N: Joel Stanley F: package/pdbg/ F: board/qemu/ppc64le-pseries/ diff --git a/package/Config.in b/package/Config.in index 1730201bf3..9640ab2d4e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1508,6 +1508,7 @@ menu "Other" source "package/fftw/Config.in" source "package/flann/Config.in" source "package/flatbuffers/Config.in" + source "package/flatcc/Config.in" source "package/gconf/Config.in" source "package/gflags/Config.in" source "package/glibmm/Config.in" diff --git a/package/flatcc/Config.in b/package/flatcc/Config.in new file mode 100644 index 0000000000..6273f2b500 --- /dev/null +++ b/package/flatcc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLATCC + bool "flatcc" + help + flatcc is C language implementation of Google Flatbuffers. It + consists of both a library for the target as well as a + flatbuffer compiler tool for the host. + + https://github.com/dvidelabs/flatcc diff --git a/package/flatcc/flatcc.hash b/package/flatcc/flatcc.hash new file mode 100644 index 0000000000..357d8b707d --- /dev/null +++ b/package/flatcc/flatcc.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8c4560ca32e3c555716d9363bed469e2c60e0f443ec32bc08e7abfe681e25ca9 flatcc-v0.5.1.tar.gz diff --git a/package/flatcc/flatcc.mk b/package/flatcc/flatcc.mk new file mode 100644 index 0000000000..55356445a2 --- /dev/null +++ b/package/flatcc/flatcc.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# FLATCC +# +################################################################################ + +FLATCC_VERSION = v0.5.1 +FLATCC_SITE = $(call github,dvidelabs,flatcc,$(FLATCC_VERSION)) +FLATCC_LICENSE = Apache-2.0 +FLATCC_LICENSE_FILES = LICENSE +FLATCC_INSTALL_STAGING = YES +FLATCC_DEPENDENCIES = host-flatcc + +# Disable build of tests and samples +FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF +HOST_FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF + +# Enable install targets +FLATCC_CONF_OPTS += -DFLATCC_INSTALL=ON +HOST_FLATCC_CONF_OPTS += -DFLATCC_INSTALL=ON + +define FLATCC_TARGET_REMOVE_FLATCC_COMPILER + rm $(TARGET_DIR)/usr/bin/flatcc +endef + +FLATCC_POST_INSTALL_TARGET_HOOKS += FLATCC_TARGET_REMOVE_FLATCC_COMPILER + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 6ed0e6ba235c3fd8a915e2f5777a4bfc69a5fcff Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 4 May 2018 11:21:59 +0200 Subject: [PATCH 1617/2640] package/mender: new package This patch add mender, an open source over-the-air (OTA) software updater for embedded Linux devices. Signed-off-by: Angelo Compagnucci [Thomas: - add entry to DEVELOPERS file. - drop dependency on systemd, since there is really no build dependency, it's just that the init script integration is missing. - add Config.in comment about the thread dependency - don't override install commands, otherwise the mender binary is not installed, and instead use a post install target hook.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/mender/Config.in | 17 ++++++++ package/mender/mender-device-identity | 52 ++++++++++++++++++++++++ package/mender/mender-inventory-hostinfo | 21 ++++++++++ package/mender/mender-inventory-network | 47 +++++++++++++++++++++ package/mender/mender.conf | 14 +++++++ package/mender/mender.hash | 2 + package/mender/mender.mk | 36 ++++++++++++++++ package/mender/mender.service | 15 +++++++ package/mender/server.crt | 22 ++++++++++ package/mender/tenant.conf | 0 12 files changed, 228 insertions(+) create mode 100644 package/mender/Config.in create mode 100644 package/mender/mender-device-identity create mode 100644 package/mender/mender-inventory-hostinfo create mode 100644 package/mender/mender-inventory-network create mode 100644 package/mender/mender.conf create mode 100644 package/mender/mender.hash create mode 100644 package/mender/mender.mk create mode 100644 package/mender/mender.service create mode 100644 package/mender/server.crt create mode 100644 package/mender/tenant.conf diff --git a/DEVELOPERS b/DEVELOPERS index e5d5a26e1f..32fa08f5c3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -145,6 +145,7 @@ F: package/libunwind/ N: Angelo Compagnucci F: package/corkscrew/ F: package/i2c-tools/ +F: package/mender/ F: package/mono/ F: package/mono-gtksharp3/ F: package/monolite/ diff --git a/package/Config.in b/package/Config.in index 9640ab2d4e..fcabed4fde 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2015,6 +2015,7 @@ menu "System tools" source "package/kvmtool/Config.in" source "package/libostree/Config.in" source "package/lxc/Config.in" + source "package/mender/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" source "package/numactl/Config.in" diff --git a/package/mender/Config.in b/package/mender/Config.in new file mode 100644 index 0000000000..61a20cfd8a --- /dev/null +++ b/package/mender/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_MENDER + bool "mender" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Mender is an open source over-the-air (OTA) software updater for + embedded Linux devices. Mender comprises a client running at the + embedded device, as well as a server that manages deployments + across many devices. + + https://github.com/mendersoftware/mender + +comment "mender needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mender/mender-device-identity b/package/mender/mender-device-identity new file mode 100644 index 0000000000..d87f843357 --- /dev/null +++ b/package/mender/mender-device-identity @@ -0,0 +1,52 @@ +#!/bin/sh + +# Example script called by Mender agent to collect device identity data. The +# script needs to be located at +# $(datadir)/mender/identity/mender-device-identity path for the agent to find +# it. The script shall exit with non-0 status on errors. In this case the agent +# will discard any output the script may have produced. +# +# The script shall output identity data in = format, one +# entry per line. Example +# +# $ ./mender-device-identity +# mac=de:ad:ca:fe:00:01 +# cpuid=1112233 +# +# The example script collects the MAC address of a network interface with the +# type ARPHRD_ETHER and it will pick the interface with the lowest ifindex +# number if there are multiple interfaces with that type. The identity data is +# output in the following format: +# +# mac=00:01:02:03:04:05 +# + +set -ue + +SCN=/sys/class/net +min=65535 +arphrd_ether=1 +ifdev= + +# find iface with lowest ifindex, skip non ARPHRD_ETHER types (lo, sit ...) +for dev in $SCN/*; do + iftype=$(cat $dev/type) + if [ $iftype -ne $arphrd_ether ]; then + continue + fi + + idx=$(cat $dev/ifindex) + if [ $idx -lt $min ]; then + min=$idx + ifdev=$dev + fi +done + +if [ -z "$ifdev" ]; then + echo "no suitable interfaces found" >&2 + exit 1 +else + echo "using interface $ifdev" >&2 + # grab MAC address + echo "mac=$(cat $ifdev/address)" +fi diff --git a/package/mender/mender-inventory-hostinfo b/package/mender/mender-inventory-hostinfo new file mode 100644 index 0000000000..cf508fdf88 --- /dev/null +++ b/package/mender/mender-inventory-hostinfo @@ -0,0 +1,21 @@ +#!/bin/sh +# +# The example script collects information about current host +# + +set -ue + +LC_ALL=C +export LC_ALL + +grep 'model name' /proc/cpuinfo | uniq | awk -F': ' ' + // { printf("cpu_model=%s\n", $2);} +' +echo "kernel=$(cat /proc/version)" + +cat /proc/meminfo | awk ' +/MemTotal/ {printf("mem_total_kB=%d\n", $2)} +' + +echo "hostname=$(cat /etc/hostname)" + diff --git a/package/mender/mender-inventory-network b/package/mender/mender-inventory-network new file mode 100644 index 0000000000..b017c4ea14 --- /dev/null +++ b/package/mender/mender-inventory-network @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Example script called by Mender agent to collect inventory data for a +# particular devce. The script needs to be located in $(datadir)/mender and its +# name shall start with `mender-inventory-` prefix. The script shall exit with +# non-0 status on errors. In this case the agent will discard any output the +# script may have produced. +# +# The script shall output inventory data in = format, one entry per +# line. Entries appearing multiple times will be joined in a list under the same +# key. +# +# $ ./mender-inventory-network +# mac_br-fbfdad18c33c=02:42:7e:74:96:85 +# network_interfaces=br-fbfdad18c33c +# ipv4_br-fbfdad18c33c=172.21.0.1/16 +# mac_enp0s25=de:ad:be:ef:bb:05 +# network_interfaces=enp0s25 +# ipv4_enp0s25=123.22.0.197/16 +# ipv4_enp0s25=10.20.20.105/16 +# ipv6_enp0s25=fe80::2aad:beff:feef:bb05/64 +# +# +# The example script collects the list of network interfaces, as well as +# ethernet and IP addresses of each of the interfaces. +# + +set -ue + +SCN=/sys/class/net +min=65535 +ifdev= + +# find iface with lowest ifindex, except loopback +for devpath in $SCN/*; do + dev=$(basename $devpath) + if [ $dev = "lo" ]; then + continue + fi + echo "mac_$dev=$(cat $devpath/address)" + echo "network_interfaces=$dev" + + ip addr show dev $dev | awk -v dev=$dev ' + /inet / { printf("ipv4_%s=%s\n", dev, $2) } + /inet6 / {printf("ipv6_%s=%s\n", dev, $2) } + ' +done diff --git a/package/mender/mender.conf b/package/mender/mender.conf new file mode 100644 index 0000000000..a5c7c545c3 --- /dev/null +++ b/package/mender/mender.conf @@ -0,0 +1,14 @@ +{ + "ClientProtocol": "http", + "HttpsClient": { + "Certificate": "", + "Key": "" + }, + "RootfsPartA": "@MENDER_ROOTFS_PART_A@", + "RootfsPartB": "@MENDER_ROOTFS_PART_B@", + "UpdatePollIntervalSeconds": @MENDER_UPDATE_POLL_INTERVAL_SECONDS@, + "InventoryPollIntervalSeconds": @MENDER_INVENTORY_POLL_INTERVAL_SECONDS@, + "RetryPollIntervalSeconds": @MENDER_RETRY_POLL_INTERVAL_SECONDS@, + "ServerURL": "@MENDER_SERVER_URL@", + "ServerCertificate": "@MENDER_CERT_LOCATION@" +} diff --git a/package/mender/mender.hash b/package/mender/mender.hash new file mode 100644 index 0000000000..30a04fad7a --- /dev/null +++ b/package/mender/mender.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 267fa73ad472b034248ee298593b5c52ea0b105fd73c91febb3587280c61bee2 mender-1.4.0.tar.gz diff --git a/package/mender/mender.mk b/package/mender/mender.mk new file mode 100644 index 0000000000..ab0078e0cc --- /dev/null +++ b/package/mender/mender.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# mender +# +################################################################################ + +MENDER_VERSION = 1.4.0 +MENDER_SOURCE = mender-$(MENDER_VERSION).tar.gz +MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) + +define MENDER_INSTALL_CONFIG_FILES + $(INSTALL) -D -m 0644 package/mender/mender.conf \ + $(TARGET_DIR)/etc/mender/mender.conf + $(INSTALL) -D -m 0644 package/mender/tenant.conf \ + $(TARGET_DIR)/etc/mender/tenant.conf + $(INSTALL) -D -m 0644 package/mender/server.crt \ + $(TARGET_DIR)/etc/mender/server.crt + $(INSTALL) -D -m 0755 package/mender/mender-device-identity \ + $(TARGET_DIR)/var/share/mender/identity/mender-device-identity + $(INSTALL) -D -m 0755 package/mender/mender-inventory-network \ + $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-network + $(INSTALL) -D -m 0755 package/mender/mender-inventory-hostinfo \ + $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-hostinfo +endef + +MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES + +define MENDER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/mender/mender.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mender.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/mender.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service +endef + +$(eval $(golang-package)) diff --git a/package/mender/mender.service b/package/mender/mender.service new file mode 100644 index 0000000000..ec77fbc46c --- /dev/null +++ b/package/mender/mender.service @@ -0,0 +1,15 @@ +[Unit] +Description=Mender OTA update service +After=systemd-resolved.service + +[Service] +Type=idle +User=root +Group=root +ExecStartPre=/bin/mkdir -p -m 0700 /data/mender +ExecStartPre=/bin/ln -sf /etc/mender/tenant.conf /var/lib/mender/authtentoken +ExecStart=/usr/bin/mender -daemon +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/package/mender/server.crt b/package/mender/server.crt new file mode 100644 index 0000000000..79a57e15e7 --- /dev/null +++ b/package/mender/server.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIBfTCCASOgAwIBAgIJAJOS76a0qWuZMAoGCCqGSM49BAMCMBsxGTAXBgNVBAMM +EGRvY2tlci5tZW5kZXIuaW8wHhcNMTYxMjE0MTk1MjQ2WhcNMjYxMjEyMTk1MjQ2 +WjAbMRkwFwYDVQQDDBBkb2NrZXIubWVuZGVyLmlvMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAE7AVYis6MWGPGQYU1/tlLEnskRifDIhvkRb8Y4nQPekRkLkiBYYT3 +iJ46wHrnejbHaLstU9GRdKWOmOuU6HGdO6NQME4wHQYDVR0OBBYEFGOIU4q++Vz8 +9HuT1jg9V+wFeJcyMB8GA1UdIwQYMBaAFGOIU4q++Vz89HuT1jg9V+wFeJcyMAwG +A1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAPLnEeWPNeN7eDCEYRitBfyO +X1yf2kzOm4ohBE5GY9gzAiBCq7HOSkzQDkelmQCCCpGXf/UwYNgQJjSoeGfk0j1a +TQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBhDCCASmgAwIBAgIJALQrf4QDot4IMAoGCCqGSM49BAMCMB4xHDAaBgNVBAMM +E3MzLmRvY2tlci5tZW5kZXIuaW8wHhcNMTYxMjE0MTk1MjQ2WhcNMjYxMjEyMTk1 +MjQ2WjAeMRwwGgYDVQQDDBNzMy5kb2NrZXIubWVuZGVyLmlvMFkwEwYHKoZIzj0C +AQYIKoZIzj0DAQcDQgAEEc/Y3T+l3DvINePkpvVZORMIdHVs29jgsl48ia7z/NRX +HlKtKxVGJyFN5Y7sBZeLgBYH3F4Bo3KfmxI7ad0tI6NQME4wHQYDVR0OBBYEFIUm +cip00QZYpe4ULflbGNJan+Y9MB8GA1UdIwQYMBaAFIUmcip00QZYpe4ULflbGNJa +n+Y9MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIhANHij9VZBDHOUPaC +pFiagnWnYL2HBR72W1xTKQbrLLTXAiEAvpwA4HzSnGmLd3010+jqQuMRHArN5WaX +h0fy7niBbIQ= +-----END CERTIFICATE----- diff --git a/package/mender/tenant.conf b/package/mender/tenant.conf new file mode 100644 index 0000000000..e69de29bb2 From 6f84d52bb402d60ab53bc9ba185a540d61a2a4ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Jun 2018 20:20:57 +0200 Subject: [PATCH 1618/2640] oprofile: fix musl build Add patch to replace undeclared basename call by op_basename Fixes: - http://autobuild.buildroot.net/results/39ba30f4ec94e176e3d5d5b5ced37a0aa030cc5a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ve-replace-basename-with-op_basename.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch diff --git a/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch b/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch new file mode 100644 index 0000000000..a2b580dad7 --- /dev/null +++ b/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch @@ -0,0 +1,34 @@ +From 5da92e18a538c630cb06a3dbb2affd9bfc128901 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 5 Jun 2018 13:31:34 +0200 +Subject: [PATCH] oparchive: replace basename with op_basename + +Use op_basename instead of basename in oparchive function. +This seems to be the intended use as there is no include on libgen.h for +the standard basename and the argument is a const char* instead of a +char*. + +Fixes: + - http://autobuild.buildroot.net/results/06fbff267063e09f7bc06adb08c896f861ecdb1d + +Signed-off-by: Fabrice Fontaine +--- + pp/oparchive.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pp/oparchive.cpp b/pp/oparchive.cpp +index 6221e148..274152ba 100644 +--- a/pp/oparchive.cpp ++++ b/pp/oparchive.cpp +@@ -261,7 +261,7 @@ int oparchive(options::spec const & spec) + /* determine the session name of sample file */ + int offset = sample_name.find('{'); + string base_samples_dir = sample_name.substr(0, offset-1); +- string session = basename(base_samples_dir.c_str()); ++ string session = op_basename(base_samples_dir.c_str()); + /* Get rid of the the archive_path from the name */ + string sample_base = sample_name.substr(offset); + string sample_archive_file = dest_samples_dir + "/" + session + "/" + sample_base; +-- +2.14.1 + From 64aec332bf4eada6df9453d60c17460e6c17dd39 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Jun 2018 21:19:35 +0300 Subject: [PATCH 1619/2640] libbsd: bump to version 0.9.1 Drop upstream patches. Add a patch fixing build with musl libc. Update the list of licenses based on the content of COPYING. The BSD-5-Clause license is not listed by SPDX, but that is its name in the COPYING file. Update the license file hash: new licenses, dates update, reformat. Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...laration-protection-for-glibc-alread.patch | 80 ------ ...0001-flopen-fix-build-with-musl-libc.patch | 40 +++ ...2-Fix-build-for-openrisc-with-uClibc.patch | 48 ---- ...3-Handle-systems-missing-sys-cdefs.h.patch | 230 ------------------ package/libbsd/libbsd.hash | 6 +- package/libbsd/libbsd.mk | 5 +- 6 files changed, 46 insertions(+), 363 deletions(-) delete mode 100644 package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch create mode 100644 package/libbsd/0001-flopen-fix-build-with-musl-libc.patch delete mode 100644 package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch delete mode 100644 package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch diff --git a/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch b/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch deleted file mode 100644 index fdf45bdef6..0000000000 --- a/package/libbsd/0001-Fix-function-declaration-protection-for-glibc-alread.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:39:45 +0100 -Subject: [PATCH] Fix function declaration protection for glibc already - providing them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On non-glibc based systems we cannot unconditionally use the -__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, -if it is undefined, define it to 0. - -We should also always declare these functions on non-glibc based -systems. And on systems with a new enough glibc, which provides these -functions, we should still provide the declarations if _GNU_SOURCE -is *not* defined. - -Backported from: -https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 - -Reported-by: Jörg Krause -Signed-off-by: Guillem Jover -Signed-off-by: Jörg Krause ---- - include/bsd/stdlib.h | 3 ++- - include/bsd/string.h | 3 ++- - include/bsd/sys/cdefs.h | 8 ++++++++ - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index 8d33d1f..a5b063c 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 29097f6..f987fee 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS -diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h -index b4c8f30..d1cc419 100644 ---- a/include/bsd/sys/cdefs.h -+++ b/include/bsd/sys/cdefs.h -@@ -58,6 +58,14 @@ - #endif - #endif - -+/* -+ * On non-glibc based systems, we cannot unconditionally use the -+ * __GLIBC_PREREQ macro as it gets expanded before evaluation. -+ */ -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(maj, min) 0 -+#endif -+ - /* - * Some kFreeBSD headers expect those macros to be set for sanity checks. - */ --- -2.16.2 - diff --git a/package/libbsd/0001-flopen-fix-build-with-musl-libc.patch b/package/libbsd/0001-flopen-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..6f0aeffed7 --- /dev/null +++ b/package/libbsd/0001-flopen-fix-build-with-musl-libc.patch @@ -0,0 +1,40 @@ +From 8575450b9c1226fc38196b29e33c67f2b58cacf5 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 5 Jun 2018 19:18:47 +0300 +Subject: [PATCH] flopen: fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the +fcntl.h header. This breaks the build with musl libc: + +flopen.c: In function ‘vflopenat’: +flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) + if (flags & O_CREAT) { + ^~~~~~~ + +Restore the fcntl.h header include to fix the build. + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to libbsd@lists.freedesktop.org + + src/flopen.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/flopen.c b/src/flopen.c +index b9972c94ec90..ff20d074445b 100644 +--- a/src/flopen.c ++++ b/src/flopen.c +@@ -32,6 +32,7 @@ + #include + + #include ++#include + #include + #include + +-- +2.17.1 + diff --git a/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch b/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch deleted file mode 100644 index 1b28df5a8b..0000000000 --- a/package/libbsd/0002-Fix-build-for-openrisc-with-uClibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From aa902671bf1e0e808fd994bd6b403d70af7ab6dd Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 3 Apr 2018 20:02:14 +0300 -Subject: [PATCH] Fix build for openrisc with uClibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -uClibc defines EM_OR1K instead of EM_OPENRISC for the OpenRISC ELF -e_machine ID. Use EM_OR1K when EM_OPENRISC is not defined. - -This fixes the following build failure: - -In file included from nlist.c:44:0: -nlist.c: In function ‘__elf_is_okay__’: -local-elf.h:224:23: error: ‘EM_OPENRISC’ undeclared (first use in this function) - #define ELF_TARG_MACH EM_OPENRISC - ^ -nlist.c:77:26: note: in expansion of macro ‘ELF_TARG_MACH’ - if (ehdr->e_machine == ELF_TARG_MACH && - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to libbsd@lists.freedesktop.org - - src/local-elf.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/local-elf.h b/src/local-elf.h -index 1faf182f87d7..79f7d026f6c9 100644 ---- a/src/local-elf.h -+++ b/src/local-elf.h -@@ -221,7 +221,11 @@ - - #elif defined(__or1k__) - -+#if defined(EM_OPENRISC) - #define ELF_TARG_MACH EM_OPENRISC -+#else -+#define ELF_TARG_MACH EM_OR1K -+#endif - #define ELF_TARG_CLASS ELFCLASS32 - #define ELF_TARG_DATA ELFDATA2MSB - --- -2.16.3 - diff --git a/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch b/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch deleted file mode 100644 index 2cf7a5f09f..0000000000 --- a/package/libbsd/0003-Handle-systems-missing-sys-cdefs.h.patch +++ /dev/null @@ -1,230 +0,0 @@ -From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:41:35 +0100 -Subject: [PATCH] Handle systems missing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is a non-portable header, and we cannot expect it to be provided by -the system libc (e.g. musl). We just need and rely on declaration that -we have defined ourselves in our own . So we switch to -only ever assume that. - -Fixes: https://bugs.freedesktop.org/105281 - -Backported from: 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd - -Signed-off-by: Guillem Jover -Signed-off-by: Jörg Krause ---- - include/bsd/libutil.h | 4 ++++ - include/bsd/md5.h | 4 ++++ - include/bsd/nlist.h | 4 ++++ - include/bsd/readpassphrase.h | 4 ++++ - include/bsd/stdlib.h | 4 ++++ - include/bsd/string.h | 4 ++++ - include/bsd/stringlist.h | 5 +++++ - include/bsd/sys/queue.h | 4 ++++ - include/bsd/sys/tree.h | 4 ++++ - include/bsd/timeconv.h | 4 ++++ - include/bsd/vis.h | 4 ++++ - include/bsd/wchar.h | 4 ++++ - 12 files changed, 49 insertions(+) - -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..ccca29a 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -40,7 +40,11 @@ - #define LIBBSD_LIBUTIL_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - #include -diff --git a/include/bsd/md5.h b/include/bsd/md5.h -index 5f3ae46..bf36a30 100644 ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -27,7 +27,11 @@ typedef struct MD5Context { - uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } MD5_CTX; - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index cb297e8..8767117 100644 ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -27,7 +27,11 @@ - #ifndef LIBBSD_NLIST_H - #define LIBBSD_NLIST_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - struct nlist { - union { -diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h -index 14744b8..5eb8021 100644 ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -31,7 +31,11 @@ - #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ - #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..8d33d1f 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -42,7 +42,11 @@ - #ifndef LIBBSD_STDLIB_H - #define LIBBSD_STDLIB_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..29097f6 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_STRING_H - #define LIBBSD_STRING_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h -index ff30cac..dd71496 100644 ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -31,7 +31,12 @@ - - #ifndef LIBBSD_STRINGLIST_H - #define LIBBSD_STRINGLIST_H -+ -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - /* -diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h -index 4a94ea7..ac00026 100644 ---- a/include/bsd/sys/queue.h -+++ b/include/bsd/sys/queue.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_SYS_QUEUE_H - #define LIBBSD_SYS_QUEUE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, -diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h -index 628bec0..325b382 100644 ---- a/include/bsd/sys/tree.h -+++ b/include/bsd/sys/tree.h -@@ -30,7 +30,11 @@ - #ifndef LIBBSD_SYS_TREE_H - #define LIBBSD_SYS_TREE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines data structures for different types of trees: -diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h -index e2a2c55..a426bd3 100644 ---- a/include/bsd/timeconv.h -+++ b/include/bsd/timeconv.h -@@ -41,7 +41,11 @@ - #ifndef LIBBSD_TIMECONV_H - #define LIBBSD_TIMECONV_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/vis.h b/include/bsd/vis.h -index 970dfdd..ab5430c 100644 ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -72,7 +72,11 @@ - */ - #define UNVIS_END 1 /* no more characters */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - __BEGIN_DECLS - char *vis(char *, int, int, int); -diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h -index 33a500e..7216503 100644 ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -40,7 +40,11 @@ - #define LIBBSD_WCHAR_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS --- -2.17.0 - diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 133df90cb9..93af3944ae 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/libbsd/2018-January/000166.html -sha256 f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31 libbsd-0.8.7.tar.xz -sha256 0b6cedd686394f9c811a6a9fd314d68ab4738475ad3d9df61154259fa649a2a7 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2018-May/000190.html +sha256 56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4 libbsd-0.9.1.tar.xz +sha256 df6d8e1b5b3a5b06376c658c8ad3afc82687f1c0e0404cec4738ad14b2675708 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index e211389ec7..2d78b8c5f3 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBBSD_VERSION = 0.8.7 +LIBBSD_VERSION = 0.9.1 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://archive.hadrons.org/software/libbsd -LIBBSD_LICENSE = BSD-3-Clause, MIT +LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ + MIT, ISC, Beerware LIBBSD_LICENSE_FILES = COPYING LIBBSD_INSTALL_STAGING = YES From d2c7f8438068c4175daab02af93d710494abb56d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Jun 2018 21:40:32 +0200 Subject: [PATCH 1620/2640] libstrophe: bump to version 0.9.2 - Remove first patch (already in version, see https://github.com/strophe/libstrophe/pull/59) - Use --without-xml (fixed by https://github.com/strophe/libstrophe/commit/3b55c20879aabad2f1b601b141d73c157972708d) - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Namespace-SHA-functions.patch | 189 ------------------ ...e.patch => 0001-make-autoreconfable.patch} | 0 package/libstrophe/libstrophe.hash | 4 +- package/libstrophe/libstrophe.mk | 6 +- 4 files changed, 5 insertions(+), 194 deletions(-) delete mode 100644 package/libstrophe/0001-Namespace-SHA-functions.patch rename package/libstrophe/{0002-make-autoreconfable.patch => 0001-make-autoreconfable.patch} (100%) diff --git a/package/libstrophe/0001-Namespace-SHA-functions.patch b/package/libstrophe/0001-Namespace-SHA-functions.patch deleted file mode 100644 index 8c3451bbac..0000000000 --- a/package/libstrophe/0001-Namespace-SHA-functions.patch +++ /dev/null @@ -1,189 +0,0 @@ -From b08766c8e46956daba010044b00c97f78b598780 Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Sun, 24 May 2015 10:55:02 -0400 -Subject: [PATCH] Namespace SHA functions - -Fix statically linking against libstrophe by renaming the internal SHA -functions: - -https://github.com/strophe/libstrophe/issues/40 - -Although the same function names are used by libstrophe and OpenSSL, -the signatures and contexts of the SHA functions differ, resulting in -a segfault if the OpenSSL versions are substituted. - -[Upstream commit: https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780] -Signed-off-by: Thomas Petazzoni ---- - src/auth.c | 8 ++++---- - src/scram.c | 22 +++++++++++----------- - src/sha1.c | 30 +++++++++++++++--------------- - src/sha1.h | 6 +++--- - 4 files changed, 33 insertions(+), 33 deletions(-) - -diff --git a/src/auth.c b/src/auth.c -index b06f18c..3506977 100644 ---- a/src/auth.c -+++ b/src/auth.c -@@ -1187,10 +1187,10 @@ int _handle_component_auth(xmpp_conn_t * const conn) - /* Feed the session id and passphrase to the algorithm. - * We need to compute SHA1(session_id + passphrase) - */ -- SHA1_Init(&mdctx); -- SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id)); -- SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass)); -- SHA1_Final(&mdctx, md_value); -+ xmpp_SHA1_Init(&mdctx); -+ xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id)); -+ xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass)); -+ xmpp_SHA1_Final(&mdctx, md_value); - - digest = xmpp_alloc(conn->ctx, 2*sizeof(md_value)+1); - if (digest) { -diff --git a/src/scram.c b/src/scram.c -index 5cce168..6e420e1 100644 ---- a/src/scram.c -+++ b/src/scram.c -@@ -37,9 +37,9 @@ static void SHA1(const uint8_t* data, size_t len, - uint8_t digest[SHA1_DIGEST_SIZE]) - { - SHA1_CTX ctx; -- SHA1_Init(&ctx); -- SHA1_Update(&ctx, data, len); -- SHA1_Final(&ctx, digest); -+ xmpp_SHA1_Init(&ctx); -+ xmpp_SHA1_Update(&ctx, data, len); -+ xmpp_SHA1_Final(&ctx, digest); - } - - static void HMAC_SHA1(const uint8_t *key, size_t key_len, -@@ -66,15 +66,15 @@ static void HMAC_SHA1(const uint8_t *key, size_t key_len, - key_opad[i] = key_pad[i] ^ opad; - } - -- SHA1_Init(&ctx); -- SHA1_Update(&ctx, key_ipad, BLOCK_SIZE); -- SHA1_Update(&ctx, text, len); -- SHA1_Final(&ctx, sha_digest); -+ xmpp_SHA1_Init(&ctx); -+ xmpp_SHA1_Update(&ctx, key_ipad, BLOCK_SIZE); -+ xmpp_SHA1_Update(&ctx, text, len); -+ xmpp_SHA1_Final(&ctx, sha_digest); - -- SHA1_Init(&ctx); -- SHA1_Update(&ctx, key_opad, BLOCK_SIZE); -- SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE); -- SHA1_Final(&ctx, digest); -+ xmpp_SHA1_Init(&ctx); -+ xmpp_SHA1_Update(&ctx, key_opad, BLOCK_SIZE); -+ xmpp_SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE); -+ xmpp_SHA1_Final(&ctx, digest); - } - - static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len, -diff --git a/src/sha1.c b/src/sha1.c -index 9af4f04..b60b325 100644 ---- a/src/sha1.c -+++ b/src/sha1.c -@@ -202,7 +202,7 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]) - - - /* SHA1Init - Initialize new context */ --void SHA1_Init(SHA1_CTX* context) -+void xmpp_SHA1_Init(SHA1_CTX* context) - { - /* SHA1 initialization constants */ - context->state[0] = 0x67452301; -@@ -215,7 +215,7 @@ void SHA1_Init(SHA1_CTX* context) - - - /* Run your data through this. */ --void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len) -+void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len) - { - size_t i, j; - -@@ -244,7 +244,7 @@ void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len) - - - /* Add padding and return the message digest. */ --void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]) -+void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]) - { - uint32_t i; - uint8_t finalcount[8]; -@@ -253,11 +253,11 @@ void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]) - finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] - >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ - } -- SHA1_Update(context, (uint8_t *)"\200", 1); -+ xmpp_SHA1_Update(context, (uint8_t *)"\200", 1); - while ((context->count[0] & 504) != 448) { -- SHA1_Update(context, (uint8_t *)"\0", 1); -+ xmpp_SHA1_Update(context, (uint8_t *)"\0", 1); - } -- SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */ -+ xmpp_SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */ - for (i = 0; i < SHA1_DIGEST_SIZE; i++) { - digest[i] = (uint8_t) - ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); -@@ -300,12 +300,12 @@ FILE* file; - return(-1); - } - } -- SHA1_Init(&context); -+ xmpp_SHA1_Init(&context); - while (!feof(file)) { /* note: what if ferror(file) */ - i = fread(buffer, 1, 16384, file); -- SHA1_Update(&context, buffer, i); -+ xmpp_SHA1_Update(&context, buffer, i); - } -- SHA1_Final(&context, digest); -+ xmpp_SHA1_Final(&context, digest); - fclose(file); - for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) { - for (j = 0; j < 4; j++) { -@@ -358,9 +358,9 @@ int main(int argc, char** argv) - fprintf(stdout, "verifying SHA-1 implementation... "); - - for (k = 0; k < 2; k++){ -- SHA1_Init(&context); -- SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k])); -- SHA1_Final(&context, digest); -+ xmpp_SHA1_Init(&context); -+ xmpp_SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k])); -+ xmpp_SHA1_Final(&context, digest); - digest_to_hex(digest, output); - - if (strcmp(output, test_results[k])) { -@@ -372,10 +372,10 @@ int main(int argc, char** argv) - } - } - /* million 'a' vector we feed separately */ -- SHA1_Init(&context); -+ xmpp_SHA1_Init(&context); - for (k = 0; k < 1000000; k++) -- SHA1_Update(&context, (uint8_t*)"a", 1); -- SHA1_Final(&context, digest); -+ xmpp_SHA1_Update(&context, (uint8_t*)"a", 1); -+ xmpp_SHA1_Final(&context, digest); - digest_to_hex(digest, output); - if (strcmp(output, test_results[2])) { - fprintf(stdout, "FAIL\n"); -diff --git a/src/sha1.h b/src/sha1.h -index 10266cb..7ff48d7 100644 ---- a/src/sha1.h -+++ b/src/sha1.h -@@ -23,9 +23,9 @@ typedef struct { - - #define SHA1_DIGEST_SIZE 20 - --void SHA1_Init(SHA1_CTX* context); --void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len); --void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]); -+void xmpp_SHA1_Init(SHA1_CTX* context); -+void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len); -+void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]); - - #ifdef __cplusplus - } diff --git a/package/libstrophe/0002-make-autoreconfable.patch b/package/libstrophe/0001-make-autoreconfable.patch similarity index 100% rename from package/libstrophe/0002-make-autoreconfable.patch rename to package/libstrophe/0001-make-autoreconfable.patch diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index 6a2d99706b..72eb386520 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 08f4a85ef419a8bdf08b6afa8f7b2a0e5e180fdc9c16cede81af672ec10e21e7 libstrophe-0.8.8.tar.gz +sha256 158145bc1565a5fd0bbd7f57e3e15d768e58b8a460897ab5918a5a689d67ae6f libstrophe-0.9.2.tar.gz +sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 4b5a10a558..7445caa67f 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.8.8 +LIBSTROPHE_VERSION = 0.9.2 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf # Doesn't ship configure @@ -14,9 +14,7 @@ LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt LIBSTROPHE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_EXPAT),y) -# Passing --without-libxml2 doesn't work, due to how AC_ARG_WITH is -# used in configure.ac. As long as --with-libxml2 is *not* passed, the -# configure script assumes expat should be used. +LIBSTROPHE_CONF_OPTS += --without-libxml2 LIBSTROPHE_DEPENDENCIES += expat else LIBSTROPHE_CONF_OPTS += --with-libxml2 From 6e179bda00d51dbe07789cbd6297f57a2cc89171 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Jun 2018 21:41:21 +0200 Subject: [PATCH 1621/2640] libsoxr: bump to version 0.1.3 Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libsoxr/libsoxr.hash | 8 +++++--- package/libsoxr/libsoxr.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libsoxr/libsoxr.hash b/package/libsoxr/libsoxr.hash index 066b546e62..1ea0c3ace4 100644 --- a/package/libsoxr/libsoxr.hash +++ b/package/libsoxr/libsoxr.hash @@ -1,5 +1,7 @@ # From http://sourceforge.net/projects/soxr/files/ -sha1 3b990f91dc8dc08e70626cd5fb90deda0239c211 soxr-0.1.2-Source.tar.xz -md5 0866fc4320e26f47152798ac000de1c0 soxr-0.1.2-Source.tar.xz +sha1 32ea46b1a8c0c15f835422892d02fce8286aec3c soxr-0.1.3-Source.tar.xz +md5 3f16f4dcb35b471682d4321eda6f6c08 soxr-0.1.3-Source.tar.xz # Locally calculated -sha256 54e6f434f1c491388cd92f0e3c47f1ade082cc24327bdc43762f7d1eefe0c275 soxr-0.1.2-Source.tar.xz +sha256 b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5a15889 soxr-0.1.3-Source.tar.xz +sha256 dc98676341fdcd29d9f279c9679d6a75288785b174ded8d1b2e316c366166135 LICENCE +sha256 f2f118b9029ec1871b953639ecc46651b2fc7b62e295e6cf3ef2ac4c9a058b33 COPYING.LGPL diff --git a/package/libsoxr/libsoxr.mk b/package/libsoxr/libsoxr.mk index c1dc4b0844..5291f9474b 100644 --- a/package/libsoxr/libsoxr.mk +++ b/package/libsoxr/libsoxr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOXR_VERSION = 0.1.2 +LIBSOXR_VERSION = 0.1.3 LIBSOXR_SOURCE = soxr-$(LIBSOXR_VERSION)-Source.tar.xz LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr LIBSOXR_LICENSE = LGPL-2.1+ From dc5553d2ce1d333cbecac563d2c55525aa8e14ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Jun 2018 20:13:47 +0200 Subject: [PATCH 1622/2640] dependencies.sh: add perl autodie for whois Add dependency on perl autodie if whois package is selected Fixes: - http://autobuild.buildroot.net/results/4d2ca14580cbc73f94e86ee834fac6d2541298ec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index f98678973b..e570a9ee1a 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -256,6 +256,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules autodie" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" From 4f8d590ccc243c9d0f360ac7cd368ceb53bb0a3d Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 28 May 2018 20:37:05 +0200 Subject: [PATCH 1623/2640] package/python-pydal: bump to version 17.11 This patch bumps python-pyDAL to version 17.11. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pydal/python-pydal.hash | 5 ++--- package/python-pydal/python-pydal.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 9a3fad3707..8e6fa90e6a 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,2 @@ -# md5 from https://pypi.python.org/pypi/pydal/json, sha256 locally computed -md5 5a6ad0db15dc39987b4518247a9d0b4b pyDAL-17.8.tar.gz -sha256 46abe2c978ec24013e29cf485a74c90309ebcd2f0d577687ff2d224547cebfc8 pyDAL-17.8.tar.gz +# sha256 from https://pypi.org/project/pyDAL/#files +sha256 59b28cbad92743c76134fc078b62f49d5c02b86c55cbdee527f75995d2681735 pyDAL-17.11.tar.gz diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index c8d4b44cfd..9de56bff61 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 17.8 +PYTHON_PYDAL_VERSION = 17.11 PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://pypi.python.org/packages/e3/bd/1d5ca8be486d845074161456637f7d73acc09dc6c8d69bf0e7ad55ce9027 +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/d2/64/a119cb70ed91a6273aad811fd250b8a55d4bc8b0d900757723ec5a4f0ba9 PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE PYTHON_PYDAL_SETUP_TYPE = setuptools From ae0a8be90e298650bd32a7f6d79d9ef42437aa92 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 28 May 2018 20:37:06 +0200 Subject: [PATCH 1624/2640] package/python-web2py: bump to version R-2.16.1 This patch bumps python-web2py to version R-2.16.1. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index adc7bc5d5c..d23da1ea6e 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 e432e051ebb826b77835bda03ddb16364b37d137b37ac33005b6ac0fd5d56280 python-web2py-R-2.15.4.tar.gz +sha256 d9ed52676e9becd53d2d73a849dea3d55b8b61231abf3428cf516dcc0083d451 python-web2py-R-2.16.1.tar.gz diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 9ad5a7785a..1e02fb7ca5 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = R-2.15.4 +PYTHON_WEB2PY_VERSION = R-2.16.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 7a31f4354ab7a6882c888d4afdc5bb383b8f55b5 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 6 Jun 2018 16:28:24 +0200 Subject: [PATCH 1625/2640] libgpiod: bump version to v1.1 This is a minor release the main feature of which are the object-oriented bindings for C++ and Python3. Other than that there's a couple bug-fixes and minor improvements all around. Signed-off-by: Bartosz Golaszewski Signed-off-by: Thomas Petazzoni --- package/libgpiod/libgpiod.hash | 2 +- package/libgpiod/libgpiod.mk | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index 9ed4b59ab9..1d217f6048 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 972924195367f5fb045c023d65340c4b7dfc8764499516be446553865208dedc libgpiod-1.0.1.tar.xz +sha256 9758466468a7ef3f5e30c182c1303abef6241e665cda4d82a64328a7474838c1 libgpiod-1.1.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index 7f8fa4b7dd..2f4b40eafc 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBGPIOD_VERSION = 1.0.1 +LIBGPIOD_VERSION = 1.1 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ LIBGPIOD_LICENSE_FILES = COPYING LIBGPIOD_INSTALL_STAGING = YES - LIBGPIOD_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBGPIOD_TOOLS),y) @@ -19,4 +18,21 @@ else LIBGPIOD_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +LIBGPIOD_CONF_OPTS += --enable-bindings-cxx +else +LIBGPIOD_CONF_OPTS += --disable-bindings-cxx +endif + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBGPIOD_CONF_OPTS += --enable-bindings-python +LIBGPIOD_DEPENDENCIES += python3 +LIBGPIOD_CONF_ENV += \ + PYTHON=$(HOST_DIR)/bin/python3 \ + PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ + PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" +else +LIBGPIOD_CONF_OPTS += --disable-bindings-python +endif + $(eval $(autotools-package)) From d5843f90a55a8ce65bbb80a9ade9c96e91d8695f Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Wed, 6 Jun 2018 19:19:52 +0200 Subject: [PATCH 1626/2640] DEVELOPERS: add myself as maintainer of abootimg I forgot to do it while submitting this package [1]. Thanks Thomas for pointing it. [1] https://git.buildroot.net/buildroot/commit/package/abootimg?id=43bafa748fbb5439856b9de1667db93c43ddd21f Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 32fa08f5c3..c7c798d020 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1029,6 +1029,7 @@ F: package/tegrarcm/ N: Julien Boibessot F: board/armadeus/ F: configs/armadeus* +F: package/abootimg/ F: package/gpm/ F: package/lbreakout2/ F: package/libcddb/ From 5c572b92034cfe359579e1fbc4e13dd02f838417 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Jun 2018 21:39:03 +0200 Subject: [PATCH 1627/2640] whois: bump to version 5.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 635066c5e3..e69b95d999 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20180121T094839Z/pool/main/w/whois/whois_5.3.0.dsc -sha256 4d789c403bfb5833c8ae168a5f31be70e34b045bd5d95a54c82a27b0ff135723 whois_5.3.0.tar.xz +# From http://snapshot.debian.org/archive/debian/20180522T155750Z/pool/main/w/whois/whois_5.3.1.dsc +sha256 ef4ead31306a388d9c8c83d67f56c94ed8b4c85e94f60baea2f5b1660445893e whois_5.3.1.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 5cd7cde7fd..c9203d8c0d 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.3.0 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180121T094839Z/pool/main/w/whois +WHOIS_VERSION = 5.3.1 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180522T155750Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES) From b778f48d7310706b18feda1b4d87e91b3136ad21 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Jun 2018 21:45:50 +0200 Subject: [PATCH 1628/2640] libucl: bump to version 0.8.1 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libucl/libucl.hash | 3 ++- package/libucl/libucl.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libucl/libucl.hash b/package/libucl/libucl.hash index bd2ca13bf3..8d4a796e22 100644 --- a/package/libucl/libucl.hash +++ b/package/libucl/libucl.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2f69995c7f8320350f56c1183c395cc4a2a958331f22d60b7839a117c9c601e1 libucl-0.7.3.tar.gz +sha256 a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef libucl-0.8.1.tar.gz +sha256 1bf976835764c1d827e07472a0a75adb098682df56681878af05fc0db7439b03 COPYING diff --git a/package/libucl/libucl.mk b/package/libucl/libucl.mk index 39a7ed3cc7..087fea683d 100644 --- a/package/libucl/libucl.mk +++ b/package/libucl/libucl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUCL_VERSION = 0.7.3 +LIBUCL_VERSION = 0.8.1 LIBUCL_SITE = $(call github,vstakhov,libucl,$(LIBUCL_VERSION)) LIBUCL_INSTALL_STAGING = YES LIBUCL_AUTORECONF = YES From aef29acd148c3e0ce50d05f62ae5a44304404c9b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 6 Jun 2018 23:04:39 +0300 Subject: [PATCH 1629/2640] imx-usb-loader: propagate libusb dependency Avoid select of libusb when the toolchain does not support threads. Fixes: http://autobuild.buildroot.net/results/a21/a212ee3e5ec174f4e6e7d582f777325dac035bfd/ Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/imx-usb-loader/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/imx-usb-loader/Config.in b/package/imx-usb-loader/Config.in index 6f083f34d1..1cc0dd8c25 100644 --- a/package/imx-usb-loader/Config.in +++ b/package/imx-usb-loader/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_IMX_USB_LOADER bool "imx-usb-loader" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_LIBUSB help This package contains tools to download and execute code @@ -7,3 +8,6 @@ config BR2_PACKAGE_IMX_USB_LOADER Serial Download Protocol. https://github.com/boundarydevices/imx_usb_loader + +comment "imx-usb-loader needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From 0326a06bea92ab67b5ac8db96f619820b5f6cf86 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 5 Jun 2018 22:04:40 -0300 Subject: [PATCH 1630/2640] linux-headers: bump 3.2.x and 4.{4, 9, 14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f6229c065e..f56d85b2da 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -256,16 +256,16 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.101" if BR2_KERNEL_HEADERS_3_2 + default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.134" if BR2_KERNEL_HEADERS_4_4 - default "4.9.104" if BR2_KERNEL_HEADERS_4_9 + default "4.4.135" if BR2_KERNEL_HEADERS_4_4 + default "4.9.106" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.46" if BR2_KERNEL_HEADERS_4_14 + default "4.14.48" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.13" if BR2_KERNEL_HEADERS_4_16 + default "4.16.14" if BR2_KERNEL_HEADERS_4_16 default "4.17" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 2d6300e67f69695fb8af0c923a2bd037a0434777 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 May 2018 15:10:08 +0200 Subject: [PATCH 1631/2640] dnsmasq: NLS/i18n does not mandate libidn anymore Since May 2017, automatic inclusion of IDN has been removed when building internationalisation support: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=43cdf1c3d074e75389392d495690923ef37d3248 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dnsmasq/dnsmasq.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index f519835828..79c5619966 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -9,11 +9,14 @@ DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" -DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" -DNSMASQ_DEPENDENCIES = host-pkgconf +DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ + LIBS+=$(TARGET_NLS_LIBS) +DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 +DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) + ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) DNSMASQ_COPTS += -DNO_DHCP endif @@ -30,12 +33,9 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) DNSMASQ_COPTS += -DNO_TFTP endif -# NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) -DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES) -DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS) +DNSMASQ_DEPENDENCIES += libidn DNSMASQ_COPTS += -DHAVE_IDN -DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) endif ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) From ded50f69c691e4b4a391ee23ec466abaad4bed99 Mon Sep 17 00:00:00 2001 From: Sam Lancia Date: Thu, 7 Jun 2018 08:51:07 +0100 Subject: [PATCH 1632/2640] docker-containerd: add missing docker-containerd symlink Prior to commit 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13 ("package/docker-containerd: convert to golang infrastructure"), the containerd binary was installed as docker-containerd. Following the conversion to the golang package infrastructure, the binary is now installed as "containerd", which breaks some use cases. Let's add a symlink link docker-containerd -> containerd to fix such use cases. Fixes: https://bugs.busybox.net/show_bug.cgi?id=11076 Signed-off-by: Sam Lancia Signed-off-by: Thomas Petazzoni --- package/docker-containerd/docker-containerd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 88e27b5ed4..09e89f1aba 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -21,6 +21,7 @@ DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim define DOCKER_CONTAINERD_INSTALL_SYMLINKS ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim + ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd endef DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS From a17402e42d8c996af239cfdb536e74188d6c6245 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Thu, 7 Jun 2018 10:38:57 +0200 Subject: [PATCH 1633/2640] opencv3: conditionally enable NEON and VFPv3 optimizations Signed-off-by: Mathieu Maret Signed-off-by: Thomas Petazzoni --- package/opencv3/opencv3.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 15e4eadfe3..53b771ef25 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -99,7 +99,9 @@ OPENCV3_CONF_OPTS += \ # * PowerPC support is turned off since its only effect is altering CFLAGS, # adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. OPENCV3_CONF_OPTS += \ - -DENABLE_POWERPC=OFF + -DENABLE_POWERPC=OFF \ + -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \ + -DENABLE_VFPV3=$(if $(BR2_ARM_CPU_HAS_VFPV3),ON,OFF) # Cuda stuff OPENCV3_CONF_OPTS += \ From 41a365d40bf8f391a9af2ac9c7a18bfff97f35f9 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 6 Jun 2018 21:15:47 -0300 Subject: [PATCH 1634/2640] DEVELOPERS: add myself to init-related packages I'm working on improving the sysvinit scripts, so it's advisable to keep an eye on them. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c7c798d020..c1ab83ebd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -408,11 +408,20 @@ N: Carlo Caione F: package/sunxi-boards/ N: Carlos Santos +F: package/busybox/ F: package/gtest/ +F: package/initscripts/ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ F: package/modem-manager/ F: package/perl-file-util/ +F: package/skeleton-custom/ +F: package/skeleton-init-common/ +F: package/skeleton-init-none/ +F: package/skeleton-init-systemd/ +F: package/skeleton-init-sysv/ +F: package/skeleton/ +F: package/sysvinit/ F: package/util-linux/ F: package/tpm2-abrmd/ F: package/tpm2-tools/ From 3c6a5bdd3ed94f97afe2db9123d7117f85f654ce Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 6 Jun 2018 22:36:41 -0300 Subject: [PATCH 1635/2640] netplug: prevent starting multiple instances of netplugd Executing "/etc/init.d/S29netplug start" multiple times resulted in multiple instances of netplugd. Pass "-p /var/run/netplug.pid" to netplugd, so it creates the PID file that start-stop-daemon needs to know that netplugd is already running. Also use the pid file to stop netplugd, instead of the daemon name. Fixes https://bugs.busybox.net/show_bug.cgi?id=10661 Reported-by: Joachim Krueger Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/netplug/S29netplug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netplug/S29netplug b/package/netplug/S29netplug index 04cac9f07c..66459061b3 100755 --- a/package/netplug/S29netplug +++ b/package/netplug/S29netplug @@ -41,7 +41,7 @@ case "$1" in start) # Start daemon. printf "Starting network plug daemon: " - start-stop-daemon -S -q -p /var/run/netplugd.pid -x /sbin/netplugd ${NETPLUGDARGS} + start-stop-daemon -S -q -x /sbin/netplugd -- -p /var/run/netplugd.pid ${NETPLUGDARGS} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd @@ -49,7 +49,7 @@ case "$1" in stop) # Stop daemon. printf "Shutting down network plug daemon: " - start-stop-daemon -K -n netplugd + start-stop-daemon -K -q -p /var/run/netplugd.pid RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd From 65163ac929e16256a0ffb7510721e83720d04a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 7 Jun 2018 15:32:04 +0200 Subject: [PATCH 1636/2640] mpd: bump to version 0.20.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index d6e66216cf..6eb384e763 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434 mpd-0.20.18.tar.xz +sha256 a9e458c6e07cdf62649de7722e1e5a7f13aa82eeb397bfbbebc07cf5cf273584 mpd-0.20.20.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index d41ffe1571..a0bbc7222a 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).18 +MPD_VERSION = $(MPD_VERSION_MAJOR).20 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost From d932638bf3b28ce1c8a88820ae8a7157cef8a56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 7 Jun 2018 15:39:31 +0200 Subject: [PATCH 1637/2640] opusfile: bump to version 0.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/opusfile/opusfile.hash | 2 +- package/opusfile/opusfile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opusfile/opusfile.hash b/package/opusfile/opusfile.hash index 59e08192f5..f1fcf5f9d6 100644 --- a/package/opusfile/opusfile.hash +++ b/package/opusfile/opusfile.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 f75fb500e40b122775ac1a71ad80c4477698842a8fe9da4a1b4a1a9f16e4e979 opusfile-0.9.tar.gz +sha256 48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f opusfile-0.10.tar.gz # Hash for license file sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 186288ddff..0cfe623941 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUSFILE_VERSION = 0.9 +OPUSFILE_VERSION = 0.10 OPUSFILE_SITE = https://downloads.xiph.org/releases/opus OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus OPUSFILE_LICENSE = BSD-3-Clause From c091a9d88b75d038c791af5425078fe2f1b9b200 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Jun 2018 22:33:55 +0200 Subject: [PATCH 1638/2640] libseccomp: bump to version 2.3.3 - Update patch and sent it upstream - Remove LIBSECCOMP_FIXUP_M4_DIR (not needed anymore) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libseccomp/0001-remove-static.patch | 43 ++++++++++++--------- package/libseccomp/libseccomp.hash | 3 +- package/libseccomp/libseccomp.mk | 8 +--- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/package/libseccomp/0001-remove-static.patch b/package/libseccomp/0001-remove-static.patch index 6fd81f96d5..9f0ac210c7 100644 --- a/package/libseccomp/0001-remove-static.patch +++ b/package/libseccomp/0001-remove-static.patch @@ -1,24 +1,28 @@ -Do not force static link, it breaks build with -# BR2_STATIC_LIBS is not set +From 8632287cf6863b580340f846ac14adf2609abdb0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 Jun 2018 13:45:22 +0200 +Subject: [PATCH] remove static + +Do not force static link of tools, it breaks build with: BR2_SHARED_LIBS=y -Signed-off-by: Bernd Kuhls +Patch retrieved from +https://git.buildroot.net/buildroot/tree/package/libseccomp/0001-remove-static.patch +and slighly updated to work with 2.3.3 -diff -uNr libseccomp-2.2.0.org/tests/Makefile.am libseccomp-2.2.0/tests/Makefile.am ---- libseccomp-2.2.0.org/tests/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tests/Makefile.am 2015-03-29 16:03:49.668946652 +0200 -@@ -16,7 +16,6 @@ - # along with this library; if not, see . - # - --AM_LDFLAGS = -static - LDADD = util.la ../src/libseccomp.la - - check_LTLIBRARIES = util.la -diff -uNr libseccomp-2.2.0.org/tools/Makefile.am libseccomp-2.2.0/tools/Makefile.am ---- libseccomp-2.2.0.org/tools/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tools/Makefile.am 2015-03-29 16:03:46.164992302 +0200 -@@ -33,8 +33,6 @@ +[Upstream status: https://github.com/seccomp/libseccomp/pull/121] + +Signed-off-by: Bernd Kuhls +Signed-off-by: Fabrice Fontaine +--- + tools/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 70b4aed..ef74270 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -35,8 +35,6 @@ scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h scmp_sys_resolver_LDADD = ../src/libseccomp.la @@ -27,3 +31,6 @@ diff -uNr libseccomp-2.2.0.org/tools/Makefile.am libseccomp-2.2.0/tools/Makefile -scmp_arch_detect_LDFLAGS = -static scmp_bpf_disasm_LDADD = util.la scmp_bpf_sim_LDADD = util.la +-- +2.14.1 + diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index ef390ff562..0362ce9ba4 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 09864282ae579c34bd5ef75ef3487200adfecaa51f5cffc7c7ad1ed2f89f5d6c libseccomp-v2.3.1.tar.gz +sha256 5a52495207f00d1254707f11226e17c16ec53f5038d65bbabf1892873fa2fe5b libseccomp-v2.3.3.tar.gz +sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index 9a241a5513..afa2d36122 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,17 +4,11 @@ # ################################################################################ -LIBSECCOMP_VERSION = v2.3.1 +LIBSECCOMP_VERSION = v2.3.3 LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION)) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE LIBSECCOMP_INSTALL_STAGING = YES LIBSECCOMP_AUTORECONF = YES -# Needed for autoreconf to work properly, see ./autogen.sh -define LIBSECCOMP_FIXUP_M4_DIR - mkdir $(@D)/m4 -endef -LIBSECCOMP_POST_EXTRACT_HOOKS += LIBSECCOMP_FIXUP_M4_DIR - $(eval $(autotools-package)) From f56814faa87fa06331fe15e52784040b06d3dead Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 8 Jun 2018 06:16:22 +0300 Subject: [PATCH 1639/2640] trinity: fix build with kernel headers v4.17+ Kernel v4.17 removed the linux/irda.h header. Add a patch to skip the irda test when the header is missing. Fixes: http://autobuild.buildroot.net/results/39d/39d131048d6eb3cd4d802dae462116f7728c41fd/ http://autobuild.buildroot.net/results/af2/af2288711d1a0939a06ea51e65ed32d39e395e2b/ http://autobuild.buildroot.net/results/41f/41fead6d53dba2539ba246f682973e0b5967f3d0/ Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...-fix-build-with-kernel-headers-v4.17.patch | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch diff --git a/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch b/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch new file mode 100644 index 0000000000..89aa4219c2 --- /dev/null +++ b/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch @@ -0,0 +1,73 @@ +From 5431126ac94bf81743852493a041e80e82918741 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 8 Jun 2018 06:05:26 +0300 +Subject: [PATCH] configure: fix build with kernel headers v4.17+ + +Kernel v4.17 removed the linux/irda.h header. Skip the irda test when +this header is missing. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/kernelslacker/trinity/pull/25 + + configure | 1 + + net/proto-irda.c | 6 +++++- + net/protocols.c | 2 ++ + 3 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index c0166af33048..944c8cf77d1b 100755 +--- a/configure ++++ b/configure +@@ -316,6 +316,7 @@ fi + check_header linux/caif/caif_socket.h USE_CAIF + check_header linux/fsmap.h USE_FSMAP + check_header linux/if_alg.h USE_IF_ALG ++check_header linux/irda.h USE_IRDA + check_header linux/rds.h USE_RDS + check_header linux/vfio.h USE_VFIO + check_header drm/drm.h USE_DRM +diff --git a/net/proto-irda.c b/net/proto-irda.c +index 02d51bcd2ee0..264e36dfa040 100644 +--- a/net/proto-irda.c ++++ b/net/proto-irda.c +@@ -4,13 +4,15 @@ + #include + /* old irda.h does not include something which defines sa_family_t */ + #include +-#include + #include + #include "net.h" + #include "random.h" + #include "utils.h" // RAND_ARRAY + #include "compat.h" + ++#ifdef USE_IRDA ++#include ++ + static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) + { + struct sockaddr_irda *irda; +@@ -53,3 +55,5 @@ const struct netproto proto_irda = { + .valid_triplets = irda_triplets, + .nr_triplets = ARRAY_SIZE(irda_triplets), + }; ++ ++#endif +diff --git a/net/protocols.c b/net/protocols.c +index 90a60affedca..87acf85c707f 100644 +--- a/net/protocols.c ++++ b/net/protocols.c +@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { + #ifdef USE_RDS + [PF_RDS] = { .proto = &proto_rds }, + #endif ++#ifdef USE_IRDA + [PF_IRDA] = { .proto = &proto_irda }, ++#endif + [PF_LLC] = { .proto = &proto_llc }, + [PF_CAN] = { .proto = &proto_can }, + [PF_TIPC] = { .proto = &proto_tipc }, +-- +2.17.1 + From eca8704dcf4d026f7aea6f1819772d0c19517346 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Jun 2018 20:07:04 +0200 Subject: [PATCH 1640/2640] libxslt: security bump to version 1.3.2 - Fix CVE-2017-5029 - Remove first patch (already in version) - Add a dependency to host-pkgconf and remove libxml2 options: see https://github.com/GNOME/libxslt/commit/abf537ebb2296cd3ae89989a17b0e1b5c79db107 - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...erread-in-xsltFormatNumberConversion.patch | 35 ------------------- package/libxslt/libxslt.hash | 5 ++- package/libxslt/libxslt.mk | 10 +++--- 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch diff --git a/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch b/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch deleted file mode 100644 index 1ad494a6c0..0000000000 --- a/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch +++ /dev/null @@ -1,35 +0,0 @@ -From eb1030de31165b68487f288308f9d1810fed6880 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 10 Jun 2016 14:23:58 +0200 -Subject: [PATCH] Fix heap overread in xsltFormatNumberConversion - -An empty decimal-separator could cause a heap overread. This can be -exploited to leak a couple of bytes after the buffer that holds the -pattern string. - -Found with afl-fuzz and ASan. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit eb1030de311 - - libxslt/numbers.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index d1549b46ca26..e78c46b6357b 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -1090,7 +1090,8 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self, - } - - /* We have finished the integer part, now work on fraction */ -- if (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) { -+ if ( (*the_format != 0) && -+ (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) ) { - format_info.add_decimal = TRUE; - the_format += xsltUTF8Size(the_format); /* Skip over the decimal */ - } --- -2.10.2 - diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 8222bc590d..f28150b71e 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce libxslt-1.1.29.tar.gz +sha256 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460 libxslt-1.1.32.tar.gz + +# Hash for license file: +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 868ba6a10f..972d5b80d5 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.29 +LIBXSLT_VERSION = 1.1.32 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT @@ -13,11 +13,9 @@ LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ --without-debug \ - --without-python \ - --with-libxml-prefix=$(STAGING_DIR)/usr/ \ - --with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib + --without-python LIBXSLT_CONFIG_SCRIPTS = xslt-config -LIBXSLT_DEPENDENCIES = libxml2 +LIBXSLT_DEPENDENCIES = host-pkgconf libxml2 # If we have enabled libgcrypt then use it, else disable crypto support. ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) @@ -29,7 +27,7 @@ endif HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto -HOST_LIBXSLT_DEPENDENCIES = host-libxml2 +HOST_LIBXSLT_DEPENDENCIES = host-pkgconf host-libxml2 $(eval $(autotools-package)) $(eval $(host-autotools-package)) From f0335b0cf78dee43df93b9ee17d86f1443990cca Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 8 Jun 2018 09:21:57 +0300 Subject: [PATCH 1641/2640] elfutils: bump to version 0.171 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the po/ disable patch; not needed anymore. Drop the __mempcpy compatibility patch; __mempcpy is not used anymore. Refresh the -Werror removal patch; still needed, unfortunately. Renumber the remaining patches. Add GPLv3 license file. Add license files hash. [Peter: drop security reference, was added post-release] Cc: Stefan Fröberg Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...able-disable-progs-configure-option.patch} | 0 ...mplementation-of-the-fts_-functions.patch} | 0 ...-Werror-conditional-to-BUILD_WERROR.patch} | 10 +++---- package/elfutils/0004-disable-po.patch | 24 ----------------- package/elfutils/0006-memcpy-def.patch | 26 ------------------- package/elfutils/elfutils.hash | 8 ++++-- package/elfutils/elfutils.mk | 4 +-- 7 files changed, 13 insertions(+), 59 deletions(-) rename package/elfutils/{0002-disable-progs.patch => 0001-Add-a-enable-disable-progs-configure-option.patch} (100%) rename package/elfutils/{0003-fts.patch => 0002-Add-an-implementation-of-the-fts_-functions.patch} (100%) rename package/elfutils/{0005-really-make-werror-conditional-to-build-werror.patch => 0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch} (80%) delete mode 100644 package/elfutils/0004-disable-po.patch delete mode 100644 package/elfutils/0006-memcpy-def.patch diff --git a/package/elfutils/0002-disable-progs.patch b/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch similarity index 100% rename from package/elfutils/0002-disable-progs.patch rename to package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch diff --git a/package/elfutils/0003-fts.patch b/package/elfutils/0002-Add-an-implementation-of-the-fts_-functions.patch similarity index 100% rename from package/elfutils/0003-fts.patch rename to package/elfutils/0002-Add-an-implementation-of-the-fts_-functions.patch diff --git a/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch b/package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch similarity index 80% rename from package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch rename to package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch index a7017d6e88..21ffa7f31b 100644 --- a/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch +++ b/package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -1,4 +1,4 @@ -From 1d8f27d73df6369b19ddd6732960df0d4fdec338 Mon Sep 17 00:00:00 2001 +From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 29 May 2017 23:24:42 +0300 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR @@ -20,17 +20,17 @@ Signed-off-by: Vicente Olivert Riera 1 file changed, 1 deletion(-) diff --git a/config/eu.am b/config/eu.am -index 8fe1e259f9e2..c5a6209a4e04 100644 +index c2cc349ce876..99b368e09060 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -71,7 +71,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ -Wold-style-definition -Wstrict-prototypes \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) + $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ -- -2.11.0 +2.17.1 diff --git a/package/elfutils/0004-disable-po.patch b/package/elfutils/0004-disable-po.patch deleted file mode 100644 index c45c580463..0000000000 --- a/package/elfutils/0004-disable-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -Disable the build of the po/ directory - -Building the po/ directory complains that the scripts in there have -been generated with gettext 0.17, while we use gettext 0.18 in -Buildroot. Since we don't care that much about po files anyway, just -disable the build of this directory. - -Based on the former patch by Thomas Petazzoni. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000 -+++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000 -@@ -28,7 +28,7 @@ endif - - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ -- backends $(PROGS_SUBDIR) po tests -+ backends $(PROGS_SUBDIR) tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/0006-memcpy-def.patch b/package/elfutils/0006-memcpy-def.patch deleted file mode 100644 index 509482774c..0000000000 --- a/package/elfutils/0006-memcpy-def.patch +++ /dev/null @@ -1,26 +0,0 @@ -Provide a compatibility alias __memcpy - -For some reason, libelf uses the internal glibc alias __memcpy, which -doesn't exist in uClibc. Add a manual alias so that the build can -proceed with uClibc. - -Based on the former patch by Thomas Petazzoni. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/libelf/libelf.h b/libelf/libelf.h ---- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100 -+++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000 -@@ -34,6 +34,11 @@ - /* Get the ELF types. */ - #include - -+#ifndef _LIBC -+#ifndef __mempcpy -+#define __mempcpy mempcpy -+#endif -+#endif - - /* Known translation types. */ - typedef enum diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 76b6dc6458..dc321e9359 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,2 +1,6 @@ -# From https://sourceware.org/elfutils/ftp/0.169/sha512.sum -sha512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 elfutils-0.169.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.171/sha512.sum +sha512 777be2d63ca9b11440bf358a33428d9ca974e2612a880934156c9f7194af596ed627c1ed2d48dbd47a3761c94913b8f39565f9dcb6b62c92bf229f04c96d5ee3 elfutils-0.171.tar.bz2 +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 5570a3b37f..5eaaaeadad 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -ELFUTILS_VERSION = 0.169 +ELFUTILS_VERSION = 0.171 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) -ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 +ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz From 65a7c23edceb5c22ce351ee8dc8df5eac783cdbf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 8 Jun 2018 12:42:21 +0300 Subject: [PATCH 1642/2640] libedit: bump to version 20180525-3.1 Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index e8136df9c4..3a5cdbac95 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be libedit-20170329-3.1.tar.gz +sha256 c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116 libedit-20180525-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index bbdc871b35..a4b32e05eb 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20170329-3.1 +LIBEDIT_VERSION = 20180525-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses From 9314ad18708dbe164bd7eb20b01d0693d6509463 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Fri, 8 Jun 2018 12:23:07 +0200 Subject: [PATCH 1643/2640] package/cryptodev-linux: bump to the latest version (f60aa0) Bumps the cryptodev-linux package to the latest version available, which contains some fixes and allows to use cryptodev-linux with a recent kernel (v4.17). The patch bumps the version and update the locally calculated hash. Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- package/cryptodev-linux/cryptodev-linux.hash | 2 +- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index 48d608e127..ad7cb615e6 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 90a4c5e46d7d5fcc0c6155f1add824e73c27de9b1ff0b7fe2017a104cf9398dd cryptodev-linux-0a54e38b264d9a3bed74c642a61b88191660d0f8.tar.gz +sha256 994ed2f715dd3786f534d5215ae7ae4735b84cff28ea41080ff3501bf1503944 cryptodev-linux-f60aa08c63fc02780554a0a12180a478ca27d49f.tar.gz diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index dacb29dab8..028f7b1df4 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = 0a54e38b264d9a3bed74c642a61b88191660d0f8 +CRYPTODEV_LINUX_VERSION = f60aa08c63fc02780554a0a12180a478ca27d49f CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ From 690c08b696997d3eb06d3a699f2ce763067c4613 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 8 Jun 2018 14:25:29 -0300 Subject: [PATCH 1644/2640] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f56d85b2da..5f6c834b71 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,8 +258,8 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.135" if BR2_KERNEL_HEADERS_4_4 - default "4.9.106" if BR2_KERNEL_HEADERS_4_9 + default "4.4.136" if BR2_KERNEL_HEADERS_4_4 + default "4.9.107" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 From f1ddbd0539d5f32f654321603a58e92215356b1b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Jun 2018 19:05:55 +0200 Subject: [PATCH 1645/2640] tinyxml2: bump to version 6.2.0 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tinyxml2/tinyxml2.hash | 3 ++- package/tinyxml2/tinyxml2.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index e5e4d238ab..5f38546466 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20 tinyxml2-4.0.1.tar.gz +sha256 cdf0c2179ae7a7931dba52463741cf59024198bbf9673bf08415bcb46344110f tinyxml2-6.2.0.tar.gz +sha256 8b2ab0b6ffb86798a2512f45fcf50a3b04b3516782d2e3fb30ebf55dc18c7cce readme.md diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index e289ca9cf0..9439c5cb80 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 4.0.1 +TINYXML2_VERSION = 6.2.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = readme.md From 8f557f69f371b7f062179e2b5d85ea3b2fddb03b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Jun 2018 19:16:23 +0200 Subject: [PATCH 1646/2640] tinymembench: bump to version 0.4 - Use LICENSE instead of main.c in TINYMEMBENCH_LICENSE_FILES - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tinymembench/tinymembench.hash | 3 ++- package/tinymembench/tinymembench.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash index 813a1df429..59ca70dcb2 100644 --- a/package/tinymembench/tinymembench.hash +++ b/package/tinymembench/tinymembench.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e8cfcf0817eb8430f736426bc7557273765cef0e8002a17cca51645114e723b7 tinymembench-v0.3.tar.gz +sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-v0.4.tar.gz +sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk index ab479d64e3..b2ccc749fe 100644 --- a/package/tinymembench/tinymembench.mk +++ b/package/tinymembench/tinymembench.mk @@ -4,10 +4,10 @@ # ################################################################################ -TINYMEMBENCH_VERSION = v0.3 +TINYMEMBENCH_VERSION = v0.4 TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,$(TINYMEMBENCH_VERSION)) TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = main.c +TINYMEMBENCH_LICENSE_FILES = LICENSE define TINYMEMBENCH_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) From fd77f8d7f6401cf7c4d3438caab457848322791d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 8 Jun 2018 14:26:23 -0300 Subject: [PATCH 1647/2640] configs/imx6ulpico: Bump kernel and U-Boot Bump kernel to version 4.17 and U-Boot to 2018.05. As the imx_v6_v7_defconfig in 4.17 already selects the CONFIG_CFG80211_WEXT option, the linux.fragment can be simply removed. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/technexion/imx6ulpico/linux.fragment | 1 - configs/imx6ulpico_defconfig | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 board/technexion/imx6ulpico/linux.fragment diff --git a/board/technexion/imx6ulpico/linux.fragment b/board/technexion/imx6ulpico/linux.fragment deleted file mode 100644 index 892d0cb7b9..0000000000 --- a/board/technexion/imx6ulpico/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CFG80211_WEXT=y diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 96ac038d2f..69d1a8055d 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" @@ -15,9 +15,8 @@ BR2_ROOTFS_OVERLAY="board/technexion/imx6ulpico/rootfs_overlay" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-pico-hobbit" @@ -37,7 +36,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="pico-imx6ul" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_FORMAT_IMX=y # required tools to create the eMMC image From 0233e7ded1d4cb6fa7b0f8ce3a74a7f1c0db816b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 8 Jun 2018 14:26:24 -0300 Subject: [PATCH 1648/2640] configs/imx7dpico: Bump kernel and U-Boot Bump kernel to version 4.17 and U-Boot to 2018.05. As the dtb file has been renamed in mainline, make the necessary adjustments in U-Boot environment and also in BR2_LINUX_KERNEL_INTREE_DTS_NAME. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- .../patches/uboot/0001-picomx7dname.patch | 31 +++++++++++++++++++ configs/imx7dpico_defconfig | 13 +++++--- 2 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch diff --git a/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch b/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch new file mode 100644 index 0000000000..59408bcd7a --- /dev/null +++ b/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch @@ -0,0 +1,31 @@ +From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Tue, 5 Jun 2018 22:12:48 -0300 +Subject: [PATCH] pico-imx7d: Adjust the dtb name + +Since kernel commit 41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate +into cpu and baseboard dts") the dtb name has changed. + +Fix it accordingly. + +Signed-off-by: Fabio Estevam +--- + include/configs/pico-imx7d.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h +index b208d7f..d2ffa70 100644 +--- a/include/configs/pico-imx7d.h ++++ b/include/configs/pico-imx7d.h +@@ -41,7 +41,7 @@ + "console=ttymxc4\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=imx7d-pico.dtb\0" \ ++ "fdt_file=imx7d-pico-pi.dtb\0" \ + "fdt_addr=0x83000000\0" \ + "ip_dyn=yes\0" \ + "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ +-- +2.7.4 + diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index b72d56bc94..971e4022f2 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -3,8 +3,11 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# patches +BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches" + +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" @@ -12,16 +15,16 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_FORMAT_IMX=y # required tools to create the eMMC image From 78e020726c8af031c9f38153d58aded4716b80d7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 9 Jun 2018 10:10:25 +0200 Subject: [PATCH 1649/2640] package/samba4: bump version to 4.8.2 Release notes: https://www.samba.org/samba/history/samba-4.8.2.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 85d0e18b52..cadb88b260 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.8.1.tar.asc -sha256 8ef7367507f16b7a5e2f6aed5bcdbd1143feca79aa2a07c9b21292b17d7f789d samba-4.8.1.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.asc +sha256 62e552296d49e6ab44bb87d120a288813fa52e42435d53a1f71b77596512bf22 samba-4.8.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b03af34cd0..f75b350375 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.8.1 +SAMBA4_VERSION = 4.8.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From d8b2c6f71783ff45b2d1153df291fa5519b50568 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 9 Jun 2018 10:13:04 +0200 Subject: [PATCH 1650/2640] package/tor: bump version to 0.3.3.6 Release notes: https://blog.torproject.org/tor-0336-released-new-stable-series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 2841d4099a..ca015a8dc0 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 60df77c31dcf94fdd686c8ca8c34f3b70243b33a7344ecc0b719d5ca2617cbee tor-0.3.2.10.tar.gz +sha256 99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7 tor-0.3.3.6.tar.gz sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 4a1a48357f..f7af718b9b 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.2.10 +TOR_VERSION = 0.3.3.6 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From dc7f8715746d50d3a7db36211d5da6c68020eb18 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 9 Jun 2018 10:43:37 +0200 Subject: [PATCH 1651/2640] package/libvorbis: add upstream security patch to fix CVE-2017-14160 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ounds-check-on-very-low-sample-rates.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch diff --git a/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch b/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch new file mode 100644 index 0000000000..e84f3d4799 --- /dev/null +++ b/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch @@ -0,0 +1,28 @@ +From: Thomas Daede +Date: Wed, 9 May 2018 21:56:59 +0000 (-0700) +Subject: CVE-2017-14160: fix bounds check on very low sample rates. +X-Git-Url: https://git.xiph.org/?p=vorbis.git;a=commitdiff_plain;h=018ca26dece618457dd13585cad52941193c4a25 + +CVE-2017-14160: fix bounds check on very low sample rates. + +Downloaded from upstream commit +https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=018ca26dece618457dd13585cad52941193c4a25 + +Signed-off-by: Bernd Kuhls +--- + +diff --git a/lib/psy.c b/lib/psy.c +index 422c6f1..1310123 100644 +--- a/lib/psy.c ++++ b/lib/psy.c +@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b, + for (i = 0, x = 0.f;; i++, x += 1.f) { + + lo = b[i] >> 16; +- if( lo>=0 ) break; + hi = b[i] & 0xffff; ++ if( lo>=0 ) break; ++ if( hi>=n ) break; + + tN = N[hi] + N[-lo]; + tX = X[hi] - X[-lo]; From ba819ad3b91b94a03de4c509d4f0d182585af845 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Jun 2018 10:41:39 +0200 Subject: [PATCH 1652/2640] json-c: bump to version 0.13.1 Drop patch, issue has been properly fixed by: https://github.com/json-c/json-c/commit/0f814e52dd22ee959a29ffcce36923aff62147b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-configure.ac-remove-Werror.patch | 32 ------------------- package/json-c/json-c.hash | 2 +- package/json-c/json-c.mk | 5 +-- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/json-c/0001-configure.ac-remove-Werror.patch diff --git a/package/json-c/0001-configure.ac-remove-Werror.patch b/package/json-c/0001-configure.ac-remove-Werror.patch deleted file mode 100644 index e877671519..0000000000 --- a/package/json-c/0001-configure.ac-remove-Werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 79d862ccaabc6620ce4b2783a44d6014ae837df9 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 31 Dec 2017 00:01:37 +0200 -Subject: [PATCH] configure.ac: remove -Werror - -The unconditional _REENTRANT macro causes a warning when building with a -no-threads toolchain. Remove -Werror to fix the build. - -Signed-off-by: Baruch Siach ---- -Patch status: not upstreamable -Issue reported upstream: https://github.com/json-c/json-c/issues/396 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 024c5aa0d687..74caa4d99e15 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,7 +165,7 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"], - AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions]) - AC_SUBST(JSON_BSYMBOLIC_LDFLAGS) - --AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations]) -+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations]) - AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter]) - AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE -D_REENTRANT]) - --- -2.15.1 - diff --git a/package/json-c/json-c.hash b/package/json-c/json-c.hash index 41e614d6dc..0e03007476 100644 --- a/package/json-c/json-c.hash +++ b/package/json-c/json-c.hash @@ -1,4 +1,4 @@ # From https://github.com/json-c/json-c/wiki -sha256 0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d json-c-0.13.tar.gz +sha256 b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873 json-c-0.13.1.tar.gz # Locally calculated sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c COPYING diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 450ee8b27b..57d8c35dd5 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,14 +4,11 @@ # ################################################################################ -JSON_C_VERSION = 0.13 +JSON_C_VERSION = 0.13.1 JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -# Patching configure.ac -JSON_C_AUTORECONF = YES - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 3d32f7f6fe577e483d39440722e3245d64bcbec9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Jun 2018 11:59:28 +0200 Subject: [PATCH 1653/2640] json-glib: bump to version 1.4.2 - Switch to meson-package - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/json-glib/json-glib.hash | 7 +++++-- package/json-glib/json-glib.mk | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index 2f190ab934..fae4df36d4 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,2 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.8.sha256sum -sha256 fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a json-glib-1.2.8.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.2.sha256sum +sha256 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8 json-glib-1.4.2.tar.xz + +# Hash for license file: +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index 5ee43d9a12..77c0c45323 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,8 +4,8 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.2 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).8 +JSON_GLIB_VERSION_MAJOR = 1.4 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).2 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ @@ -17,4 +17,4 @@ JSON_GLIB_DEPENDENCIES = \ host-pkgconf \ libglib2 -$(eval $(autotools-package)) +$(eval $(meson-package)) From a1567b603704b17e84648e2d55e2f65cf793a157 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Jun 2018 12:13:17 +0200 Subject: [PATCH 1654/2640] pugixml: bump to version 1.9 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...1-check-cxx_long_long_type-existence.patch | 33 ------------------- package/pugixml/pugixml.hash | 3 +- package/pugixml/pugixml.mk | 4 +-- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/pugixml/0001-check-cxx_long_long_type-existence.patch diff --git a/package/pugixml/0001-check-cxx_long_long_type-existence.patch b/package/pugixml/0001-check-cxx_long_long_type-existence.patch deleted file mode 100644 index a53c84a29a..0000000000 --- a/package/pugixml/0001-check-cxx_long_long_type-existence.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6cfd9c14ced26c8220f7f7ea99610cbdbfb9eba7 Mon Sep 17 00:00:00 2001 -From: Theo Debrouwere -Date: Mon, 12 Sep 2016 09:38:56 +0200 -Subject: [PATCH] Bugfix: check if cxx_long_long_type is present before - applying it. - -Check if cxx_long_long_type is present in the list of compiler features -before adding it as a target_compile_feature. - -Patch was backported from -https://github.com/zeux/pugixml/commit/4dbb5646196a4a3cc94097f1473ef11d1d44df11 - -Signed-off-by: Theo Debrouwere ---- - scripts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 40a7ab0..6403753 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -26,7 +26,7 @@ else() - endif() - - # Enable C++11 long long for compilers that are capable of it --if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -+if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;") - target_compile_features(pugixml PUBLIC cxx_long_long_type) - endif() - --- -2.9.3 - diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 9007f7cae6..fb6566dabf 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca pugixml-1.7.tar.gz +sha256 d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 pugixml-1.9.tar.gz +sha256 5f2318fdea73711b4761fd395462a51dc7d4626088ebaa41732b598821ac935a readme.txt diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 2e4f0ce561..e5188e5f53 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,12 +4,10 @@ # ################################################################################ -PUGIXML_VERSION = 1.7 +PUGIXML_VERSION = 1.9 PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = readme.txt PUGIXML_INSTALL_STAGING = YES -PUGIXML_SUBDIR = scripts - $(eval $(cmake-package)) From 8779224f2b59a74c80e11bc59738460e3127d41c Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Fri, 8 Jun 2018 13:27:39 -0600 Subject: [PATCH 1655/2640] DEVELOPERS: update email for flatcc Signed-off-by: Joel Carlson Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index c1ab83ebd3..d5345f47f3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -959,7 +959,7 @@ F: package/batctl/ N: Jeremy Rosen F: package/fxload/ -N: Joel Carlson +N: Joel Carlson F: package/flatcc/ N: Joel Stanley From 14b3352b2b64b488286abfef47c9af90dec4cba4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Jun 2018 23:57:44 +0200 Subject: [PATCH 1656/2640] jansson: bump to version 2.11 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jansson/jansson.hash | 3 ++- package/jansson/jansson.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/jansson/jansson.hash b/package/jansson/jansson.hash index 7a04586c70..e169b229cb 100644 --- a/package/jansson/jansson.hash +++ b/package/jansson/jansson.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 78215ad1e277b42681404c1d66870097a50eb084be9d771b1d15576575cf6447 jansson-2.10.tar.gz +sha256 6e85f42dabe49a7831dbdd6d30dca8a966956b51a9a50ed534b82afc3fa5b2f4 jansson-2.11.tar.gz +sha256 3034b2319f8c053995e8c8abf11b76418a3a8836cd769e5b3f0b6b13bfa00ec4 LICENSE diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk index 9771434c89..920008757b 100644 --- a/package/jansson/jansson.mk +++ b/package/jansson/jansson.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANSSON_VERSION = 2.10 +JANSSON_VERSION = 2.11 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE From cc90a068d794cbb281c819c8ba46dd1f881efa9d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Jun 2018 23:35:40 +0200 Subject: [PATCH 1657/2640] aubio: bump to version 0.4.6 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/aubio/aubio.hash | 7 +++++-- package/aubio/aubio.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash index b4233aee72..edb63f0769 100644 --- a/package/aubio/aubio.hash +++ b/package/aubio/aubio.hash @@ -1,2 +1,5 @@ -# From https://aubio.org/pub/aubio-0.4.5.tar.bz2.sha256 -sha256 70c2804e6f4fbf0ebc0fb9ac8cc9d465ef4a4d438311c074c9a7364e98827af6 aubio-0.4.5.tar.bz2 +# From https://aubio.org/pub/aubio-0.4.6.tar.bz2.sha256 +sha256 bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb aubio-0.4.6.tar.bz2 + +# Hash for license file: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index 2a09ebb3b5..b0cc8b899e 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUBIO_VERSION = 0.4.5 +AUBIO_VERSION = 0.4.6 AUBIO_SITE = https://aubio.org/pub AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 AUBIO_LICENSE = GPL-3.0+ From 5fbacdd59fd43c47f7031922e9fbae4d316a296f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 8 Jun 2018 18:44:34 +0200 Subject: [PATCH 1658/2640] mariadb: security bump version to 10.1.33 Release notes: https://mariadb.com/kb/en/mariadb-10133-release-notes/ Changelog: https://mariadb.com/kb/en/mariadb-10133-changelog/ Fixes the following security vulnerabilities: CVE-2018-2782 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2784 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2787 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server as well as unauthorized update, insert or delete access to some of MySQL Server accessible data. CVE-2018-2766 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2755 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: Replication). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Difficult to exploit vulnerability allows unauthenticated attacker with logon to the infrastructure where MySQL Server executes to compromise MySQL Server. Successful attacks require human interaction from a person other than the attacker and while the vulnerability is in MySQL Server, attacks may significantly impact additional products. Successful attacks of this vulnerability can result in takeover of MySQL Server. CVE-2018-2819 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2817 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DDL). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2761 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Client programs). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Difficult to exploit vulnerability allows unauthenticated attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2781 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: Optimizer). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2771 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: Locking). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Difficult to exploit vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2018-2813 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DDL). Supported versions that are affected are 5.5.59 and prior, 5.6.39 and prior and 5.7.21 and prior. Easily exploitable vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized read access to a subset of MySQL Server accessible data. Signed-off-by: Peter Korsgaard Acked-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 4 ++-- package/mariadb/mariadb.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index b8b2dde374..7eea62ab7b 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://downloads.mariadb.org/mariadb/10.1.32/ -sha256 0e2aae6a6a190d07c8e36e87dd43377057fa82651ca3c583462563f3e9369096 mariadb-10.1.32.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.33/ +sha256 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d mariadb-10.1.33.tar.gz # Hash for license files sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 391655fb0a..ce846d9cda 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.32 +MARIADB_VERSION = 10.1.33 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text From 574fba15fcea6c3b1a2e647e79d1bd6997d3b677 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sat, 9 Jun 2018 12:05:35 +0200 Subject: [PATCH 1659/2640] meson: bump version to 0.46.1 Signed-off-by: Eric Le Bihan Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 44785aef29..bd9e4114ff 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.46.0/meson-0.46.0.tar.gz.asc -sha256 b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0 meson-0.46.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.46.1/meson-0.46.1.tar.gz.asc +sha256 19497a03e7e5b303d8d11f98789a79aba59b5ad4a81bd00f4d099be0212cee78 meson-0.46.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 9b5ca0d5b9..28c9e6f202 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.46.0 +MESON_VERSION = 0.46.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From f7e4793c507e2ac77812e32ca1a7678c884423d3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 11:04:41 +0200 Subject: [PATCH 1660/2640] package/sqlite: bump version to 3.24.0 Release notes: https://www.sqlite.org/releaselog/3_24_0.html https://www.sqlite.org/releaselog/3_23_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 2aac7dc1d3..73a7ae6f11 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,6 +1,6 @@ # From http://www.sqlite.org/download.html -sha1 2fb24ec12001926d5209d2da90d252b9825366ac sqlite-autoconf-3220000.tar.gz +sha1 da68915e3563b5244cbcdb6c7e20fb35559bcfc6 sqlite-autoconf-3240000.tar.gz # Calculated based on the hash above -sha256 2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612 sqlite-autoconf-3220000.tar.gz +sha256 d9d14e88c6fb6d68de9ca0d1f9797477d82fc3aed613558f87ffbdbbc5ceb74a sqlite-autoconf-3240000.tar.gz # Locally calculated sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 5ae17e17f6..15cfea48a0 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3220000 +SQLITE_VERSION = 3240000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2018 SQLITE_LICENSE = Public domain From 0aa611fd0ee8b9260cafba1e3fa721e1b226a8bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 11:04:42 +0200 Subject: [PATCH 1661/2640] DEVELOPERS: add myself for sqlite Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d5345f47f3..eaf64ede61 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -371,6 +371,7 @@ F: package/python-slob/ F: package/rtmpdump/ F: package/samba4/ F: package/softether/ +F: package/sqlite/ F: package/taglib/ F: package/tinyxml2/ F: package/tor/ From 43ebb35e9b8cf935e62a67bd26468d70c45c5980 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 11:16:56 +0200 Subject: [PATCH 1662/2640] package/pngquant: bump version to 2.12.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pngquant/pngquant.hash | 4 ++-- package/pngquant/pngquant.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index a279100eca..f525e466c3 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,5 +1,5 @@ # From https://pngquant.org/releases.html -sha1 be140ec83c571b19219b639f2671b2316a2acaa1 pngquant-2.11.7-src.tar.gz +sha1 f57ce0112e86ac966c55270ccf5971deff241d4f pngquant-2.12.0-src.tar.gz # Locally computed -sha256 d70b46c3335c7abf21944aced2d9d2b54819ab84ed1a140b354d5e8cc9f0fb0a pngquant-2.11.7-src.tar.gz +sha256 0e540c64bb58c05f2a05b4eaf1d3d165f0d3278500f15abfeac47f93f8fa8fa8 pngquant-2.12.0-src.tar.gz sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 20e5e763fb..26c293bec3 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.11.7 +PNGQUANT_VERSION = 2.12.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From 54917abdd74158298fd848a58117c796c641a130 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 11:30:48 +0200 Subject: [PATCH 1663/2640] package/wireless-regdb: bump version to 2018.05.31 Added license hash, updated project URL, old site is dead. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/wireless-regdb/Config.in | 2 +- package/wireless-regdb/wireless-regdb.hash | 4 +++- package/wireless-regdb/wireless-regdb.mk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in index d9c7b8d2d1..0c9896deb9 100644 --- a/package/wireless-regdb/Config.in +++ b/package/wireless-regdb/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_WIRELESS_REGDB Wireless regulatory database for CRDA. The database lists the allowed radio frequencies for each local jurisdiction. - http://linuxwireless.org/en/developers/Regulatory + https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 4163609d17..65ae735cb5 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 371eafa3b26ece916ef83aca02c4bed2e54099eb5b8c6d22d3a4358dce6535b9 wireless-regdb-2017.03.07.tar.xz +sha256 e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b wireless-regdb-2018.05.31.tar.xz +# Locally computed +sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9d7a375461..e9283a00e2 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2017.03.07 +WIRELESS_REGDB_VERSION = 2018.05.31 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From 76d1654dfc2052239f0245a3b9d215fa8dba57cd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:10:23 +0200 Subject: [PATCH 1664/2640] package/speex: use pkgconf to detect libogg Upstream removed with-ogg-* configure options and switched to pkgconf to detect libogg back in 2014: https://git.xiph.org/?p=speex.git;a=commitdiff;h=e1b1eeabce815283c5bbc42016a9d6a11eda2866 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/speex/speex.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/speex/speex.mk b/package/speex/speex.mk index 3c188b631e..516e89929a 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -8,12 +8,9 @@ SPEEX_VERSION = 1.2rc1 SPEEX_SITE = http://downloads.us.xiph.org/releases/speex SPEEX_LICENSE = BSD-3-Clause SPEEX_LICENSE_FILES = COPYING - SPEEX_INSTALL_STAGING = YES -SPEEX_DEPENDENCIES = libogg +SPEEX_DEPENDENCIES = host-pkgconf libogg SPEEX_CONF_OPTS = \ - --with-ogg-libraries=$(STAGING_DIR)/usr/lib \ - --with-ogg-includes=$(STAGING_DIR)/usr/include \ --enable-fixed-point ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y) From 88f659fe2567595bf88b4dba9035065a995d3071 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:10:24 +0200 Subject: [PATCH 1665/2640] package/speex: bump version to 1.2.0 Added upstream md5 & locally computed license hashes, rebased patch, updated SPEEX_SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/speex/0001-thumb2-support.patch | 6 ++++-- package/speex/speex.hash | 8 ++++++-- package/speex/speex.mk | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/speex/0001-thumb2-support.patch b/package/speex/0001-thumb2-support.patch index b6f7369299..092fa13252 100644 --- a/package/speex/0001-thumb2-support.patch +++ b/package/speex/0001-thumb2-support.patch @@ -4,6 +4,8 @@ Patch written by Michael Hope from Linaro, available at http://lists.xiph.org/pipermail/speex-dev/2010-November/008041.html. Signed-off-by: Thomas Petazzoni +[Bernd: rebased for 1.2.0] +Signed-off-by: Bernd Kuhls diff --git a/libspeex/filters_arm4.h b/libspeex/filters_arm4.h index 7a74042..6ec1f75 100644 @@ -12,10 +14,10 @@ index 7a74042..6ec1f75 100644 @@ -47,8 +47,10 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le "\tldr %4, [%0], #4 \n" - "\tcmps %4, %1 \n" + "\tcmp %4, %1 \n" + "\tit gt \n" "\tmovgt %1, %4 \n" - "\tcmps %4, %3 \n" + "\tcmp %4, %3 \n" + "\tit lt \n" "\tmovlt %3, %4 \n" diff --git a/package/speex/speex.hash b/package/speex/speex.hash index c38a0a7b22..f5235d6262 100644 --- a/package/speex/speex.hash +++ b/package/speex/speex.hash @@ -1,2 +1,6 @@ -# From http://downloads.xiph.org/releases/speex/SHA256SUMS.txt -sha256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6 speex-1.2rc1.tar.gz +# From https://downloads.xiph.org/releases/speex/SHA256SUMS.txt +sha256 eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 speex-1.2.0.tar.gz +# From https://downloads.xiph.org/releases/speex/MD5SUMS +md5 8ab7bb2589110dfaf0ed7fa7757dc49c speex-1.2.0.tar.gz +# Locally computed +sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speex/speex.mk b/package/speex/speex.mk index 516e89929a..c6b46e0eb3 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -4,8 +4,8 @@ # ################################################################################ -SPEEX_VERSION = 1.2rc1 -SPEEX_SITE = http://downloads.us.xiph.org/releases/speex +SPEEX_VERSION = 1.2.0 +SPEEX_SITE = https://downloads.xiph.org/releases/speex SPEEX_LICENSE = BSD-3-Clause SPEEX_LICENSE_FILES = COPYING SPEEX_INSTALL_STAGING = YES From 2cc2a63ea107eb36d1b45860983ecd9b959ddae0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:14:15 +0200 Subject: [PATCH 1666/2640] package/dtv-scan-tables: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dtv-scan-tables/dtv-scan-tables.hash | 2 +- package/dtv-scan-tables/dtv-scan-tables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dtv-scan-tables/dtv-scan-tables.hash b/package/dtv-scan-tables/dtv-scan-tables.hash index 1aa6bd59fa..29d0c4cc54 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 7ded9b437fc3345bbd13a6c1c446c54d0e24d2d337e5abda223adb6362916d8c dtv-scan-tables-07b18ecef17493ac0908a2e112eae3fe269da7fa.tar.gz +sha256 7860092725f07ac6f974415e9f06a2763710d308b0817f7c3641aaf4b902ccc5 dtv-scan-tables-c2b6af67f7d8620acbf052fc754ec831ed2188ba.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index b7f82562f2..fe0a310817 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 07b18ecef17493ac0908a2e112eae3fe269da7fa +DTV_SCAN_TABLES_VERSION = c2b6af67f7d8620acbf052fc754ec831ed2188ba DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git From c3387c59bb6b5ccb89bb7acd7db05a8655eb71c5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:21:56 +0200 Subject: [PATCH 1667/2640] package/imagemagick: security bump to version 7.0.7-38 Fixes CVE-2018-11625, CVE-2018-11624 & CVE-2018-10177. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 170231c4b7..cf529b597c 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 723a28f9cbc5c6130f496065fc01c839083e97bf3e4930f940a03c0155046170 7.0.7-27.tar.gz +sha256 ac957ef303fb870cb92331947ebcdcef5b553e80c7897c0aec866889f35e1a23 7.0.7-38.tar.gz sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 116543888b..4aa9d56db2 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-27 +IMAGEMAGICK_VERSION = 7.0.7-38 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From a73c944fa90199b1d16a66f3092c80cdf4ded6d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:28:14 +0200 Subject: [PATCH 1668/2640] package/x265: bump version to 2.8 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x265/x265.hash | 3 ++- package/x265/x265.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/x265/x265.hash b/package/x265/x265.hash index e6f22db646..61e6181199 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,2 +1,3 @@ # Locally generated -sha256 d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2 x265_2.7.tar.gz +sha256 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 x265_2.8.tar.gz +sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 243025c08b..0ad27ee006 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 2.7 +X265_VERSION = 2.8 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ From bc864a5b55577bfdaf7823e052bab9a22a576604 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:29:46 +0200 Subject: [PATCH 1669/2640] package/nvidia-driver: bump version to 390.67 Added license hash, adjusted upstream library names. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/nvidia-driver.hash | 5 +++-- package/nvidia-driver/nvidia-driver.mk | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index e05b8f04d5..79ac052610 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 3b70587582220ab1102bcb8386f206f89e6b146856af41f16eaa5910e54ef8fd NVIDIA-Linux-x86-384.69.run -sha256 a7b7984fc532be17c262bc4353e279824ae63625d8ae9f1016cb66d199b97650 NVIDIA-Linux-x86_64-384.69.run +sha256 6f4af70ee3d03ed31c497a5d555164c56057b53ecedfc0d2c8de4b0b90728805 NVIDIA-Linux-x86-390.67.run +sha256 6df2ca1a7420b6751bcaf257d321b14f4e5f7ca54d77a43514912a3792ece65a NVIDIA-Linux-x86_64-390.67.run +sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 404fa881ec..a595aed4f7 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 384.69 +NVIDIA_DRIVER_VERSION = 390.67 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run @@ -46,19 +46,19 @@ NVIDIA_DRIVER_LIBS_GL = \ libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_LIBS_EGL = \ - libEGL.so.1 \ + libEGL.so.1.1.0 \ libGLdispatch.so.0 \ libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_LIBS_GLES = \ - libGLESv1_CM.so.1 \ - libGLESv2.so.2 \ + libGLESv1_CM.so.1.2.0 \ + libGLESv2.so.2.1.0 \ libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_LIBS_MISC = \ libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-egl-wayland.so.1.0.1 \ + libnvidia-egl-wayland.so.1.0.2 \ libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \ libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \ tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \ From 687c7e5e481478f672697e5f272955fde28d1adb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 12:11:23 +0200 Subject: [PATCH 1670/2640] package/fdk-aac: bump version to 0.1.6 Added upstream and license hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fdk-aac/fdk-aac.hash | 6 +++++- package/fdk-aac/fdk-aac.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/fdk-aac/fdk-aac.hash b/package/fdk-aac/fdk-aac.hash index cd2e868488..db0f0d535c 100644 --- a/package/fdk-aac/fdk-aac.hash +++ b/package/fdk-aac/fdk-aac.hash @@ -1,2 +1,6 @@ +# From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ +sha1 574103e24fe45b3b89a92cc6a7a9d260c483b9e0 fdk-aac-0.1.6.tar.gz +md5 13c04c5f4f13f4c7414c95d7fcdea50f fdk-aac-0.1.6.tar.gz # Locally computed: -sha256 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7 fdk-aac-0.1.5.tar.gz +sha256 aab61b42ac6b5953e94924c73c194f08a86172d63d39c5717f526ca016bed3ad fdk-aac-0.1.6.tar.gz +sha256 40b9ad8a1c630853bffc51bb5a46adf5c457afcc7c70d66d2ef919b1f14ccb4e NOTICE diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk index 0c9662ef32..72ae553c26 100644 --- a/package/fdk-aac/fdk-aac.mk +++ b/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 0.1.5 +FDK_AAC_VERSION = 0.1.6 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE From cb67c1d55b7b58d542ec1c4d0311543f40d5d0a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Jun 2018 14:09:10 +0200 Subject: [PATCH 1671/2640] package/mpg123: security bump to version 1.25.10 Version 1.25.4 fixes CVE-2017-9545, for details see release notes: http://www.mpg123.org/cgi-bin/news.cgi Added upstream hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mpg123/mpg123.hash | 8 +++++--- package/mpg123/mpg123.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index cbab6f3ee9..22db5bca3c 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,5 +1,7 @@ -# Locally calculated after checking pgp signature -sha256 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 mpg123-1.25.2.tar.bz2 - +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.10/ +sha1 604784ddbcfe282bffdc595d1d45c677c7cf381f mpg123-1.25.10.tar.bz2 +md5 ea32caa61d41d8be797f0b04a1b43ad9 mpg123-1.25.10.tar.bz2 +# Locally calculated +sha256 6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023 mpg123-1.25.10.tar.bz2 # License file sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 01923d7990..dd2d39d978 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.25.2 +MPG123_VERSION = 1.25.10 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPTS = --disable-lfs-alias From e5975c729e2ddb5321c48af23d9b5975d68165b0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Jun 2018 12:46:37 +0200 Subject: [PATCH 1672/2640] yaml-cpp: bump to version 0.6.2 - Remove boost dependency (not needed since 0.6) - Add C++11 dependency (needed since 0.6) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/yaml-cpp/Config.in | 8 +++----- package/yaml-cpp/yaml-cpp.hash | 3 ++- package/yaml-cpp/yaml-cpp.mk | 8 +++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package/yaml-cpp/Config.in b/package/yaml-cpp/Config.in index 6d34f4210e..e02b85df12 100644 --- a/package/yaml-cpp/Config.in +++ b/package/yaml-cpp/Config.in @@ -1,14 +1,12 @@ config BR2_PACKAGE_YAML_CPP bool "yaml-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_USE_WCHAR # boost - select BR2_PACKAGE_BOOST + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 help yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec. https://github.com/jbeder/yaml-cpp -comment "yaml-cpp needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "yaml-cpp needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/yaml-cpp/yaml-cpp.hash b/package/yaml-cpp/yaml-cpp.hash index 7d6753732c..b2c0214102 100644 --- a/package/yaml-cpp/yaml-cpp.hash +++ b/package/yaml-cpp/yaml-cpp.hash @@ -1,2 +1,3 @@ # locally computed -sha256 6fb92f6f5925e0af918ffbb90acf19b7b88706ebcd40fc186b7caa76609b6350 yaml-cpp-0.5.2.tar.gz +sha256 e4d8560e163c3d875fd5d9e5542b5fd5bec810febdcba61481fe5fc4e6b1fd05 yaml-cpp-0.6.2.tar.gz +sha256 aa6fcc27be034e41e21dd832f9175bfe694a48491d9e14ff0fa278e19ad14f1b LICENSE diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 6a01b02a3b..d97c84a7cf 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -4,13 +4,11 @@ # ################################################################################ -YAML_CPP_VERSION = 0.5.2 -YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,release-$(YAML_CPP_VERSION)) +YAML_CPP_VERSION = 0.6.2 +YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT -YAML_CPP_LICENSE_FILES = license.txt - -YAML_CPP_DEPENDENCIES = boost +YAML_CPP_LICENSE_FILES = LICENSE # Disable testing and parse tools YAML_CPP_CONF_OPTS += -DYAML_CPP_BUILD_TOOLS=OFF From a4f7700f0b40022f91c2d43f7d21c5a01487587e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Jun 2018 18:02:29 +0200 Subject: [PATCH 1673/2640] libvncserver: add upstream security fix for CVE-2018-7225 Fixes CVE-2018-7225 - An issue was discovered in LibVNCServer through 0.9.11. rfbProcessClientNormalMessage() in rfbserver.c does not sanitize msg.cct.length, leading to access to uninitialized and potentially sensitive data or possibly unspecified other impact (e.g., an integer overflow) via specially crafted VNC packets. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...Limit-client-cut-text-length-to-1-MB.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch diff --git a/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch b/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch new file mode 100644 index 0000000000..84a537640d --- /dev/null +++ b/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch @@ -0,0 +1,65 @@ +From 28afb6c537dc82ba04d5f245b15ca7205c6dbb9c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 26 Feb 2018 13:48:00 +0100 +Subject: [PATCH] Limit client cut text length to 1 MB + +This patch constrains a client cut text length to 1 MB. Otherwise +a client could make server allocate 2 GB of memory and that seems to +be to much to classify it as a denial of service. + +The limit also prevents from an integer overflow followed by copying +an uninitilized memory when processing msg.cct.length value larger +than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg. + +This patch also corrects accepting length value of zero (malloc(0) is +interpreted on differnet systems differently). + +CVE-2018-7225 + + +Signed-off-by: Peter Korsgaard +--- + libvncserver/rfbserver.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c +index 116c488..4fc4d9d 100644 +--- a/libvncserver/rfbserver.c ++++ b/libvncserver/rfbserver.c +@@ -88,6 +88,8 @@ + #include + /* strftime() */ + #include ++/* PRIu32 */ ++#include + + #ifdef LIBVNCSERVER_WITH_WEBSOCKETS + #include "rfbssl.h" +@@ -2575,7 +2577,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) + + msg.cct.length = Swap32IfLE(msg.cct.length); + +- str = (char *)malloc(msg.cct.length); ++ /* uint32_t input is passed to malloc()'s size_t argument, ++ * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int ++ * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int ++ * argument. Here we impose a limit of 1 MB so that the value fits ++ * into all of the types to prevent from misinterpretation and thus ++ * from accessing uninitialized memory (CVE-2018-7225) and also to ++ * prevent from a denial-of-service by allocating to much memory in ++ * the server. */ ++ if (msg.cct.length > 1<<20) { ++ rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n", ++ msg.cct.length); ++ rfbCloseClient(cl); ++ return; ++ } ++ ++ /* Allow zero-length client cut text. */ ++ str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1); + if (str == NULL) { + rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); + rfbCloseClient(cl); +-- +2.11.0 + From 9475c20a81460b7f16159c7066e5f5a4c9b1107e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Jun 2018 21:55:22 +0200 Subject: [PATCH 1674/2640] libtirpc: bump to version 1.0.3 - Remove 0006-include-stdint.h-for-uintptr_t.patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0006-include-stdint.h-for-uintptr_t.patch | 31 ------------------- package/libtirpc/libtirpc.hash | 5 +-- package/libtirpc/libtirpc.mk | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch diff --git a/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch b/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch deleted file mode 100644 index 62031613d6..0000000000 --- a/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 18f8a605e176f0362da22fd1203eb7cedb136aaf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 20 Jun 2017 22:06:35 +0200 -Subject: [PATCH] include stdint.h for uintptr_t - -Fixes -| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? -| if (len < (uintptr_t)xdrs->x_base) { -| ^~~~~~~~~ - -Signed-off-by: Khem Raj -Signed-off-by: Dmitrii Kolesnichenko ---- - src/xdr_sizeof.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c -index d23fbd1..79d6707 100644 ---- a/src/xdr_sizeof.c -+++ b/src/xdr_sizeof.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "un-namespace.h" - - /* ARGSUSED */ --- -2.9.4 - diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 35ac6a2278..643a5d2050 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,4 +1,5 @@ # From sourceforge's info on download page: -sha1 2a8dc0e6eecc45be6597c8287b1d8e15cbee46e3 libtirpc-1.0.2.tar.bz2 +sha1 48adb32dc7c3b73c66f001c239da76b8398abf11 libtirpc-1.0.3.tar.bz2 # Locally computed -sha256 723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5 libtirpc-1.0.2.tar.bz2 +sha256 86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e libtirpc-1.0.3.tar.bz2 +sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 319b78c3f0..36f9f7ef21 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.0.2 +LIBTIRPC_VERSION = 1.0.3 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause From a1f4421cc7d6c4c1a7678bcca477ac311d0b4116 Mon Sep 17 00:00:00 2001 From: Mikhail Karpenko Date: Thu, 7 Jun 2018 22:51:32 +0300 Subject: [PATCH 1675/2640] numactl: change source code provider to GitHub The original ftp with source code is not reachable any more and this commit changes the location of the package to corresponding GitHub project. Signed-off-by: Mikhail Karpenko Signed-off-by: Thomas Petazzoni --- package/numactl/numactl.hash | 2 +- package/numactl/numactl.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/numactl/numactl.hash b/package/numactl/numactl.hash index c36e24d6ba..8a395417f1 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861 numactl-2.0.11.tar.gz +sha256 3e099a59b2c527bcdbddd34e1952ca87462d2cef4c93da9b0bc03f02903f7089 numactl-v2.0.11.tar.gz diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index d37ee9e882..d3ce4f43c0 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,10 +4,11 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.11 -NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download +NUMACTL_VERSION = v2.0.11 +NUMACTL_SITE = $(call github,numactl,numactl,$(NUMACTL_VERSION)) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = README NUMACTL_INSTALL_STAGING = YES +NUMACTL_AUTORECONF = YES $(eval $(autotools-package)) From 99723554c0c84002c25e98eb187fa667abee4ced Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Jun 2018 11:08:21 +0200 Subject: [PATCH 1676/2640] support/testing: fix python syntax Fix three issues with code style in our test infra: - 'print' is now a function, - exceptions need to be caught-assigned with the 'as' keyword, - old-style "%s"%() formatting is deprecated. Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski [Thomas: drop indices in format strings.] Signed-off-by: Thomas Petazzoni --- support/testing/infra/__init__.py | 6 +++--- support/testing/infra/basetest.py | 4 ++-- support/testing/run-tests | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index b03e891771..e229e90852 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -34,17 +34,17 @@ def download(dldir, filename): os.makedirs(dldir) tmpfile = tempfile.mktemp(dir=dldir) - print "Downloading to {}".format(tmpfile) + print("Downloading to {}".format(tmpfile)) try: url_fh = urlopen(os.path.join(ARTIFACTS_URL, filename)) with open(tmpfile, "w+") as tmpfile_fh: tmpfile_fh.write(url_fh.read()) - except (HTTPError, URLError), err: + except (HTTPError, URLError) as err: os.unlink(tmpfile) raise err - print "Renaming from %s to %s" % (tmpfile, finalpath) + print("Renaming from {} to {}".format(tmpfile, finalpath)) os.rename(tmpfile, finalpath) return finalpath diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index f3f13ad97f..5014fefafa 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -46,8 +46,8 @@ class BRTest(unittest.TestCase): self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) def show_msg(self, msg): - print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"), - self.testname, msg) + print("{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"), + self.testname, msg)) def setUp(self): self.show_msg("Starting") diff --git a/support/testing/run-tests b/support/testing/run-tests index 270e78cff7..76dd15e9f0 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -41,7 +41,7 @@ def main(): BRTest.logtofile = False if args.list: - print "List of tests" + print("List of tests") nose2.discover(argv=[script_path, "-s", test_dir, "-v", @@ -52,16 +52,16 @@ def main(): if args.download is None: args.download = os.getenv("BR2_DL_DIR") if args.download is None: - print "Missing download directory, please use -d/--download" - print "" + print("Missing download directory, please use -d/--download") + print("") parser.print_help() return 1 BRTest.downloaddir = os.path.abspath(args.download) if args.output is None: - print "Missing output directory, please use -o/--output" - print "" + print("Missing output directory, please use -o/--output") + print("") parser.print_help() return 1 @@ -71,8 +71,8 @@ def main(): BRTest.outputdir = os.path.abspath(args.output) if args.all is False and len(args.testname) == 0: - print "No test selected" - print "" + print("No test selected") + print("") parser.print_help() return 1 @@ -80,8 +80,8 @@ def main(): if args.testcases != 1: if args.testcases < 1: - print "Invalid number of testcases to run simultaneously" - print "" + print("Invalid number of testcases to run simultaneously") + print("") parser.print_help() return 1 # same default BR2_JLEVEL as package/Makefile.in @@ -93,16 +93,16 @@ def main(): if args.jlevel: if args.jlevel < 0: - print "Invalid BR2_JLEVEL to use for each testcase" - print "" + print("Invalid BR2_JLEVEL to use for each testcase") + print("") parser.print_help() return 1 # the user can override the auto calculated value BRTest.jlevel = args.jlevel if args.timeout_multiplier < 1: - print "Invalid multiplier for timeout values" - print "" + print("Invalid multiplier for timeout values") + print("") parser.print_help() return 1 BRTest.timeout_multiplier = args.timeout_multiplier From bd425f716f0a92ef627f7287869d88ca408fe55e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Jun 2018 15:38:56 +0200 Subject: [PATCH 1677/2640] host-cargo: select host-rustc Buildroot documentation specifies that cargo-based package should only depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS and selects BR2_PACKAGE_HOST_CARGO but this fails with the following error: warning: (BR2_PACKAGE_LIBRSVG) selects BR2_PACKAGE_HOST_CARGO which has unmet direct dependencies (BR2_PACKAGE_HAS_HOST_RUSTC) Indeed, host-cargo depends on BR2_PACKAGE_HAS_HOST_RUSTC which is selected only when host-rustc is selected. So instead of having to select both cargo and rustc in each cargo-based package, replace BR2_PACKAGE_HAS_HOST_RUSTC dependency by BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS and select BR2_PACKAGE_HOST_RUSTC Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cargo/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host index 0f1ca305c6..c33c6851f2 100644 --- a/package/cargo/Config.in.host +++ b/package/cargo/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_CARGO bool "host cargo" - depends on BR2_PACKAGE_HAS_HOST_RUSTC + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC help Cargo is the package manager for the Rust programming language. From 9962368a90516fa90625be58319b486f960afa1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 10 Jun 2018 15:58:29 +0200 Subject: [PATCH 1678/2640] rustc: drop BR2_PACKAGE_HAS_HOST_RUSTC This commit drops the option BR2_PACKAGE_HAS_HOST_RUSTC, which is no longer used following commit bd425f716f0a92ef627f7287869d88ca408fe55e ("host-cargo: select host-rustc"). Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 84a8e0f90b..2ae8f89d3f 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -46,7 +46,6 @@ config BR2_PACKAGE_HOST_RUST depends on BR2_HOST_GCC_AT_LEAST_4_7 # required by LLVM # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 - select BR2_PACKAGE_HAS_HOST_RUSTC help This package will build the compiler for the host as well as two flavors of the standard library: one for the host, another @@ -61,16 +60,12 @@ comment "host-rust needs host gcc >= 4.7" config BR2_PACKAGE_HOST_RUST_BIN bool "host rust (pre-built)" - select BR2_PACKAGE_HAS_HOST_RUSTC help This package will install pre-built versions of the compiler for the host and the Rust standard library for the target. endchoice -config BR2_PACKAGE_HAS_HOST_RUSTC - bool - config BR2_PACKAGE_PROVIDES_HOST_RUSTC string default "host-rust" if BR2_PACKAGE_HOST_RUST From 1ec1f865515223426518e0709d4ca8b57dded6fc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Jun 2018 15:38:57 +0200 Subject: [PATCH 1679/2640] librsvg: bump to version 2.42.5 - Add a dependency to host-cargo - Add a patch to set RUST_TARGET - Add a dependency to BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - Forward this dependency to efl svg, enlightment, gst-plugins-bad and gst1-plugins-bad - Add hash for license file Signed-off-by: Fabrice Fontaine [Thomas: propagate the new dependency to the gst-plugins-bad and gst1-plugins-bad Config.in comments.] Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 1 + package/enlightenment/Config.in | 2 + package/gstreamer/gst-plugins-bad/Config.in | 2 + package/gstreamer1/gst1-plugins-bad/Config.in | 2 + .../0001-Add-RUST_TARGET-variable.patch | 57 +++++++++++++++++++ package/librsvg/Config.in | 3 + package/librsvg/librsvg.hash | 7 ++- package/librsvg/librsvg.mk | 12 ++-- 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 package/librsvg/0001-Add-RUST_TARGET-variable.patch diff --git a/package/efl/Config.in b/package/efl/Config.in index cfb803c6df..b9b285d8da 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -289,6 +289,7 @@ config BR2_PACKAGE_EFL_LIBRAW config BR2_PACKAGE_EFL_SVG bool "SVG loader" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index d1dee25f86..892da79b4d 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ENLIGHTENMENT bool "enlightenment" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # efl svg -> librsvg # libevas-generic-loaders-svg -> librsvg -> glib2 / pango depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP @@ -29,6 +30,7 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_PACKAGE_HAS_UDEV diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in index 7bbd56a602..3f2392afdb 100644 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ b/package/gstreamer/gst-plugins-bad/Config.in @@ -297,11 +297,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG comment "rsvg plugin needs a toolchain w/ C++" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 7e166e43a1..b09e515f5a 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -643,6 +643,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG @@ -650,6 +651,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG RSVG plugin library comment "rsvg plugin needs a toolchain w/ C++" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/librsvg/0001-Add-RUST_TARGET-variable.patch b/package/librsvg/0001-Add-RUST_TARGET-variable.patch new file mode 100644 index 0000000000..2807c2423f --- /dev/null +++ b/package/librsvg/0001-Add-RUST_TARGET-variable.patch @@ -0,0 +1,57 @@ +From 2bef718d1ade8dd20f431ac2eef9fdf58d96842f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 1 Jun 2018 20:58:25 +0200 +Subject: [PATCH] Add RUST_TARGET variable + +Add RUST_TARGET environment variable through AC_ARG_VAR to allow the +user to override the rust target name. Indeed, using $host when +cross-compiling is not always the good option especially when vendor +part of target is not set to unknown but to another value such as +buildroot. +Indeed, in this case aarch64-buildroot-linux-gnu won't be recognised as +a valid target by rust/cargo. + +[Upstream status: merged (https://github.com/GNOME/librsvg/commit/f0b76ab6f003b8e05d4caab2b6d844e97b97796f)] + +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 2 +- + configure.ac | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index f21b58e2..0b5b906f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -136,7 +136,7 @@ CARGO_RELEASE_ARGS=--release + endif + + if CROSS_COMPILING +-CARGO_TARGET_ARGS=--target=$(host) ++CARGO_TARGET_ARGS=--target=$(RUST_TARGET) + endif + + CARGO_VERBOSE = $(cargo_verbose_$(V)) +diff --git a/configure.ac b/configure.ac +index c9666757..50ca9f0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -286,9 +286,14 @@ else + fi + AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) + ++AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) ++if test "x$RUST_TARGET" == x; then ++ RUST_TARGET=$host ++fi ++ + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) + if test "x$cross_compiling" = "xyes" ; then +- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR" ++ RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" + fi + AC_SUBST([RUST_TARGET_SUBDIR]) + +-- +2.14.1 + diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index ffb0287dbd..45919c7d51 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBRSVG bool "librsvg" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -8,6 +9,7 @@ config BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_HOST_CARGO select BR2_PACKAGE_LIBCROCO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 @@ -19,6 +21,7 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg comment "librsvg needs a toolchain w/ wchar, threads, C++" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index 6f4b07423a..dce918d0ce 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,2 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum -sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.42/librsvg-2.42.5.sha256sum +sha256 d4dd51a492a2022c07dec385e22947190fe70410928c471934ff3399f20935ec librsvg-2.42.5.tar.xz + +# Hash for license file: +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index 4f563ce6db..037e1fbc14 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -4,18 +4,22 @@ # ################################################################################ -LIBRSVG_VERSION_MAJOR = 2.40 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20 +LIBRSVG_VERSION_MAJOR = 2.42 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).5 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no -LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ +LIBRSVG_DEPENDENCIES = cairo host-cargo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) -HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango +HOST_LIBRSVG_DEPENDENCIES = host-cairo host-cargo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango LIBRSVG_LICENSE = LGPL-2.0+ LIBRSVG_LICENSE_FILES = COPYING.LIB +# We're patching configure.ac +LIBRSVG_AUTORECONF = YES +LIBRSVG_CONF_ENV = RUST_TARGET=$(RUSTC_TARGET_NAME) + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 529219ba96128b3de17dc1201f0b64d723013315 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 2 Jun 2018 10:01:01 +0200 Subject: [PATCH 1680/2640] docs/manual: always point to the correct license file The manual is GPL-2, and points to the COPYING file in the repository. When we do a rendering of the manual for a specific version, that URL is currently always poitning to the latest version of the COPYING file. If we ever have to change the content of that file (e.g. to add a new exception, more clarifications, a license change, or whatever), then an old manual would point to that newer version, which would then be incorrect. Include the sha1 of the commit in the URL, so that the manual always point to the tree at the time the manual was rendered, not the time it is consulted. Contrary to the informative text above, use the full sha1, not the shortened one. Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- docs/manual/manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index afb53d0482..9d5076047f 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -9,8 +9,8 @@ Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate} The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -http://git.buildroot.org/buildroot/tree/COPYING[COPYING] file in the Buildroot -sources for the full text of this license. +http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] +file in the Buildroot sources for the full text of this license. Copyright (C) 2004-2018 The Buildroot developers From 12b70acb82acfa4925a8436a31a668ac92a58d1d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 10 Jun 2018 16:43:53 +0200 Subject: [PATCH 1681/2640] mender: fix check-package warnings Fixes: package/mender/Config.in:7: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/mender/Config.in:8: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/mender/mender.mk:8: remove default value of _SOURCE variable (http://nightly.buildroot.org/#generic-package-reference) Signed-off-by: Thomas Petazzoni --- package/mender/Config.in | 8 ++++---- package/mender/mender.mk | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/mender/Config.in b/package/mender/Config.in index 61a20cfd8a..e461857486 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,10 +4,10 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help - Mender is an open source over-the-air (OTA) software updater for - embedded Linux devices. Mender comprises a client running at the - embedded device, as well as a server that manages deployments - across many devices. + Mender is an open source over-the-air (OTA) software updater + for embedded Linux devices. Mender comprises a client + running at the embedded device, as well as a server that + manages deployments across many devices. https://github.com/mendersoftware/mender diff --git a/package/mender/mender.mk b/package/mender/mender.mk index ab0078e0cc..695b5e7a91 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -5,7 +5,6 @@ ################################################################################ MENDER_VERSION = 1.4.0 -MENDER_SOURCE = mender-$(MENDER_VERSION).tar.gz MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) define MENDER_INSTALL_CONFIG_FILES From 693b27e2252afbf7f31e9e7a8e7a661c18bb288a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Jun 2018 06:51:44 +0200 Subject: [PATCH 1682/2640] yaml-cpp: disable tests fork is used in tests so build fails without MMU Fixes: - http://autobuild.buildroot.net/results/3cb7c4d93e466c6eef69aacd0e561a9fb569e69b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/yaml-cpp/yaml-cpp.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index d97c84a7cf..97021ea421 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -11,6 +11,8 @@ YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE # Disable testing and parse tools -YAML_CPP_CONF_OPTS += -DYAML_CPP_BUILD_TOOLS=OFF +YAML_CPP_CONF_OPTS += \ + -DYAML_CPP_BUILD_TESTS=OFF \ + -DYAML_CPP_BUILD_TOOLS=OFF $(eval $(cmake-package)) From b78a365b56eeb57030b8e3ca98c23dddfc416820 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 11 Jun 2018 18:53:12 +0300 Subject: [PATCH 1683/2640] gnupg2: security bump to version 2.2.8 Fixes CVE-2018-12020: Unsanitized file names might cause injection of terminal control characters into the status output of gnupg. Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f5cc95cb1b..f5890c5e2a 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,6 +1,6 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000424.html -sha1 e222cda63409a86992369df8976f6c7511e10ea0 gnupg-2.2.7.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html +sha1 d87553a125832ea90e8aeb3ceeecf24f88de56fb gnupg-2.2.8.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.7.tar.bz2.sig -sha256 d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e gnupg-2.2.7.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.8.tar.bz2.sig +sha256 777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd gnupg-2.2.8.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 0823921b0b..3151860f37 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.7 +GNUPG2_VERSION = 2.2.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 0647268416ecf5c50741838fae4fc48b1c0750be Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 11 Jun 2018 19:08:43 +0300 Subject: [PATCH 1684/2640] gnupg: security bump to version 1.4.23 Fixes CVE-2018-12020: Unsanitized file names might cause injection of terminal control characters into the status output of gnupg. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnupg/gnupg.hash | 4 ++-- package/gnupg/gnupg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnupg/gnupg.hash b/package/gnupg/gnupg.hash index abd76cde9c..3bacdf6563 100644 --- a/package/gnupg/gnupg.hash +++ b/package/gnupg/gnupg.hash @@ -1,3 +1,3 @@ # Locally computed based on signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.22.tar.bz2.sig -sha256 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4 gnupg-1.4.22.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.23.tar.bz2.sig +sha256 c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba gnupg-1.4.23.tar.bz2 diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index 3ff202b709..ac9047894d 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG_VERSION = 1.4.22 +GNUPG_VERSION = 1.4.23 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG_LICENSE = GPL-3.0+ From b4a7145b0b98fb37ee649e293a6a81785df67837 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 11 Jun 2018 21:24:47 +0300 Subject: [PATCH 1685/2640] triggerhappy: use target pkg-config triggerhappy uses pkg-config to detect the systemd library. Make sure it uses the target pkg-config, not the host one. Fixes build failure when the host has systemd pkg-config files: .../host/bin/arm-linux-gcc -static th-cmd.o cmdsocket.o -lsystemd -o th-cmd .../host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/6.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lsystemd Cc: Peter Korsgaard Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/triggerhappy/triggerhappy.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk index 9f74c486f1..4c39ab5e5d 100644 --- a/package/triggerhappy/triggerhappy.mk +++ b/package/triggerhappy/triggerhappy.mk @@ -8,9 +8,11 @@ TRIGGERHAPPY_VERSION = b822888066129350e51ad79f1cf307fa38dae4f7 TRIGGERHAPPY_SITE = $(call github,wertarbyte,triggerhappy,$(TRIGGERHAPPY_VERSION)) TRIGGERHAPPY_LICENSE = GPL-3.0+ TRIGGERHAPPY_LICENSE_FILES = COPYING +TRIGGERHAPPY_DEPENDENCIES = host-pkgconf define TRIGGERHAPPY_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) thd th-cmd + $(MAKE) $(TARGET_CONFIGURE_OPTS) PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + -C $(@D) thd th-cmd endef ifeq ($(BR2_PACKAGE_HAS_UDEV),y) From a96100599071055e6daad1211f68b022c86a25c1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Jun 2018 16:31:32 +0200 Subject: [PATCH 1686/2640] orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05 4.17 brings support for HDMI out, but sunxi_defconfig hasn't been updated to enable the drivers - So add a kernel fragment to enable them. Likewise, analog audio has been supported since 4.10, but the driver isn't enabled in sunxi_defconfig, so enable it in the fragment. Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-pc/linux.fragment | 3 +++ configs/orangepi_pc_defconfig | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 board/orangepi/orangepi-pc/linux.fragment diff --git a/board/orangepi/orangepi-pc/linux.fragment b/board/orangepi/orangepi-pc/linux.fragment new file mode 100644 index 0000000000..cdd522452a --- /dev/null +++ b/board/orangepi/orangepi-pc/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_DRM_SUN8I_DW_HDMI=y +CONFIG_SUN8I_DE2_CCU=y +CONFIG_SND_SUN8I_CODEC_ANALOG=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index aa559e743e..05199af53b 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,14 +1,17 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" BR2_TARGET_ROOTFS_EXT2=y @@ -17,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -29,5 +32,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" From 0b0bc52cdd254966bb909b88ef4e94486f361a95 Mon Sep 17 00:00:00 2001 From: Jan Kraval Date: Mon, 11 Jun 2018 19:01:12 +0200 Subject: [PATCH 1687/2640] configs/orangepi_lite: Bump kernel and U-Boot versions Bump kernel to version 4.17 and U-Boot to 2018.05. Signed-off-by: Jan Kraval Signed-off-by: Peter Korsgaard --- configs/orangepi_lite_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index 1e5fca8677..109861f21c 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From c7a445a58fac3adb5d5da2d3bbce649814646ab9 Mon Sep 17 00:00:00 2001 From: Jan Kraval Date: Mon, 11 Jun 2018 19:01:13 +0200 Subject: [PATCH 1688/2640] configs/orangepi_lite: Enable HDMI and analog audio in Linux config Signed-off-by: Jan Kraval Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-lite/linux-extras.config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/orangepi/orangepi-lite/linux-extras.config b/board/orangepi/orangepi-lite/linux-extras.config index 5e3af2b831..6bb716903f 100644 --- a/board/orangepi/orangepi-lite/linux-extras.config +++ b/board/orangepi/orangepi-lite/linux-extras.config @@ -6,3 +6,10 @@ CONFIG_CFG80211_WEXT=y # wireless drivers CONFIG_WLAN=y + +# hdmi +CONFIG_DRM_SUN8I_DW_HDMI=y +CONFIG_SUN8I_DE2_CCU=y + +# analog audio +CONFIG_SND_SUN8I_CODEC_ANALOG=y From d06d70d28db37e77a74493e2181fc5b0f6dedd17 Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Mon, 11 Jun 2018 09:51:53 -0500 Subject: [PATCH 1689/2640] modem-manager: update to version 1.8.0 Update to modem manager 1.8.0 which does not require udev. Added option to build without udev but if udev exists in the build, it build with libgudev. Signed-off-by: Jared Bents Signed-off-by: Peter Korsgaard --- package/modem-manager/Config.in | 10 ++++------ package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 11 +++++++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 215449a50e..226f82f4f6 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MODEM_MANAGER bool "modemmanager" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS # runtime dependency select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections. @@ -28,7 +27,6 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI This option enables support for QMI protocol endif -comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV +comment "modemmanager needs a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 8531330d22..77a8c2dc43 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 eefb7615c2c7ebc994abfc2782bfa9e798643a633362b40db96f7f61706a6283 ModemManager-1.6.12.tar.xz +sha256 18abe34421aa3b52ff47d4ba93aa282f8f8944717dd644a5c0c81eeeac9c7eb1 ModemManager-1.8.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index fe4a7a95da..e2f89d9de1 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,12 +4,12 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.6.12 +MODEM_MANAGER_VERSION = 1.8.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB -MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 libgudev +MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings @@ -20,6 +20,13 @@ else MODEM_MANAGER_CONF_OPTS += --without-qmi endif +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +MODEM_MANAGER_DEPENDENCIES += libgudev +MODEM_MANAGER_CONF_OPTS += --with-udev +else +MODEM_MANAGER_CONF_OPTS += --without-udev +endif + ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim MODEM_MANAGER_CONF_OPTS += --with-mbim From ba2ee2306b4d9c737630aae2898284c486f163ce Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 10 Jun 2018 21:44:48 +0300 Subject: [PATCH 1690/2640] x265: fix build Add upstream patch fixing missing function argument issue. Fixes: http://autobuild.buildroot.net/results/caa/caaaa5dc428c12ce7137194589153313911b000f/ http://autobuild.buildroot.net/results/741/741d8bacbe12e2f40047e30f7765039a88d1ce8f/ http://autobuild.buildroot.net/results/2c3/2c3f5b18efe5f42e1ab5269e106b9200690330af/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0002-fix-build-error-on-ppc64le.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/x265/0002-fix-build-error-on-ppc64le.patch diff --git a/package/x265/0002-fix-build-error-on-ppc64le.patch b/package/x265/0002-fix-build-error-on-ppc64le.patch new file mode 100644 index 0000000000..ca034477eb --- /dev/null +++ b/package/x265/0002-fix-build-error-on-ppc64le.patch @@ -0,0 +1,23 @@ +# HG changeset patch +# User Jayashree +# Date 1527224165 -19800 +# Node ID 4504219210793536d921ee4e0b3058698c630bf4 +# Parent cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704 +Fix build error on on ppc64le + +Signed-off-by: Baruch Siach + +Upstream status: commit 450421921 + +diff --git a/source/common/param.cpp b/source/common/param.cpp +--- a/source/common/param.cpp ++++ b/source/common/param.cpp +@@ -633,7 +633,7 @@ + if (bValueWasNull) + p->cpuid = atobool(value); + else +- p->cpuid = parseCpuName(value, bError); ++ p->cpuid = parseCpuName(value, bError, false); + #endif + } + OPT("fps") From 1b86479da599072d00683e15307962b013b998fe Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 10 Jun 2018 22:09:22 +0300 Subject: [PATCH 1691/2640] znc: fix build without openssl Add a patch to include unconditionally. Fixes: http://autobuild.buildroot.net/results/4c3/4c3d9f6f5214052b7eda4c7bbfabe5b463080b12/ http://autobuild.buildroot.net/results/d06/d06176f00109ad0707032b0d76fe94f1d414106c/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-without-SSL-support.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/znc/0001-Fix-build-without-SSL-support.patch diff --git a/package/znc/0001-Fix-build-without-SSL-support.patch b/package/znc/0001-Fix-build-without-SSL-support.patch new file mode 100644 index 0000000000..23b78ed4be --- /dev/null +++ b/package/znc/0001-Fix-build-without-SSL-support.patch @@ -0,0 +1,37 @@ +From a263157165c411552d73a211ac9c7647285abdc5 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 10 Jun 2018 22:01:47 +0300 +Subject: [PATCH] Fix build without SSL support + +The headers is needed for unique_ptr even when SSL is not +enabled. This fixes the following build failure: + +src/Utils.cpp: In static member function 'static bool CUtils::CheckCIDR(const CString&, const CString&)': +src/Utils.cpp:674:5: error: 'unique_ptr' is not a member of 'std' + std::unique_ptr aiHost(aiHostC, deleter); + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/znc/znc/pull/1554 + + src/Utils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Utils.cpp b/src/Utils.cpp +index 9c3b2549b791..cced5683d78a 100644 +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -27,8 +27,8 @@ + #include + #ifdef HAVE_LIBSSL + #include +-#include + #endif /* HAVE_LIBSSL */ ++#include + #include + #include + +-- +2.17.1 + From 2b88def5db35fc3f3b4e68c664c230bba33f0bb3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 11 Jun 2018 21:24:48 +0300 Subject: [PATCH 1692/2640] triggerhappy: add optional dependency on systemd triggerhappy can use systemd for socket activation. Cc: Peter Korsgaard Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/triggerhappy/triggerhappy.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk index 4c39ab5e5d..7c4bf40476 100644 --- a/package/triggerhappy/triggerhappy.mk +++ b/package/triggerhappy/triggerhappy.mk @@ -10,6 +10,10 @@ TRIGGERHAPPY_LICENSE = GPL-3.0+ TRIGGERHAPPY_LICENSE_FILES = COPYING TRIGGERHAPPY_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TRIGGERHAPPY_DEPENDENCIES += systemd +endif + define TRIGGERHAPPY_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \ -C $(@D) thd th-cmd From 82818284ed77276902b49f4b82106faf43b89003 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 10 Jun 2018 21:28:18 +0300 Subject: [PATCH 1693/2640] flatcc: fix build with gcc 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gcc 8 enables a strncpy() warning. This breaks the build of flatcc that enables -Werror. Add upstream patch fixing the issue. Fixes: http://autobuild.buildroot.net/results/0e3/0e3a959855fad5899db184f7d2c960c89df03672/ http://autobuild.buildroot.net/results/d2c/d2c03bc253bdf135b0f31f3d1e6fd33f7d37d64b/ http://autobuild.buildroot.net/results/163/1636ec6ddad92add95f42451d941156451c6d936/ Cc: Joel Carlson Cc: Mikkel Fahnøe Jørgensen Signed-off-by: Baruch Siach Reviewed-by: Joel Carlson Tested-by: Joel Carlson Signed-off-by: Peter Korsgaard --- ...cc-8-warning-add-flatbuffers_type_ha.patch | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch diff --git a/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch b/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch new file mode 100644 index 0000000000..28c0208891 --- /dev/null +++ b/package/flatcc/0001-Remove-strncpy-gcc-8-warning-add-flatbuffers_type_ha.patch @@ -0,0 +1,138 @@ +From c0df0b6fca4fa6bca114bba4df74f1b4e53124c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mikkel=20Fahn=C3=B8e=20J=C3=B8rgensen?= +Date: Sat, 9 Jun 2018 11:10:24 +0200 +Subject: [PATCH] Remove strncpy gcc-8 warning, add + flatbuffers_type_hash_from_string + +[baruch: drop CHANGELOG hunk] +Signed-off-by: Baruch Siach +--- +Upstream status: commit c0df0b6fca4 + + include/flatcc/flatcc_identifier.h | 21 +++++++++++++++++++ + .../reflection/flatbuffers_common_reader.h | 4 +--- + src/compiler/codegen_c_reader.c | 4 +--- + src/runtime/json_printer.c | 7 +++++-- + src/runtime/verifier.c | 5 ++--- + 6 files changed, 32 insertions(+), 11 deletions(-) + +diff --git a/include/flatcc/flatcc_identifier.h b/include/flatcc/flatcc_identifier.h +index cd918cb42b48..31af3074f4db 100644 +--- a/include/flatcc/flatcc_identifier.h ++++ b/include/flatcc/flatcc_identifier.h +@@ -77,6 +77,27 @@ static inline flatbuffers_thash_t flatbuffers_type_hash_from_identifier(const fl + (uint32_t)p[0] + (((uint32_t)p[1]) << 8) + (((uint32_t)p[2]) << 16) + (((uint32_t)p[3]) << 24) : 0; + } + ++/* ++ * Convert a null terminated string identifier like "MONS" or "X" into a ++ * native type hash identifier, usually for comparison. This will not ++ * work with type hash strings because they can contain null bytes. ++ */ ++static inline flatbuffers_thash_t flatbuffers_type_hash_from_string(const char *identifier) ++{ ++ flatbuffers_thash_t h = 0; ++ const uint8_t *p = (const uint8_t *)identifier; ++ ++ if (!p[0]) return h; ++ h += p[0]; ++ if (!p[1]) return h; ++ h += p[1] << 8; ++ if (!p[2]) return h; ++ h += p[2] << 16; ++ /* No need to test for termination here. */ ++ h += p[3] << 24; ++ return h; ++} ++ + /* + * Computes the little endian wire format of the type hash. It can be + * used as a file identifer argument to various flatcc buffer calls. +diff --git a/include/flatcc/reflection/flatbuffers_common_reader.h b/include/flatcc/reflection/flatbuffers_common_reader.h +index dee44ad653f1..9604052685f6 100644 +--- a/include/flatcc/reflection/flatbuffers_common_reader.h ++++ b/include/flatcc/reflection/flatbuffers_common_reader.h +@@ -464,9 +464,7 @@ static inline T N ## _ ## NK (N ## _struct_t t__tmp) { return t__tmp ? &(t__tmp- + /* If fid is null, the function returns true without testing as buffer is not expected to have any id. */ + static inline int flatbuffers_has_identifier(const void *buffer, const char *fid) + { flatbuffers_thash_t id, id2 = 0; if (fid == 0) { return 1; }; +- strncpy((char *)&id2, fid, sizeof(id2)); +- /* Identifier strings are always considered little endian. */ +- id2 = __flatbuffers_thash_cast_from_le(id2); ++ id2 = flatbuffers_type_hash_from_string(fid); + id = __flatbuffers_thash_read_from_pe(((flatbuffers_uoffset_t *)buffer) + 1); + return id2 == 0 || id == id2; } + static inline int flatbuffers_has_type_hash(const void *buffer, flatbuffers_thash_t thash) +diff --git a/src/compiler/codegen_c_reader.c b/src/compiler/codegen_c_reader.c +index e3df74754344..559731050a15 100644 +--- a/src/compiler/codegen_c_reader.c ++++ b/src/compiler/codegen_c_reader.c +@@ -748,9 +748,7 @@ static void gen_helpers(fb_output_t *out) + "/* If fid is null, the function returns true without testing as buffer is not expected to have any id. */\n" + "static inline int %shas_identifier(const void *buffer, const char *fid)\n" + "{ %sthash_t id, id2 = 0; if (fid == 0) { return 1; };\n" +- " strncpy((char *)&id2, fid, sizeof(id2));\n" +- " /* Identifier strings are always considered little endian. */\n" +- " id2 = __%sthash_cast_from_le(id2);\n" ++ " id2 = %stype_hash_from_string(fid);\n" + " id = __%sthash_read_from_pe(((%suoffset_t *)buffer) + 1);\n" + " return id2 == 0 || id == id2; }\n" + "static inline int %shas_type_hash(const void *buffer, %sthash_t thash)\n" +diff --git a/src/runtime/json_printer.c b/src/runtime/json_printer.c +index 8fe248331f43..bc86d21f8f9d 100644 +--- a/src/runtime/json_printer.c ++++ b/src/runtime/json_printer.c +@@ -20,6 +20,7 @@ + + #include "flatcc/flatcc_flatbuffers.h" + #include "flatcc/flatcc_json_printer.h" ++#include "flatcc/flatcc_identifier.h" + + #include "flatcc/portable/pprintint.h" + #include "flatcc/portable/pprintfp.h" +@@ -1008,6 +1009,9 @@ void flatcc_json_printer_struct_field(flatcc_json_printer_t *ctx, + /* + * Make sure the buffer identifier is valid before assuming the rest of + * the buffer is sane. ++ * NOTE: this won't work with type hashes because these can contain ++ * nulls in the fid string. In this case use null as fid to disable ++ * check. + */ + static int accept_header(flatcc_json_printer_t * ctx, + const void *buf, size_t bufsiz, const char *fid) +@@ -1020,8 +1024,7 @@ static int accept_header(flatcc_json_printer_t * ctx, + return 0; + } + if (fid != 0) { +- strncpy((char *)&id2, fid, FLATBUFFERS_IDENTIFIER_SIZE); +- id2 = __flatbuffers_thash_cast_from_le(id2); ++ id2 = flatbuffers_type_hash_from_string(fid); + id = __flatbuffers_thash_read_from_pe((uint8_t *)buf + offset_size); + if (!(id2 == 0 || id == id2)) { + RAISE_ERROR(bad_input); +diff --git a/src/runtime/verifier.c b/src/runtime/verifier.c +index 68dbc1b6fb0b..3b7c68cca4d7 100644 +--- a/src/runtime/verifier.c ++++ b/src/runtime/verifier.c +@@ -10,6 +10,7 @@ + #include "flatcc/flatcc_rtconfig.h" + #include "flatcc/flatcc_flatbuffers.h" + #include "flatcc/flatcc_verifier.h" ++#include "flatcc/flatcc_identifier.h" + + /* Customization for testing. */ + #if FLATCC_DEBUG_VERIFY +@@ -110,9 +111,7 @@ static inline uoffset_t read_uoffset(const void *p, uoffset_t base) + + static inline thash_t read_thash_identifier(const char *identifier) + { +- flatbuffers_thash_t id = 0; +- strncpy((char *)&id, identifier, sizeof(id)); +- return __flatbuffers_thash_cast_from_le(id); ++ return flatbuffers_type_hash_from_string(identifier); + } + + static inline thash_t read_thash(const void *p, uoffset_t base) +-- +2.17.1 + From 9a5c3d5bb40f31676cd9949e4e63d7f3d4f2f812 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 11 Jun 2018 16:36:18 -0700 Subject: [PATCH 1694/2640] libnss: bump to version 3.37.3 Fixes: http://autobuild.buildroot.net/results/fd64ee3486f9045dfbd83908b8f06ef62c0d9781/ http://autobuild.buildroot.net/results/698500a92688c50e9cc71cf82c0848cb4adb81ad/ http://autobuild.buildroot.net/results/adaa2f79b202cb01ae57fa0cdb0eac9c07b22ea2/ Signed-off-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- ...hen-not-building-with-int128-support.patch | 143 ------------------ package/libnss/libnss.hash | 4 +- package/libnss/libnss.mk | 3 +- 3 files changed, 4 insertions(+), 146 deletions(-) delete mode 100644 package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch diff --git a/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch b/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch deleted file mode 100644 index 1216429696..0000000000 --- a/package/libnss/0003-Bug-1432455-Build-FStar-c-when-not-building-with-int128-support.patch +++ /dev/null @@ -1,143 +0,0 @@ - -# HG changeset patch -# User Mike Hommey -# Date 1527430800 -7200 -# Node ID 3d3e34bb75172462c7b4bbe7bd5e3e47ed65e464 -# Parent 8e600e2af5bf0c29e88f928471e6aba1a734d05b -Bug 1432455 - Build FStar.c when not building with int128 support. r=fkiefer - -Patch retrieved and slightly updated (to add nss path) from: -https://hg.mozilla.org/projects/nss/rev/3d3e34bb75172462c7b4bbe7bd5e3e47ed65e464 - -Signed-off-by: Fabrice Fontaine - -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -530,22 +530,26 @@ ifndef NSS_DISABLE_CHACHAPOLY - VERIFIED_SRCS += Hacl_Chacha20.c - VERIFIED_SRCS += Hacl_Chacha20_Vec128.c - endif # NSS_DISABLE_CHACHAPOLY - - ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) - # All intel architectures get the 64 bit version - # With custom uint128 if necessary (faster than generic 32 bit version). - ECL_SRCS += curve25519_64.c -- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c -+ VERIFIED_SRCS += Hacl_Curve25519.c - else - # All non intel architectures get the generic 32 bit implementation (slow!) - ECL_SRCS += curve25519_32.c - endif - -+ifndef HAVE_INT128_SUPPORT -+ VERIFIED_SRCS += FStar.c -+endif -+ - ####################################################################### - # (5) Execute "global" rules. (OPTIONAL) # - ####################################################################### - - include $(CORE_DEPTH)/coreconf/rules.mk - - ####################################################################### - # (6) Execute "component" rules. (OPTIONAL) # -diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp ---- a/nss/lib/freebl/freebl.gyp -+++ b/nss/lib/freebl/freebl.gyp -@@ -272,28 +272,20 @@ - }, - }], - [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', { - # mingw x64 - 'defines': [ - 'MP_IS_LITTLE_ENDIAN', - ], - }], -- [ 'OS!="win"', { -- 'conditions': [ -- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { -- 'defines': [ -- # The Makefile does version-tests on GCC, but we're not doing that here. -- 'HAVE_INT128_SUPPORT', -- ], -- }, { -- 'defines': [ -- 'KRML_NOUINT128', -- ], -- }], -+ [ 'have_int128_support==1', { -+ 'defines': [ -+ # The Makefile does version-tests on GCC, but we're not doing that here. -+ 'HAVE_INT128_SUPPORT', - ], - }, { - 'defines': [ - 'KRML_NOUINT128', - ], - }], - [ 'OS=="linux"', { - 'defines': [ -@@ -345,10 +337,23 @@ - ], - }], - ], - }], - ], - }, - 'variables': { - 'module': 'nss', -+ 'conditions': [ -+ [ 'OS!="win"', { -+ 'conditions': [ -+ [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { -+ 'have_int128_support%': 1, -+ }, { -+ 'have_int128_support%': 0, -+ }], -+ ], -+ }, { -+ 'have_int128_support%': 0, -+ }], -+ ], - } - } -diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi ---- a/nss/lib/freebl/freebl_base.gypi -+++ b/nss/lib/freebl/freebl_base.gypi -@@ -55,17 +55,16 @@ - 'rsa.c', - 'rsapkcs.c', - 'seed.c', - 'sha512.c', - 'sha_fast.c', - 'shvfy.c', - 'sysrand.c', - 'tlsprfalg.c', -- 'verified/FStar.c', - ], - 'conditions': [ - [ 'OS=="linux" or OS=="android"', { - 'conditions': [ - [ 'target_arch=="x64"', { - 'sources': [ - 'arcfour-amd64-gas.s', - 'intel-aes.s', -@@ -215,13 +214,16 @@ - 'MP_USE_UINT_DIGIT', - 'MP_ASSEMBLY_MULTIPLY', - 'MP_ASSEMBLY_SQUARE', - 'MP_ASSEMBLY_DIV_2DX1D', - ], - }], - ], - }], -+ [ 'have_int128_support==0', { -+ 'sources': [ 'verified/FStar.c' ], -+ }], - ], - 'ldflags': [ - '-Wl,-Bsymbolic' - ], - } - diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index fa145c91f2..2b79901a7c 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_35_RTM/src/SHA256SUMS -sha256 5821969e85d241833e96cb82bd4211ddea6d87003f2cccce25e0eab4aefa6268 nss-3.37.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_3_RTM/src/SHA256SUMS +sha256 9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be nss-3.37.3.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 053c09f7dc..dd84aafcbe 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,8 @@ # ################################################################################ -LIBNSS_VERSION = 3.37 +LIBNSS_VERSION_MAJOR = 3.37 +LIBNSS_VERSION = $(LIBNSS_VERSION_MAJOR).3 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From dc267db6ab4d54ed3ddb582774fb51ef64332649 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 11 Jun 2018 03:00:13 -0300 Subject: [PATCH 1695/2640] sysvinit: reduce number of mkdir calls in inittab The default sysvinit inittab does two separate mkdir calls to create /dev/pts and /dev/shm. Reduce this to call mkdir only once for both directories. This removes id "si3" but keeps ids "si4".."si9" intact rather than renumbering them. This would just increase the turmoil without any practical effect. Based on commit e9db8122fb, by Florian La Roche . Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/sysvinit/inittab | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab index 7eaef59d9e..2ca253ad6c 100644 --- a/package/sysvinit/inittab +++ b/package/sysvinit/inittab @@ -6,8 +6,7 @@ id:3:initdefault: si0::sysinit:/bin/mount -t proc proc /proc si1::sysinit:/bin/mount -o remount,rw / -si2::sysinit:/bin/mkdir -p /dev/pts -si3::sysinit:/bin/mkdir -p /dev/shm +si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm si4::sysinit:/bin/mount -a si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null From d2a091c96b87c5674754a12ee9055a164270d0eb Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 11 Jun 2018 03:00:14 -0300 Subject: [PATCH 1696/2640] sysvinit: add an inittab entry to activate swap There is a call to swapoff in the shutdown sequence, so call "swapon -a" on startup. As stated in the swapon man page, All devices marked as "swap" in /etc/fstab are made available, except for those with the "noauto" option. Devices that are already being used as swap are silently skipped. So even if the system has some init script to start/stop swap (e.g. from a rootfs ovelay) calling swapon/swapoff would be harmless. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/sysvinit/inittab | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab index 2ca253ad6c..a31471031f 100644 --- a/package/sysvinit/inittab +++ b/package/sysvinit/inittab @@ -7,7 +7,8 @@ id:3:initdefault: si0::sysinit:/bin/mount -t proc proc /proc si1::sysinit:/bin/mount -o remount,rw / si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm -si4::sysinit:/bin/mount -a +si3::sysinit:/bin/mount -a +si4::sysinit:/sbin/swapon -a si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null From d524cc7d9de549228b998ba5747b0d7cd4f24251 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 11 Jun 2018 03:00:15 -0300 Subject: [PATCH 1697/2640] busybox: add an inittab entry to activate swap There is a call to swapoff in the shutdown sequence, so call "swapon -a" on startup. As stated in the swapon man page, All devices marked as "swap" in /etc/fstab are made available, except for those with the "noauto" option. Devices that are already being used as swap are silently skipped. So even if the system has some init script to start/stop swap (e.g. from a rootfs ovelay) calling swapon/swapoff would be harmless. Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/busybox/inittab | 1 + 1 file changed, 1 insertion(+) diff --git a/package/busybox/inittab b/package/busybox/inittab index 7cd203de0b..ff1725c775 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -18,6 +18,7 @@ ::sysinit:/bin/mount -o remount,rw / ::sysinit:/bin/mkdir -p /dev/pts /dev/shm ::sysinit:/bin/mount -a +::sysinit:/sbin/swapon -a null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout From a3df894e8315d2b55192abe7ddd7b07128118a79 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 11 Jun 2018 03:00:16 -0300 Subject: [PATCH 1698/2640] board/synopsys: synchronize custom inittab with BusyBox' one Apply modifications made in recent commits: - 456ea9871e busybox: add /dev/std{in, out, err} symlinks to inittab - 13dbe73782 busybox: reduce number of mkdir calls in inittab - 8a89d290d4 busybox: add an inittab entry to activate swap Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- board/synopsys/axs10x/fs-overlay/etc/inittab | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/board/synopsys/axs10x/fs-overlay/etc/inittab b/board/synopsys/axs10x/fs-overlay/etc/inittab index 43bacc6580..7412a27366 100644 --- a/board/synopsys/axs10x/fs-overlay/etc/inittab +++ b/board/synopsys/axs10x/fs-overlay/etc/inittab @@ -14,12 +14,16 @@ # process == program to run # Startup the system -null::sysinit:/bin/mount -t proc proc /proc -null::sysinit:/bin/mount -o remount,rw / -null::sysinit:/bin/mkdir -p /dev/pts -null::sysinit:/bin/mkdir -p /dev/shm -null::sysinit:/bin/mount -a -null::sysinit:/bin/hostname -F /etc/hostname +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / +::sysinit:/bin/mkdir -p /dev/pts /dev/shm +::sysinit:/bin/mount -a +::sysinit:/sbin/swapon -a +null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd +null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin +null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout +null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr +::sysinit:/bin/hostname -F /etc/hostname # now run any rc scripts ::sysinit:/etc/init.d/rcS From b94ddb8d5d1cc74eaf47d3272c2313860d96430d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Jun 2018 15:11:51 +0300 Subject: [PATCH 1699/2640] lighttpd: bump to version 1.4.49 Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 813d1cd0e0..c99e240c7b 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From http://www.lighttpd.net/ -sha256 0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36 lighttpd-1.4.48.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.49.sha256sum +sha256 aedf49d7127d9e4c0ea56618e9e945a17674dc46a37ac7990120f87dd939ce09 lighttpd-1.4.49.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 592f547434..c565fed4ff 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).48 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).49 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause From e46cecf2d43656009f2ff77e36ba4020576fbe27 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Jun 2018 15:28:44 +0300 Subject: [PATCH 1700/2640] hiawatha: bump to version 10.8.1 Drop upstream patch. Add license file hash. Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-cmake-allow-build-without-c.patch | 34 ------------------- package/hiawatha/hiawatha.hash | 3 +- package/hiawatha/hiawatha.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/hiawatha/0001-cmake-allow-build-without-c.patch diff --git a/package/hiawatha/0001-cmake-allow-build-without-c.patch b/package/hiawatha/0001-cmake-allow-build-without-c.patch deleted file mode 100644 index d264d621c8..0000000000 --- a/package/hiawatha/0001-cmake-allow-build-without-c.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 784e46afd7530f3010726ba73cc1a81059eae8bf Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 5 Jun 2017 13:26:18 +0200 -Subject: [PATCH] cmake: allow build without c++ - -By default cmake also searches for a c++ compiler: -https://cmake.org/cmake/help/v3.7/command/project.html -"By default C and CXX are enabled if no language options are given." - -This patch restricts the compiler to C to fix a build error detected -by the buildroot autobuilders: -http://autobuild.buildroot.net/results/c04/c04ff29b83c020573add597c355c57a6d9c9761d/build-end.log - -Patch sent upstream: https://github.com/hsleisink/hiawatha/pull/30 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f28d76..e8051fc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.0) --project(Hiawatha VERSION 10.6) -+project(Hiawatha VERSION 10.6 LANGUAGES C) - - # Compiler - set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}") --- -2.11.0 - diff --git a/package/hiawatha/hiawatha.hash b/package/hiawatha/hiawatha.hash index 3ec11cc21a..7d98c01bf7 100644 --- a/package/hiawatha/hiawatha.hash +++ b/package/hiawatha/hiawatha.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0cf014ae214be1bf6244c46c25e66805987c948837a4e37f9dede570de49bdeb hiawatha-10.6.tar.gz +sha256 0f013afc71284bab7267b0d80a51133a8fd4248575dbcbabf338cf826095cda8 hiawatha-10.8.1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 4dde25459d..776efc1dcf 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIAWATHA_VERSION = 10.6 +HIAWATHA_VERSION = 10.8.1 HIAWATHA_SITE = https://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 From abcc95b3c1c1c725750c480c16c6195af02858b5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 12 Jun 2018 15:04:53 -0300 Subject: [PATCH 1701/2640] linux: bump default to version 4.17.1 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 07888e2f96..603aec6b9e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 0fee303fff5d6cb979a7b197b3e6a3cf3fb3fc0b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 12 Jun 2018 15:04:54 -0300 Subject: [PATCH 1702/2640] linux-headers: bump 4.{14, 16, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 5f6c834b71..efdeb3bcca 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -264,8 +264,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.48" if BR2_KERNEL_HEADERS_4_14 + default "4.14.49" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.14" if BR2_KERNEL_HEADERS_4_16 - default "4.17" if BR2_KERNEL_HEADERS_4_17 + default "4.16.15" if BR2_KERNEL_HEADERS_4_16 + default "4.17.1" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From a74a41d834042ec1f2651cfd4adc23e21c8a8a22 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Jun 2018 20:40:48 +0300 Subject: [PATCH 1703/2640] f2fs-tools: update homepage link As noted in the sourceforge page, the project is not using sourceforge anymore. Use the gitweb summary page instead. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/f2fs-tools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in index f0630e99c6..e373096380 100644 --- a/package/f2fs-tools/Config.in +++ b/package/f2fs-tools/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_F2FS_TOOLS help Tools for Flash-Friendly File System (F2FS) - http://sourceforge.net/projects/f2fs-tools/ + https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git comment "f2fs-tools needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR From 7e3ff45cf1287c0ef9f890cad06008dad0efaafc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Jun 2018 20:40:49 +0300 Subject: [PATCH 1704/2640] f2fs-tools: bump to version 1.10.0 Add license file hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/f2fs-tools/f2fs-tools.hash | 3 ++- package/f2fs-tools/f2fs-tools.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/f2fs-tools/f2fs-tools.hash b/package/f2fs-tools/f2fs-tools.hash index 36c3b115c6..cef779084c 100644 --- a/package/f2fs-tools/f2fs-tools.hash +++ b/package/f2fs-tools/f2fs-tools.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 aefd2a67e8ddf9db92145dde41b4a697d1c498ff2e113fbfd26ce1efa6cc3f2d f2fs-tools-v1.8.0.tar.gz +sha256 424ea9fd2472ea062f21c4268a82a7ad435b6f704e41a494424068c11dec4c24 f2fs-tools-v1.10.0.tar.gz +sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index 9b827df086..333a2cf7d4 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = v1.8.0 +F2FS_TOOLS_VERSION = v1.10.0 F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git F2FS_TOOLS_SITE_METHOD = git F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no From e2a92d114b12c7bd28f6061e9066e915b1a7bd56 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Jun 2018 20:40:50 +0300 Subject: [PATCH 1705/2640] f2fs-tools: add selinux and libblk optional dependencies Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/f2fs-tools/f2fs-tools.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index 333a2cf7d4..1736dc4ead 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -15,4 +15,18 @@ F2FS_TOOLS_INSTALL_STAGING = YES F2FS_TOOLS_LICENSE = GPL-2.0 F2FS_TOOLS_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +F2FS_TOOLS_CONF_OPTS += --with-selinux +F2FS_TOOLS_DEPENDENCIES += libselinux +else +F2FS_TOOLS_CONF_OPTS += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +# util-linux is a dependency already, no need to list it again +F2FS_TOOLS_CONF_OPTS += --with-blkid +else +F2FS_TOOLS_CONF_OPTS += --without-blkid +endif + $(eval $(autotools-package)) From 5b9c59707143f23ae0630c181794a3a3781bde3e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 13 Jun 2018 21:16:53 +0300 Subject: [PATCH 1706/2640] f2fs-tools: fix build for uclinux Add a patch making uclinux also linux. Fixes: http://autobuild.buildroot.net/results/357/3577d413dc16bcec7a403fd8857ec5dd64470ba5/ http://autobuild.buildroot.net/results/819/819a8a528764a68c02b1b98431a1d09929c387f1/ http://autobuild.buildroot.net/results/d98/d987df1ea7f8043f05d5221342888892990e9252/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...0001-configure-uclinux-is-also-linux.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch diff --git a/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch b/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch new file mode 100644 index 0000000000..dc91b22c83 --- /dev/null +++ b/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch @@ -0,0 +1,31 @@ +From 67629fd736a8a4295a9f2acb96563953be22a3ae Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Wed, 13 Jun 2018 20:39:04 +0300 +Subject: [PATCH] configure: uclinux is also linux + +Linux systems on no-MMU platforms identify as uclinux. They are +otherwise identical to plain Linux. + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to linux-f2fs-devel@lists.sourceforge.net + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a3ff12bf3de9..2b13be5b09f9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,7 +166,7 @@ build_mac=no + + # Detect the target system + case "${host_os}" in +-linux*) ++linux*|uclinux*) + build_linux=yes + ;; + cygwin*|mingw*) +-- +2.17.1 + From 78117a553b4734ab810e218d8e3355f12d6889ee Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 13 Jun 2018 14:04:26 -0300 Subject: [PATCH 1707/2640] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index efdeb3bcca..0a8ca79b08 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,8 +258,8 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.136" if BR2_KERNEL_HEADERS_4_4 - default "4.9.107" if BR2_KERNEL_HEADERS_4_9 + default "4.4.137" if BR2_KERNEL_HEADERS_4_4 + default "4.9.108" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 From 4f877e3cf3cd29da7ed40cfe4608c8167a3c06ce Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 19:08:33 +0200 Subject: [PATCH 1708/2640] package/connman: bump version to 1.36 Added licence hash, removed patch applied upstream https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24 Renumbered remaining patch. Signed-off-by: Bernd Kuhls Acked-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...ure.patch => 0001-nat-build-failure.patch} | 0 ...01-tethering-Reorder-header-includes.patch | 37 ------------------- package/connman/connman.hash | 4 +- package/connman/connman.mk | 2 +- 4 files changed, 4 insertions(+), 39 deletions(-) rename package/connman/{0002-nat-build-failure.patch => 0001-nat-build-failure.patch} (100%) delete mode 100644 package/connman/0001-tethering-Reorder-header-includes.patch diff --git a/package/connman/0002-nat-build-failure.patch b/package/connman/0001-nat-build-failure.patch similarity index 100% rename from package/connman/0002-nat-build-failure.patch rename to package/connman/0001-nat-build-failure.patch diff --git a/package/connman/0001-tethering-Reorder-header-includes.patch b/package/connman/0001-tethering-Reorder-header-includes.patch deleted file mode 100644 index 4955df1cdd..0000000000 --- a/package/connman/0001-tethering-Reorder-header-includes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bdfb3526466f8fb8f13d9259037d8f42c782ce24 Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Wed, 17 Jan 2018 23:42:50 +0100 -Subject: [PATCH] tethering: Reorder header includes - -Avoid compile errors due to unsupported header include order with -newer kernels (>=4.15). We should import the libc header files first -and then the Linux header files in user space applications. - -Reported by Neil MacLeod . Fix probosal by Jonas -Bonn and Hauke Mehrtens . - -Signed-off-by: Martin Bark ---- - src/tethering.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tethering.c b/src/tethering.c -index c929ba7..4b20236 100644 ---- a/src/tethering.c -+++ b/src/tethering.c -@@ -31,11 +31,11 @@ - #include - #include - #include --#include - #include - #include --#include - #include -+#include -+#include - #include - - #include "connman.h" --- -2.7.4 diff --git a/package/connman/connman.hash b/package/connman/connman.hash index c822bb1fe4..fad1c55d2d 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf40afbc859842cf2aa connman-1.35.tar.xz +sha256 c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074 connman-1.36.tar.xz +# Locally computed +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 52c45451d9..b67d1c4b86 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.35 +CONNMAN_VERSION = 1.36 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables From eacca09a8a219fdcd94f39ccab329a4d6a63092b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 19:16:14 +0200 Subject: [PATCH 1709/2640] package/file: bump version to 5.33 Added license hashes, added optional dependency to libseccomp provided by upstream in this version bump. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/file/file.hash | 5 ++++- package/file/file.mk | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index fee516c8e2..a6b40be349 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50 file-5.32.tar.gz +sha256 1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6 file-5.33.tar.gz +sha256 3c0ad13c36f891a9b4f951e59eb2fc108065a46f849697cc6fd3cdb41cc23a3d COPYING +sha256 d98ee4d8d95e7d021a5dfc41f137ecc3b624a7b98e8bd793130202d12a21ed57 src/mygetopt.h +sha256 85e358d575ad4ac5b38b623a25b24246ccff3c7e680d930c0a9ff5228fe434b6 src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index df0e0f0eb9..422e29b1ce 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.32 +FILE_VERSION = 5.33 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib @@ -13,5 +13,12 @@ FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +FILE_CONF_OPTS += --enable-libseccomp +FILE_DEPENDENCIES += libseccomp +else +FILE_CONF_OPTS += --disable-libseccomp +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ab9d39275c362650e734aef73124aa155d4ac33b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 19:19:56 +0200 Subject: [PATCH 1710/2640] package/unrar: bump version to 5.6.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 81688d7b7d..95acb85763 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4 unrarsrc-5.5.8.tar.gz +sha256 9335d2201870f2034007c04be80e00f1dc23932cb88b329d55c76134e6ba49fe unrarsrc-5.6.4.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index d6c97dff2c..75e9329903 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.5.8 +UNRAR_VERSION = 5.6.4 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = http://www.rarlab.com/rar UNRAR_LICENSE = unrar From 3ee1976cccce68d016e5d45dae7f4809a6c12da6 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Wed, 13 Jun 2018 19:39:56 +0300 Subject: [PATCH 1711/2640] binutils: fix glibc building for ARC with stock binutils 2.30 There're known issues with building glibc for ARC with vanilla Binutils 2.30. Adding a couple of not yet upstreamed patches that solve it. Signed-off-by: Alexey Brodkin [Thomas: remove numbering in patch titles, renumber patch file names.] Signed-off-by: Thomas Petazzoni --- ...ocation-where-GOT-information-is-col.patch | 197 ++++++++++++++++++ ...ustness.-Return-FALSE-in-case-of-NUL.patch | 34 +++ ...obal-symbol-is-not-an-indirect-or-wa.patch | 42 ++++ ...ion-was-still-being-generated-when-s.patch | 35 ++++ 4 files changed, 308 insertions(+) create mode 100644 package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch create mode 100644 package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch create mode 100644 package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch create mode 100644 package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch diff --git a/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch b/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch new file mode 100644 index 0000000000..396f2f14f9 --- /dev/null +++ b/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch @@ -0,0 +1,197 @@ +From 141346d3968bdc82d3e487f3effdc3f835a09403 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:16:21 +0100 +Subject: [PATCH] [ARC] Refactored location where GOT information is + collected. + +Change location where GOT information is collected for ARC target, avoiding +posible use conflicts of the previous .got field in the symbols hash_entry. + +bfd/ +2018-03-01 Cupertino Miranda + + * arc-got.h (get_got_entry_list_for_symbol): Changed. + * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed. + (elf_arc_link_hash_newfunc): Changed. + (arc_elf_link_hash_table_create): Removed old initializations. + (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed. + +Signed-off-by: Alexey Brodkin +--- + bfd/arc-got.h | 6 ++-- + bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++---------------------- + 2 files changed, 46 insertions(+), 37 deletions(-) + +diff --git a/bfd/arc-got.h b/bfd/arc-got.h +index a86061bcb38f..81ce88fe21a0 100644 +--- a/bfd/arc-got.h ++++ b/bfd/arc-got.h +@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd, + unsigned long r_symndx, + struct elf_link_hash_entry *h) + { +- if (h != NULL) ++ struct elf_arc_link_hash_entry *h1 = ++ ((struct elf_arc_link_hash_entry *) h); ++ if (h1 != NULL) + { +- return &h->got.glist; ++ return &h1->got_ents; + } + else + { +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 5921cc25259e..166a5ef604ff 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -159,6 +159,18 @@ struct arc_relocation_data + const char * symbol_name; + }; + ++/* ARC ELF linker hash entry. */ ++struct elf_arc_link_hash_entry ++{ ++ struct elf_link_hash_entry root; ++ ++ /* Track dynamic relocs copied for this symbol. */ ++ struct elf_dyn_relocs *dyn_relocs; ++ ++ struct got_entry *got_ents; ++}; ++ ++ + /* Should be included at this location due to static declarations + * defined before this point. */ + #include "arc-got.h" +@@ -275,15 +287,6 @@ struct arc_reloc_map + unsigned char elf_reloc_val; + }; + +-/* ARC ELF linker hash entry. */ +-struct elf_arc_link_hash_entry +-{ +- struct elf_link_hash_entry root; +- +- /* Track dynamic relocs copied for this symbol. */ +- struct elf_dyn_relocs *dyn_relocs; +-}; +- + /* ARC ELF linker hash table. */ + struct elf_arc_link_hash_table + { +@@ -295,28 +298,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) + { ++ struct elf_arc_link_hash_entry * ret = ++ (struct elf_arc_link_hash_entry *) entry; ++ + /* Allocate the structure if it has not already been allocated by a + subclass. */ +- if (entry == NULL) +- { +- entry = (struct bfd_hash_entry *) +- bfd_hash_allocate (table, +- sizeof (struct elf_arc_link_hash_entry)); +- if (entry == NULL) +- return entry; +- } ++ if (ret == NULL) ++ ret = (struct elf_arc_link_hash_entry *) ++ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry)); ++ if (ret == NULL) ++ return (struct bfd_hash_entry *) ret; + + /* Call the allocation method of the superclass. */ +- entry = _bfd_elf_link_hash_newfunc (entry, table, string); +- if (entry != NULL) ++ ret = ((struct elf_arc_link_hash_entry *) ++ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, ++ table, string)); ++ if (ret != NULL) + { +- struct elf_arc_link_hash_entry *eh; +- +- eh = (struct elf_arc_link_hash_entry *) entry; +- eh->dyn_relocs = NULL; ++ ret->dyn_relocs = NULL; ++ ret->got_ents = NULL; + } + +- return entry; ++ return (struct bfd_hash_entry *) ret; + } + + /* Destroy an ARC ELF linker hash table. */ +@@ -346,11 +349,6 @@ arc_elf_link_hash_table_create (bfd *abfd) + return NULL; + } + +- ret->elf.init_got_refcount.refcount = 0; +- ret->elf.init_got_refcount.glist = NULL; +- ret->elf.init_got_offset.offset = 0; +- ret->elf.init_got_offset.glist = NULL; +- + ret->elf.root.hash_table_free = elf_arc_link_hash_table_free; + + return &ret->elf.root; +@@ -1598,10 +1596,14 @@ elf_arc_relocate_section (bfd * output_bfd, + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + { +- struct elf_link_hash_entry *h_old = h; ++ struct elf_arc_link_hash_entry *ah_old = ++ (struct elf_arc_link_hash_entry *) h; + h = (struct elf_link_hash_entry *) h->root.u.i.link; +- if (h->got.glist == 0 && h_old->got.glist != h->got.glist) +- h->got.glist = h_old->got.glist; ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ ++ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents) ++ ah->got_ents = ah_old->got_ents; + } + + /* TODO: Need to validate what was the intention. */ +@@ -1619,6 +1621,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + if (is_reloc_for_GOT (howto) && !bfd_link_pic (info)) + { ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; + /* TODO: Change it to use arc_do_relocation with + ARC_32 reloc. Try to use ADD_RELA macro. */ + bfd_vma relocation = +@@ -1628,8 +1632,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + reloc_data.sym_section->output_section->vma) + : 0); + +- BFD_ASSERT (h->got.glist); +- bfd_vma got_offset = h->got.glist->offset; ++ BFD_ASSERT (ah->got_ents); ++ bfd_vma got_offset = ah->got_ents->offset; + bfd_put_32 (output_bfd, relocation, + htab->sgot->contents + got_offset); + } +@@ -1941,6 +1945,7 @@ elf_arc_check_relocs (bfd * abfd, + else /* Global one. */ + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + ++ + switch (r_type) + { + case R_ARC_32: +@@ -2387,7 +2392,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + create respective dynamic relocs. */ + /* TODO: Make function to get list and not access the list directly. */ + /* TODO: Move function to relocate_section create this relocs eagerly. */ +- create_got_dynrelocs_for_got_info (&h->got.glist, ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ create_got_dynrelocs_for_got_info (&ah->got_ents, + output_bfd, + info, + h); +-- +2.17.1 + diff --git a/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch b/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch new file mode 100644 index 0000000000..0633692cac --- /dev/null +++ b/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch @@ -0,0 +1,34 @@ +From 4bac50c2c94023cb1b5bf947abfb1c72eeeb12d5 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:33:48 +0100 +Subject: [PATCH] [ARC] Improved robustness. Return FALSE in case of NULL + pointer. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case + arc_htab is NULL. + +Signed-off-by: Alexey Brodkin +--- + bfd/elf32-arc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 166a5ef604ff..72b808b99127 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2403,6 +2403,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + { + struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info); + ++ if(arc_htab == NULL) ++ return FALSE; ++ + if (h->dynindx == -1 + || (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) +-- +2.17.1 + diff --git a/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch b/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch new file mode 100644 index 0000000000..2ffe9c9733 --- /dev/null +++ b/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch @@ -0,0 +1,42 @@ +From b182c9f81daa08cf18cd78af3e7aca74640e8551 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:38:14 +0100 +Subject: [PATCH] [ARC] Make sure global symbol is not an indirect or + warning. + +Problem identified in the context of glibc with latest upstream binutils. +Dynamic symbol space was being reserved but, no actual information for the +symbol was being set. Data for the symbol was kept initialized with -1. +No easy test case was possible to be created. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Alexey Brodkin +--- + bfd/elf32-arc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 72b808b99127..6f6470f6f202 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -1943,7 +1943,12 @@ elf_arc_check_relocs (bfd * abfd, + if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ + h = NULL; + else /* Global one. */ +- h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ { ++ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ while (h->root.type == bfd_link_hash_indirect ++ || h->root.type == bfd_link_hash_warning) ++ h = (struct elf_link_hash_entry *) h->root.u.i.link; ++ } + + + switch (r_type) +-- +2.17.1 + diff --git a/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch b/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch new file mode 100644 index 0000000000..a5bcb94d11 --- /dev/null +++ b/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch @@ -0,0 +1,35 @@ +From e2f2d7f939435280003983ef822acd0844648643 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:44:29 +0100 +Subject: [PATCH] [ARC] PLT information was still being generated when + symbol was forced_local. + +A change upstream reveiled this issue, triggering an assert when linking glibc. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Alexey Brodkin +--- + bfd/elf32-arc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 6f6470f6f202..184957c7d750 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2024,7 +2024,8 @@ elf_arc_check_relocs (bfd * abfd, + if (h == NULL) + continue; + else +- h->needs_plt = 1; ++ if(h->forced_local == 0) ++ h->needs_plt = 1; + } + + /* Add info to the symbol got_entry_list. */ +-- +2.17.1 + From cabf1d658ebc878088e8ee592549d412f8f82f6f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:39:06 +0200 Subject: [PATCH 1712/2640] package/autossh: bump version to 1.4f Removed patch applied upstream, added all upstream and license hashes. Removed _AUTORECONF, configure and configure.ac in the tarball match, also removed _INSTALL_TARGET_CMDS, the upstream install target works just fine nowadays. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/autossh/0001-honour-LDFLAGS.patch | 16 ---------------- package/autossh/autossh.hash | 8 ++++++-- package/autossh/autossh.mk | 9 +-------- 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 package/autossh/0001-honour-LDFLAGS.patch diff --git a/package/autossh/0001-honour-LDFLAGS.patch b/package/autossh/0001-honour-LDFLAGS.patch deleted file mode 100644 index 2e6160b8fd..0000000000 --- a/package/autossh/0001-honour-LDFLAGS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Honour LDFLAGS, especially required when static linking - -Signed-off-by: Waldemar Brodkorb - -diff -Nur autossh-1.4e.orig/Makefile.in autossh-1.4e/Makefile.in ---- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100 -+++ autossh-1.4e/Makefile.in 2016-11-25 12:49:06.052122855 +0100 -@@ -31,7 +31,7 @@ - - - $(TARGET): $(OFILES) -- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) -+ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) - - clean: - - /bin/rm -f *.o *.a *.core *~ diff --git a/package/autossh/autossh.hash b/package/autossh/autossh.hash index 4f3de137a5..5c6cfbc98f 100644 --- a/package/autossh/autossh.hash +++ b/package/autossh/autossh.hash @@ -1,2 +1,6 @@ -# From http://www.harding.motd.ca/autossh/autossh-1.4e.cksums -sha256 9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156 autossh-1.4e.tgz +# From http://www.harding.motd.ca/autossh/autossh-1.4f.cksums +sha256 0172e5e1bea40c642e0ef025334be3aadd4ff3b4d62c0b177ed88a8384e2f8f2 autossh-1.4f.tgz +sha1 28189c42ab2e05448596a44adc9d62071172fe9b autossh-1.4f.tgz +md5 432ed721a71b8af4b5763b5c484f80df autossh-1.4f.tgz +# Locally computed +sha256 b6938db718166520533b1d56b01e1eb5f0ad508624478e674938b8f507b66d98 autossh.c diff --git a/package/autossh/autossh.mk b/package/autossh/autossh.mk index d52b4e9666..1538a4c8bc 100644 --- a/package/autossh/autossh.mk +++ b/package/autossh/autossh.mk @@ -4,19 +4,12 @@ # ################################################################################ -AUTOSSH_VERSION = 1.4e +AUTOSSH_VERSION = 1.4f AUTOSSH_SITE = http://www.harding.motd.ca/autossh AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz AUTOSSH_LICENSE = Modified BSD AUTOSSH_LICENSE_FILES = autossh.c -# Bundled ./configure is not up-to-date with what is in configure.ac -AUTOSSH_AUTORECONF = YES - AUTOSSH_CONF_OPTS = --with-ssh=/usr/bin/ssh -define AUTOSSH_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/autossh $(TARGET_DIR)/usr/bin/autossh -endef - $(eval $(autotools-package)) From cbf4ead19c7336efd5e04becea23727ca65ffdaf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 13 Jun 2018 10:00:27 +0300 Subject: [PATCH 1713/2640] =?UTF-8?q?DEVELOPERS:=20drop=20Stefan=20Fr?= =?UTF-8?q?=C3=B6berg's=20entry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emails bounce. The domain does not resolve. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index eaf64ede61..e276b45565 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1827,14 +1827,6 @@ F: package/mesa3d-demos/ F: package/sunxi-mali/ F: package/ti-gfx/ -N: Stefan Fröberg -F: package/elfutils/ -F: package/libtasn1/ -F: package/proxychains-ng/ -F: package/vte/ -F: package/yasm/ -F: package/zlib-ng/ - N: Stefan Sørensen F: package/cracklib/ F: package/libpwquality/ From 66760f27342fccacdba64269525a3a32d0518905 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 12 Jun 2018 17:21:30 +0200 Subject: [PATCH 1714/2640] perl: add upstream security fix for CVE-2018-12015 Fixes CVE-2018-12015 - In Perl through 5.26.2, the Archive::Tar module allows remote attackers to bypass a directory-traversal protection mechanism, and overwrite arbitrary files, via an archive file containing a symlink and a regular file with the same name. Patch from https://github.com/jib/archive-tar-new/commit/ae65651eab053fc6dc4590dbb863a268215c1fc5 with path rewritten to match perl tarball. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...isting-files-before-overwriting-them.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch diff --git a/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch b/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch new file mode 100644 index 0000000000..5223b78c01 --- /dev/null +++ b/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch @@ -0,0 +1,46 @@ +From ae65651eab053fc6dc4590dbb863a268215c1fc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 8 Jun 2018 11:45:40 +0100 +Subject: [PATCH] [PATCH] Remove existing files before overwriting them + +Archive should extract only the latest same-named entry. +Extracted regular file should not be writtent into existing block +device (or any other one). + +https://rt.cpan.org/Ticket/Display.html?id=125523 + +[Peter: rewrite path to match perl tarball with sed 's|\(lib/Archive\)|cpan/Archive-Tar/\1|g'] +Signed-off-by: Chris 'BinGOs' Williams +Signed-off-by: Peter Korsgaard +--- + cpan/Archive-Tar/lib/Archive/Tar.pm | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm +index 6244369..a83975f 100644 +--- a/cpan/Archive-Tar/lib/Archive/Tar.pm ++++ b/cpan/Archive-Tar/lib/Archive/Tar.pm +@@ -845,6 +845,20 @@ sub _extract_file { + return; + } + ++ ### If a file system already contains a block device with the same name as ++ ### the being extracted regular file, we would write the file's content ++ ### to the block device. So remove the existing file (block device) now. ++ ### If an archive contains multiple same-named entries, the last one ++ ### should replace the previous ones. So remove the old file now. ++ ### If the old entry is a symlink to a file outside of the CWD, the new ++ ### entry would create a file there. This is CVE-2018-12015 ++ ### . ++ if (-l $full || -e _) { ++ if (!unlink $full) { ++ $self->_error( qq[Could not remove old file '$full': $!] ); ++ return; ++ } ++ } + if( length $entry->type && $entry->is_file ) { + my $fh = IO::File->new; + $fh->open( $full, '>' ) or ( +-- +2.11.0 + From 69d2b693c605082f2459c282947c99df517984ab Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:06:34 +0200 Subject: [PATCH 1715/2640] imx-usb-loader: bump revision to e539461 This latest revision supports starting i.MX8MQ via USB recovery mode. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/imx-usb-loader/imx-usb-loader.hash | 2 +- package/imx-usb-loader/imx-usb-loader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash index e246ff85f2..8f59a3888b 100644 --- a/package/imx-usb-loader/imx-usb-loader.hash +++ b/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,2 @@ # locally computed -sha256 717b64cec31f7e1167d4a31e4f511eea97ab80039dd435b7b183c6f41352213a imx-usb-loader-7e77787c83288a421080a9bf2f67063931f561be.tar.gz +sha256 263dba6331206816890eaed0de7b0aa748c6e5300982fe6f31dcfe0df383ad62 imx-usb-loader-e5394615dd413c3823d5bd1de340933e16a8c07c.tar.gz diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index 01a654e6cf..f0db57faac 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = 7e77787c83288a421080a9bf2f67063931f561be +IMX_USB_LOADER_VERSION = e5394615dd413c3823d5bd1de340933e16a8c07c IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING From 9bc75578616731b888b8934e4eed80ddb1b4ba3a Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:06:35 +0200 Subject: [PATCH 1716/2640] imx-usb-loader: enable package for 64-bit ARM platforms Now that it works for i.MX8MQ processors (tested on Nitrogen8M). Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/imx-usb-loader/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-usb-loader/Config.in.host b/package/imx-usb-loader/Config.in.host index a4a0f88531..04bd4cc018 100644 --- a/package/imx-usb-loader/Config.in.host +++ b/package/imx-usb-loader/Config.in.host @@ -1,9 +1,9 @@ config BR2_PACKAGE_HOST_IMX_USB_LOADER bool "host imx-usb-loader" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help This package contains tools to download and execute code - on Freescale i.MX5/i.MX6 and Vybrid SoCs through the + on Freescale i.MX5x/6x/7x/8x and Vybrid SoCs through the Serial Download Protocol. https://github.com/boundarydevices/imx_usb_loader From 375e11a186bd6ac9f934f9bb0b8102cab58efa53 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 12 Jun 2018 20:36:18 +0200 Subject: [PATCH 1717/2640] mosquitto: bump to version 1.5 - Remove patch (already in version) - Add patch to fix crash (retrieved from upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Fix-subs-memory-issue.patch | 151 ++++++++++++++++++ ...bsockets.c-unbreak-build-without-TLS.patch | 49 ------ package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 4 files changed, 153 insertions(+), 51 deletions(-) create mode 100644 package/mosquitto/0001-Fix-subs-memory-issue.patch delete mode 100644 package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch diff --git a/package/mosquitto/0001-Fix-subs-memory-issue.patch b/package/mosquitto/0001-Fix-subs-memory-issue.patch new file mode 100644 index 0000000000..49ec15630a --- /dev/null +++ b/package/mosquitto/0001-Fix-subs-memory-issue.patch @@ -0,0 +1,151 @@ +From 67fe32672b60afd6cf91f7a3ccc969259dc68a19 Mon Sep 17 00:00:00 2001 +From: Tatsuzo Osawa +Date: Thu, 24 Aug 2017 12:22:33 +0000 +Subject: [PATCH] Fix subs memory issue. + +Patches retrieved from: https://github.com/eclipse/mosquitto/pull/531 + +Both patches have been merged in a single one as second patch is putting +back code that is wrongly deleted in first patch. +First patch needs also an update to apply on version 1.5 + +Signed-off-by: Tatsuzo Osawa +Signed-off-by: Fabrice Fontaine +--- + src/database.c | 16 ++++++++++++---- + src/mosquitto_broker_internal.h | 4 ++-- + src/subs.c | 21 ++++++++++++--------- + 3 files changed, 26 insertions(+), 15 deletions(-) + +diff --git a/src/database.c b/src/database.c +index 670cf710..9e02de2d 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at + + Contributors: + Roger Light - initial implementation and documentation. ++ Tatsuzo Osawa - Fix subs memory issue. + */ + + #include +@@ -121,10 +122,10 @@ int db__open(struct mosquitto__config *config, struct mosquitto_db *db) + + db->subs = NULL; + +- subhier = sub__add_hier_entry(&db->subs, "", strlen("")); ++ subhier = sub__add_hier_entry(NULL, &db->subs, "", strlen("")); + if(!subhier) return MOSQ_ERR_NOMEM; + +- subhier = sub__add_hier_entry(&db->subs, "$SYS", strlen("$SYS")); ++ subhier = sub__add_hier_entry(NULL, &db->subs, "$SYS", strlen("$SYS")); + if(!subhier) return MOSQ_ERR_NOMEM; + + db->unpwd = NULL; +diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h +index 3508c555..808b4f2b 100644 +--- a/src/mosquitto_broker_internal.h ++++ b/src/mosquitto_broker_internal.h +@@ -12,7 +12,7 @@ and the Eclipse Distribution License is available at + + Contributors: + Roger Light - initial implementation and documentation. +- Tatsuzo Osawa - Add epoll. ++ Tatsuzo Osawa - Add epoll. Fix subs memory issue. + */ + + #ifndef MOSQUITTO_BROKER_INTERNAL_H +@@ -547,7 +547,7 @@ void sys_tree__update(struct mosquitto_db *db, int interval, time_t start_time); + * Subscription functions + * ============================================================ */ + int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub, int qos, struct mosquitto__subhier **root); +-struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len); ++struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len); + int sub__remove(struct mosquitto_db *db, struct mosquitto *context, const char *sub, struct mosquitto__subhier *root); + void sub__tree_print(struct mosquitto__subhier *root, int level); + int sub__clean_session(struct mosquitto_db *db, struct mosquitto *context); +diff --git a/src/subs.c b/src/subs.c +index 7b9b457c..b1c0fc78 100644 +--- a/src/subs.c ++++ b/src/subs.c +@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at + + Contributors: + Roger Light - initial implementation and documentation. ++ Tatsuzo Osawa - Fix subs memory issue. + */ + + /* A note on matching topic subscriptions. +@@ -314,7 +315,7 @@ static int sub__add_recurse(struct mosquitto_db *db, struct mosquitto *context, + return sub__add_recurse(db, context, qos, branch, tokens->next); + }else{ + /* Not found */ +- branch = sub__add_hier_entry(&subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); ++ branch = sub__add_hier_entry(subhier, &subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); + if(!branch) return MOSQ_ERR_NOMEM; + + return sub__add_recurse(db, context, qos, branch, tokens->next); +@@ -406,18 +407,18 @@ static void sub__search(struct mosquitto_db *db, struct mosquitto__subhier *subh + } + + +-struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len) ++struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len) + { + struct mosquitto__subhier *child; + +- assert(parent); ++ assert(head); + + child = mosquitto__malloc(sizeof(struct mosquitto__subhier)); + if(!child){ + log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); + return NULL; + } +- child->parent = *parent; ++ child->parent = parent; + child->topic_len = strlen(topic); + if(UHPA_ALLOC_TOPIC(child) == 0){ + child->topic_len = 0; +@@ -433,13 +434,13 @@ struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **paren + + if(child->topic_len+1 > sizeof(child->topic.array)){ + if(child->topic.ptr){ +- HASH_ADD_KEYPTR(hh, *parent, child->topic.ptr, child->topic_len, child); ++ HASH_ADD_KEYPTR(hh, *head, child->topic.ptr, child->topic_len, child); + }else{ + mosquitto__free(child); + return NULL; + } + }else{ +- HASH_ADD(hh, *parent, topic.array, child->topic_len, child); ++ HASH_ADD(hh, *head, topic.array, child->topic_len, child); + } + + return child; +@@ -460,7 +461,7 @@ int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub + + HASH_FIND(hh, *root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len, subhier); + if(!subhier){ +- subhier = sub__add_hier_entry(root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); ++ subhier = sub__add_hier_entry(NULL, root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); + if(!subhier){ + sub__topic_tokens_free(tokens); + log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); +@@ -545,12 +546,14 @@ static struct mosquitto__subhier *tmp_remove_subs(struct mosquitto__subhier *sub + return NULL; + } + +- if(sub->children || sub->subs){ ++ if(sub->children || sub->subs || sub->retained){ + return NULL; + } + + parent = sub->parent; +- HASH_DELETE(hh, parent, sub); ++ HASH_DELETE(hh, parent->children, sub); ++ UHPA_FREE_TOPIC(sub); ++ mosquitto__free(sub); + + if(parent->subs == NULL + && parent->children == NULL diff --git a/package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch b/package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch deleted file mode 100644 index e977fae56c..0000000000 --- a/package/mosquitto/0001-websockets.c-unbreak-build-without-TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4822aa97da80a86033ec6e4a8b2f4ad0911235cf Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 3 Mar 2018 11:04:47 +0100 -Subject: [PATCH] websockets.c: unbreak build without TLS - -Commit 7943072b1f3b (Fix use_identity_as_username not working on websockets -clients) added code which unconditionally accesses mosq-ssl, breaking the -build when TLS support is disabled. - -Fix it by guarding this logic inside #ifdef WITH_TLS. - -[Upstream: https://dev.eclipse.org/mhonarc/lists/mosquitto-dev/msg01813.html] -Signed-off-by: Peter Korsgaard ---- - src/websockets.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/websockets.c b/src/websockets.c -index d4d7961..a796f0a 100644 ---- a/src/websockets.c -+++ b/src/websockets.c -@@ -201,12 +201,14 @@ static int callback_mqtt(struct libwebsocket_context *context, - mosq->ws_context = context; - #endif - mosq->wsi = wsi; -+#ifdef WITH_TLS - if(in){ - mosq->ssl = (SSL *)in; - if(!mosq->listener->ssl_ctx){ - mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl); - } - } -+#endif - u->mosq = mosq; - }else{ - return -1; -@@ -240,7 +242,9 @@ static int callback_mqtt(struct libwebsocket_context *context, - mosq->pollfd_index = -1; - } - mosq->wsi = NULL; -+#ifdef WITH_TLS - mosq->ssl = NULL; -+#endif - do_disconnect(db, mosq); - } - break; --- -2.11.0 - diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 91c855cb4e..87ddad9578 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,5 +1,5 @@ # Locally calculated after checking gpg signature -sha256 7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83 mosquitto-1.4.15.tar.gz +sha256 80c9606a906c736fe582b67bdfb650ee45239fea058fe34927f81277d3486e21 mosquitto-1.5.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index ec5fc02f9f..993da2f925 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.15 +MOSQUITTO_VERSION = 1.5 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From faf50414611b674b1758900d228fa6156cb65d57 Mon Sep 17 00:00:00 2001 From: David Barbion Date: Thu, 7 Jun 2018 15:45:28 +0200 Subject: [PATCH 1718/2640] qt5webengine: fix BR2_TOOLCHAIN_HAS_GCC_BUG_85862 condition In commit bd03966d4ebeb284ac3afb5f3b8cba13da2b9983 ("toolchain: GCC bug 85862"), a dependency on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 was added to the qt5webengine package, but it should have been a dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862. This commit fixes that. Signed-off-by: David Barbion Reviewed-by: Matt Weber Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 38486c6dcf..744d659567 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs From 89be4c7b0ea4cb650aeaff78b9cf7265a89ba43f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Jun 2018 06:56:48 +0300 Subject: [PATCH 1719/2640] file: add upstream security fix Fixes CVE-2018-10360: The do_core_note function in readelf.c in libmagic.a in file 5.33 allows remote attackers to cause a denial of service (out-of-bounds read and application crash) via a crafted ELF file. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ding-past-the-end-of-buffer-Rui-Reis.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch diff --git a/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch b/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch new file mode 100644 index 0000000000..daff866692 --- /dev/null +++ b/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch @@ -0,0 +1,30 @@ +From a642587a9c9e2dd7feacdf513c3643ce26ad3c22 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sat, 9 Jun 2018 16:00:06 +0000 +Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis) + +[baruch: drop file version string update hunk] +Signed-off-by: Baruch Siach +--- +Upstream status: commit a642587a9c9 in github mirror + + src/readelf.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/readelf.c b/src/readelf.c +index 79c83f9f5048..1f41b46113c3 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + + cname = (unsigned char *) + &nbuf[doff + prpsoffsets(i)]; +- for (cp = cname; *cp && isprint(*cp); cp++) ++ for (cp = cname; cp < nbuf + size && *cp ++ && isprint(*cp); cp++) + continue; + /* + * Linux apparently appends a space at the end +-- +2.17.1 + From c15ecc66de8811707f92ea2629b352010e8087ef Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Thu, 14 Jun 2018 13:44:15 +0200 Subject: [PATCH 1720/2640] package/cryptodev-linux: add an hash for the license file Add a locally computed hash for the license file to track possible updates. Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- package/cryptodev-linux/cryptodev-linux.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index ad7cb615e6..eeb481d6aa 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 994ed2f715dd3786f534d5215ae7ae4735b84cff28ea41080ff3501bf1503944 cryptodev-linux-f60aa08c63fc02780554a0a12180a478ca27d49f.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING From f4b4f77e84b932162a0050111019343bfd174979 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Jun 2018 21:18:36 +0200 Subject: [PATCH 1721/2640] docs/manual: fix scancpan path scancpan is now in utils not in supports/scripts Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-perl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt index 08ef559209..eb14d9de18 100644 --- a/docs/manual/adding-packages-perl.txt +++ b/docs/manual/adding-packages-perl.txt @@ -46,7 +46,7 @@ built. Most of these data can be retrieved from https://metacpan.org/. So, this file and the Config.in can be generated by running -the script +supports/scripts/scancpan Foo-Bar+ in the Buildroot directory +the script +utils/scancpan Foo-Bar+ in the Buildroot directory (or in a br2-external tree). This script creates a Config.in file and foo-bar.mk file for the requested package, and also recursively for all dependencies specified by From acf255e559c60eea03409ae457d673261910e9f7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 14 Jun 2018 21:38:48 +0300 Subject: [PATCH 1722/2640] autossh: fix manual set of ssh path The configure script that is bundled with autossh does not generate the correct code for the AC_ARG_WITH() macro of --with-ssh. As a result, the configure scripts always check the host location, and fails with ssh is not found. Restore the autoreconf that has been removed in the last bump to fix the --with-ssh configure option. Fixes: http://autobuild.buildroot.net/results/25d/25d681f9df22c07cdf5a6b8756bfc2d5ecf36247/ http://autobuild.buildroot.net/results/f0a/f0ae62d0ed6bac011c507cfea7cd7157671baf39/ http://autobuild.buildroot.net/results/b15/b1546bb3e861c14771bdd03cda9ce2e9176a2069/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/autossh/autossh.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/autossh/autossh.mk b/package/autossh/autossh.mk index 1538a4c8bc..5af8b735c2 100644 --- a/package/autossh/autossh.mk +++ b/package/autossh/autossh.mk @@ -9,6 +9,8 @@ AUTOSSH_SITE = http://www.harding.motd.ca/autossh AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz AUTOSSH_LICENSE = Modified BSD AUTOSSH_LICENSE_FILES = autossh.c +# Fix AC_ARG_WITH code generation for --with-ssh +AUTOSSH_AUTORECONF = YES AUTOSSH_CONF_OPTS = --with-ssh=/usr/bin/ssh From b6543b5fdfb17adc81af33cad8133bb86e31748f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Jun 2018 11:21:52 +0300 Subject: [PATCH 1723/2640] libgcrypt: security bump to version 1.8.3 Fixes CVE-2018-0495: ECDSA signing side-channel attack. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 8 ++++---- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 736332d350..dce6522959 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,6 +1,6 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 ab8aae5d7a68f8e0988f90e11e7f6a4805af5c8d libgcrypt-1.8.2.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000426.html +sha1 13bd2ce69e59ab538e959911dfae80ea309636e3 libgcrypt-1.8.3.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.2.tar.bz2.sig -sha256 c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07 libgcrypt-1.8.2.tar.bz2 +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.3.tar.bz2.sig +sha256 66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c libgcrypt-1.8.3.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 00e864e836..f25944da64 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.8.2 +LIBGCRYPT_VERSION = 1.8.3 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From b609ee33e1d2d37711722933bad279df3bed2786 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Jun 2018 11:22:08 +0300 Subject: [PATCH 1724/2640] libressl: security bump to version 2.7.4 Fixes CVE-2018-0495: ECDSA signing side-channel attack. Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 53b7e0af59..111fe4feed 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995 libressl-2.7.2.tar.gz +sha256 1e3a9fada06c1c060011470ad0ff960de28f9a0515277d7336f7e09362517da6 libressl-2.7.4.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 1a1dda1000..35494c8239 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 2.7.2 +LIBRESSL_VERSION = 2.7.4 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 3bf2745a0f310f2d0b173cc30645bb8ecadaa0a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Jun 2018 22:16:43 +0200 Subject: [PATCH 1725/2640] redis: security bump to version 3.2.12 >From the release notes: ================================================================================ Redis 3.2.12 Released Wed Jun 13 12:43:01 CEST 2018 ================================================================================ Upgrade urgency CRITICAL: * Multilple security issues fixed. * Backport of an older AOF fsync=always fix. Check 4.x release notes. * Backport of a *SCAN bug. Sometimes elements could be missing from the scan. * Other minor things. https://raw.githubusercontent.com/antirez/redis/3.2/00-RELEASENOTES For more details about the lua related security issues, see the blog: http://antirez.com/news/119 Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index ce2d66b8c2..d9a14cef6c 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 31ae927cab09f90c9ca5954aab7aeecc3bb4da6087d3d12ba0a929ceb54081b5 redis-3.2.11.tar.gz +sha256 98c4254ae1be4e452aa7884245471501c9aa657993e0318d88f048093e7f88fd redis-3.2.12.tar.gz # Locally calculated sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 82969c9022..cbd2d7bdcb 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.11 +REDIS_VERSION = 3.2.12 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From fb775f4c87c627537efbb56f2663d6079489f018 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 13 Jun 2018 09:37:10 +0200 Subject: [PATCH 1726/2640] scanpypi: rework download_package error handling Some packages don't provide source archive but only a wheel file. In this case download variable is not defined. So define this variable at the very beginning and check whether it is None after searching for source archives in the metadata. Bonus: fix PEP8 issue with wrong indentation. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 8a2ae00434..12c96b842e 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -178,6 +178,7 @@ class BuildrootPackage(): """ Download a package using metadata from pypi """ + download = None try: self.metadata['urls'][0]['filename'] except IndexError: @@ -201,7 +202,7 @@ class BuildrootPackage(): continue try: print('Downloading package {pkg} from {url}...'.format( - pkg=self.real_name, url=download_url['url'])) + pkg=self.real_name, url=download_url['url'])) download = six.moves.urllib.request.urlopen(download_url['url']) except six.moves.urllib.error.HTTPError as http_error: download = http_error @@ -213,11 +214,14 @@ class BuildrootPackage(): self.md5_sum = hashlib.md5(self.as_string).hexdigest() if self.md5_sum == download_url['digests']['md5']: break - else: - if download.__class__ == six.moves.urllib.error.HTTPError: - raise download - raise DownloadFailed('Failed to download package {pkg}' + + if download is None: + raise DownloadFailed('Failed to download package {pkg}: ' + 'No source archive available' .format(pkg=self.real_name)) + elif download.__class__ == six.moves.urllib.error.HTTPError: + raise download + self.filename = self.used_url['filename'] self.url = self.used_url['url'] From c8c3a902193552ae9b478bbd76e04f21bbce30b3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 15 Jun 2018 16:28:31 +0200 Subject: [PATCH 1727/2640] librtlsdr: fix typo in LIBRTLSDR_CONF_OPTS variable name Commit 9ff035839eef68eb16e90ae70c3e70dc7f57ca5e ("librtlsdr: fix static build") introduced this obvious typo, which was spotted by check-package: package/librtlsdr/librtlsdr.mk:18: possible typo: LIBRTLSDRCONF_OPTS -> *LIBRTLSDR* Signed-off-by: Thomas Petazzoni --- package/librtlsdr/librtlsdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index ba8a1af104..dd1feacc03 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -15,7 +15,7 @@ LIBRTLSDR_DEPENDENCIES = libusb ifeq ($(BR2_STATIC_LIBS),y) LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDRCONF_OPTS += -DBUILD_STATIC_LIBS=ON +LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON else ifeq ($(BR2_SHARED_LIBS),y) LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF endif From 945636b304e3d36984859faf04c674d7a0e4c7d5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Jun 2018 07:02:13 +0300 Subject: [PATCH 1728/2640] modem-manager: fix build with musl modem-manager version 1.8.0 introduced use of canonicalize_file_name(), which is a GNU extension that musl does not implement. Add a patch switching to POSIX standard realpath(). Fixes: http://autobuild.buildroot.net/results/9f6/9f6859f1854d94d3caba7b5c24d9ca6a14622042/ Cc: Aleksander Morgado Cc: Carlos Santos Cc: Petr Vorel Cc: Yegor Yefremov Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...erneldevice-fix-build-with-musl-libc.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch diff --git a/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch b/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..68181cb5ed --- /dev/null +++ b/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch @@ -0,0 +1,67 @@ +From ed40ac76b125b1c3b2e2f8522d283b073c23bd3b Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 15 Jun 2018 06:25:46 +0300 +Subject: [PATCH] kerneldevice: fix build with musl libc + +musl libc does not implement the canonicalize_file_name() GNU extension. +Use the POSIX standard realpath() instead. + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to modemmanager-devel@lists.freedesktop.org + + src/kerneldevice/mm-kernel-device-generic.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c +index 6b0f072402ff..885bef171f5d 100644 +--- a/src/kerneldevice/mm-kernel-device-generic.c ++++ b/src/kerneldevice/mm-kernel-device-generic.c +@@ -120,7 +120,7 @@ preload_sysfs_path (MMKernelDeviceGeneric *self) + mm_kernel_event_properties_get_subsystem (self->priv->properties), + mm_kernel_event_properties_get_name (self->priv->properties)); + +- self->priv->sysfs_path = canonicalize_file_name (tmp); ++ self->priv->sysfs_path = realpath (tmp, NULL); + if (!self->priv->sysfs_path || !g_file_test (self->priv->sysfs_path, G_FILE_TEST_EXISTS)) { + mm_warn ("Invalid sysfs path read for %s/%s", + mm_kernel_event_properties_get_subsystem (self->priv->properties), +@@ -163,7 +163,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) + * The correct parent dir we want to have is the first one with "usb" subsystem. + */ + aux = g_strdup_printf ("%s/device", self->priv->sysfs_path); +- dirpath = canonicalize_file_name (aux); ++ dirpath = realpath (aux, NULL); + g_free (aux); + + while (dirpath) { +@@ -179,7 +179,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) + gchar *canonicalized_subsystem; + gchar *subsystem_name; + +- canonicalized_subsystem = canonicalize_file_name (subsystem_filepath); ++ canonicalized_subsystem = realpath (subsystem_filepath, NULL); + g_free (subsystem_filepath); + + subsystem_name = g_path_get_basename (canonicalized_subsystem); +@@ -239,7 +239,7 @@ preload_driver (MMKernelDeviceGeneric *self) + gchar *tmp2; + + tmp = g_strdup_printf ("%s/driver", self->priv->interface_sysfs_path); +- tmp2 = canonicalize_file_name (tmp); ++ tmp2 = realpath (tmp, NULL); + if (tmp2 && g_file_test (tmp2, G_FILE_TEST_EXISTS)) + self->priv->driver = g_path_get_basename (tmp2); + g_free (tmp2); +@@ -308,7 +308,7 @@ preload_physdev_subsystem (MMKernelDeviceGeneric *self) + gchar *subsyspath; + + aux = g_strdup_printf ("%s/subsystem", self->priv->physdev_sysfs_path); +- subsyspath = canonicalize_file_name (aux); ++ subsyspath = realpath (aux, NULL); + self->priv->physdev_subsystem = g_path_get_dirname (subsyspath); + g_free (subsyspath); + g_free (aux); +-- +2.17.1 + From de46ba290d2152261e29ef5339d8ea4adbbaf132 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Jun 2018 07:02:14 +0300 Subject: [PATCH 1729/2640] modem-manager: update package prompt name Rename the prompt string for consistency with the package directory name. Cc: Aleksander Morgado Cc: Carlos Santos Cc: Petr Vorel Cc: Yegor Yefremov Signed-off-by: Baruch Siach Reviewed-by: Yegor Yefremov Acked-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 226f82f4f6..c4c723776d 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_MODEM_MANAGER - bool "modemmanager" + bool "modem-manager" depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus From 45d623f4fe8124253c2efccb7467cf32f96f333a Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 14 Jun 2018 15:48:12 -0700 Subject: [PATCH 1730/2640] atk: bump to version 2.28.1 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 12c98706dd..80aeecaee9 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.22/atk-2.22.0.sha256sum -sha256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 atk-2.22.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.28/atk-2.28.1.sha256sum +sha256 cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc atk-2.28.1.tar.xz diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 88cf5fbc0a..64950bfd08 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.22 -ATK_VERSION = $(ATK_VERSION_MAJOR).0 +ATK_VERSION_MAJOR = 2.28 +ATK_VERSION = $(ATK_VERSION_MAJOR).1 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+ From 2d8ce733b852a09764eeea57f73ab4b5859a3da4 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 14 Jun 2018 15:48:17 -0700 Subject: [PATCH 1731/2640] llvm: bump to version 6.0.0 Signed-off-by: Joseph Kogut Tested-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- ...type-in-ORC-readMem-client-interface.patch | 37 ------------------- package/llvm/llvm.hash | 2 +- package/llvm/llvm.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch diff --git a/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch deleted file mode 100644 index 0343b4c7e8..0000000000 --- a/package/llvm/0001-Fix-return-type-in-ORC-readMem-client-interface.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 72ea6ea635d5b5a88f411710daf7e1d340d232d8 Mon Sep 17 00:00:00 2001 -From: Tilmann Scheller -Date: Thu, 1 Feb 2018 11:40:01 -0600 -Subject: [PATCH] Fix return type in ORC readMem() client interface. - -GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang -and earlier versions of GCC don't detect the issue. - -Fixes rhbz#1540620. - -This patch was taken from llvm5.0-5.0.1-7.fc28.src.rpm - -Link to bug: https://bugzilla.redhat.com/show_bug.cgi?id=1540620 - -Signed-off-by: Valentin Korenblit ---- - include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -index da02250ba16..bed472e2e0e 100644 ---- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -@@ -713,8 +713,8 @@ private: - - uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } - -- Expected> readMem(char *Dst, JITTargetAddress Src, -- uint64_t Size) { -+ Expected> readMem(char *Dst, JITTargetAddress Src, -+ uint64_t Size) { - // Check for an 'out-of-band' error, e.g. from an MM destructor. - if (ExistingError) - return std::move(ExistingError); --- -2.14.3 - diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 14f8bb4488..93bdf2e20e 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 d522eda97835a9c75f0b88ddc81437e5edbb87dc2740686cb8647763855c2b3c llvm-5.0.2.src.tar.xz +sha256 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 llvm-6.0.0.src.tar.xz sha256 abd4d8794808bacb1eb6924d49efafd9ab6eef88faaaeb5d3cfa13ee3670d672 LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 3abf428989..fb0ae4ce5c 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_VERSION = 5.0.2 +LLVM_VERSION = 6.0.0 LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = NCSA From 1f4616a1de1bf2b73140f4e9426d2225640bbc46 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 14 Jun 2018 15:48:18 -0700 Subject: [PATCH 1732/2640] clang: bump to version 6.0.0 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/clang/clang.hash | 2 +- package/clang/clang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clang/clang.hash b/package/clang/clang.hash index bf54f9bb53..600c3cc9a4 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 fa9ce9724abdb68f166deea0af1f71ca0dfa9af8f7e1261f2cae63c280282800 cfe-5.0.2.src.tar.xz +sha256 e07d6dd8d9ef196cfc8e8bb131cbd6a2ed0b1caf1715f9d05b0f0eeaddb6df32 cfe-6.0.0.src.tar.xz sha256 de4c79665f0f5688b0ace17cba6f8e0343925bb95e0949d66d47bbd4527310d6 LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index dc086c6eed..f828bac72a 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLANG_VERSION = 5.0.2 +CLANG_VERSION = 6.0.0 CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION) CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = NCSA From 5f6f32968e9f64441c822d0353c1eaacfde33dbe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Jun 2018 18:31:54 +0200 Subject: [PATCH 1733/2640] package/python: bump version to 2.7.15 Rebased patch 0009, removed patch 0035 after upstream commit https://github.com/python/cpython/commit/0b91f8a668201fc58fa732b8acc496caedfdbae0 Updated license hash after 2018 bump. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...9-Fix-python-config-for-cross-builds.patch | 6 +- package/python/0035-GCC8-alignment-fix.patch | 65 ------------------- package/python/python.hash | 9 ++- package/python/python.mk | 2 +- 4 files changed, 9 insertions(+), 73 deletions(-) delete mode 100644 package/python/0035-GCC8-alignment-fix.patch diff --git a/package/python/0009-Fix-python-config-for-cross-builds.patch b/package/python/0009-Fix-python-config-for-cross-builds.patch index 44ddbcec6f..761d6d9294 100644 --- a/package/python/0009-Fix-python-config-for-cross-builds.patch +++ b/package/python/0009-Fix-python-config-for-cross-builds.patch @@ -12,6 +12,8 @@ doesn't depend on the sysconfig import that usually leads to bad data/results. Signed-off-by: Gustavo Zacarias +[Bernd: rebased for Python 2.7.15] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 13 +++--- Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++ @@ -36,8 +38,8 @@ index 33b994d..beb0837 100644 # Default target all: @DEF_MAKE_ALL_RULE@ --build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks -+build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config +-build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks ++build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config # Compile a binary with profile guided optimization. profile-opt: diff --git a/package/python/0035-GCC8-alignment-fix.patch b/package/python/0035-GCC8-alignment-fix.patch deleted file mode 100644 index b742aa09de..0000000000 --- a/package/python/0035-GCC8-alignment-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0b91f8a668201fc58fa732b8acc496caedfdbae0 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Sun, 29 Apr 2018 12:18:33 -0700 -Subject: [PATCH] Indicate that _PyGC_Head is only 8-byte aligned. (closes - bpo-33374) - -By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte -aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC -8 are starting to use alignment information to do store-merging. So, the "long -double" needs to be changed to a simple "double" as was long ago done in Python -3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some -dummy padding to make sure _PyGC_Head stays the same size. - -Upstream: https://bugs.python.org/issue33374 -Signed-off-by: Stefan Becker ---- - Include/objimpl.h | 17 ++++++++++++++++- - .../2018-04-29-12-07-00.bpo-33374.-xegL6.rst | 3 +++ - 2 files changed, 19 insertions(+), 1 deletion(-) - create mode 100644 Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst - -diff --git a/Include/objimpl.h b/Include/objimpl.h -index 5f2868332955..cbf6bc3f8763 100644 ---- a/Include/objimpl.h -+++ b/Include/objimpl.h -@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); - /* for source compatibility with 2.2 */ - #define _PyObject_GC_Del PyObject_GC_Del - -+/* -+ * Former over-aligned definition of PyGC_Head, used to compute the size of the -+ * padding for the new version below. -+ */ -+union _gc_head; -+union _gc_head_old { -+ struct { -+ union _gc_head_old *gc_next; -+ union _gc_head_old *gc_prev; -+ Py_ssize_t gc_refs; -+ } gc; -+ long double dummy; -+}; -+ - /* GC information is stored BEFORE the object structure. */ - typedef union _gc_head { - struct { -@@ -255,7 +269,8 @@ typedef union _gc_head { - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; -- long double dummy; /* force worst-case alignment */ -+ double dummy; /* Force at least 8-byte alignment. */ -+ char dummy_padding[sizeof(union _gc_head_old)]; - } PyGC_Head; - - extern PyGC_Head *_PyGC_generation0; -diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst -new file mode 100644 -index 000000000000..9ec1a605c8f2 ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst -@@ -0,0 +1,3 @@ -+Tweak the definition of PyGC_Head, so compilers do not believe it is always -+16-byte aligned on x86. This prevents crashes with more aggressive -+optimizations present in GCC 8. diff --git a/package/python/python.hash b/package/python/python.hash index 77e0fc878e..feadcfdcb5 100644 --- a/package/python/python.hash +++ b/package/python/python.hash @@ -1,6 +1,5 @@ -# From https://www.python.org/downloads/release/python-2714/ -md5 1f6db41ad91d9eb0a6f0c769b8613c5b Python-2.7.14.tar.xz +# From https://www.python.org/downloads/release/python-2715/ +md5 a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz # Locally calculated -sha256 71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66 Python-2.7.14.tar.xz -# License files, locally calculated -sha256 d2d17b17388da74dc9c6bdbf78eb7237432c3f8a0c87852df740ec99de2ec680 LICENSE +sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 Python-2.7.15.tar.xz +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE diff --git a/package/python/python.mk b/package/python/python.mk index aa7917ab46..79df3c462a 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).14 +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).15 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python-2.0, others From 5439d82271c64e531300ed6157bfc09857305379 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 15 Jun 2018 14:54:55 +0200 Subject: [PATCH 1734/2640] package: add python-validators Simple data validation library. Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-validators/Config.in | 8 ++++++++ package/python-validators/python-validators.hash | 5 +++++ package/python-validators/python-validators.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-validators/Config.in create mode 100644 package/python-validators/python-validators.hash create mode 100644 package/python-validators/python-validators.mk diff --git a/DEVELOPERS b/DEVELOPERS index e276b45565..07c24acb91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1534,6 +1534,7 @@ F: package/python-pam/ F: package/python-psutil/ F: package/python-request-id/ F: package/python-texttable/ +F: package/python-validators/ F: package/python-webob/ F: package/python-websocket-client/ F: package/triggerhappy/ diff --git a/package/Config.in b/package/Config.in index fcabed4fde..368c05df0b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -965,6 +965,7 @@ menu "External python modules" source "package/python-ujson/Config.in" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" + source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" source "package/python-visitor/Config.in" source "package/python-watchdog/Config.in" diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in new file mode 100644 index 0000000000..e700369910 --- /dev/null +++ b/package/python-validators/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_VALIDATORS + bool "python-validators" + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_DECORATOR # runtime + help + Python Data Validation for Humans. + + https://github.com/kvesteri/validators diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash new file mode 100644 index 0000000000..8c6e3f9ecc --- /dev/null +++ b/package/python-validators/python-validators.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/validators/json +md5 9c9583f91972163b3b736033bb929d8a validators-0.12.2.tar.gz +sha256 172ac45f7d1944ce4beca3c5c53ca7c83e9759e39fd3fedc1cf28e2130268706 validators-0.12.2.tar.gz +# Locally computed sha256 checksums +sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk new file mode 100644 index 0000000000..e94476f834 --- /dev/null +++ b/package/python-validators/python-validators.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-validators +# +################################################################################ + +PYTHON_VALIDATORS_VERSION = 0.12.2 +PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/45/7b/5b7b74208a3e0744d1a0efbfb1935fa46fa4cfe58d3d63f17c49c58c429c +PYTHON_VALIDATORS_SETUP_TYPE = setuptools +PYTHON_VALIDATORS_LICENSE = BSD +PYTHON_VALIDATORS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From b6677fba3e2db29c9b5e4f52e11ae5ee4a290d7c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:21 +0200 Subject: [PATCH 1735/2640] package/speexdsp: new package Quoting speex release notes from https://www.speex.org "Speex 1.2rc2 and SpeexDSP 1.2rc2 are out December 6, 2014 This release splits the speex codec library and the speex DSP library into separate source trees." After bumping speex to 1.2.0 this new package is necessary to provide speex-based DSP support for packages like Freeswitch and Asterisk. We use current git HEAD which received 21 commits since the 1.2rc3 tarball was released in 2015, including a fix for building on arm. We still need another patch which was not committed to git master to fix building on aarch64. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../0001-port-resample-neon-to-aarch64.patch | 250 ++++++++++++++++++ package/speexdsp/Config.in | 6 + package/speexdsp/speexdsp.hash | 3 + package/speexdsp/speexdsp.mk | 22 ++ 5 files changed, 282 insertions(+) create mode 100644 package/speexdsp/0001-port-resample-neon-to-aarch64.patch create mode 100644 package/speexdsp/Config.in create mode 100644 package/speexdsp/speexdsp.hash create mode 100644 package/speexdsp/speexdsp.mk diff --git a/package/Config.in b/package/Config.in index 368c05df0b..a5ecfecbf9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1044,6 +1044,7 @@ menu "Audio/Sound" source "package/portaudio/Config.in" source "package/sbc/Config.in" source "package/speex/Config.in" + source "package/speexdsp/Config.in" source "package/taglib/Config.in" source "package/tinyalsa/Config.in" source "package/tremor/Config.in" diff --git a/package/speexdsp/0001-port-resample-neon-to-aarch64.patch b/package/speexdsp/0001-port-resample-neon-to-aarch64.patch new file mode 100644 index 0000000000..7f3da9c407 --- /dev/null +++ b/package/speexdsp/0001-port-resample-neon-to-aarch64.patch @@ -0,0 +1,250 @@ +From: Frank Barchard +Date: Thu, 21 Jul 2016 23:01:19 +0000 (-0700) +Subject: resample: port resample_neon.h to aarch64 +X-Git-Url: https://git.xiph.org/?p=speexdsp.git;a=commitdiff_plain;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088 + +resample: port resample_neon.h to aarch64 + +port optimized inner_product_single and WORD2INT(x) for fixed +and floating point from 32 bit armv7 NEON to aarch64 NEON. + +Patch downloaded from upstream repo to fix aarch64 build error: +https://git.xiph.org/?p=speexdsp.git;a=commitdiff;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088#patch1 + +Signed-off-by: Bernd Kuhls +--- + +diff --git a/libspeexdsp/resample_neon.h b/libspeexdsp/resample_neon.h +index 0acbd27..e14ffe1 100644 +--- a/libspeexdsp/resample_neon.h ++++ b/libspeexdsp/resample_neon.h +@@ -36,14 +36,24 @@ + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include +- + #ifdef FIXED_POINT +-#ifdef __thumb2__ ++#if defined(__aarch64__) ++static inline int32_t saturate_32bit_to_16bit(int32_t a) { ++ int32_t ret; ++ asm ("fmov s0, %w[a]\n" ++ "sqxtn h0, s0\n" ++ "sxtl v0.4s, v0.4h\n" ++ "fmov %w[ret], s0\n" ++ : [ret] "=r" (ret) ++ : [a] "r" (a) ++ : "v0" ); ++ return ret; ++} ++#elif defined(__thumb2__) + static inline int32_t saturate_32bit_to_16bit(int32_t a) { + int32_t ret; + asm ("ssat %[ret], #16, %[a]" +- : [ret] "=&r" (ret) ++ : [ret] "=r" (ret) + : [a] "r" (a) + : ); + return ret; +@@ -54,7 +64,7 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) { + asm ("vmov.s32 d0[0], %[a]\n" + "vqmovn.s32 d0, q0\n" + "vmov.s16 %[ret], d0[0]\n" +- : [ret] "=&r" (ret) ++ : [ret] "=r" (ret) + : [a] "r" (a) + : "q0"); + return ret; +@@ -64,7 +74,63 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) { + #define WORD2INT(x) (saturate_32bit_to_16bit(x)) + + #define OVERRIDE_INNER_PRODUCT_SINGLE +-/* Only works when len % 4 == 0 */ ++/* Only works when len % 4 == 0 and len >= 4 */ ++#if defined(__aarch64__) ++static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) ++{ ++ int32_t ret; ++ uint32_t remainder = len % 16; ++ len = len - remainder; ++ ++ asm volatile (" cmp %w[len], #0\n" ++ " b.ne 1f\n" ++ " ld1 {v16.4h}, [%[b]], #8\n" ++ " ld1 {v20.4h}, [%[a]], #8\n" ++ " subs %w[remainder], %w[remainder], #4\n" ++ " smull v0.4s, v16.4h, v20.4h\n" ++ " b.ne 4f\n" ++ " b 5f\n" ++ "1:" ++ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" ++ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" ++ " subs %w[len], %w[len], #16\n" ++ " smull v0.4s, v16.4h, v20.4h\n" ++ " smlal v0.4s, v17.4h, v21.4h\n" ++ " smlal v0.4s, v18.4h, v22.4h\n" ++ " smlal v0.4s, v19.4h, v23.4h\n" ++ " b.eq 3f\n" ++ "2:" ++ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" ++ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" ++ " subs %w[len], %w[len], #16\n" ++ " smlal v0.4s, v16.4h, v20.4h\n" ++ " smlal v0.4s, v17.4h, v21.4h\n" ++ " smlal v0.4s, v18.4h, v22.4h\n" ++ " smlal v0.4s, v19.4h, v23.4h\n" ++ " b.ne 2b\n" ++ "3:" ++ " cmp %w[remainder], #0\n" ++ " b.eq 5f\n" ++ "4:" ++ " ld1 {v18.4h}, [%[b]], #8\n" ++ " ld1 {v22.4h}, [%[a]], #8\n" ++ " subs %w[remainder], %w[remainder], #4\n" ++ " smlal v0.4s, v18.4h, v22.4h\n" ++ " b.ne 4b\n" ++ "5:" ++ " saddlv d0, v0.4s\n" ++ " sqxtn s0, d0\n" ++ " sqrshrn h0, s0, #15\n" ++ " sxtl v0.4s, v0.4h\n" ++ " fmov %w[ret], s0\n" ++ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), ++ [len] "+r" (len), [remainder] "+r" (remainder) ++ : ++ : "cc", "v0", ++ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); ++ return ret; ++} ++#else + static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) + { + int32_t ret; +@@ -112,33 +178,104 @@ static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, u + " vqmovn.s64 d0, q0\n" + " vqrshrn.s32 d0, q0, #15\n" + " vmov.s16 %[ret], d0[0]\n" +- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b), ++ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), + [len] "+r" (len), [remainder] "+r" (remainder) + : + : "cc", "q0", +- "d16", "d17", "d18", "d19", +- "d20", "d21", "d22", "d23"); ++ "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23"); + + return ret; + } +-#elif defined(FLOATING_POINT) ++#endif // !defined(__aarch64__) + ++#elif defined(FLOATING_POINT) ++#if defined(__aarch64__) ++static inline int32_t saturate_float_to_16bit(float a) { ++ int32_t ret; ++ asm ("fcvtas s1, %s[a]\n" ++ "sqxtn h1, s1\n" ++ "sxtl v1.4s, v1.4h\n" ++ "fmov %w[ret], s1\n" ++ : [ret] "=r" (ret) ++ : [a] "w" (a) ++ : "v1"); ++ return ret; ++} ++#else + static inline int32_t saturate_float_to_16bit(float a) { + int32_t ret; + asm ("vmov.f32 d0[0], %[a]\n" + "vcvt.s32.f32 d0, d0, #15\n" + "vqrshrn.s32 d0, q0, #15\n" + "vmov.s16 %[ret], d0[0]\n" +- : [ret] "=&r" (ret) ++ : [ret] "=r" (ret) + : [a] "r" (a) + : "q0"); + return ret; + } ++#endif ++ + #undef WORD2INT + #define WORD2INT(x) (saturate_float_to_16bit(x)) + + #define OVERRIDE_INNER_PRODUCT_SINGLE +-/* Only works when len % 4 == 0 */ ++/* Only works when len % 4 == 0 and len >= 4 */ ++#if defined(__aarch64__) ++static inline float inner_product_single(const float *a, const float *b, unsigned int len) ++{ ++ float ret; ++ uint32_t remainder = len % 16; ++ len = len - remainder; ++ ++ asm volatile (" cmp %w[len], #0\n" ++ " b.ne 1f\n" ++ " ld1 {v16.4s}, [%[b]], #16\n" ++ " ld1 {v20.4s}, [%[a]], #16\n" ++ " subs %w[remainder], %w[remainder], #4\n" ++ " fmul v1.4s, v16.4s, v20.4s\n" ++ " b.ne 4f\n" ++ " b 5f\n" ++ "1:" ++ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" ++ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" ++ " subs %w[len], %w[len], #16\n" ++ " fmul v1.4s, v16.4s, v20.4s\n" ++ " fmul v2.4s, v17.4s, v21.4s\n" ++ " fmul v3.4s, v18.4s, v22.4s\n" ++ " fmul v4.4s, v19.4s, v23.4s\n" ++ " b.eq 3f\n" ++ "2:" ++ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" ++ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" ++ " subs %w[len], %w[len], #16\n" ++ " fmla v1.4s, v16.4s, v20.4s\n" ++ " fmla v2.4s, v17.4s, v21.4s\n" ++ " fmla v3.4s, v18.4s, v22.4s\n" ++ " fmla v4.4s, v19.4s, v23.4s\n" ++ " b.ne 2b\n" ++ "3:" ++ " fadd v16.4s, v1.4s, v2.4s\n" ++ " fadd v17.4s, v3.4s, v4.4s\n" ++ " cmp %w[remainder], #0\n" ++ " fadd v1.4s, v16.4s, v17.4s\n" ++ " b.eq 5f\n" ++ "4:" ++ " ld1 {v18.4s}, [%[b]], #16\n" ++ " ld1 {v22.4s}, [%[a]], #16\n" ++ " subs %w[remainder], %w[remainder], #4\n" ++ " fmla v1.4s, v18.4s, v22.4s\n" ++ " b.ne 4b\n" ++ "5:" ++ " faddp v1.4s, v1.4s, v1.4s\n" ++ " faddp %[ret].4s, v1.4s, v1.4s\n" ++ : [ret] "=w" (ret), [a] "+r" (a), [b] "+r" (b), ++ [len] "+r" (len), [remainder] "+r" (remainder) ++ : ++ : "cc", "v1", "v2", "v3", "v4", ++ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); ++ return ret; ++} ++#else + static inline float inner_product_single(const float *a, const float *b, unsigned int len) + { + float ret; +@@ -191,11 +328,12 @@ static inline float inner_product_single(const float *a, const float *b, unsigne + " vadd.f32 d0, d0, d1\n" + " vpadd.f32 d0, d0, d0\n" + " vmov.f32 %[ret], d0[0]\n" +- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b), ++ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), + [len] "+l" (len), [remainder] "+l" (remainder) + : +- : "cc", "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", +- "q9", "q10", "q11"); ++ : "cc", "q0", "q1", "q2", "q3", ++ "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11"); + return ret; + } ++#endif // defined(__aarch64__) + #endif diff --git a/package/speexdsp/Config.in b/package/speexdsp/Config.in new file mode 100644 index 0000000000..2ae5b59d02 --- /dev/null +++ b/package/speexdsp/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_SPEEXDSP + bool "speexdsp" + help + DSP library derived from speex. + + https://www.speex.org diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash new file mode 100644 index 0000000000..5c3d6b96f3 --- /dev/null +++ b/package/speexdsp/speexdsp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e896489e045d11933723a94b9dd6f8e7d3d4e0d4b34c9612bcb2f4204261130c speexdsp-20ed3452074664ad07e380e51321b148acebdf20.tar.gz +sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk new file mode 100644 index 0000000000..09c8285688 --- /dev/null +++ b/package/speexdsp/speexdsp.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# speexdsp +# +################################################################################ + +SPEEXDSP_VERSION = 20ed3452074664ad07e380e51321b148acebdf20 +SPEEXDSP_SITE = https://git.xiph.org/speexdsp.git +SPEEXDSP_SITE_METHOD = git +SPEEXDSP_LICENSE = BSD-3-Clause +SPEEXDSP_LICENSE_FILES = COPYING +SPEEXDSP_INSTALL_STAGING = YES +SPEEXDSP_DEPENDENCIES = host-pkgconf +SPEEXDSP_AUTORECONF = YES + +# Autoreconf step fails due to missing m4 directory +define SPEEXDSP_CREATE_M4_DIR + mkdir -p $(@D)/m4 +endef +SPEEXDSP_PRE_CONFIGURE_HOOKS += SPEEXDSP_CREATE_M4_DIR + +$(eval $(autotools-package)) From 1ad40107beb67a0b6a8381e7e1782f68d8adbd3c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:22 +0200 Subject: [PATCH 1736/2640] package/speex: add optional dependency to speexdsp Quoting speex release notes from https://www.speex.org "Speex 1.2rc2 and SpeexDSP 1.2rc2 are out December 6, 2014 This release splits the speex codec library and the speex DSP library into separate source trees." After bumping speex to 1.2.0 DSP support is provided by speexdsp. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/speex/speex.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/speex/speex.mk b/package/speex/speex.mk index c6b46e0eb3..522f8cc09c 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -13,6 +13,10 @@ SPEEX_DEPENDENCIES = host-pkgconf libogg SPEEX_CONF_OPTS = \ --enable-fixed-point +ifeq ($(BR2_PACKAGE_SPEEXDSP),y) +SPEEX_DEPENDENCIES += speexdsp +endif + ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y) SPEEX_CONF_OPTS += --enable-arm4-asm endif From ba8805fe8e5307025fc8120a29b3bd4f23f3590d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:23 +0200 Subject: [PATCH 1737/2640] package/freeswitch: needs speexdsp Fixes http://autobuild.buildroot.net/results/a3f/a3f9845681025fad93a4f867bb667822e87a08ea/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index 1f6459335d..ff2898dc3c 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_FREESWITCH select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE select BR2_PACKAGE_SPEEX + select BR2_PACKAGE_SPEEXDSP select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID From bb9a2c178f8d634ed26ad7d399df4ca7dfc6d25a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:24 +0200 Subject: [PATCH 1738/2640] package/asterisk: add optional dependency to speexdsp Fixes http://autobuild.buildroot.net/results/9f6/9f61192382ea4b57b0f0548626968752363bb13f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/asterisk/asterisk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index f2f210b524..430b122655 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -229,7 +229,7 @@ else ASTERISK_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_SPEEX),y) +ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) ASTERISK_DEPENDENCIES += speex ASTERISK_CONF_OPTS += --with-speex --with-speexdsp else From af4e09769d2f74ca4a6bbcb688374c717fb11913 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:25 +0200 Subject: [PATCH 1739/2640] package/linphone: needs speexdsp Fixes http://autobuild.buildroot.net/results/956/956b8cffa0a35a417763ad72bb7c8e8a8b2fe6b0/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linphone/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linphone/Config.in b/package/linphone/Config.in index 2504ca2b49..06eb059cfd 100644 --- a/package/linphone/Config.in +++ b/package/linphone/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LINPHONE depends on BR2_USE_MMU # libeXosip2 select BR2_PACKAGE_LIBEXOSIP2 select BR2_PACKAGE_SPEEX + select BR2_PACKAGE_SPEEXDSP help Linphone is an internet phone or Voice Over IP phone (VoIP). From e9b1ec76aa457affc35d372b3d8604a93670d28b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Jun 2018 18:28:26 +0200 Subject: [PATCH 1740/2640] package/mediastreamer: add optional dependency to speexdsp Fixes http://autobuild.buildroot.net/results/594/594ea96cd7b6726052268a3c0b094e00e7b8f12f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mediastreamer/mediastreamer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 1276cfae10..d3b70f4ca9 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -46,7 +46,7 @@ MEDIASTREAMER_CONF_OPTS += --disable-opus endif # portaudio backend needs speex as well -ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy) +ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yyy) MEDIASTREAMER_CONF_OPTS += --enable-portaudio MEDIASTREAMER_DEPENDENCIES += portaudio speex else From 020d692be69188e775bdf7ffb67b81e5b4009b91 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:21 +0200 Subject: [PATCH 1741/2640] perl-datetime-tiny: bump to version 1.07 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-datetime-tiny/perl-datetime-tiny.hash | 7 +++++-- package/perl-datetime-tiny/perl-datetime-tiny.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-datetime-tiny/perl-datetime-tiny.hash b/package/perl-datetime-tiny/perl-datetime-tiny.hash index 68f2c025ea..62fe407d29 100644 --- a/package/perl-datetime-tiny/perl-datetime-tiny.hash +++ b/package/perl-datetime-tiny/perl-datetime-tiny.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 736be4b3e8171f4a029fb6ac3712a9b4 DateTime-Tiny-1.06.tar.gz -sha256 bd725df481d7223ee787e154c116098b08a129f55e0763194b07ebea3dda33ec DateTime-Tiny-1.06.tar.gz +md5 5ac2924652edb0cf5fda7c9d52162b3f DateTime-Tiny-1.07.tar.gz +sha256 83568a22838cb518fbeb9e060460ec7f59d5a0b0a1cc06562954c3674d7cf7e4 DateTime-Tiny-1.07.tar.gz + +# computed by scancpan +sha256 21cda7a55a8d4b32a43c654f0d4d4a1587096b35bf2a93ea12a2e3a8c2c0b88f LICENSE diff --git a/package/perl-datetime-tiny/perl-datetime-tiny.mk b/package/perl-datetime-tiny/perl-datetime-tiny.mk index 6b54967196..e8ee3d60e2 100644 --- a/package/perl-datetime-tiny/perl-datetime-tiny.mk +++ b/package/perl-datetime-tiny/perl-datetime-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATETIME_TINY_VERSION = 1.06 +PERL_DATETIME_TINY_VERSION = 1.07 PERL_DATETIME_TINY_SOURCE = DateTime-Tiny-$(PERL_DATETIME_TINY_VERSION).tar.gz PERL_DATETIME_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_DATETIME_TINY_LICENSE = Artistic or GPL-1.0+ From b31677677bcdecff741fa93c1ab6b67395541550 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:22 +0200 Subject: [PATCH 1742/2640] perl-http-message: bump to version 6.18 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-http-message/perl-http-message.hash | 9 +++++---- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index b58792b5af..78fda135cc 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,5 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eddd79e2d2975a55bb6ea2e7707e3137 HTTP-Message-6.16.tar.gz -sha256 46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0 HTTP-Message-6.16.tar.gz -# Locally computed -sha256 66f0d1e8593d5512d7a8cd90549a976aaae97e4fa9b6097249b3682f14747a6b LICENSE +md5 9fd400da24e1784f85d32de1705fc795 HTTP-Message-6.18.tar.gz +sha256 d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112 HTTP-Message-6.18.tar.gz + +# computed by scancpan +sha256 66f0d1e8593d5512d7a8cd90549a976aaae97e4fa9b6097249b3682f14747a6b LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index c35796e065..e4d642afde 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.16 +PERL_HTTP_MESSAGE_VERSION = 6.18 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_DEPENDENCIES = perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri From b18cfc3feb40a9d87e643b279d07c73d095f4a3f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:23 +0200 Subject: [PATCH 1743/2640] perl-io-socket: bump to version 2.056 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 7 +++++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index 3bf0421ee2..5b9cb9934b 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 26c9bcdfb4ba8763ef89264f21326a48 IO-Socket-SSL-2.052.tar.gz -sha256 e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673 IO-Socket-SSL-2.052.tar.gz +md5 7f575fd3844263a3401dc6e1fe3ad44c IO-Socket-SSL-2.056.tar.gz +sha256 91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259 IO-Socket-SSL-2.056.tar.gz + +# computed by scancpan +sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index 62fc2298c8..95bb852f56 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.052 +PERL_IO_SOCKET_SSL_VERSION = 2.056 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay From 664f5b45bc43122145d99acf431f8f49ad076517 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:24 +0200 Subject: [PATCH 1744/2640] perl-mojolicious: bump to version 7.84 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mojolicious/Config.in | 2 +- package/perl-mojolicious/perl-mojolicious.hash | 7 +++++-- package/perl-mojolicious/perl-mojolicious.mk | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/perl-mojolicious/Config.in b/package/perl-mojolicious/Config.in index ebf0932b9f..28d45a35fd 100644 --- a/package/perl-mojolicious/Config.in +++ b/package/perl-mojolicious/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PERL_MOJOLICIOUS help Real-time web framework - http://mojolicious.org + https://mojolicious.org diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index 0593a3cc62..528fb7a731 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 47d198ea987b4913818c24107cd9673d Mojolicious-7.61.tar.gz -sha256 386ade41021bf0470879a0abceeccc305f773b41b76245cc3cdce92d7dc8897d Mojolicious-7.61.tar.gz +md5 2aca5046a2efc7ce596c4470893b555f Mojolicious-7.84.tar.gz +sha256 7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc Mojolicious-7.84.tar.gz + +# computed by scancpan +sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index 4e94c47a71..f20fabc9fa 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 7.61 +PERL_MOJOLICIOUS_VERSION = 7.84 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 From de85509592d21043cb1b16ad97224406c2c57d6c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:25 +0200 Subject: [PATCH 1745/2640] perl-net-ssleay: bump to version 1.85 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-net-ssleay/perl-net-ssleay.hash | 7 +++++-- package/perl-net-ssleay/perl-net-ssleay.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index daa2c186b3..517b3c4da3 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cfbe968487149626978f427cc9fb8c77 Net-SSLeay-1.84.tar.gz -sha256 823ec3cbb428309d6a9e56f362a9300693ce3215b7fede109adb7be361fff177 Net-SSLeay-1.84.tar.gz +md5 d602bdce4e0531c6efc276e3e429ca69 Net-SSLeay-1.85.tar.gz +sha256 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8 Net-SSLeay-1.85.tar.gz + +# computed by scancpan +sha256 b55065185a2172d9f2ea2dd87c18c206ea3dc45a64e5f3deb3eee34d839dc822 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 3814038ccd..2b3b10716d 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.84 +PERL_NET_SSLEAY_VERSION = 1.85 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM PERL_NET_SSLEAY_DEPENDENCIES = openssl From 8c2003b22f6a5e030485f8c8c4ceac2f0aa7e940 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:26 +0200 Subject: [PATCH 1746/2640] perl-time-hires: bump to version 1.9758 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-time-hires/perl-time-hires.hash | 7 +++++-- package/perl-time-hires/perl-time-hires.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-time-hires/perl-time-hires.hash b/package/perl-time-hires/perl-time-hires.hash index f3ab700ea3..4260766681 100644 --- a/package/perl-time-hires/perl-time-hires.hash +++ b/package/perl-time-hires/perl-time-hires.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b98099e0cb7702210606776e9746e103 Time-HiRes-1.9753.tar.gz -sha256 0fbfd5f99cdd26011d5c0bc3a8e369dacc4a9e1d1658f4663ac6018f2cec4915 Time-HiRes-1.9753.tar.gz +md5 8f998cb60966c86e24c500016e4d1ce8 Time-HiRes-1.9758.tar.gz +sha256 5bfa145bc11e70a8e337543b1084a293743a690691b568493455dedf58f34b1e Time-HiRes-1.9758.tar.gz + +# computed by scancpan +sha256 ecc20782bd6c34d2d632356020f9ad0150c7ae1803ae9560258d76d4533030da README diff --git a/package/perl-time-hires/perl-time-hires.mk b/package/perl-time-hires/perl-time-hires.mk index c8dde49f2f..271c1398a3 100644 --- a/package/perl-time-hires/perl-time-hires.mk +++ b/package/perl-time-hires/perl-time-hires.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TIME_HIRES_VERSION = 1.9753 +PERL_TIME_HIRES_VERSION = 1.9758 PERL_TIME_HIRES_SOURCE = Time-HiRes-$(PERL_TIME_HIRES_VERSION).tar.gz PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JH/JHI PERL_TIME_HIRES_LICENSE = Artistic or GPL-1.0+ From e1a2bbf267bb0a71833834b228f8456fcb7c3e53 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:27 +0200 Subject: [PATCH 1747/2640] perl-xml-sax: bump to version 1.00 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-xml-sax/perl-xml-sax.hash | 7 +++++-- package/perl-xml-sax/perl-xml-sax.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-xml-sax/perl-xml-sax.hash b/package/perl-xml-sax/perl-xml-sax.hash index 6aa543c002..888e9d2b5d 100644 --- a/package/perl-xml-sax/perl-xml-sax.hash +++ b/package/perl-xml-sax/perl-xml-sax.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 290f5375ae87fdebfdb5bc3854019f24 XML-SAX-0.99.tar.gz -sha256 32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6f5ad84 XML-SAX-0.99.tar.gz +md5 861a454f7bf269990ed2c1c125f4db48 XML-SAX-1.00.tar.gz +sha256 45ea6564ef8692155d57b2de0862b6442d3c7e29f4a9bc9ede5d7ecdc74c2ae3 XML-SAX-1.00.tar.gz + +# computed by scancpan +sha256 bf2fb225e77b46b8892ef2a8aa5efa92d65b176a870f42559d8b73b308a36509 LICENSE diff --git a/package/perl-xml-sax/perl-xml-sax.mk b/package/perl-xml-sax/perl-xml-sax.mk index 90b2cd6940..024ac6211e 100644 --- a/package/perl-xml-sax/perl-xml-sax.mk +++ b/package/perl-xml-sax/perl-xml-sax.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_XML_SAX_VERSION = 0.99 +PERL_XML_SAX_VERSION = 1.00 PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM PERL_XML_SAX_DEPENDENCIES = perl-xml-namespacesupport perl-xml-sax-base From 3cc471a72e0c70786f19b5a7d5813c8e94cd62d9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:28 +0200 Subject: [PATCH 1748/2640] perl-digest-hmac: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-digest-hmac/perl-digest-hmac.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-digest-hmac/perl-digest-hmac.hash b/package/perl-digest-hmac/perl-digest-hmac.hash index 018e4eb0ab..84bc86488a 100644 --- a/package/perl-digest-hmac/perl-digest-hmac.hash +++ b/package/perl-digest-hmac/perl-digest-hmac.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 e6a5d6f552da16eacb5157ea4369ff9d Digest-HMAC-1.03.tar.gz sha256 3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59 Digest-HMAC-1.03.tar.gz + +# computed by scancpan +sha256 56bf7cdaec5eebf74d58679638ebef5015883e65c1be7251a3ef8cce8bdd1ff5 README From 979cdb1703d8f71a96e0384c7a107118c200e5a6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:29 +0200 Subject: [PATCH 1749/2640] perl-digest-sha1: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-digest-sha1/perl-digest-sha1.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-digest-sha1/perl-digest-sha1.hash b/package/perl-digest-sha1/perl-digest-sha1.hash index d24d5ab668..bfc94a12a5 100644 --- a/package/perl-digest-sha1/perl-digest-sha1.hash +++ b/package/perl-digest-sha1/perl-digest-sha1.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 bd22388f268434f2b24f64e28bf1aa35 Digest-SHA1-2.13.tar.gz sha256 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc Digest-SHA1-2.13.tar.gz + +# computed by scancpan +sha256 805bee77fab9c72b0bfb452bb623b278f1767de62011e1814de2a6f6115439c8 README From 801367df53ac146ce3e35904d8d242f4f3bfd719 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:30 +0200 Subject: [PATCH 1750/2640] perl-encode-detect: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-encode-detect/perl-encode-detect.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-encode-detect/perl-encode-detect.hash b/package/perl-encode-detect/perl-encode-detect.hash index c727a44912..1893f1db94 100644 --- a/package/perl-encode-detect/perl-encode-detect.hash +++ b/package/perl-encode-detect/perl-encode-detect.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 ee9faf55d7105c97b02b8ebe590819c7 Encode-Detect-1.01.tar.gz sha256 834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1 Encode-Detect-1.01.tar.gz + +# computed by scancpan +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f LICENSE From 236a20b30940d03807fa71b10b775b44b7705bfb Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:31 +0200 Subject: [PATCH 1751/2640] perl-encode-locale: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-encode-locale/perl-encode-locale.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-encode-locale/perl-encode-locale.hash b/package/perl-encode-locale/perl-encode-locale.hash index 1b6a6bcbc9..258eb295a7 100644 --- a/package/perl-encode-locale/perl-encode-locale.hash +++ b/package/perl-encode-locale/perl-encode-locale.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 fcfdb8e4ee34bcf62aed429b4a23db27 Encode-Locale-1.05.tar.gz sha256 176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 Encode-Locale-1.05.tar.gz + +# computed by scancpan +sha256 edfeacafbed5a0f2c4a2a3db3fb0274a7f210768d01c853c60b7feac841c83c8 README From c19f739589534cedae845987a1599995ba203a37 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:32 +0200 Subject: [PATCH 1752/2640] perl-file-listing: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-file-listing/perl-file-listing.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 1549c5af17..6189948a19 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 83f636b477741f3a014585bb9cc079a6 File-Listing-6.04.tar.gz sha256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5 File-Listing-6.04.tar.gz + +# computed by scancpan +sha256 9ee526d1593c48e65141aea5567f0cdf156eb57e68448cd91584c7aae92bd787 README From 72e3ec870ace078841dd32ed1e80a25959486609 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:33 +0200 Subject: [PATCH 1753/2640] perl-file-util: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-file-util/perl-file-util.hash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/perl-file-util/perl-file-util.hash b/package/perl-file-util/perl-file-util.hash index dc3e59e325..0915494f76 100644 --- a/package/perl-file-util/perl-file-util.hash +++ b/package/perl-file-util/perl-file-util.hash @@ -1,3 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 5706487ecf0daae885f709914915e832 File-Util-4.161950.tar.gz sha256 88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee File-Util-4.161950.tar.gz + +# computed by scancpan +sha256 5f3732812570654ba911e45ec4e5f7353f4b63747ebfc506c543e8fb1ccf797f COPYING +sha256 48428fd07c402ea82d3556753ca936c7030f0d7a6a93c3ef09423c36820ffb91 LICENSE From 2f991008700d4eaa01d2be02822492ddd14e6c5d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:34 +0200 Subject: [PATCH 1754/2640] perl-gdgraph: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-gdgraph/perl-gdgraph.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-gdgraph/perl-gdgraph.hash b/package/perl-gdgraph/perl-gdgraph.hash index 2e85452c18..ea994519dd 100644 --- a/package/perl-gdgraph/perl-gdgraph.hash +++ b/package/perl-gdgraph/perl-gdgraph.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 38c6a188519e6272e9b2b722b315c3d8 GDGraph-1.54.tar.gz sha256 b96f5c10b656c17d16ab65a1777c908297b028d3b6815f6d54b2337f006bfa4f GDGraph-1.54.tar.gz + +# computed by scancpan +sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE From b97977f5a1060dd64f596549466a56921db4efd1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:35 +0200 Subject: [PATCH 1755/2640] perl-gdtextutil: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-gdtextutil/perl-gdtextutil.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-gdtextutil/perl-gdtextutil.hash b/package/perl-gdtextutil/perl-gdtextutil.hash index 7996ed9d3d..f0e947f63c 100644 --- a/package/perl-gdtextutil/perl-gdtextutil.hash +++ b/package/perl-gdtextutil/perl-gdtextutil.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 941ad06eadc86b47f3a32da405665c41 GDTextUtil-0.86.tar.gz sha256 886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc GDTextUtil-0.86.tar.gz + +# computed by scancpan +sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE From bc25b53296846846d27bd5ee289f2116fc14c37a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:36 +0200 Subject: [PATCH 1756/2640] perl-html-parser: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-html-parser/perl-html-parser.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index 0c0bb1f298..f06ec034b7 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 eb7505e5f626913350df9dd4a03d54a8 HTML-Parser-3.72.tar.gz sha256 ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b HTML-Parser-3.72.tar.gz + +# computed by scancpan +sha256 663867028ae22c6f2fabab11238f65f1bf8dd789233b844bead5f6d22220d160 README From a49d6c5e75f180043dc6e2eab24c2c768b9abe37 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:37 +0200 Subject: [PATCH 1757/2640] perl-html-tagset: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-html-tagset/perl-html-tagset.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-html-tagset/perl-html-tagset.hash b/package/perl-html-tagset/perl-html-tagset.hash index a4cf09082c..9569ece662 100644 --- a/package/perl-html-tagset/perl-html-tagset.hash +++ b/package/perl-html-tagset/perl-html-tagset.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 d2bfa18fe1904df7f683e96611e87437 HTML-Tagset-3.20.tar.gz sha256 adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 HTML-Tagset-3.20.tar.gz + +# computed by scancpan +sha256 275cc182d78ac2db6856442c5d334c925350fb56fe83ee3577f5850317423419 README From 9d7686a8e18e2a8febf81699b6310dcd2209cab6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:38 +0200 Subject: [PATCH 1758/2640] perl-http-cookies: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-http-cookies/perl-http-cookies.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-http-cookies/perl-http-cookies.hash b/package/perl-http-cookies/perl-http-cookies.hash index 361d4db923..e504063fa7 100644 --- a/package/perl-http-cookies/perl-http-cookies.hash +++ b/package/perl-http-cookies/perl-http-cookies.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 7bf1e277bd5c886bc18d21eb8423b65f HTTP-Cookies-6.04.tar.gz sha256 0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4 HTTP-Cookies-6.04.tar.gz + +# computed by scancpan +sha256 f67a84709b8757e38e389ea9ab7cdef424d2b7cf999a92556ffd0b61ff87600d LICENSE From 6f31e5575718920b2f0132ab6ec3ba8a98e73127 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:39 +0200 Subject: [PATCH 1759/2640] perl-http-daemon: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-http-daemon/perl-http-daemon.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index f4f6023083..f7bf64f636 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 ed0ae02d25d7f1e89456d4d69732adc2 HTTP-Daemon-6.01.tar.gz sha256 43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2 HTTP-Daemon-6.01.tar.gz + +# computed by scancpan +sha256 6a23ab5e150eeab25c21065446beda077352181aa024972ae06965c377f5b15f README From 324010193e55b11511725928942056ee1c353459 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:40 +0200 Subject: [PATCH 1760/2640] perl-http-date: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-http-date/perl-http-date.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-http-date/perl-http-date.hash b/package/perl-http-date/perl-http-date.hash index db85cd061c..f74ca0cd83 100644 --- a/package/perl-http-date/perl-http-date.hash +++ b/package/perl-http-date/perl-http-date.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 52b7a0d5982d61be1edb217751d7daba HTTP-Date-6.02.tar.gz sha256 e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333 HTTP-Date-6.02.tar.gz + +# computed by scancpan +sha256 fad3a7732ff63e3521b94baea45d82a300edf8e0a5cf571ef2661c894e196632 README From fd0fd23a3befe1d4639663c0797c52985a606f49 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:41 +0200 Subject: [PATCH 1761/2640] perl-http-negotiate: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-http-negotiate/perl-http-negotiate.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-http-negotiate/perl-http-negotiate.hash b/package/perl-http-negotiate/perl-http-negotiate.hash index f1db2fff65..e561496f26 100644 --- a/package/perl-http-negotiate/perl-http-negotiate.hash +++ b/package/perl-http-negotiate/perl-http-negotiate.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 1236195250e264d7436e7bb02031671b HTTP-Negotiate-6.01.tar.gz sha256 1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 HTTP-Negotiate-6.01.tar.gz + +# computed by scancpan +sha256 7a2114bb46279309f8a67e359ab0a578a4e9a7c7add0d1725de46b44f6da6514 README From 9f26e91cc58cab4870f950b0fe145ae9f9105d9b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:42 +0200 Subject: [PATCH 1762/2640] perl-io-html: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-io-html/perl-io-html.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-io-html/perl-io-html.hash b/package/perl-io-html/perl-io-html.hash index 8d8c48d433..d8d865e8da 100644 --- a/package/perl-io-html/perl-io-html.hash +++ b/package/perl-io-html/perl-io-html.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 3f8958718844dc96b9f6946f21d70d22 IO-HTML-1.001.tar.gz sha256 ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 IO-HTML-1.001.tar.gz + +# computed by scancpan +sha256 b386f0545c17589141d98810dd46aa1c4a14d7028cae6bdd807969639ea7405e LICENSE From 7e3d92d0917513c90e34f8fe2148ab1d2701a97e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:43 +0200 Subject: [PATCH 1763/2640] perl-json-tiny: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-json-tiny/perl-json-tiny.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-json-tiny/perl-json-tiny.hash b/package/perl-json-tiny/perl-json-tiny.hash index 86478da9a8..48fae2b0cd 100644 --- a/package/perl-json-tiny/perl-json-tiny.hash +++ b/package/perl-json-tiny/perl-json-tiny.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 aa006882222e17a94295b3a655aab91b JSON-Tiny-0.58.tar.gz sha256 ad42e9137f5148df7fdb22aa52186b306032977bcd70d49f44a288070e4f0f23 JSON-Tiny-0.58.tar.gz + +# computed by scancpan +sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE From afbba05e373285a3dae71818e50e381bf52b4fd2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:44 +0200 Subject: [PATCH 1764/2640] perl-lwp-mediatypes: add licence hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash index 0f6fee9230..b459bb0663 100644 --- a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash +++ b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 8c5f25fb64b974d22aff424476ba13c9 LWP-MediaTypes-6.02.tar.gz sha256 18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676 LWP-MediaTypes-6.02.tar.gz + +# computed by scancpan +sha256 0844071ccbc184e7376c61051986c0b7bc3f0e6094c052ceaafd3d057673c17d README From 59a7c1c5274db364040a06339e721c2827156c20 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:45 +0200 Subject: [PATCH 1765/2640] perl-mime-base64: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mime-base64/perl-mime-base64.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-mime-base64/perl-mime-base64.hash b/package/perl-mime-base64/perl-mime-base64.hash index 0cfe598c89..77bd7b0631 100644 --- a/package/perl-mime-base64/perl-mime-base64.hash +++ b/package/perl-mime-base64/perl-mime-base64.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 ef958dc2bf96be5f759391c6ac1debd4 MIME-Base64-3.15.tar.gz sha256 7f863566a6a9cb93eda93beadb77d9aa04b9304d769cea3bb921b9a91b3a1eb9 MIME-Base64-3.15.tar.gz + +# computed by scancpan +sha256 08e6898e3d62619e83880832ec42ae8a2984257e4c244843db9d3b9b7fcff236 README From 2f79652e8dd5359b9748f07abee96e83788e9d7e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:46 +0200 Subject: [PATCH 1766/2640] perl-module-build: add license file Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-module-build/perl-module-build.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-module-build/perl-module-build.hash b/package/perl-module-build/perl-module-build.hash index 17e8b4e5de..fa0f223165 100644 --- a/package/perl-module-build/perl-module-build.hash +++ b/package/perl-module-build/perl-module-build.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 b74c2f6e84b60aad3a3defd30b6f0f4d Module-Build-0.4224.tar.gz sha256 a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782 Module-Build-0.4224.tar.gz + +# computed by scancpan +sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE From 5836067fd408699cb7bb35294b25193b7dfc84d8 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:47 +0200 Subject: [PATCH 1767/2640] perl-netaddr-ip: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-netaddr-ip/perl-netaddr-ip.hash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.hash b/package/perl-netaddr-ip/perl-netaddr-ip.hash index fde62b1223..ce0477d978 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.hash +++ b/package/perl-netaddr-ip/perl-netaddr-ip.hash @@ -1,3 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 990dfcbffae356835c536e8ab56a2880 NetAddr-IP-4.079.tar.gz sha256 ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7 NetAddr-IP-4.079.tar.gz + +# computed by scancpan +sha256 b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88 Artistic +sha256 773a84089e32147cffef4c6fa127a14658c8c5866987d71d86f0fe22161780f4 Copying From 58275faca50de50d95a13cb17cfeed694e23f343 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:48 +0200 Subject: [PATCH 1768/2640] perl-path-tiny: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-path-tiny/perl-path-tiny.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 49b6661e78..c73b621ebb 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 17354181d9794df01be555b25114dd24 Path-Tiny-0.104.tar.gz sha256 c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef Path-Tiny-0.104.tar.gz + +# computed by scancpan +sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE From de6d681d344222840cd7589f1890031703764910 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:49 +0200 Subject: [PATCH 1769/2640] perl-timedate: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-timedate/perl-timedate.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-timedate/perl-timedate.hash b/package/perl-timedate/perl-timedate.hash index 28a9f078d0..234136d0c8 100644 --- a/package/perl-timedate/perl-timedate.hash +++ b/package/perl-timedate/perl-timedate.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 b1d91153ac971347aee84292ed886c1c TimeDate-2.30.tar.gz sha256 75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86 TimeDate-2.30.tar.gz + +# computed by scancpan +sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README From d8763ae58c68d8c79d38f47dba5dde43f831f485 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:50 +0200 Subject: [PATCH 1770/2640] perl-try-tiny: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-try-tiny/perl-try-tiny.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index 85f6040119..65731bc14b 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz + +# computed by scancpan +sha256 6c7eb089021283de176a5c838217ae16453cf9f67899b27cdcd0827045f6f781 README From 413f592d916e7f8acbaafa1699f73160ee1c8e57 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:51 +0200 Subject: [PATCH 1771/2640] perl-www-robotrules: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-www-robotrules/perl-www-robotrules.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-www-robotrules/perl-www-robotrules.hash b/package/perl-www-robotrules/perl-www-robotrules.hash index 9091a29659..41f2d7a19a 100644 --- a/package/perl-www-robotrules/perl-www-robotrules.hash +++ b/package/perl-www-robotrules/perl-www-robotrules.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 b7186e8b8b3701e70c22abf430742403 WWW-RobotRules-6.02.tar.gz sha256 46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e WWW-RobotRules-6.02.tar.gz + +# computed by scancpan +sha256 fa375c4f771b92fc076b6c66e19440a0fff51dacf489fecd94bf560091279e05 README From 4771628ff1b2fbeaf10b8fa889dbb8edb4f90f05 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:52 +0200 Subject: [PATCH 1772/2640] perl-xml-libxml: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-xml-libxml/perl-xml-libxml.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-xml-libxml/perl-xml-libxml.hash b/package/perl-xml-libxml/perl-xml-libxml.hash index bbe841a603..a3f4d5d643 100644 --- a/package/perl-xml-libxml/perl-xml-libxml.hash +++ b/package/perl-xml-libxml/perl-xml-libxml.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 43546fd9a3974f19323f9fb04861ece9 XML-LibXML-2.0132.tar.gz sha256 721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476 XML-LibXML-2.0132.tar.gz + +# computed by scancpan +sha256 5046a7ec515cc1542beafdf2eadeeff24cc221fc3fde9913dd144fd263ae6100 LICENSE From 6d3ce550f65e693c8243c2ac8158553caab021ab Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:53 +0200 Subject: [PATCH 1773/2640] perl-xml-namespacesupport: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../perl-xml-namespacesupport/perl-xml-namespacesupport.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash index d55551c11c..e5a98ecf48 100644 --- a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash +++ b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 a8916c6d095bcf073e1108af02e78c97 XML-NamespaceSupport-1.12.tar.gz sha256 47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef XML-NamespaceSupport-1.12.tar.gz + +# computed by scancpan +sha256 3fed787f0f9e1d74024ec7ae5f0f4736c693bcf263781da2054eb4bb1337e911 LICENSE From 24523be8388e92ca0eff113c6f9d67a58083772c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 10:16:54 +0200 Subject: [PATCH 1774/2640] perl-xml-sax-base: add license hash Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-xml-sax-base/perl-xml-sax-base.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/perl-xml-sax-base/perl-xml-sax-base.hash b/package/perl-xml-sax-base/perl-xml-sax-base.hash index a51e1d1b14..1542922b17 100644 --- a/package/perl-xml-sax-base/perl-xml-sax-base.hash +++ b/package/perl-xml-sax-base/perl-xml-sax-base.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ md5 ec347a14065dd7aec7d9fb181b2d7946 XML-SAX-Base-1.09.tar.gz sha256 66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 XML-SAX-Base-1.09.tar.gz + +# computed by scancpan +sha256 2a9aae56e13888493523ee9053689627e092aafcf2c5fb06f06df07260f91b42 README From 8d4f508a3199d52e930ab2d33027a8b73f1731d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Jun 2018 10:41:49 +0200 Subject: [PATCH 1775/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.1.2 Removed patch 0003, applied upstream: https://cgit.freedesktop.org/mesa/mesa/commit/?h=18.1&id=f9500edb96b7b50a6ab29ebf694610f0112d741f Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...03-configure.ac-rework-latomic-check.patch | 124 ------------------ package/mesa3d/mesa3d.hash | 10 +- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 7 insertions(+), 131 deletions(-) delete mode 100644 package/mesa3d/0003-configure.ac-rework-latomic-check.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1ce30f7dcf..846091eb57 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.1.1 +MESA3D_HEADERS_VERSION = 18.1.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0003-configure.ac-rework-latomic-check.patch b/package/mesa3d/0003-configure.ac-rework-latomic-check.patch deleted file mode 100644 index ee8107d2ad..0000000000 --- a/package/mesa3d/0003-configure.ac-rework-latomic-check.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 5865c7cb4e4ed1d63699e384ea52984448adfec9 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 7 May 2018 10:36:10 +0200 -Subject: [PATCH] configure.ac: rework -latomic check - -The configure.ac logic added in commit -2ef7f23820a67e958c2252bd81eb0458903ebf33 ("configure: check if --latomic is needed for __atomic_*") makes the assumption that if a -64-bit atomic intrinsic test program fails to link without -latomic, -it is because we must use -latomic. - -Unfortunately, this is not completely correct: libatomic only appeared -in gcc 4.8, and therefore gcc versions before that will not have -libatomic, and therefore don't provide atomic intrinsics for all -architectures. This issue was for example encountered on PowerPC with -a gcc 4.7 toolchain, where the build fails with: - -powerpc-ctng_e500v2-linux-gnuspe/bin/ld: cannot find -latomic - -This commit aims at fixing that, by not assuming -latomic is -available. The commit re-organizes the atomic intrinsics detection as -follows: - - (1) Test if a program using 64-bit atomic intrinsics links properly, - without -latomic. If this is the case, we have atomic intrinsics, - and we're good to go. - - (2) If (1) has failed, then test to link the same program, but this - time with -latomic in LDFLAGS. If this is the case, then we have - atomic intrinsics, provided we link with -latomic. - -This has been tested in three situations: - - - On x86-64, where atomic instrinsics are all built-in, with no need - for libatomic. In this case, config.log contains: - - GCC_ATOMIC_BUILTINS_SUPPORTED_FALSE='#' - GCC_ATOMIC_BUILTINS_SUPPORTED_TRUE='' - LIBATOMIC_LIBS='' - - This means: atomic intrinsics are available, and we don't need to - link with libatomic. - - - On NIOS2, where atomic intrinsics are available, but some of them - (64-bit ones) require using libatomic. In this case, config.log - contains: - - GCC_ATOMIC_BUILTINS_SUPPORTED_FALSE='#' - GCC_ATOMIC_BUILTINS_SUPPORTED_TRUE='' - LIBATOMIC_LIBS='-latomic' - - This means: atomic intrinsics are available, and we need to link - with libatomic. - - - On PowerPC with an old gcc 4.7 toolchain, where 32-bit atomic - instrinsics are available, but not 64-bit atomic instrinsics, and - there is no libatomic. In this case, config.log contains: - - GCC_ATOMIC_BUILTINS_SUPPORTED_FALSE='' - GCC_ATOMIC_BUILTINS_SUPPORTED_TRUE='#' - - With means that atomic intrinsics are not usable. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://lists.freedesktop.org/archives/mesa-dev/2018-May/194214.html ---- - configure.ac | 37 +++++++++++++++++++++---------------- - 1 file changed, 21 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..c94e547874 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -433,26 +433,31 @@ fi - AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1]) - AC_SUBST([SSE41_CFLAGS], $SSE41_CFLAGS) - --dnl Check for new-style atomic builtins --AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+dnl Check for new-style atomic builtins. We first check without linking to -+dnl -latomic. -+AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+#include - int main() { -- int n; -- return __atomic_load_n(&n, __ATOMIC_ACQUIRE); -+ uint64_t n; -+ return (int)__atomic_load_n(&n, __ATOMIC_ACQUIRE); - }]])], GCC_ATOMIC_BUILTINS_SUPPORTED=1) -+ -+dnl If that didn't work, we try linking with -latomic, which is needed on some -+dnl platforms. -+if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != x1; then -+ save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -latomic" -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+ #include -+ int main() { -+ uint64_t n; -+ return (int)__atomic_load_n(&n, __ATOMIC_ACQUIRE); -+ }]])], GCC_ATOMIC_BUILTINS_SUPPORTED=1 LIBATOMIC_LIBS="-latomic") -+ LDFLAGS=$save_LDFLAGS -+fi -+ - if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then - DEFINES="$DEFINES -DUSE_GCC_ATOMIC_BUILTINS" -- dnl On some platforms, new-style atomics need a helper library -- AC_MSG_CHECKING(whether -latomic is needed) -- AC_LINK_IFELSE([AC_LANG_SOURCE([[ -- #include -- uint64_t v; -- int main() { -- return (int)__atomic_load_n(&v, __ATOMIC_ACQUIRE); -- }]])], GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=no, GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=yes) -- AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC) -- if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then -- LIBATOMIC_LIBS="-latomic" -- fi - fi - AC_SUBST([LIBATOMIC_LIBS]) - --- -2.14.3 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d8c7105fe7..77b3eb1c67 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-June/196523.html -md5 063468c930ff61d211ece0191874fa95 mesa-18.1.1.tar.xz -sha1 60d6b58f8f119b3731de587bdad30c1ecbb52678 mesa-18.1.1.tar.xz -sha256 d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781 mesa-18.1.1.tar.xz -sha512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 mesa-18.1.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-June/000437.html +md5 a2d4f031eb6bd6111d44d84004476918 mesa-18.1.2.tar.xz +sha1 938d22b966e9861a5387d31c44cd4753931d3076 mesa-18.1.2.tar.xz +sha256 070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9 mesa-18.1.2.tar.xz +sha512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5 mesa-18.1.2.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 3a0cf6c7835f98f86d5579b2cc517f84254da7411f764fb0095a383fb0759771 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index a323747e61..6e1e27f62f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.1.1 +MESA3D_VERSION = 18.1.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 35fbd0a7ebe44f67203a0728b15bc1f90b9ea571 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Jun 2018 10:20:29 +0200 Subject: [PATCH 1776/2640] linux: bump default to version 4.17.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 603aec6b9e..75a175391b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From a5a9beb7d9a423bbc9916cbfca87ffcab4c74705 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Jun 2018 10:20:30 +0200 Subject: [PATCH 1777/2640] linux-headers: bump 4.{4, 9, 14, 16, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0a8ca79b08..24a2433f27 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.137" if BR2_KERNEL_HEADERS_4_4 - default "4.9.108" if BR2_KERNEL_HEADERS_4_9 + default "4.4.138" if BR2_KERNEL_HEADERS_4_4 + default "4.9.109" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.49" if BR2_KERNEL_HEADERS_4_14 + default "4.14.50" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.15" if BR2_KERNEL_HEADERS_4_16 - default "4.17.1" if BR2_KERNEL_HEADERS_4_17 + default "4.16.16" if BR2_KERNEL_HEADERS_4_16 + default "4.17.2" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From f155bb619f99fe1586f5b71af2abd79632fd44cc Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 16 Jun 2018 17:46:08 +0200 Subject: [PATCH 1778/2640] perl-gd: bump to version 2.68 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-gd/perl-gd.hash | 7 +++++-- package/perl-gd/perl-gd.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index ad30e0a170..c1990e4949 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,3 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b9cfc5a677b5e9fa607be1379f789855 GD-2.67.tar.gz -sha256 93a47c2259979cf20c6a39c9e03e0da87a9a855d8b650fb68a08d16a96684246 GD-2.67.tar.gz +md5 b18bf9698608699309dfb3d09e260c63 GD-2.68.tar.gz +sha256 6aa3de0d49c22011d412789be664c46520b8d4eb4920fe30dbac501b88515e5c GD-2.68.tar.gz + +# computed by scancpan +sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 81070a939d..3686e9c871 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.67 +PERL_GD_VERSION = 2.68 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = zlib libpng freetype gd From a5ff91f36e3b0c4aa475b9e30a9ccdff6178e9ec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Jun 2018 23:39:18 +0200 Subject: [PATCH 1779/2640] package/mesa3d: fix musl build error Fixes http://autobuild.buildroot.net/results/ccd/ccd07150e459b2b2caba6e561ecc6eae60c83ef5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/0003-musl-time-h.patch | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mesa3d/0003-musl-time-h.patch diff --git a/package/mesa3d/0003-musl-time-h.patch b/package/mesa3d/0003-musl-time-h.patch new file mode 100644 index 0000000000..811d135622 --- /dev/null +++ b/package/mesa3d/0003-musl-time-h.patch @@ -0,0 +1,33 @@ +From 3c288da5eec81ee58b85927df18d9194ead8f5c2 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 12 Jun 2018 11:59:01 +0100 +Subject: drivers/dri/i965: add missing #include + +brw_bufmgr.h uses time_t without include time.h, so the build fails under musl. + +Reviewed-by: Eric Engestrom + +Downloaded from upstream commit +https://cgit.freedesktop.org/mesa/mesa/commit/src/mesa/drivers/dri/i965/brw_bufmgr.h?id=3c288da5eec81ee58b85927df18d9194ead8f5c2 + +Signed-off-by: Bernd Kuhls +--- + src/mesa/drivers/dri/i965/brw_bufmgr.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h +index 8cdf944..32fc7a5 100644 +--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,8 @@ + #include + #include + #include ++#include ++ + #include "util/u_atomic.h" + #include "util/list.h" + +-- +cgit v1.1 + From 88813806cb45b5bf50b99f90b9718ccafdfdb63f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Jun 2018 10:40:17 +0200 Subject: [PATCH 1780/2640] package/tor: bump version to 0.3.3.7 Release notes: https://blog.torproject.org/tor-0337-released Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index ca015a8dc0..554d5906b6 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7 tor-0.3.3.6.tar.gz +sha256 ea6bb512c4adfbc4e05b22e4c2d06bddff5b358a53de982273fec846b75bde0c tor-0.3.3.7.tar.gz sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index f7af718b9b..39006e7caf 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.3.6 +TOR_VERSION = 0.3.3.7 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 64baf3def763fe962f19d7ca083cf019a73f6281 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 16 Jun 2018 23:44:08 +0100 Subject: [PATCH 1781/2640] package/nodejs: security bump to version 8.11.3 Fixes the following security issues: - (CVE-2018-7167): Fixes Denial of Service vulnerability where calling Buffer.fill() could hang - (CVE-2018-7161): Fixes Denial of Service vulnerability by updating the http2 implementation to not crash under certain circumstances during cleanup - (CVE-2018-1000168): Fixes Denial of Service vulnerability by upgrading nghttp2 to 1.32.0 See https://nodejs.org/en/blog/release/v8.11.3/ for more details Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 25b035d694..be4c3de4f7 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From http://nodejs.org/dist/v8.11.2/SHASUMS256.txt -sha256 539946c0381809576bed07424a35fc1740d52f4bd56305d6278d9e76c88f4979 node-v8.11.2.tar.xz +# From http://nodejs.org/dist/v8.11.3/SHASUMS256.txt +sha256 577c751fdca91c46c60ffd8352e5b465881373bfdde212c17c3a3c1bd2616ee0 node-v8.11.3.tar.xz # Hash for license file sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 0c7db83012..61cd03bb8f 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.11.2 +NODEJS_VERSION = 8.11.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From b5da9637ec97a8159d4d92b13ee392f9e656cd94 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 15 Jun 2018 23:21:25 +0200 Subject: [PATCH 1782/2640] network-manager: fix package prompt name Rename the prompt string for consistency with the package directory name. Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 72658c1278..9602cc4a1a 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_NETWORK_MANAGER - bool "networkmanager" + bool "network-manager" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_MMU # dbus From 19448f40a0e9cfd6b3ff7f22c38a4b893cf36690 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 15 Jun 2018 10:48:38 +0200 Subject: [PATCH 1783/2640] gnutls: use included unistring unless libunistring is selected Use the included copy of libunistring unless BR2_PACKAGE_LIBUNISTRING is already selected. The resulting gnutls library with libunistring included is about 1.2 MB smaller than the sum of libgnutls and libunistring. Signed-off-by: Sven Neumann Signed-off-by: Thomas Petazzoni --- package/gnutls/Config.in | 1 - package/gnutls/gnutls.mk | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 176951a385..ef995d21d2 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_GNUTLS depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBTASN1 - select BR2_PACKAGE_LIBUNISTRING select BR2_PACKAGE_NETTLE select BR2_PACKAGE_PCRE help diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 3d1a627781..fec07dfe03 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -10,7 +10,7 @@ GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER -GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_CONF_OPTS = \ --disable-doc \ --disable-guile \ @@ -19,7 +19,6 @@ GNUTLS_CONF_OPTS = \ --enable-local-libopts \ --enable-openssl-compatibility \ --with-libnettle-prefix=$(STAGING_DIR)/usr \ - --with-libunistring-prefix=$(STAGING_DIR)/usr \ --with-librt-prefix=$(STAGING_DIR) \ --without-tpm \ $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) @@ -82,6 +81,13 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif +ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) +GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr +GNUTLS_DEPENDENCIES += libunistring +else +GNUTLS_CONF_OPTS += --with-included-unistring +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) GNUTLS_CONF_OPTS += --with-zlib GNUTLS_DEPENDENCIES += zlib From b08b9490a1f766f111c974b90228dda0d9cdff24 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Jun 2018 00:07:00 +0200 Subject: [PATCH 1784/2640] package/mediastreamer: add another optional dependency to speexdsp Fixes http://autobuild.buildroot.net/results/b21/b2104c491f0898981c652043161c52ac6c43110f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mediastreamer/mediastreamer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index d3b70f4ca9..3c9756936a 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -60,7 +60,7 @@ else MEDIASTREAMER_CONF_OPTS += --disable-pulseaudio endif -ifeq ($(BR2_PACKAGE_SPEEX),y) +ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) MEDIASTREAMER_CONF_OPTS += --enable-speex MEDIASTREAMER_DEPENDENCIES += speex else From 9e21ee71a8eca328b9e54bfc1023c0ce487ba5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:31:58 -0400 Subject: [PATCH 1785/2640] qt5canvas3d: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `canvas3d' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5canvas3d/qt5canvas3d.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index 13e233f237..3cdf59a157 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -26,8 +26,15 @@ define QT5CANVAS3D_INSTALL_STAGING_CMDS $(QT5_LA_PRL_FILES_FIXUP) endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5CANVAS3D_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/canvas3d $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + define QT5CANVAS3D_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtCanvas3D $(TARGET_DIR)/usr/qml/ + $(QT5CANVAS3D_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 2f8bfba3655ccee69c2c16f0aeefc7afeec83483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:31:59 -0400 Subject: [PATCH 1786/2640] qt5location: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `location' and `positioning' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5location/qt5location.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 05cd1168a3..18253e9965 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -44,6 +44,12 @@ define QT5LOCATION_INSTALL_TARGET_LOCATION cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/ endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5LOCATION_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/location $(TARGET_DIR)/usr/lib/qt/examples/ + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/positioning $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif endif define QT5LOCATION_INSTALL_TARGET_POSITION @@ -55,6 +61,7 @@ define QT5LOCATION_INSTALL_TARGET_CMDS $(QT5LOCATION_INSTALL_TARGET_POSITION) $(QT5LOCATION_INSTALL_TARGET_LOCATION) $(QT5LOCATION_INSTALL_TARGET_QMLS) + $(QT5LOCATION_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 39f17dea025ea3e45f288973fd0c75286e96d585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:00 -0400 Subject: [PATCH 1787/2640] qt5quickcontrols: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `quickcontrols' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 5517cc1537..6e551d5a27 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -25,6 +25,12 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick @@ -43,6 +49,7 @@ define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) + $(QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 259f6782a99794044ea6aec43d6766e4fae30d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:01 -0400 Subject: [PATCH 1788/2640] qt5script: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `script' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5script/qt5script.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index fe0ad9e888..4a292c95a5 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -41,9 +41,20 @@ define QT5SCRIPT_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -define QT5SCRIPT_INSTALL_TARGET_CMDS +define QT5SCRIPT_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5SCRIPT_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/script $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + +define QT5SCRIPT_INSTALL_TARGET_CMDS + $(QT5SCRIPT_INSTALL_TARGET_LIBS) + $(QT5SCRIPT_INSTALL_TARGET_EXAMPLES) +endef + $(eval $(generic-package)) From 752a2743e262b4732da92cb5e3b10c55f7b830e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:02 -0400 Subject: [PATCH 1789/2640] qt5wayland: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `wayland' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5wayland/qt5wayland.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index d018cccd6d..98e592f03d 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -51,11 +51,18 @@ endef endif endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5WAYLAND_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + define QT5WAYLAND_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms $(QT5WAYLAND_INSTALL_COMPOSITOR) + $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 7892aacc881cfc41226866f31294d6ac27c38ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:03 -0400 Subject: [PATCH 1790/2640] qt5svg: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `svg' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5svg/qt5svg.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 168c4c063f..48ff04bd75 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -37,12 +37,23 @@ define QT5SVG_INSTALL_ICONENGINES endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5SVG_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/svg $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + ifeq ($(BR2_STATIC_LIBS),) -define QT5SVG_INSTALL_TARGET_CMDS +define QT5SVG_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ $(QT5SVG_INSTALL_ICONENGINES) endef endif +define QT5SVG_INSTALL_TARGET_CMDS + $(QT5SVG_INSTALL_TARGET_LIBS) + $(QT5SVG_INSTALL_TARGET_EXAMPLES) +endef + $(eval $(generic-package)) From 4188f95c415221832fcc6f75944c05903983e5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:04 -0400 Subject: [PATCH 1791/2640] qt5serialbus: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `serialbus' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index c9a2139556..6de9f9b7d3 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -36,8 +36,15 @@ define QT5SERIALBUS_INSTALL_TARGET_LIBS endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5SERIALBUS_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialbus $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + define QT5SERIALBUS_INSTALL_TARGET_CMDS $(QT5SERIALBUS_INSTALL_TARGET_LIBS) + $(QT5SERIALBUS_INSTALL_TARGET_EXAMPLES) $(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \ $(TARGET_DIR)/usr/bin/canbusutil endef From 6ce2eaaab97d33f0688f5a41f8961a8464813812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:05 -0400 Subject: [PATCH 1792/2640] qt5serialport: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `serialport' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5serialport/qt5serialport.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 1cddaf857e..2b0953586b 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -32,9 +32,20 @@ define QT5SERIALPORT_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALPORT_INSTALL_TARGET_CMDS +define QT5SERIALPORT_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5SERIALPORT_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialport $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + +define QT5SERIALPORT_INSTALL_TARGET_CMDS + $(QT5SERIALPORT_INSTALL_TARGET_LIBS) + $(QT5SERIALPORT_INSTALL_TARGET_EXAMPLES) +endef + $(eval $(generic-package)) From 9d2d810a6c3fb95d764a7ff4d2e7c9554fd8c1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 08:32:06 -0400 Subject: [PATCH 1793/2640] qt5sensors: install examples to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When BR2_PACKAGE_QT5BASE_EXAMPLES is set, the examples for this module are installed in the staging directory but they are not shipped to the target. This commit copies the examples `sensors' from the staging directory to the target. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5sensors/qt5sensors.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 805abcccd1..2d5cf327a6 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -48,9 +48,16 @@ define QT5SENSORS_INSTALL_TARGET_QMLS endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5SENSORS_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/sensors $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + define QT5SENSORS_INSTALL_TARGET_CMDS $(QT5SENSORS_INSTALL_TARGET_LIBS) $(QT5SENSORS_INSTALL_TARGET_QMLS) + $(QT5SENSORS_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 15706f86baf4e4f3ad7d0b9b5dadfb5710a9296b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 11 Jun 2018 09:54:17 -0400 Subject: [PATCH 1794/2640] qt5script: fix build issue with 32-bits armv8-a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds WTF platform support for the 32-bits armv8-a architectures. Fixes: In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26, from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44: ../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture" # error "Not supported ARM architecture" ^~~~~ The patch is based on two upstream fixes in WebKit[1][2]. See also commit cea7aa873a. [1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb [2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- ...-Detect-32-bits-armv8-a-architecture.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch diff --git a/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch new file mode 100644 index 0000000000..7e4e524dc9 --- /dev/null +++ b/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch @@ -0,0 +1,49 @@ +From daf2e222903bacf85f27dfb0fffc4459bbf58b77 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Sun, 10 Jun 2018 08:23:50 -0400 +Subject: [PATCH] Detect 32-bits armv8-a architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +These toolchains define __ARM_ARCH_8A__ (for ARM architecture version) +and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). + +This commit catches this new architecture (armv8a) within a #ifdef/#endif +inside the if statement dedicated for 32-bits ARM detection. See commit +from WebKit [1] and [2]. + +Fixes: + + In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26, + from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44: + ../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture" + # error "Not supported ARM architecture" + ^~~~~ + +[1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb +[2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6 + +Signed-off-by: Gaël PORTAY +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 00caa6d..c4b758e 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -306,6 +306,10 @@ + || defined(__ARM_ARCH_7R__) + #define WTF_ARM_ARCH_VERSION 7 + ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) ++#define WTF_ARM_ARCH_VERSION 8 ++ + /* RVCT sets _TARGET_ARCH_ARM */ + #elif defined(__TARGET_ARCH_ARM) + #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM +-- +2.17.1 + From e922bbc7aef31267bea730a1d4a98ec2eabdf761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 11 Jun 2018 09:56:55 -0400 Subject: [PATCH 1795/2640] qt53d: fix install issue with qt5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both plugins `geometryloaders' and `renderplugins' are available since Qt 5.9. Fixes: >>> qt53d 5.6.3 Installing to target cp -dpf /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.* /home/gportay/src/buildroot/output/target/usr/lib cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders': No such file or directory package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed' failed make[2]: *** [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed] Error 1 Signed-off-by: Gaël PORTAY Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
          Signed-off-by: Thomas Petazzoni --- package/qt5/qt53d/qt53d.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 6896b00318..48a931d60b 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -37,13 +37,19 @@ endef endif ifeq ($(BR2_STATIC_LIBS),) -define QT53D_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +# Available since 5.9 +define QT53D_INSTALL_TARGET_LATEST cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins +endef +endif +define QT53D_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml + $(QT53D_INSTALL_TARGET_LATEST) $(QT53D_INSTALL_TARGET_EXAMPLES) endef endif From b57b7a3571d14fec37ee8a73585bfb0ebd88c781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 11 Jun 2018 09:47:50 -0400 Subject: [PATCH 1796/2640] libusb: add an option to compile examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY [Thomas: - use make loop instead of shell loop - use $(INSTALL) instead of cp.] Signed-off-by: Thomas Petazzoni --- package/libusb/Config.in | 7 +++++++ package/libusb/libusb.mk | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/package/libusb/Config.in b/package/libusb/Config.in index 5238588aa8..d31a717fdf 100644 --- a/package/libusb/Config.in +++ b/package/libusb/Config.in @@ -6,5 +6,12 @@ config BR2_PACKAGE_LIBUSB http://libusb.info/ +if BR2_PACKAGE_LIBUSB + +config BR2_PACKAGE_LIBUSB_EXAMPLES + bool "build libusb examples" + +endif + comment "libusb needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index aee3622f8d..fe38a1d2d2 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -25,5 +25,15 @@ else LIBUSB_CONF_OPTS += --disable-udev endif +ifeq ($(BR2_PACKAGE_LIBUSB_EXAMPLES),y) +LIBUSB_CONF_OPTS += --enable-examples-build +define LIBUSB_INSTALL_TARGET_EXAMPLES + $(foreach example,listdevs xusb fxload hotplugtest testlibusb dpfp dpfp_threaded sam3u_benchmark, + $(INSTALL) -D -m0755 $(@D)/examples/$(example) $(TARGET_DIR)/usr/bin/$(example) + ) +endef +LIBUSB_POST_INSTALL_TARGET_HOOKS += LIBUSB_INSTALL_TARGET_EXAMPLES +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 90955660da1508b0ebd93c49a2896b4c32351d0c Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:02:18 +0200 Subject: [PATCH 1797/2640] imx-gpu-viv: bump to version 6.2.4.p1.2 No changelog was provided by NXP but we can assume it's the latest and therefore the greatest. What is known, is that that same version worked both ARM and ARM64. The support for the latter will be added in a follow-up patch. This package has been tested with X11, Framebuffer and Wayland back-ends: # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 # gmem_info ... display memory use per PID ... Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 2 +- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 894bc90dae..3b54eec099 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1 +1 @@ -sha256 4f93a4412c93ca5959aa2437bfed2ecbaf983b5b272be5977f76a967de5db150 imx-gpu-viv-6.2.2.p0-aarch32.bin +sha256 dddadd164bede4793409ccfb636324dd73862c33458db66a5860f126bada25dc imx-gpu-viv-6.2.4.p1.2-aarch32.bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index a339c22978..35ff9d457c 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_GPU_VIV_VERSION = 6.2.2.p0-aarch32 +IMX_GPU_VIV_VERSION = 6.2.4.p1.2-aarch32 IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin From 84afda9ca6dad5fd828ba94fa60df52c81cc7814 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:02:19 +0200 Subject: [PATCH 1798/2640] imx-gpu-viv: enable package for 64-bit i.MX processors Basically enabling the package for aarch64. One difference with 32-bit i.MX platforms resides in the fact that Wayland is the only back-end supported. Therefore X11 and Framebuffer options are masked. This was tested on i.MX8MQ Nitrogen8M platform (with weston-imx): # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 Signed-off-by: Gary Bisson [Thomas: drop BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU_WAYLAND_ONLY and use BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M directly.] Signed-off-by: Thomas Petazzoni --- package/freescale-imx/Config.in | 3 ++- package/freescale-imx/imx-gpu-viv/Config.in | 11 ++++++++++- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 1 + package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 97aeb15764..30e71b825f 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -69,7 +69,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 4e753a41f3..a2deaf2e12 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -2,10 +2,14 @@ comment "imx-gpu-viv needs a glibc toolchain with armhf enabled" depends on BR2_arm depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF +comment "imx-gpu-viv needs a glibc toolchain" + depends on BR2_aarch64 + depends on !BR2_TOOLCHAIN_USES_GLIBC + config BR2_PACKAGE_IMX_GPU_VIV bool "imx-gpu-viv" # Pre-built binaries only available for ARM EABIhf - depends on BR2_ARM_EABIHF + depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # Library binaries are linked against libc.so.6 depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL @@ -34,15 +38,20 @@ choice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "X11" depends on BR2_PACKAGE_XORG7 + # The i.MX8 blob doesn't support X11 output + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES comment "X11 backend needs Xorg package" depends on !BR2_PACKAGE_XORG7 + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" + # The i.MX8 blob doesn't support FB output + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 3b54eec099..2cbc36a185 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1 +1,2 @@ sha256 dddadd164bede4793409ccfb636324dd73862c33458db66a5860f126bada25dc imx-gpu-viv-6.2.4.p1.2-aarch32.bin +sha256 27ed3f58681cef18f87ea20946cc89b2cef4848006064303d20583e6ed7aeec7 imx-gpu-viv-6.2.4.p1.2-aarch64.bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 35ff9d457c..511e3b3b6c 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,7 +4,11 @@ # ################################################################################ +ifeq ($(BR2_aarch64),y) +IMX_GPU_VIV_VERSION = 6.2.4.p1.2-aarch64 +else IMX_GPU_VIV_VERSION = 6.2.4.p1.2-aarch32 +endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin From c72165998bba0982e4f41f97a508b08b0723cbe6 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:02:20 +0200 Subject: [PATCH 1799/2640] imx-gpu-g2d: bump to version 6.2.4.p1.2 Same as imx-gpu-viv, no changelog was provided by NXP. Tested with the following commands: # /usr/share/examples/g2d_samples/g2d_multiblit_test # /usr/share/examples/g2d_samples/g2d_overlay_test # /usr/share/examples/g2d_samples/g2d_test # gst-launch-1.0 videotestsrc ! imxg2dvideosink Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 2 +- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 299ec703f5..3bcbc558e2 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1 +1 @@ -sha256 070a95aa9942bd67e8ba4012962df74143bffb9998301ac097dab5e1437000d8 imx-gpu-g2d-6.2.2.p0.bin +sha256 5f2d2171d5cd57f37ab07184fc908a0f6ecb2a97f023f04c2f9f3b3d7fec8481 imx-gpu-g2d-6.2.4.p1.2.bin diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index aafd70dc9d..015ab628b6 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_GPU_G2D_VERSION = 6.2.2.p0 +IMX_GPU_G2D_VERSION = 6.2.4.p1.2 IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin IMX_GPU_G2D_DEPENDENCIES = imx-gpu-viv From 376377d946580549beec1058dad63d85f3e2a1e3 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 12 Jun 2018 17:02:21 +0200 Subject: [PATCH 1800/2640] kernel-module-imx-gpu-viv: bump to version 6.2.4.p1.2 This package has been tested with the following commands: # modprobe galcore # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash | 2 +- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index c6204aff0e..3ed7ca2dd9 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,2 +1,2 @@ # locally computed -sha256 35db597ae0dd8e9e80511e5e9d882a01e4c178b83ffc192c8dd6a1a35859aa13 kernel-module-imx-gpu-viv-3b9e057f29853fd29364aa666328a92b807007d7.tar.gz +sha256 ad910b7d36dc433bbbe85808d278312e9199635aaa5d00097b70ffab11bde9e6 kernel-module-imx-gpu-viv-86354002bea77acd9ce1812712e9d8485b377ec8.tar.gz diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index 2e6744c4f9..c76a5ee386 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = 3b9e057f29853fd29364aa666328a92b807007d7 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 86354002bea77acd9ce1812712e9d8485b377ec8 KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 From e69bce3a5602fa0eaf246a99a4b4e1e69f398e73 Mon Sep 17 00:00:00 2001 From: Min Xu Date: Mon, 11 Jun 2018 11:18:21 -0700 Subject: [PATCH 1801/2640] shadowsocks-libev: drop the useless hash In commit f8d44394777fb9b45befaee3333d974dfe5e745d ("shadowsocks-libev: new package"), when this package was introduced, the hash for a license file that isn't available in upstream's tarball was added to the license file. Obviously, this hash serves no purpose, so drop it. Signed-off-by: Min Xu Signed-off-by: Thomas Petazzoni --- package/shadowsocks-libev/shadowsocks-libev.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash index e8be8a8a71..fffe9fddf0 100644 --- a/package/shadowsocks-libev/shadowsocks-libev.hash +++ b/package/shadowsocks-libev/shadowsocks-libev.hash @@ -5,4 +5,3 @@ sha256 5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 shadowso sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb libbloom/LICENSE sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93 libcork/COPYING -sha256 4b3adc9ce620fa868f1dda328203dbccbd3e9f5fbafb49c581edc386a504ee1a libipset/LICENSE.txt From c3be7d770cdaed65eb98497b797aea3a6bcc27a6 Mon Sep 17 00:00:00 2001 From: Min Xu Date: Mon, 11 Jun 2018 11:18:22 -0700 Subject: [PATCH 1802/2640] shadowsocks-libev: add dependency on thread support shadowsocks-libev needs thread support, otherwise the configure script fails with: configure: error: Can not find pthreads. This is required. Signed-off-by: Min Xu Signed-off-by: Thomas Petazzoni --- package/shadowsocks-libev/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in index d02e5a93ef..56914e8e9d 100644 --- a/package/shadowsocks-libev/Config.in +++ b/package/shadowsocks-libev/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV bool "shadowsocks-libev" + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBEV @@ -11,3 +12,7 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV embedded devices and low-end boxes. https://github.com/shadowsocks/shadowsocks-libev + +comment "shadowsocks-libev needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS From 156a13fc876725624d1c14cafd60f0d32fa6d129 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 17 Jun 2018 18:26:20 +0200 Subject: [PATCH 1803/2640] perl-libwww-perl: bump to version 6.34 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl-libwww-perl/perl-libwww-perl.hash | 4 ++-- package/perl-libwww-perl/perl-libwww-perl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index a9f3a34615..5606c926b2 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 2e15c1c789ac9036c99d094e47e3da23 libwww-perl-6.33.tar.gz -sha256 97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99 libwww-perl-6.33.tar.gz +md5 725d6aac274575d614c3cc87e1a91eb8 libwww-perl-6.34.tar.gz +sha256 260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c libwww-perl-6.34.tar.gz # computed by scancpan sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 427e4c1a97..254603df7b 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.33 +PERL_LIBWWW_PERL_VERSION = 6.34 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz -PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS +PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_LIBWWW_PERL_DEPENDENCIES = \ perl-encode-locale \ perl-file-listing \ From f0c28f2a80522961c33bbcefc35b4f09dbcb6429 Mon Sep 17 00:00:00 2001 From: Min Xu Date: Mon, 11 Jun 2018 11:18:23 -0700 Subject: [PATCH 1804/2640] shadowsocks-libev: add dependency on sync builtins libcork (bundled inside shadowsocks-libev) uses the __sync builtins for atomic operations: the 4-byte variant on 32 bits platforms and the 8-byte variant on 64-bits platform. Fixes: http://autobuild.buildroot.net/results/552b09ffe951c429422529c895f4c3ec723cf5ab Signed-off-by: Min Xu Signed-off-by: Thomas Petazzoni --- package/shadowsocks-libev/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in index 56914e8e9d..f58abdbcb1 100644 --- a/package/shadowsocks-libev/Config.in +++ b/package/shadowsocks-libev/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV bool "shadowsocks-libev" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # for libcork + depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64 # for libcork depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_C_ARES @@ -14,5 +16,7 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV https://github.com/shadowsocks/shadowsocks-libev comment "shadowsocks-libev needs a toolchain w/ threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS From afc1ec707384dabd0d63d316c117f45ee8976356 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Jun 2018 17:44:57 +0200 Subject: [PATCH 1805/2640] support/docker: sort the list of installed packages As suggested in the docker best practices [0], order the package list alphabetically, and list only one package per line. This will be much usefull later, we need to update the list of installed packages, like adding new ones for example. [0] https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#sort-multi-line-arguments Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 8c525f7cf1..bebd861dc1 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -22,13 +22,30 @@ COPY apt-sources.list /etc/apt/sources.list RUN dpkg --add-architecture i386 && \ apt-get update -y RUN apt-get install -y --no-install-recommends \ - build-essential cmake libc6:i386 g++-multilib \ - bc ca-certificates file locales rsync \ - cvs bzr git mercurial subversion wget \ - cpio unzip \ + bc \ + build-essential \ + bzr \ + ca-certificates \ + cmake \ + cpio \ + cvs \ + file \ + g++-multilib \ + git \ + libc6:i386 \ libncurses5-dev \ - python-nose2 python-pexpect qemu-system-arm qemu-system-x86 \ - python-pip && \ + locales \ + mercurial \ + python-nose2 \ + python-pexpect \ + python-pip \ + qemu-system-arm \ + qemu-system-x86 \ + rsync \ + subversion \ + unzip \ + wget \ + && \ apt-get -y autoremove && \ apt-get -y clean From 567a8476ad0fa36d854db011ef4dbfdee32384f2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Jun 2018 17:44:58 +0200 Subject: [PATCH 1806/2640] support/docker: use the distro-provided flake8 Currently, we install flake8 and its dependencies via pip. We tried to be reproducible by pinning the version of those python packages, but we did forget quite a few of them, and thus some dependencies for flake8 are installed as uncontrolled versions. Furthermore, before we install flake8 and its dependencies, we forcibly update pip, setuptools, and wheels packages to their latest versions. This explicitly breaks reproducibility. While we could enforce a specific version of all those packages and still grab them from PyPI, we can simply grab them from the distribution-provided packages instead. Since we're using a pinned version of stretch, this already guarantees we'll reproducibly get the same versions over and over again. Besides, we just need to list flake8 as a package to install to automatically get all its dependencies (again, in a reproducible way). This has the slight unfortunate drawback of downgrading flake8 to version 3.2.1, from version 3.5.0, as well as downgrading a few of flake8's dependencies, as noticed by Ricardo: http://lists.busybox.net/pipermail/buildroot/2018-May/222376.html However, as Ricardo said, there isn't "any serious limitation of this old version, the release notes for a version in the between mentions 'Dramatically improve the performance' but we have a limited number of scripts and running on Gitlab for all of them still takes less than 5 minutes". Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Acked-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index bebd861dc1..36cd3b28a4 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -36,9 +36,9 @@ RUN apt-get install -y --no-install-recommends \ libncurses5-dev \ locales \ mercurial \ + python-flake8 \ python-nose2 \ python-pexpect \ - python-pip \ qemu-system-arm \ qemu-system-x86 \ rsync \ @@ -49,14 +49,6 @@ RUN apt-get install -y --no-install-recommends \ apt-get -y autoremove && \ apt-get -y clean -# For check-flake8 -RUN python -m pip install --upgrade pip setuptools wheel && \ - pip install -q \ - flake8==3.5.0 \ - mccabe==0.6.1 \ - pycodestyle==2.3.1 \ - pyflakes==1.6.0 - # To be able to generate a toolchain with locales, enable one UTF-8 locale RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen From 64c3b03b664553a2669f46c07c951267b1557414 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Jun 2018 20:05:32 +0200 Subject: [PATCH 1807/2640] libtirpc: fix musl build Don't redefine existing typedef (u_char, u_long, ...) on musl Fixes: - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0006-rpc-types.h-fix-musl-build.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/libtirpc/0006-rpc-types.h-fix-musl-build.patch diff --git a/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch b/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch new file mode 100644 index 0000000000..d4bcd80991 --- /dev/null +++ b/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch @@ -0,0 +1,31 @@ +From 238f0a870f577e8fffd92820e1c1a88d4fc6d35f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 10 Jun 2018 19:48:21 +0200 +Subject: [PATCH] rpc/types.h: fix musl build + +Don't redefine existing typedef (u_char, u_long, ...) on musl + +Fixes: + - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a + +Signed-off-by: Fabrice Fontaine +--- + tirpc/rpc/types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h +index f069efa..0153a5c 100644 +--- a/tirpc/rpc/types.h ++++ b/tirpc/rpc/types.h +@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; + #define mem_free(ptr, bsize) free(ptr) + + +-#if defined __APPLE_CC__ || defined __FreeBSD__ ++#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined (__GLIBC__) + # define __u_char_defined + # define __daddr_t_defined + #endif +-- +2.14.1 + From 4a03a66f405fa5142f3f1fe5f91f0d4d7c097771 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 29 May 2018 19:31:46 +0200 Subject: [PATCH 1808/2640] package/ti-sgx-km: properly handle legacy for renamed options Commit b54c5464cc (ti-sgx-km: rename options to have proper prefix) forgot to add defaults from legacy options, and notices in Config.in.legacy that legacy options are still referenced in the package itself. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++++++ package/ti-sgx-km/Config.in | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index e7b0316a4f..7fc4792aed 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -169,6 +169,8 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT +# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from +# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X bool "ti-sgx-km AM335X option renamed" select BR2_LEGACY @@ -177,6 +179,8 @@ config BR2_PACKAGE_TI_SGX_AM335X BR2_PACKAGE_TI_SGX_AM335X has been renamed to BR2_PACKAGE_TI_SGX_KM_AM335X. +# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from +# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X bool "ti-sgx-km AM437X option renamed" select BR2_LEGACY @@ -185,6 +189,8 @@ config BR2_PACKAGE_TI_SGX_AM437X BR2_PACKAGE_TI_SGX_AM437X has been renamed to BR2_PACKAGE_TI_SGX_KM_AM437X. +# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from +# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 bool "ti-sgx-km AM4430 option renamed" select BR2_LEGACY @@ -193,6 +199,8 @@ config BR2_PACKAGE_TI_SGX_AM4430 BR2_PACKAGE_TI_SGX_AM4430 has been renamed to BR2_PACKAGE_TI_SGX_KM_AM4430. +# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from +# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 bool "ti-sgx-km AM5430 option renamed" select BR2_LEGACY diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in index db3d3f9ddd..348efdeb82 100644 --- a/package/ti-sgx-km/Config.in +++ b/package/ti-sgx-km/Config.in @@ -20,6 +20,10 @@ if BR2_PACKAGE_TI_SGX_KM choice prompt "Target" + default BR2_PACKAGE_TI_SGX_KM_AM335X if BR2_PACKAGE_TI_SGX_AM335X # legacy + default BR2_PACKAGE_TI_SGX_KM_AM437X if BR2_PACKAGE_TI_SGX_AM437X # legacy + default BR2_PACKAGE_TI_SGX_KM_AM4430 if BR2_PACKAGE_TI_SGX_AM4430 # legacy + default BR2_PACKAGE_TI_SGX_KM_AM5430 if BR2_PACKAGE_TI_SGX_AM5430 # legacy default BR2_PACKAGE_TI_SGX_KM_AM335X help Select the SOC for which you would like to install drivers. From b1da7a8aed6a12eeb9ad7f3870a79be859e137f0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Jun 2018 20:23:19 +0200 Subject: [PATCH 1809/2640] tor: link with libatomic when needed The following error occurs on architectures required to use gcc libatomic for atomic intrinsics: sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line This is for example the case on sparcv8 32 bit. Fixes: http://autobuild.buildroot.net/results/0f7107d0b703223f567c6749722bc82c81a04d54 Signed-off-by: Fabrice Fontaine [Thomas: use LIBS instead of LDFLAGS.] Signed-off-by: Thomas Petazzoni --- package/tor/tor.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 39006e7caf..fe22633bf6 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -47,6 +47,10 @@ endif # uses gnu extensions TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +TOR_CONF_ENV += LIBS=-latomic +endif + define TOR_INSTALL_CONF $(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \ $(TARGET_DIR)/etc/tor/torrc From 265e25834f29f0852cea0004c307a8d9ea1f72ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Jun 2018 20:02:04 +0200 Subject: [PATCH 1810/2640] pinentry: link with libatomic when needed On some architectures, atomic binutils are provided by the libatomic library from gcc. Linking with libatomic is therefore necessary, otherwise the build fails with: sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line This is often for example the case on sparcv8 32 bit. Fixes: http://autobuild.buildroot.net/results/fd6bee70ff20bee9607a9f6f557a3a793d00cd9f Signed-off-by: Fabrice Fontaine [Thomas: use LIBS instead of LDFLAGS.] Signed-off-by: Thomas Petazzoni --- package/pinentry/pinentry.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 4081a8a5d6..d0179728bd 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -18,6 +18,10 @@ PINENTRY_CONF_OPTS += \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --without-libcap # requires PAM +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +PINENTRY_CONF_ENV += LIBS=-latomic +endif + # build with X if available ifeq ($(BR2_PACKAGE_XORG7),y) PINENTRY_CONF_OPTS += --with-x From 4fbb2d143d9413df1cb771150920789b863783e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 13 Jun 2018 19:44:11 -0400 Subject: [PATCH 1811/2640] qt5: bump latest version to 5.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtwayland: Remove 0001-Fix-compilation-for-Renesas-R-Car-M3.patch (upstream since [1]). qtwebengine: New 3rd-part 0001-Fix-build-with-GCC-8.1.0.patch (upstream in chromium [2]). [1]: https://github.com/qt/qtwayland/commit/8b204b2c56be5e7c1fd21144ae140c9b865dd86b [2]: https://codereview.qt-project.org/#/c/229160/ Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 4 +- package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- ...tbase-Fix-build-error-when-using-EGL.patch | 0 package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- ...Fix-compilation-for-Renesas-R-Car-M3.patch | 44 ---------- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- .../0001-Fix-build-with-GCC-8.1.0.patch | 86 +++++++++++++++++++ package/qt5/qt5webengine/qt5webengine.hash | 4 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 30 files changed, 140 insertions(+), 98 deletions(-) rename package/qt5/qt5base/{5.10.1 => 5.11.0}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) delete mode 100644 package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch create mode 100644 package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch diff --git a/package/qt5/Config.in b/package/qt5/Config.in index b7786f7a63..735824402e 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -35,14 +35,14 @@ choice prompt "Qt5 version" config BR2_PACKAGE_QT5_VERSION_LATEST - bool "Latest (5.10)" + bool "Latest (5.11)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ # no built-in double-conversion support depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa help - This option builds Qt 5.10, which is licensed under + This option builds Qt 5.11, which is licensed under (L)GPL-3.0+. comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 14a2b938a0..193ae8b49c 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,8 +5,8 @@ ################################################################################ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.10 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION_MAJOR = 5.11 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SOURCE_TARBALL_PREFIX = everywhere-src else QT5_VERSION_MAJOR = 5.6 diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 9d9ff8f69c..8bc8b43cd5 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 041fb42536a72bbf9be17a6f52d4b73ce93fb98b456fd63503cc47d80d196b3b qt3d-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qt3d-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0 qt3d-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt5base/5.10.1/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from package/qt5/qt5base/5.10.1/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index d788c071d8..263fb84acc 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969 qtbase-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtbase-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66 qtbase-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index d15fde9df7..32d981224a 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 de829a8e6aa4b8496048e9b6f3bff306a80c35935855a94426025ddfb8bcb0c0 qtcanvas3d-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcanvas3d-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 3fc60eafbe8737a8ff126eb9e2becc010d94f3db99dfa1d365e84f6af4540ccf qtcanvas3d-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 8364536309..9cd732fa58 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 652821dc6819658ec4bc1a6bf149fd7a61008748ff4745b54f038ccf276d3ec9 qtconnectivity-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtconnectivity-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 cd2e53b1a7bee098b651cbedcecf0717036ae4bec5de0daf3a0038a50b2e1873 qtconnectivity-everywhere-src-5.11.0.tar.xz diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 1634a88ecc..0ca9b29088 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553 qtdeclarative-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtdeclarative-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 eea9378b17b1c16d3b5235629b9128349bf98cba7d9c61122653d976b25f57c0 qtdeclarative-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 0eb188f139..dff8d9ad1b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 3f3b0631b579630bf58e99f3ca0d8dfdb6a44153c63cf90ac9e07041b4b1847f qtgraphicaleffects-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtgraphicaleffects-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 727846c9d8985be402f573ea28995f4a2bc13847a6d9deeca32d1e1e0421f977 qtgraphicaleffects-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index ac858ea244..6064700c6a 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 2804baa2779eae015096820e233d7f86bb7fde9853b7c9150a321a453422a283 qtimageformats-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtimageformats-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 58406fef507a9f1e1cd97c0834b94d0a6484e19f5dea796a3b7b58fafff11e70 qtimageformats-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index f18c838800..bbe3183471 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 5e5cc05517c701a2c8ebba1fbe3ddff2b6b90d5aa554d307b1c477fe0cfd72c9 qtlocation-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtlocation-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 28f6911e3f00173005c0348c0b59f45e59ccda7feae724b1a6b8929021968c1c qtlocation-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 0fb25b6e09..272007c2c5 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 a1fa98015ee5a6b81f2d337abc98d8b297c6718f7714a1f13fccfd2934c23649 qtmultimedia-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtmultimedia-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c qtmultimedia-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 809cb6b888..0e96f4e03e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 d231a1993dc6a3f0dbc60a21d01fc0be15b0c26e881bd0631573952ea61682b7 qtquickcontrols-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 26627d592193094c65f842d5dd20c771d77c554591b9375659b03945dc8af107 qtquickcontrols-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f446980e87..bfe86465a0 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 5dc64a1b901e418b76fd3bf65dfa87a0cb11338741fb8970211c1df6df0e604a qtquickcontrols2-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols2-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 feac87e9a6ecff47bd8c18baffb93f4cea9ebb86014f817bfafe62da88454ac3 qtquickcontrols2-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 6038f315c4..0629c89cdc 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 e0618af7cb1f1f30d292c04cf484e3507cf6f4815f79870e35d2b0ce7ac9532d qtscript-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtscript-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 25926ae733b31baac7af51f489ad26570d4f4f02ad4892a4a82babae5f5168c5 qtscript-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index d272881843..ef99bc7d24 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 0b42d201e4f96af1c404a61f01da6726bab9bfba4e280cc4a82c717f0db26103 qtscxml-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtscxml-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 531c204860e381808714486bd9703570de5fc5b1f8e2f4e18ede211d73428b03 qtscxml-everywhere-src-5.11.0.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 0b7222f14d..a3861f0063 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 bb0df76c0e53cf2b39d10dbf0964706a264413aae74a4596119143ab4d165c96 qtsensors-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtsensors-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 0fc4e6d6b3281610551226cb6ffd9ef4e61b2f3bd0b7b1302135b03b5b16e2ab qtsensors-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index d392897816..e76ed95ccc 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 0650a17950f140130ec20520b06592618850cc5673a815cb4fd585590d922257 qtserialbus-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtserialbus-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 05dde5528c5b710da50d5166eef4a86a279d329a82ef172637ba03fececc6c64 qtserialbus-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index d73056cec7..5e901f7aec 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 08e4cb13bbf165eb99857301f3cffe280a4946ff58a34ccc542ad1f790194a9e qtserialport-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtserialport-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 85eef7533a18fce59551fe26bb0055dd290d5d33cbb313fcb8e5daf8b40c6eb1 qtserialport-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 3a10080e29..a96c0e9f07 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a qtsvg-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtsvg-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 4b8efe60678a37c731356cc146886360e5852a1cd4a8ba6339fb950a2e7d1f54 qtsvg-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 83e6ef41be..747be9057c 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53 qttools-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qttools-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 9d93ca84272cdf9031913cb3a6876716aa8a174e91693839f0de0ea3dd3a67d9 qttools-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 44ef1f230f..fd147e28e8 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 4319f90e68a571974d03f39507dde548971412e31f971081ca7eaf388187d52e qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 914de601a81b32acdddc572d3ade41129b018f3693d9cecdc5dad32424913cbd qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch b/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch deleted file mode 100644 index df09d4f382..0000000000 --- a/package/qt5/qt5wayland/5.10.1/0001-Fix-compilation-for-Renesas-R-Car-M3.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1619f8bcdd1680c9557996b4977580090a749037 Mon Sep 17 00:00:00 2001 -From: Johan Klokkhammer Helsing -Date: Thu, 9 Feb 2017 12:53:56 +0100 -Subject: [PATCH] Fix compilation for Renesas R-Car M3 - -Change-Id: Ib85001884bb880a18d8aa1241da0eb614a6b58ba -Reviewed-by: Paul Olav Tvete - -Upstream: http://code.qt.io/cgit/qt/qtwayland.git/patch/?id=8b204b2c56be5e7c1fd21144ae140c9b865dd86b -Signed-off-by: Peter Seiderer ---- - .../client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp | 2 +- - .../compositor/xcomposite-egl/xcompositeeglintegration.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -index 431cb14..9c3dee3 100644 ---- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp -@@ -121,7 +121,7 @@ void QWaylandXCompositeEGLWindow::createEglSurface() - XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow, CompositeRedirectManual); - XMapWindow(m_glxIntegration->xDisplay(), m_xWindow); - -- m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0); -+ m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, reinterpret_cast(m_xWindow), nullptr); - if (m_surface == EGL_NO_SURFACE) { - qFatal("Could not make eglsurface"); - } -diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -index 3cc0ba0..071b088 100644 ---- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp -@@ -129,7 +129,7 @@ QOpenGLTexture *XCompositeEglClientBuffer::toOpenGlTexture(int plane) - attribList.append(EGL_TEXTURE_2D); - attribList.append(EGL_NONE); - -- EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(),config,pixmap,attribList.constData()); -+ EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(), config, reinterpret_cast(pixmap), attribList.constData()); - if (surface == EGL_NO_SURFACE) { - qDebug() << "Failed to create eglsurface" << pixmap << compositorBuffer->window(); - } --- -2.16.3 - diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b28677ad29..c36fbfff78 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 f5a7643a5ebcdc50d02b293191e675f387f67dc360c27bf6f94345372fba6356 qtwayland-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwayland-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 68814e8f207f3a90cae29ae49ce2c1f4bf9d06709a7a7962adf23120f1644127 qtwayland-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index f94942f577..39f06cd2f4 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 c22c449fecb052597d12f8dd59498db39767037f9098123f3defc04eb20a3764 qtwebchannel-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebchannel-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 b0761a3b8260bae7f76bf26626ccd1d4ee92541d7c5d53d1958c88b9f92dca15 qtwebchannel-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch b/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch new file mode 100644 index 0000000000..dae4ecdc84 --- /dev/null +++ b/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch @@ -0,0 +1,86 @@ +From 96f354df27c2f3c7c1b221b676c7a1af6b3da375 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?J=C3=BCri=20Valdmann?= +Date: Mon, 14 May 2018 10:15:50 +0200 +Subject: [PATCH] Fix build with GCC 8.1.0 + +Task-number: QTBUG-68203 +Change-Id: I780d884d5e20ef04e902d7b449da4aa3f97d8d0b +Reviewed-by: Allan Sandfeld Jensen +Signed-off-by: Gaël PORTAY +[gportay: prepend chromium changes with src/3rdparty/chromium] +--- + .../mojo/public/cpp/bindings/associated_interface_ptr_info.h | 2 +- + .../mojo/public/cpp/bindings/associated_interface_request.h | 2 +- + .../mojo/public/cpp/bindings/interface_request.h | 2 +- + .../mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | 2 ++ + .../mojo/public/cpp/system/handle.h | 2 +- + 5 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h +index 1f79662bd7..184ba6a9e8 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h +@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { + + bool is_valid() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return !!handle_; } + + ScopedInterfaceEndpointHandle PassHandle() { + return std::move(handle_); +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h +index 12d2f3ce1d..fcdc2b9321 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h +@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { + // handle. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return !!handle_; } + + ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h +index 1007cb0b8c..da1f3244a3 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h +@@ -54,7 +54,7 @@ class InterfaceRequest { + // Indicates whether the request currently contains a valid message pipe. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return !!handle_; } + + // Removes the message pipe from the request and returns it. + ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h +index 5d00e5019e..ef8a927ba6 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h +@@ -45,6 +45,8 @@ class MOJO_CPP_BINDINGS_EXPORT ScopedInterfaceEndpointHandle { + + bool is_valid() const; + ++ explicit operator bool() const { return is_valid(); } ++ + // Returns true if the interface hasn't associated with a message pipe. + bool pending_association() const; + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/system/handle.h b/src/3rdparty/chromium/mojo/public/cpp/system/handle.h +index 7c886e8825..c9f9e961db 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/system/handle.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/system/handle.h +@@ -121,7 +121,7 @@ class ScopedHandleBase { + + bool is_valid() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return !!handle_; } + + bool operator==(const ScopedHandleBase& other) const { + return handle_.value() == other.get().value(); +-- +2.17.1 + diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 3b54435822..b9a226d6ec 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 12644f8d2ba8354a2a533d5a7f3f5139c6ff168c2f51aa3e21b701db6dbc01de qtwebengine-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebengine-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 5dd754d603c66d36e93b96b4f7c24a6e6269ae6a1682a524b8baa664d5c44b45 qtwebengine-everywhere-src-5.11.0.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 34cd6e6ce1..da44b4d815 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 6ecf790955ffe42dce731e10557f4ba625e359e867953d73f7fb453c0bad53ea qtwebsockets-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebsockets-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 7d5845805bec42de121ecc063ee40ac1438975adcec395c6af97cfd5bb3539b7 qtwebsockets-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 173e9e6b57..b8eefc24af 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 c38a371fd50b2da976ed809230678284f029cefb02d240253dcbb3d575dc97b4 qtx11extras-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtx11extras-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 116690a9b4e14267d8be0a252dae3c7a807a8b31b9c831dfb51735c683e96b8f qtx11extras-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 0aa062c13a..39d9438f5f 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 3cdef59ce96a796606e5adc5756c63c8607fb29b281fddb38acee3e674d5e9fe qtxmlpatterns-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtxmlpatterns-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 19a378cba26e243ebb97c29a9ec02499c5eb49f2672fbcc8415e1b70d415d28e qtxmlpatterns-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 From 0c2b920b2f8a4fa773af94cb77ea924daa2de63b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 4 May 2018 18:24:30 +0200 Subject: [PATCH 1812/2640] Update for 2018.02.2 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit 4acca318b1630b6aa0e1113948e7678dd902b8a3) Signed-off-by: Peter Korsgaard --- CHANGES | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/CHANGES b/CHANGES index baa85622ae..475049f841 100644 --- a/CHANGES +++ b/CHANGES @@ -194,6 +194,37 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.2, Released May 4th, 2018 + + Important / security related fixes. + + Tweak package size/file instrumentation to better handle + package rebuilds. + + Revert /etc/shells creation when bash is enabled. + + Exclude /lib/firmware from the rpath fixup logic, as it may + contain non-native ELF files. + + Scanpypi: Support the new PyPi infrastructure. + + Handle GCC 8.x on the host. + + Ensure timestamp of /usr is updated to support the systemd + ConditionNeedsUpdate option. + + Updated/fixed packages: bluez5_utils, flann, gdb, gnupg2, + grub2, libcec, libcgi, libglib2, libgpg-error, libgpgme, + libtomcrypt, mbedtls, mkpasswd, php, python, python-requests, + python-watchdog, qt53d, qt5websockets, sdl2, sdl2_image, + syslog-ng, systemd, tcl, tcllib, uclibc, usb_modeswitch, + wireguard, wmctrl + + Issues resolved (http://bugs.uclibc.org): + + #10896: /bin/sh not in /etc/shells + #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled + 2018.02.1, Released April 9th, 2018 Important / security related fixes. From afa6fe1c5089a8815b344f92b8b2e752302135df Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Jun 2018 19:43:04 +0200 Subject: [PATCH 1813/2640] Update for 2018.02.3 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit f44524f61ad304e5db7cb933704bb4951ab031d3) Signed-off-by: Peter Korsgaard --- CHANGES | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/CHANGES b/CHANGES index 475049f841..44484ee80e 100644 --- a/CHANGES +++ b/CHANGES @@ -194,6 +194,60 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.3, Released June 18th, 2018 + + Important / security related fixes. + + Various fixes for building on modern distributions (GCC 8.x, + no rpcgen utility). + + ARM: Default to binutils 2.28 and warn about newer binutils + versions, which are known to cause boot failures for Linux + kernels built in thumb mode. + + Busybox/mdev: Fix module autoloading. + + Busybox/sysvinit: inittab: Add /dev/{stdin,stdout,stderr} + symlinks, call swapon -a to activate any configured swap + devices. + + Dependencies: Check that PATH does not contain current working + directory, which triggers a number of build failures. + + Infrastructure: Error out for packages erroneously using the + 'local' site method but not defining a _SITE. + + Linux: Fix cuImage. / simpleImage. handling. Ensure + kconfig uses ncurses from the host to fix a ncurses/ncursesw + mixup, causing menuconfig display corruption. + + Toolchain: Workarounds for fix-rpath issues with binutils and + elf2flt. + + Util-linux: Fix blocking on getrandom() issue with recent + kernels. + + Remove broken freescale_imx31_3stack, + freescale_imx6sololiteevk and freescale_imx6ulevk defconfigs. + + Updated/fixed packages: apr-util, asterisk, attr, audit, + autofs, binutils, busybox, cifs-utils, cups-filters, dash, + ebtables, exim, expect, f2fs-tools, faketime, file, gdb, git, + glibc, gnupg, gnupg2, gst1-plugins-bad, imagemagick, jamvm, + jpeg-turbo, libcap, libcoap, libcurl, libgcrypt, libjpeg, + libnss, libressl, libtirpc, libvncserver, libvorbis, libxslt, + log4cplus, lrzsz, ltrace, lynx, mariadb, mbedtls, mpg123, + nasm, netplug, network-manager, nfs-utils, nodejs, + openvmtools, patch, perl, php-amqp, poppler, procps-ng, + python, python-websockets, quota, redis, samba4, sysvinit, + transmission, triggerhappy, util-linux, wavpack, wget, + wireshark, xen, zmqpp + + Issues resolved (http://bugs.uclibc.org): + + #10986: Installing package attr when already supplied by busybox.. + #11031: ld-elf2flt: host/bin/ld.real': execvp: No such file or.. + 2018.02.2, Released May 4th, 2018 Important / security related fixes. From e44fa57a30de5e3b9907bf8a6c956dba70d61d39 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Jun 2018 20:19:39 +0200 Subject: [PATCH 1814/2640] docs/website: update for 2018.02.3 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index fd08093783..8da44d76eb 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
          Download
          -

          Latest long term support release: 2018.02.2

          +

          Latest long term support release: 2018.02.1

          - +
          - +
          -

          buildroot-2018.02.2.tar.gz

          -

          PGP signature

          +

          buildroot-2018.02.3.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2018.02.2.tar.bz2

          -

          PGP signature

          +

          buildroot-2018.02.3.tar.bz2

          +

          PGP signature

          diff --git a/docs/website/news.html b/docs/website/news.html index 042051936c..a9f7ca2d63 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

          News

            +
          • +
            +
            +
            +

            2018.02.3 released

            +

            18 June 2018

            +
            +
            +

            The 2018.02.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2018.02.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2018.02.3 release.

            +
            +
            +
            • +
          • From d54dee36b0c6a8954262ce9284c272216efc4252 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Jun 2018 10:38:50 +0200 Subject: [PATCH 1815/2640] python-decorator: add license file and hash Signed-off-by: Peter Korsgaard --- package/python-decorator/python-decorator.hash | 2 ++ package/python-decorator/python-decorator.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-decorator/python-decorator.hash b/package/python-decorator/python-decorator.hash index 293f1ca685..ca7fb88e7b 100644 --- a/package/python-decorator/python-decorator.hash +++ b/package/python-decorator/python-decorator.hash @@ -1,3 +1,5 @@ # md5 from https://pypi.python.org/pypi/decorator/json, sha256 locally calculated md5 73644c8f0bd4983d1b6a34b49adec0ae decorator-4.0.11.tar.gz sha256 953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76 decorator-4.0.11.tar.gz +# Locally computed sha256 checksums +sha256 c9fbbd46d5af040b2b26db2f693034c95de8e9faaaf1cd68af358b092a56d454 LICENSE.txt diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index 3802f3dc16..67d9b8e719 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -8,6 +8,7 @@ PYTHON_DECORATOR_VERSION = 4.0.11 PYTHON_DECORATOR_SITE = https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570 PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz PYTHON_DECORATOR_LICENSE = BSD-2-Clause +PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_SETUP_TYPE = setuptools $(eval $(python-package)) From 70dc00e1c22626a57de383d534f1788a4d44ec47 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Jun 2018 10:43:27 +0200 Subject: [PATCH 1816/2640] lvm2: add license hashes Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.hash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 9f7a6c6f51..b0dfcfcef3 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,5 @@ # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e LVM2.2.02.173.tgz +# Locally computed sha256 checksums +sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB From 89634c07b492953fca4a1a07acc9d63c27eebbb6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Jun 2018 20:14:36 +0200 Subject: [PATCH 1817/2640] DEVELOPERS: add myself to some packages Add my entry to json-c, libsoup, libsoxr, libxslt and tinymembench Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 07c24acb91..d22ac527fa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -695,6 +695,7 @@ F: package/gupnp-tools/ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ +F: package/json-c/ F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ @@ -722,8 +723,11 @@ F: package/libraw1394/ F: package/libroxml/ F: package/librsvg/ F: package/librsync/ +F: package/libsoup/ +F: package/libsoxr/ F: package/libupnp/ F: package/libupnp18/ +F: package/libxslt/ F: package/mbedtls/ F: package/minissdpd/ F: package/motion/ @@ -735,6 +739,7 @@ F: package/rygel/ F: package/safeclib/ F: package/tinycbor/ F: package/tinydtls/ +F: package/tinymembench/ F: package/whois/ N: Falco Hyfing From f8616d2eafbd13cf4670908972756120c3b0e7f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Jun 2018 20:16:24 +0200 Subject: [PATCH 1818/2640] json-for-modern-cpp: bump to version 3.1.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 04a520d7d7..4b9adf73ca 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b20be343922f73504baf8a01543c2a42d16e01f18bb231b324a8959416ccf4f8 json-v3.1.0.tar.gz +sha256 e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54 json-v3.1.2.tar.gz sha256 7b875bb7a4e28abb7956ea821b4b7d88ff6a2a4fabf261c3993730a365ec56dd LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 406f8ad1f4..4bcfd46910 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = v3.1.0 +JSON_FOR_MODERN_CPP_VERSION = v3.1.2 JSON_FOR_MODERN_CPP_SOURCE = json-${JSON_FOR_MODERN_CPP_VERSION}.tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From a08d7f44ea855852cff293444813762dbbbbb32f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Jun 2018 20:18:45 +0200 Subject: [PATCH 1819/2640] jpeg-turbo: bump to version 1.5.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.hash | 8 ++++---- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 11b323b8bf..df1c053005 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/1.5.2/ -sha1 e788f6defa58b4393a5e1685c018f3b962971457 libjpeg-turbo-1.5.2.tar.gz -md5 6b4923e297a7eaa255f08511017a8818 libjpeg-turbo-1.5.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/1.5.3/ +sha1 87ebf4cab2bb27fcb8e7ccb18ec4eb680e1f2c2d libjpeg-turbo-1.5.3.tar.gz +md5 7c82f0f6a3130ec06b8a4d0b321cbca3 libjpeg-turbo-1.5.3.tar.gz # Locally computed -sha256 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 libjpeg-turbo-1.5.2.tar.gz +sha256 b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 libjpeg-turbo-1.5.3.tar.gz sha256 5c08657eda60b7946a913ee22ac73603335a468a6aa95204506a1586a8d677ee LICENSE.md sha256 53a3e3c299e08856964f4c5986e242c3695837b73c64625092f70c774e8af5d2 README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index d52ab916e0..2b5d876928 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 1.5.2 +JPEG_TURBO_VERSION = 1.5.3 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) From 8733193e6b744295f0f955b78a9323fb2615416c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 19 Jun 2018 13:45:20 +0200 Subject: [PATCH 1820/2640] docs/website/download.html: fix latest LTS version number Latest is naturally .3, not .1 Reported-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- docs/website/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/download.html b/docs/website/download.html index 8da44d76eb..660d1d42f9 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,7 +8,7 @@
            Download
            -

            Latest long term support release: 2018.02.1

            +

            Latest long term support release: 2018.02.3

            From 2cdfa6c84951b25e805d329cb7bae833d333538f Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Tue, 19 Jun 2018 14:30:52 +0300 Subject: [PATCH 1821/2640] synopsys/axs10x: Update /etc/inittab by post-build To not maintain custom copy of inittab file lets adopt approach used in raspberrypi adding post-build script for synopsys/axs10x boards. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Peter Korsgaard --- board/synopsys/axs10x/fs-overlay/etc/inittab | 42 -------------------- board/synopsys/axs10x/post-build.sh | 11 +++++ configs/snps_arc700_axs101_defconfig | 2 +- configs/snps_archs38_axs103_defconfig | 2 +- 4 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 board/synopsys/axs10x/fs-overlay/etc/inittab create mode 100755 board/synopsys/axs10x/post-build.sh diff --git a/board/synopsys/axs10x/fs-overlay/etc/inittab b/board/synopsys/axs10x/fs-overlay/etc/inittab deleted file mode 100644 index 7412a27366..0000000000 --- a/board/synopsys/axs10x/fs-overlay/etc/inittab +++ /dev/null @@ -1,42 +0,0 @@ -# /etc/inittab -# -# Copyright (C) 2001 Erik Andersen -# -# Note: BusyBox init doesn't support runlevels. The runlevels field is -# completely ignored by BusyBox init. If you want runlevels, use -# sysvinit. -# -# Format for each entry: ::: -# -# id == tty to run on, or empty for /dev/console -# runlevels == ignored -# action == one of sysinit, respawn, askfirst, wait, and once -# process == program to run - -# Startup the system -::sysinit:/bin/mount -t proc proc /proc -::sysinit:/bin/mount -o remount,rw / -::sysinit:/bin/mkdir -p /dev/pts /dev/shm -::sysinit:/bin/mount -a -::sysinit:/sbin/swapon -a -null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd -null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin -null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout -null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr -::sysinit:/bin/hostname -F /etc/hostname -# now run any rc scripts -::sysinit:/etc/init.d/rcS - -# /sbin/getty invocation for tty0 -tty0::respawn:/sbin/getty 115200 tty0 - -# Put a getty on the serial port -console::respawn:/sbin/getty -L console 0 vt100 - -# Stuff to do for the 3-finger salute -::ctrlaltdel:/sbin/reboot - -# Stuff to do before rebooting -::shutdown:/etc/init.d/rcK -::shutdown:/sbin/swapoff -a -::shutdown:/bin/umount -a -r diff --git a/board/synopsys/axs10x/post-build.sh b/board/synopsys/axs10x/post-build.sh new file mode 100755 index 0000000000..f23c8a99b8 --- /dev/null +++ b/board/synopsys/axs10x/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty0 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty0::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty0::respawn:/sbin/getty 115200 tty0' ${TARGET_DIR}/etc/inittab +fi diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 2a71ff3896..4f796b438b 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -6,7 +6,7 @@ BR2_TARGET_GENERIC_HOSTNAME="axs101" BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" # Linux headers same as kernel, a 4.16 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index 1ad79eb406..456d4cba2e 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="axs103" BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" # Linux headers same as kernel, a 4.16 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y From 09ce2519e5169254435a94d623bc4bca59286da8 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Tue, 19 Jun 2018 11:30:28 +0530 Subject: [PATCH 1822/2640] powerpc-utils: Bump version to 1.3.5 CC: Joel Stanley Signed-off-by: Vasant Hegde Signed-off-by: Peter Korsgaard --- package/powerpc-utils/powerpc-utils.hash | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/powerpc-utils/powerpc-utils.hash b/package/powerpc-utils/powerpc-utils.hash index 437a5865c2..0c495d55e9 100644 --- a/package/powerpc-utils/powerpc-utils.hash +++ b/package/powerpc-utils/powerpc-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d36372efebc1f6f9409501f7ab68a812843925334dee6438e7b52a53c21574c5 powerpc-utils-v1.3.4.tar.gz +sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-v1.3.5.tar.gz diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk index da7a3c9cd6..a3bd8832ff 100644 --- a/package/powerpc-utils/powerpc-utils.mk +++ b/package/powerpc-utils/powerpc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -POWERPC_UTILS_VERSION = v1.3.4 +POWERPC_UTILS_VERSION = v1.3.5 POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,$(POWERPC_UTILS_VERSION)) POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES From 10ddd8881ca6ffa64065761ec7d024d2b5a4453a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 18 Jun 2018 22:21:08 +0200 Subject: [PATCH 1823/2640] package/waylandpp: bump version to 0.2.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/waylandpp/waylandpp.hash | 2 +- package/waylandpp/waylandpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash index 3a580bf963..1b14814c47 100644 --- a/package/waylandpp/waylandpp.hash +++ b/package/waylandpp/waylandpp.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 e0c9012f3a5fb69922d5ecabdfbef739f1e0db3e68048b3f63537468ad5c4acd waylandpp-0.2.2.tar.gz +sha256 ebd4a8447bb65f288cad0e04538f6ec704e155213fc2b9cc1a851534c70aacac waylandpp-0.2.3.tar.gz sha256 49aa6d728fd13226952c9e3a5a9cae46379b2a501010064760172b5ce7cd94bb LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/package/waylandpp/waylandpp.mk b/package/waylandpp/waylandpp.mk index 5c9c96b379..ff17c35c1e 100644 --- a/package/waylandpp/waylandpp.mk +++ b/package/waylandpp/waylandpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLANDPP_VERSION = 0.2.2 +WAYLANDPP_VERSION = 0.2.3 WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION)) WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner) WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt From f58ab87d6f30ab067da6401626eb279e4e910d47 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 18 Jun 2018 22:14:00 +0200 Subject: [PATCH 1824/2640] package/freeswitch: enable mod_timerfd Mod_timerfd uses the Linux kernel timerfd API to create and use a kernel timer that delivers timer expire notifications via a file descriptor, for details read https://freeswitch.org/confluence/display/FREESWITCH/mod_timerfd Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 4d490b0730..7f2a067a35 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -150,6 +150,7 @@ FREESWITCH_ENABLED_MODULES += \ say/mod_say_sv \ say/mod_say_th \ say/mod_say_zh \ + timers/mod_timerfd \ xml_int/mod_xml_cdr \ xml_int/mod_xml_rpc \ xml_int/mod_xml_scgi From f66c171b4d046aca791f524ff198fb7df08d5ab0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Jun 2018 20:06:40 +0200 Subject: [PATCH 1825/2640] mosquitto: fix build with some glibc Add patch to define _GNU_SOURCE before using S_IF{DIR,REG} Fixes: - http://autobuild.buildroot.net/results/7dcfb6ca9d14a5cd6872590065549356f1ab42a0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch diff --git a/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch b/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch new file mode 100644 index 0000000000..88f9cbd94a --- /dev/null +++ b/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch @@ -0,0 +1,34 @@ +From d4442c3df7552756f53e656e446bc1bd7dc79a88 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 18 Jun 2018 19:52:58 +0200 +Subject: [PATCH] websockets: _GNU_SOURCE needed for S_IF{DIR,REG} + +Define of _GNU_SOURCE is needed to be able to use S_IFDIR and S_IFREG in +src/websockets.c + +Fixes: + - http://autobuild.buildroot.net/results/7dcfb6ca9d14a5cd6872590065549356f1ab42a0 + +[Upstream status: https://github.com/eclipse/mosquitto/pull/862] + +Signed-off-by: Fabrice Fontaine +--- + src/websockets.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/websockets.c b/src/websockets.c +index 1e513ae..7722b4d 100644 +--- a/src/websockets.c ++++ b/src/websockets.c +@@ -29,6 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. + + #ifdef WITH_WEBSOCKETS + ++#define _GNU_SOURCE ++ + #include "config.h" + + #include +-- +2.14.1 + From 4a7bf483d82af69ab14569ca6b49238d03e8c140 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Tue, 19 Jun 2018 23:12:35 +0530 Subject: [PATCH 1826/2640] package/powerpc-utils: Add sha256 hash for the COPYING file Suggested-by: Peter Korsgaard CC: Joel Stanley Signed-off-by: Vasant Hegde Signed-off-by: Peter Korsgaard --- package/powerpc-utils/powerpc-utils.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/powerpc-utils/powerpc-utils.hash b/package/powerpc-utils/powerpc-utils.hash index 0c495d55e9..b493be086b 100644 --- a/package/powerpc-utils/powerpc-utils.hash +++ b/package/powerpc-utils/powerpc-utils.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-v1.3.5.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING From 1e8d961e1af0be36308bd7aa4217ce5071194294 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Jun 2018 20:19:38 +0200 Subject: [PATCH 1827/2640] cargo-bin: add hash for powerpc64le Fixes: - http://autobuild.buildroot.net/results/1e790bd13745cc0b3f03e6182e700c07d3b8a21c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cargo-bin/cargo-bin.hash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash index f01c3f5ff2..2dfea7c868 100644 --- a/package/cargo-bin/cargo-bin.hash +++ b/package/cargo-bin/cargo-bin.hash @@ -1,5 +1,7 @@ # From https://static.rust-lang.org/dist/cargo-0.26.0-i686-unknown-linux-gnu.tar.xz.sha256 sha256 bc5f5aa32d2f4ba26abf79a900231d06eecc7f1f2e125ed51bf71766550d1879 cargo-0.26.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 b14b47f59b436d07e57c5eab5bdd7378842b8ef4873d5836e08f0391e743f516 cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz.sha256 sha256 aeaa5813aa6615dd7fdde6d870ca257c5b2e9da5e308f8242a08b231605bce0e cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated From 6c5a22079d7e20f26038e3f7cdd8ead1a7b6d5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 19 Jun 2018 21:57:19 +0200 Subject: [PATCH 1828/2640] bluez5_utils: bump to version 5.50 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop upstream patch and remove `AUTORECONF = YES`. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- ...all-only-be-build-if-readline-is-pre.patch | 32 ------------------- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +-- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch diff --git a/package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch b/package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch deleted file mode 100644 index 394742b680..0000000000 --- a/package/bluez5_utils/0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 654444dd8faf02b46f41d81f3d9c623d57bdd399 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Fri, 20 Apr 2018 16:04:17 +0200 -Subject: [PATCH] bt_shell APIs shall only be build if readline is present on - the system since it currently depend on it. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://marc.info/?l=linux-bluetooth&m=152422938306592&w=2 ---- - Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index daf34b6ca..9c3c17139 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,7 +119,11 @@ shared_sources = src/shared/io.h src/shared/timeout.h \ - src/shared/gatt-server.h src/shared/gatt-server.c \ - src/shared/gatt-db.h src/shared/gatt-db.c \ - src/shared/gap.h src/shared/gap.c \ -- src/shared/tty.h src/shared/shell.c src/shared/shell.h -+ src/shared/tty.h -+ -+if READLINE -+shared_sources += src/shared/shell.c src/shared/shell.h -+endif - - src_libshared_glib_la_SOURCES = $(shared_sources) \ - src/shared/io-glib.c \ --- -2.14.3 - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 8d142b755c..b965708559 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95 bluez-5.49.tar.xz +sha256 5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911 bluez-5.50.tar.xz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index aff1fd9796..0133e1507f 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -4,15 +4,13 @@ # ################################################################################ -BLUEZ5_UTILS_VERSION = 5.49 +BLUEZ5_UTILS_VERSION = 5.50 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB -# 0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_CONF_OPTS = \ --enable-tools \ From b05f8f43968153af197ba0e635c8afa6856665ba Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 19 Jun 2018 17:44:41 +0300 Subject: [PATCH 1829/2640] imx-usb-loader: fix build with older gcc Since the last version bump imx-usb-loader uses __builtin_bswap16 which is not universally available in gcc older than version 4.8. Add a patch switching to a local 16-bit bytes swap implementation. Should fix: http://autobuild.buildroot.net/results/a63/a63b593b7ef3b6d32e755afe42b77d47dbf0276e/ http://autobuild.buildroot.net/results/48c/48c95cfc65f99fa02be81a11303ba8999f57091a/ http://autobuild.buildroot.net/results/c9d/c9d4f99b49ddb9b2ce08fce7672dd7c70cf62912/ Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ....h-fix-build-with-gcc-older-than-4.8.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch diff --git a/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch b/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch new file mode 100644 index 0000000000..c0aabed542 --- /dev/null +++ b/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch @@ -0,0 +1,42 @@ +From c581e6037ec7ab2f9cd615f6ffa149b4d0a5638c Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 19 Jun 2018 15:31:52 +0300 +Subject: [PATCH] portable.h: fix build with gcc older than 4.8 + +__builtin_bswap16 is available in all gcc architectures only since +version 4.8. Older gcc versions fail to build: + +imx_sdp.o: In function `perform_dcd': +.../imx_sdp.c:1138: undefined reference to `__builtin_bswap16' +imx_sdp.o: In function `write_dcd_table_ivt': +.../imx_sdp.c:457: undefined reference to `__builtin_bswap16' +imx_sdp.o: In function `write_dcd': +.../imx_sdp.c:410: undefined reference to `__builtin_bswap16' +imx_sdp.o: In function `init_header': +.../imx_sdp.c:1075: undefined reference to `__builtin_bswap16' + +Use a local implementation instead. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/boundarydevices/imx_usb_loader/pull/82 + + portable.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/portable.h b/portable.h +index 364fe47b212a..364832b5ea69 100644 +--- a/portable.h ++++ b/portable.h +@@ -58,7 +58,7 @@ extern int debugmode; + #ifdef __GNUC__ + #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define BE32(x) __builtin_bswap32(x) +-#define BE16(x) __builtin_bswap16(x) ++#define BE16(x) (x<<8 | x>>8) + #else + #define BE32(x) x + #define BE16(x) x +-- +2.17.1 + From 91e0fc0bf46fba21af72ccf753db7f012ebdc169 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 19 Jun 2018 13:27:06 -0700 Subject: [PATCH 1830/2640] gcc: fix uclibc runtime issue with gcc-8 for xtensa gcc-8.1 for xtensa miscompiles uClibc dynamic linker due to gcc PR target/65416. The build completes successfully, but the binary is non-functional because the following fragment in the _dl_get_ready_to_run in ld-uClibc.so overwrites register spill area on stack causing register corruption in the previous call frame and a subsequent crash: 419f: f0c1b2 addi a11, a1, -16 41a2: 1ba9 s32i.n a10, a11, 4 41a4: 0bc9 s32i.n a12, a11, 0 41a6: 5127f2 l32i a15, a7, 0x144 41a9: 1765b2 s32i a11, a5, 92 41ac: 4e2782 l32i a8, a7, 0x138 41af: 146af2 s32i a15, a10, 80 41b2: 001b10 movsp a1, a11 The crash terminates the init process and causes kernel panic. The fix prevents reordering of movsp opcode and any access to the stack frame memory and is applicable to all existing gcc versions. Signed-off-by: Max Filippov Signed-off-by: Peter Korsgaard --- .../871-xtensa-fix-PR-target-65416.patch | 101 ++++++++++++++++++ .../0002-xtensa-fix-PR-target-65416.patch | 101 ++++++++++++++++++ .../0004-xtensa-fix-PR-target-65416.patch | 101 ++++++++++++++++++ 3 files changed, 303 insertions(+) create mode 100644 package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch create mode 100644 package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch create mode 100644 package/gcc/8.1.0/0004-xtensa-fix-PR-target-65416.patch diff --git a/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch b/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch new file mode 100644 index 0000000000..7ead575439 --- /dev/null +++ b/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch @@ -0,0 +1,101 @@ +From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 17 Jun 2018 21:18:39 -0700 +Subject: [PATCH] xtensa: fix PR target/65416 + +The issue is caused by reordering of stack pointer update after stack +space allocation with instructions that write to the allocated stack +space. In windowed ABI register spill area for the previous call frame +is located just below the stack pointer and may be reloaded back into +the register file on movsp. +Implement allocate_stack pattern for windowed ABI configuration and +insert an instruction that prevents reordering of frame memory access +and stack pointer update. + +gcc/ +2018-06-19 Max Filippov + + * config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec + constant. + (allocate_stack, frame_blockage, *frame_blockage): New patterns. + +Signed-off-by: Max Filippov +Backported from: r261755 +--- + gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md +index 84967dbedc08..209f839cfb0f 100644 +--- a/gcc/config/xtensa/xtensa.md ++++ b/gcc/config/xtensa/xtensa.md +@@ -38,6 +38,7 @@ + (UNSPEC_MEMW 11) + (UNSPEC_LSETUP_START 12) + (UNSPEC_LSETUP_END 13) ++ (UNSPEC_FRAME_BLOCKAGE 14) + + (UNSPECV_SET_FP 1) + (UNSPECV_ENTRY 2) +@@ -1676,6 +1677,32 @@ + + ;; Miscellaneous instructions. + ++;; In windowed ABI stack pointer adjustment must happen before any access ++;; to the space allocated on stack is allowed, otherwise register spill ++;; area may be clobbered. That's what frame blockage is supposed to enforce. ++ ++(define_expand "allocate_stack" ++ [(set (match_operand 0 "nonimmed_operand") ++ (minus (reg A1_REG) (match_operand 1 "add_operand"))) ++ (set (reg A1_REG) ++ (minus (reg A1_REG) (match_dup 1)))] ++ "TARGET_WINDOWED_ABI" ++{ ++ if (CONST_INT_P (operands[1])) ++ { ++ rtx neg_op0 = GEN_INT (-INTVAL (operands[1])); ++ emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0)); ++ } ++ else ++ { ++ emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, ++ operands[1])); ++ } ++ emit_move_insn (operands[0], virtual_stack_dynamic_rtx); ++ emit_insn (gen_frame_blockage ()); ++ DONE; ++}) ++ + (define_expand "prologue" + [(const_int 0)] + "" +@@ -1767,6 +1794,25 @@ + [(set_attr "length" "0") + (set_attr "type" "nop")]) + ++;; Do not schedule instructions accessing memory before this point. ++ ++(define_expand "frame_blockage" ++ [(set (match_dup 0) ++ (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++{ ++ operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); ++ MEM_VOLATILE_P (operands[0]) = 1; ++ operands[1] = stack_pointer_rtx; ++}) ++ ++(define_insn "*frame_blockage" ++ [(set (match_operand:BLK 0 "" "") ++ (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++ "" ++ [(set_attr "length" "0")]) ++ + (define_insn "trap" + [(trap_if (const_int 1) (const_int 0))] + "" +-- +2.11.0 + diff --git a/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch b/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch new file mode 100644 index 0000000000..7ead575439 --- /dev/null +++ b/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch @@ -0,0 +1,101 @@ +From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 17 Jun 2018 21:18:39 -0700 +Subject: [PATCH] xtensa: fix PR target/65416 + +The issue is caused by reordering of stack pointer update after stack +space allocation with instructions that write to the allocated stack +space. In windowed ABI register spill area for the previous call frame +is located just below the stack pointer and may be reloaded back into +the register file on movsp. +Implement allocate_stack pattern for windowed ABI configuration and +insert an instruction that prevents reordering of frame memory access +and stack pointer update. + +gcc/ +2018-06-19 Max Filippov + + * config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec + constant. + (allocate_stack, frame_blockage, *frame_blockage): New patterns. + +Signed-off-by: Max Filippov +Backported from: r261755 +--- + gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md +index 84967dbedc08..209f839cfb0f 100644 +--- a/gcc/config/xtensa/xtensa.md ++++ b/gcc/config/xtensa/xtensa.md +@@ -38,6 +38,7 @@ + (UNSPEC_MEMW 11) + (UNSPEC_LSETUP_START 12) + (UNSPEC_LSETUP_END 13) ++ (UNSPEC_FRAME_BLOCKAGE 14) + + (UNSPECV_SET_FP 1) + (UNSPECV_ENTRY 2) +@@ -1676,6 +1677,32 @@ + + ;; Miscellaneous instructions. + ++;; In windowed ABI stack pointer adjustment must happen before any access ++;; to the space allocated on stack is allowed, otherwise register spill ++;; area may be clobbered. That's what frame blockage is supposed to enforce. ++ ++(define_expand "allocate_stack" ++ [(set (match_operand 0 "nonimmed_operand") ++ (minus (reg A1_REG) (match_operand 1 "add_operand"))) ++ (set (reg A1_REG) ++ (minus (reg A1_REG) (match_dup 1)))] ++ "TARGET_WINDOWED_ABI" ++{ ++ if (CONST_INT_P (operands[1])) ++ { ++ rtx neg_op0 = GEN_INT (-INTVAL (operands[1])); ++ emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0)); ++ } ++ else ++ { ++ emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, ++ operands[1])); ++ } ++ emit_move_insn (operands[0], virtual_stack_dynamic_rtx); ++ emit_insn (gen_frame_blockage ()); ++ DONE; ++}) ++ + (define_expand "prologue" + [(const_int 0)] + "" +@@ -1767,6 +1794,25 @@ + [(set_attr "length" "0") + (set_attr "type" "nop")]) + ++;; Do not schedule instructions accessing memory before this point. ++ ++(define_expand "frame_blockage" ++ [(set (match_dup 0) ++ (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++{ ++ operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); ++ MEM_VOLATILE_P (operands[0]) = 1; ++ operands[1] = stack_pointer_rtx; ++}) ++ ++(define_insn "*frame_blockage" ++ [(set (match_operand:BLK 0 "" "") ++ (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++ "" ++ [(set_attr "length" "0")]) ++ + (define_insn "trap" + [(trap_if (const_int 1) (const_int 0))] + "" +-- +2.11.0 + diff --git a/package/gcc/8.1.0/0004-xtensa-fix-PR-target-65416.patch b/package/gcc/8.1.0/0004-xtensa-fix-PR-target-65416.patch new file mode 100644 index 0000000000..7ead575439 --- /dev/null +++ b/package/gcc/8.1.0/0004-xtensa-fix-PR-target-65416.patch @@ -0,0 +1,101 @@ +From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 17 Jun 2018 21:18:39 -0700 +Subject: [PATCH] xtensa: fix PR target/65416 + +The issue is caused by reordering of stack pointer update after stack +space allocation with instructions that write to the allocated stack +space. In windowed ABI register spill area for the previous call frame +is located just below the stack pointer and may be reloaded back into +the register file on movsp. +Implement allocate_stack pattern for windowed ABI configuration and +insert an instruction that prevents reordering of frame memory access +and stack pointer update. + +gcc/ +2018-06-19 Max Filippov + + * config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec + constant. + (allocate_stack, frame_blockage, *frame_blockage): New patterns. + +Signed-off-by: Max Filippov +Backported from: r261755 +--- + gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md +index 84967dbedc08..209f839cfb0f 100644 +--- a/gcc/config/xtensa/xtensa.md ++++ b/gcc/config/xtensa/xtensa.md +@@ -38,6 +38,7 @@ + (UNSPEC_MEMW 11) + (UNSPEC_LSETUP_START 12) + (UNSPEC_LSETUP_END 13) ++ (UNSPEC_FRAME_BLOCKAGE 14) + + (UNSPECV_SET_FP 1) + (UNSPECV_ENTRY 2) +@@ -1676,6 +1677,32 @@ + + ;; Miscellaneous instructions. + ++;; In windowed ABI stack pointer adjustment must happen before any access ++;; to the space allocated on stack is allowed, otherwise register spill ++;; area may be clobbered. That's what frame blockage is supposed to enforce. ++ ++(define_expand "allocate_stack" ++ [(set (match_operand 0 "nonimmed_operand") ++ (minus (reg A1_REG) (match_operand 1 "add_operand"))) ++ (set (reg A1_REG) ++ (minus (reg A1_REG) (match_dup 1)))] ++ "TARGET_WINDOWED_ABI" ++{ ++ if (CONST_INT_P (operands[1])) ++ { ++ rtx neg_op0 = GEN_INT (-INTVAL (operands[1])); ++ emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0)); ++ } ++ else ++ { ++ emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, ++ operands[1])); ++ } ++ emit_move_insn (operands[0], virtual_stack_dynamic_rtx); ++ emit_insn (gen_frame_blockage ()); ++ DONE; ++}) ++ + (define_expand "prologue" + [(const_int 0)] + "" +@@ -1767,6 +1794,25 @@ + [(set_attr "length" "0") + (set_attr "type" "nop")]) + ++;; Do not schedule instructions accessing memory before this point. ++ ++(define_expand "frame_blockage" ++ [(set (match_dup 0) ++ (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++{ ++ operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); ++ MEM_VOLATILE_P (operands[0]) = 1; ++ operands[1] = stack_pointer_rtx; ++}) ++ ++(define_insn "*frame_blockage" ++ [(set (match_operand:BLK 0 "" "") ++ (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))] ++ "" ++ "" ++ [(set_attr "length" "0")]) ++ + (define_insn "trap" + [(trap_if (const_int 1) (const_int 0))] + "" +-- +2.11.0 + From abb0d2ed9832ef7ace85bed579da315a0dbb2afe Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 19 Jun 2018 20:32:00 -0300 Subject: [PATCH 1831/2640] configs/mx51evk: Bump U-Boot and kernel Bump U-Boot to 2018.05 and kernel to 4.17.2 versions. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/mx51evk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 368e9beaf0..d9790ada21 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx51evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" From 2cbcf2d916d54fdb0a40f4b99d27afc1bfe854c0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 Jun 2018 21:58:04 +0200 Subject: [PATCH 1832/2640] package/berkeleydb: fix build error with gcc8 Fixes ../src/dbinc/atomic.h:179:19: error: definition of 'int __atomic_compare_exchange(db_atomic_t*, atomic_value_t, atomic_value_t)' ambiguates built-in declaration 'bool __atomic_compare_exchange(unsigned int, volatile void*, void*, void*, int, int)' static inline int __atomic_compare_exchange( ^~~~~~~~~~~~~~~~~~~~~~~~~ To reproduce the build error use this defconfig BR2_GCC_VERSION_8_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_BERKELEYDB=y BR2_PACKAGE_BERKELEYDB_COMPAT185=y BR2_PACKAGE_BERKELEYDB_TOOLS=y Please note that to trigger the error BR2_TOOLCHAIN_BUILDROOT_CXX=y is needed although berkeleydb does not depend on c++. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0002-atomic_compare_exchange.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/berkeleydb/0002-atomic_compare_exchange.patch diff --git a/package/berkeleydb/0002-atomic_compare_exchange.patch b/package/berkeleydb/0002-atomic_compare_exchange.patch new file mode 100644 index 0000000000..81e18ac96f --- /dev/null +++ b/package/berkeleydb/0002-atomic_compare_exchange.patch @@ -0,0 +1,27 @@ +Rename __atomic_compare_exchange to not clash with gcc built-in + +Downloaded from +https://src.fedoraproject.org/cgit/rpms/libdb.git/commit/?id=d6841b3b46a51db98c162347211a5a64d154ea37 + +Signed-off-by: Bernd Kuhls + +--- db-5.3.28/src/dbinc/atomic.h.old 2018-05-23 09:20:04.216914922 +0200 ++++ db-5.3.28/src/dbinc/atomic.h 2018-05-23 09:20:49.510057897 +0200 +@@ -144,7 +144,7 @@ + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __db_atomic_compare_exchange((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; From bd12cd7d4633200ce01663df6528fd061d64b784 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 Jun 2018 22:33:43 +0200 Subject: [PATCH 1833/2640] package/erlang: bump version to 21.0 Release notes: http://www.erlang.org/news/123 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...-emulator-reorder-inclued-headers-paths.patch | 16 +++++----------- package/erlang/erlang.hash | 4 ++-- package/erlang/erlang.mk | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch index c17eefc2a1..2c976f539e 100644 --- a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch +++ b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch @@ -16,6 +16,8 @@ Move INCLUDES before CFLAGS to use pcre.h from erlang. http://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log Signed-off-by: Romain Naour +[Bernd: rebased for erlang-21.0] +Signed-off-by: Bernd Kuhls --- erts/emulator/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -24,20 +26,12 @@ diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 7145824..d079487 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in -@@ -678,11 +678,11 @@ else +@@ -712,7 +712,7 @@ # Usually the same as the default rule, but certain platforms (e.g. win32) mix # different compilers $(OBJDIR)/beam_emu.o: beam/beam_emu.c - $(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ + $(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - endif - $(OBJDIR)/%.o: beam/%.c -- $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -+ $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - - $(OBJDIR)/%.o: $(TARGET)/%.c - $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@ --- -1.9.3 - + $(OBJDIR)/beam_emu.S: beam/beam_emu.c + $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index f5ff74022c..616c85e9ae 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,4 +1,4 @@ # md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 a683c8c0aacfe0305c4bf47b3abfde6a otp_src_20.3.tar.gz -sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 otp_src_20.3.tar.gz +md5 350988f024f88e9839c3715b35e7e27a otp_src_21.0.tar.gz +sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131 otp_src_21.0.tar.gz sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index b7fdb6b9ce..786641e4bd 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,7 +5,7 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 20.3 +ERLANG_VERSION = 21.0 ERLANG_SITE = http://www.erlang.org/download ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -19,7 +19,7 @@ ERLANG_AUTORECONF = YES # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.10.1 +ERLANG_EI_VSN = 3.10.3 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes From 630fd8785bd6b9cef3ada692989543ed1de6a39e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 20 Jun 2018 15:08:06 +0200 Subject: [PATCH 1834/2640] wireguard: bump version to 0.0.20180613 Contains a fix for a crash when forwarding packets from devices that use flow offloading and a x86 FPU issue on -rt kernels. Also add a post-release upstream patch fixing a compilation issue related to memcpy(). Signed-off-by: Peter Korsgaard --- ...poly1305-add-missing-string.h-header.patch | 26 +++++++++++++++++++ package/wireguard/wireguard.hash | 4 +-- package/wireguard/wireguard.mk | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 package/wireguard/0001-poly1305-add-missing-string.h-header.patch diff --git a/package/wireguard/0001-poly1305-add-missing-string.h-header.patch b/package/wireguard/0001-poly1305-add-missing-string.h-header.patch new file mode 100644 index 0000000000..8f1bfecb5c --- /dev/null +++ b/package/wireguard/0001-poly1305-add-missing-string.h-header.patch @@ -0,0 +1,26 @@ +From ed04799b1868f45e05d788e614b9b8cfa4fcab46 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Wed, 20 Jun 2018 14:55:24 +0200 +Subject: [PATCH] poly1305: add missing string.h header + +Reported-by: Peter Korsgaard +Signed-off-by: Peter Korsgaard +--- + src/crypto/poly1305.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/crypto/poly1305.c b/src/crypto/poly1305.c +index 26af4ad..65a37d9 100644 +--- a/src/crypto/poly1305.c ++++ b/src/crypto/poly1305.c +@@ -7,6 +7,7 @@ + #include "poly1305.h" + + #include ++#include + + #if defined(CONFIG_X86_64) + #include +-- +2.11.0 + diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index 7701424e4e..f7c5e65475 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2018-May/002914.html -sha256 57614239c1f1a99a367f2c816153acda5bffada66a3b8e3b8215f1625784abc9 WireGuard-0.0.20180524.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2018-June/002984.html +sha256 c120cdedc3967dcb4ad5c1c7eadd2a1b04ef5dbf2fe60cc8e7c0db337bcda7dc WireGuard-0.0.20180613.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index ee68dc5580..e1c43beea7 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20180524 +WIREGUARD_VERSION = 0.0.20180613 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 From fe03f5231f84c353914d66baef584014fcfb99f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Jun 2018 23:00:21 +0200 Subject: [PATCH 1835/2640] apache: add init sysv script sysv init script is just a wrapper to apachectl Signed-off-by: Fabrice Fontaine Tested-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/apache/S50apache | 12 ++++++++++++ package/apache/apache.mk | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 package/apache/S50apache diff --git a/package/apache/S50apache b/package/apache/S50apache new file mode 100644 index 0000000000..623a7eef3b --- /dev/null +++ b/package/apache/S50apache @@ -0,0 +1,12 @@ +#!/bin/sh + +case "$1" in + start|restart|graceful|graceful-stop|stop) + apachectl -k $1 + ;; + *) + echo "Usage: $0 {start|restart|graceful|graceful-stop|stop}" + exit 1 +esac + +exit $? diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 23414fe44d..f4c522916e 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -92,4 +92,9 @@ define APACHE_CLEANUP_TARGET endef APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET +define APACHE_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/apache/S50apache \ + $(TARGET_DIR)/etc/init.d/S50apache +endef + $(eval $(autotools-package)) From 08c7b77803285440f7370db1c0e321266390fe6b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 21 Jun 2018 20:59:29 +0200 Subject: [PATCH 1836/2640] package/pulseaudio: bump version to 12.0 Release notes: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/12.0/ Added license hashes, removed all patches after being applied upstream: https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=66885ad633db0f371693475c72133e91f1e09ee5 https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-padsp-Make-it-compile-on-musl.patch | 75 ------------------- ...nly-define-memfd_create-if-not-alrea.patch | 64 ---------------- package/pulseaudio/pulseaudio.hash | 11 ++- package/pulseaudio/pulseaudio.mk | 2 +- 4 files changed, 8 insertions(+), 144 deletions(-) delete mode 100644 package/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch delete mode 100644 package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch diff --git a/package/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch b/package/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch deleted file mode 100644 index 19842fadf0..0000000000 --- a/package/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f6ab3c3aa7a1841c8add04828029356d2a8c88e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Apr 2015 21:56:31 -0700 -Subject: [PATCH] padsp: Make it compile on musl - -break assumptions on glibc and there is no stat64 on non -glibc C libraries - -See pulseaudio bug - -https://bugs.freedesktop.org/show_bug.cgi?id=85319 - -Upstream-Status: Pending -Signed-off-by: Khem Raj -[Bernd: taken from -http://git.alpinelinux.org/cgit/aports/tree/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch, -adjusted paths.] -Signed-off-by: Bernd Kuhls - ---- - src/utils/padsp.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/utils/padsp.c b/src/utils/padsp.c -index e61373c..684721a 100644 ---- a/src/utils/padsp.c -+++ b/src/utils/padsp.c -@@ -2368,7 +2368,7 @@ fail: - return ret; - } - --#ifdef sun -+#ifndef __GLIBC__ - int ioctl(int fd, int request, ...) { - #else - int ioctl(int fd, unsigned long request, ...) { -@@ -2508,10 +2508,13 @@ int stat(const char *pathname, struct stat *buf) { - - return 0; - } -- - #ifdef HAVE_OPEN64 -- -+#undef stat64 -+#ifdef __GLIBC__ - int stat64(const char *pathname, struct stat64 *buf) { -+#else -+int stat64(const char *pathname, struct stat *buf) { -+#endif - struct stat oldbuf; - int ret; - -@@ -2544,7 +2547,7 @@ int stat64(const char *pathname, struct stat64 *buf) { - - return 0; - } -- -+#undef open64 - int open64(const char *filename, int flags, ...) { - va_list args; - mode_t mode = 0; -@@ -2670,8 +2673,8 @@ FILE* fopen(const char *filename, const char *mode) { - } - - #ifdef HAVE_OPEN64 -- --FILE *fopen64(const char *filename, const char *mode) { -+#undef fopen64 -+FILE *fopen64(const char *__restrict filename, const char *__restrict mode) { - - debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL"); - --- -2.1.4 - diff --git a/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch deleted file mode 100644 index 8f103bf201..0000000000 --- a/package/pulseaudio/0002-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen -Date: Wed, 24 Jan 2018 03:51:49 +0200 -Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already - defined - -glibc 2.27 is to be released soon, and it will provide memfd_create(). -If glibc provides the function, we must not define it ourselves, -otherwise building fails due to conflict between the two implementations -of the same function. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 -Signed-off-by: Romain Naour ---- - configure.ac | 3 +++ - src/pulsecore/memfd-wrappers.h | 7 ++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0084c86e..0eb44b08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -610,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], - [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. - *** Use linux v3.17 or higher for such a feature.])]) - -+AS_IF([test "x$HAVE_MEMFD" = "x1"], -+ AC_CHECK_FUNCS([memfd_create])) -+ - AC_SUBST(HAVE_MEMFD) - AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) - AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) -diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h -index 3bed9b2b..c7aadfd3 100644 ---- a/src/pulsecore/memfd-wrappers.h -+++ b/src/pulsecore/memfd-wrappers.h -@@ -20,13 +20,14 @@ - License along with PulseAudio; if not, see . - ***/ - --#ifdef HAVE_MEMFD -+#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) - - #include - #include - - /* -- * No glibc wrappers exist for memfd_create(2), so provide our own. -+ * Before glibc version 2.27 there was no wrapper for memfd_create(2), -+ * so we have to provide our own. - * - * Also define memfd fcntl sealing macros. While they are already - * defined in the kernel header file , that file as -@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { - #define F_SEAL_WRITE 0x0008 /* prevent writes */ - #endif - --#endif /* HAVE_MEMFD */ -+#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ - - #endif --- -2.14.3 - diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index 7e59afdf9a..f10ed82e90 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,8 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2017-September/028733.html -md5 390de38231d5cdd6b43ada8939eb74f1 pulseaudio-11.1.tar.xz -sha1 53bde72b6bfe715c19b1519db8845f7a58346b67 pulseaudio-11.1.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-June/030091.html +md5 efe7683310080e80bc42707285df8c36 pulseaudio-12.0.tar.xz +sha1 9b0dcd62ae4c24542e13644e5fac3de5b13d6db7 pulseaudio-12.0.tar.xz # Locally computed -sha256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e pulseaudio-11.1.tar.xz +sha256 6e422dbdc9fd11c0cb6af869e5eda73dc24a8be3c14725440edd51ce6b464444 pulseaudio/pulseaudio-12.0.tar.xz +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL +sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index f59828d43d..1f6bab2e3d 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 11.1 +PULSEAUDIO_VERSION = 12.0 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From b077257de88ed25cba6ad542196bbf5b604b93d3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 21 Jun 2018 23:11:18 +0300 Subject: [PATCH 1837/2640] pulseaudio: remove autoreconf Commit 08c7b77803285 (package/pulseaudio: bump version to 12.0) removed configure.ac patch, but forgot to drop autoreconf. Fix that. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/pulseaudio/pulseaudio.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 1f6bab2e3d..55f9def639 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -15,9 +15,6 @@ PULSEAUDIO_CONF_OPTS = \ --disable-legacy-database-entry-format \ --disable-manpages -# 0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch -PULSEAUDIO_AUTORECONF = YES - PULSEAUDIO_DEPENDENCIES = \ host-pkgconf libtool libsndfile speex host-intltool \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ From 7817f9f0369003e078a7dae1fc5b9876075295cf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Jun 2018 06:19:28 +0300 Subject: [PATCH 1838/2640] edid-decode: update upstream locations edid-decode moved to linuxtv.org. Update homepage link and download site. https://www.spinics.net/lists/linux-media/msg136517.html Cc: Peter Seiderer Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/edid-decode/Config.in | 2 +- package/edid-decode/edid-decode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index 64297b494d..701c70031f 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_EDID_DECODE help Decode EDID data in human-readable format. - http://cgit.freedesktop.org/xorg/app/edid-decode/ + https://git.linuxtv.org/edid-decode.git/ diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index a4141b899b..b412a77a13 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -5,7 +5,7 @@ ################################################################################ EDID_DECODE_VERSION = f56f329ed23a25d002352dedba1e8f092a47286f -EDID_DECODE_SITE = git://anongit.freedesktop.org/git/xorg/app/edid-decode.git +EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = edid-decode.c From 6076a40cd59d7b1f26162d46b670349693532854 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Jun 2018 06:57:53 +0300 Subject: [PATCH 1839/2640] strace: bump to version 4.23 Add reference to tarball signature verification key. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index f50e89c060..c6450b1c51 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking signature -# https://strace.io/files/4.22/strace-4.22.tar.xz.asc -sha256 068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d strace-4.22.tar.xz +# Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 +# https://strace.io/files/4.23/strace-4.23.tar.xz +sha256 7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad strace-4.23.tar.xz sha256 df862ba273812c589fd69acc74197a25d38c5295baccab00a62d39d1894c0253 COPYING diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4af01b9928..471dbc2e1d 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.22 +STRACE_VERSION = 4.23 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = BSD-3-Clause From c67889623ed5ed9aa8d5006edc1db90541554304 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Jun 2018 07:48:32 +0300 Subject: [PATCH 1840/2640] iproute2: bump to version 4.17.0 Drop upstream patch. Cc: Petr Vorel Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0001-arpd-remove-pthread-dependency.patch | 37 ------------------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/iproute2/0001-arpd-remove-pthread-dependency.patch diff --git a/package/iproute2/0001-arpd-remove-pthread-dependency.patch b/package/iproute2/0001-arpd-remove-pthread-dependency.patch deleted file mode 100644 index bfc9649d35..0000000000 --- a/package/iproute2/0001-arpd-remove-pthread-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4a4f4d491f89bdd580fdd7a901a3300cb5e9789e Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 1 May 2018 15:33:47 +0300 -Subject: [PATCH] arpd: remove pthread dependency - -Explicit link with pthread is not needed when linking dynamically. Even -static link with recent libdb does not pull in the code that uses -pthread. Finally, the configure check introduced in commit a25df4887d7 -(configure: Check for Berkeley DB for arpd compilation) does not add --lpthread to its link command. - -This change allows arpd build with toolchains that do not provide -threads support. - -Signed-off-by: Baruch Siach ---- -Upstream status: http://patchwork.ozlabs.org/patch/907031/ - - misc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/Makefile b/misc/Makefile -index 34ef6b21b4ed..b2dd6b26e2dc 100644 ---- a/misc/Makefile -+++ b/misc/Makefile -@@ -25,7 +25,7 @@ rtacct: rtacct.c - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm - - arpd: arpd.c -- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb -lpthread -+ $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb - - ssfilter.c: ssfilter.y - $(QUIET_YACC)bison ssfilter.y -o ssfilter.c --- -2.17.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 9f808b742a..48867f0a99 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a iproute2-4.16.0.tar.xz +sha256 6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e iproute2-4.17.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 319e69b93f..1f276ac7ed 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.16.0 +IPROUTE2_VERSION = 4.17.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 694cdb9273433e8a1278e2e3bb2a7fe2004aa813 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Jun 2018 08:38:41 +0300 Subject: [PATCH 1841/2640] gnutls: drop wchar dependency Commit 19448f40a0 (gnutls: use included unistring unless libunistring is selected) made libunistring an optional dependency. So now gnutls no longer depend on wchar. Drop wchar dependency of libmicrohttpd and libsoup, which are gnutls reverse dependencies that do not depend themselves on wchar. Update the comments in libsoup and taskd; the wchar dependency is now not due to gnutls. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnutls/Config.in | 5 ++--- package/libmicrohttpd/Config.in | 5 ++--- package/libsoup/Config.in | 2 +- package/taskd/Config.in | 2 +- package/vpnc/Config.in | 5 ++--- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index ef995d21d2..61b4b239ff 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_GNUTLS bool "gnutls" # https://gitlab.com/gnutls/gnutls/issues/203 depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_NETTLE select BR2_PACKAGE_PCRE @@ -24,5 +23,5 @@ config BR2_PACKAGE_GNUTLS_TOOLS endif -comment "gnutls needs a toolchain w/ wchar, dynamic library" - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS +comment "gnutls needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index 7f3c9bb8fd..f3386a63f2 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -12,13 +12,12 @@ if BR2_PACKAGE_LIBMICROHTTPD config BR2_PACKAGE_LIBMICROHTTPD_SSL bool "https support" depends on !BR2_STATIC_LIBS # gnutls - depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS help Enable HTTPS (SSL) support. -comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library" - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS +comment "libmicrohttpd https support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS endif diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 236d3c428a..f583322913 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBSOUP bool "libsoup" - depends on BR2_USE_WCHAR # glib2 and gnutls + depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 diff --git a/package/taskd/Config.in b/package/taskd/Config.in index 19d123fb59..c068b34724 100644 --- a/package/taskd/Config.in +++ b/package/taskd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_TASKD bool "taskd" depends on !BR2_STATIC_LIBS # gnutls - depends on BR2_USE_WCHAR # gnutls + depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_GNUTLS diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in index 6455b0d87a..b988ba342b 100644 --- a/package/vpnc/Config.in +++ b/package/vpnc/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_VPNC depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # gnutls select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_GNUTLS @@ -16,6 +15,6 @@ config BR2_PACKAGE_VPNC http://www.unix-ag.uni-kl.de/~massar/vpnc -comment "vpnc needs a toolchain w/ wchar, dynamic library" +comment "vpnc needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS From 8974ebaab005a40cf1564650d54d80830e730f55 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 20 Jun 2018 18:29:32 -0300 Subject: [PATCH 1842/2640] linux-headers: bump 4.{14, 16}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 24a2433f27..97d43e681b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -264,8 +264,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.50" if BR2_KERNEL_HEADERS_4_14 + default "4.14.51" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 - default "4.16.16" if BR2_KERNEL_HEADERS_4_16 + default "4.16.17" if BR2_KERNEL_HEADERS_4_16 default "4.17.2" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7574a5b0557f03c3f3d0e059e332749314546092 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Jun 2018 14:44:05 +0300 Subject: [PATCH 1843/2640] imx-usb-loader: make the byte swap macro more robust The local 16-bit byte swap implementation that was introduced in commit b05f8f439681 (imx-usb-loader: fix build with older gcc) is not robust enough. It suffers from double evaluation, and operators precedence breakage. Use a better implementation suggested by Arnout Vandecappelle. Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ....h-fix-build-with-gcc-older-than-4.8.patch | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch b/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch index c0aabed542..902b94d198 100644 --- a/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch +++ b/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch @@ -1,4 +1,4 @@ -From c581e6037ec7ab2f9cd615f6ffa149b4d0a5638c Mon Sep 17 00:00:00 2001 +From b9cb60a911c35650c26995c7e6f7051fdf702d22 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 19 Jun 2018 15:31:52 +0300 Subject: [PATCH] portable.h: fix build with gcc older than 4.8 @@ -15,25 +15,30 @@ imx_sdp.o: In function `write_dcd': imx_sdp.o: In function `init_header': .../imx_sdp.c:1075: undefined reference to `__builtin_bswap16' -Use a local implementation instead. +Use a local implementation instead. The implementation suggested by +Arnout Vandecappelle on the Buildroot mailing list. Signed-off-by: Baruch Siach --- Upstream status: https://github.com/boundarydevices/imx_usb_loader/pull/82 - portable.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + portable.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/portable.h b/portable.h -index 364fe47b212a..364832b5ea69 100644 +index 364fe47b212a..b8a302bae400 100644 --- a/portable.h +++ b/portable.h -@@ -58,7 +58,7 @@ extern int debugmode; +@@ -58,7 +58,11 @@ extern int debugmode; #ifdef __GNUC__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #define BE32(x) __builtin_bswap32(x) -#define BE16(x) __builtin_bswap16(x) -+#define BE16(x) (x<<8 | x>>8) ++#define BE16(x) \ ++({ \ ++ typeof(x) __x = (x); \ ++ (__x<<8 | __x>>8); \ ++}) #else #define BE32(x) x #define BE16(x) x From 876917689b32c5b65ba4e0b2014b79c55b6a45f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Jun 2018 18:36:28 +0200 Subject: [PATCH 1844/2640] apache: add reload target to sysv init script Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apache/S50apache | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/apache/S50apache b/package/apache/S50apache index 623a7eef3b..b687419055 100644 --- a/package/apache/S50apache +++ b/package/apache/S50apache @@ -4,8 +4,11 @@ case "$1" in start|restart|graceful|graceful-stop|stop) apachectl -k $1 ;; + reload) + apachectl -k restart + ;; *) - echo "Usage: $0 {start|restart|graceful|graceful-stop|stop}" + echo "Usage: $0 {start|restart|reload|graceful|graceful-stop|stop}" exit 1 esac From 19819bc7a82471615cc9f8f9c3bff32b0d53de07 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Wed, 20 Jun 2018 16:41:19 -0500 Subject: [PATCH 1845/2640] protobuf: bump to 3.6.0 (also bumps protobuf-python) Fixes the following issue and brauto builds https://github.com/google/protobuf/issues/3937 http://autobuild.buildroot.net/results/982f727495c1d3524685015c34b1cbb1e0bbb4b0 http://autobuild.buildroot.net/results/adbd3088e24d7e681c995f8c3d1db0e14ac500ba Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- package/protobuf/protobuf.hash | 3 ++- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 4492487efb..bcd1f64de0 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c28dba8782da2cfea1e11c61d335958c31a9c1bc553063546af9cbe98f204092 protobuf-cpp-3.5.1.tar.gz +sha256 c3cab055964d554e4fd85067fe3e9eb45c9915cebcf537e97fafaa245376bce1 protobuf-cpp-3.6.0.tar.gz +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 1440589c14..9caf87ed93 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works, as they share the same # version/site variables. -PROTOBUF_VERSION = 3.5.1 +PROTOBUF_VERSION = 3.6.0 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 9c7606ce34..652751c7b6 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 13d3c15ebfad8c28bee203dd4a0f6e600d2a7d2243bac8b5d0e517466500fcae protobuf-python-3.5.1.tar.gz +sha256 6b399412cd68c7efe64d31824ad0db44f803aed91d0c6a9ea94272682c3da2df protobuf-python-3.6.0.tar.gz +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From 28de0c07cf4e92f63a47328369e391241791cdc0 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Fri, 22 Jun 2018 13:01:21 -0700 Subject: [PATCH 1846/2640] python-raven: bump to version 6.9.0 Signed-off-by: Joseph Kogut Signed-off-by: Peter Korsgaard --- package/python-raven/python-raven.hash | 8 ++++---- package/python-raven/python-raven.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-raven/python-raven.hash b/package/python-raven/python-raven.hash index ce21886e76..1e451ba41d 100644 --- a/package/python-raven/python-raven.hash +++ b/package/python-raven/python-raven.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/raven/json -md5 35398b2447d337315e0069c2580d3468 raven-6.7.0.tar.gz -sha256 f908e9b39f02580e7f822030d119ed3b2e8d32300a2fec6373e5827d588bbae7 raven-6.7.0.tar.gz -# License file, locally calculated +# md5, sha256 from https://pypi.org/pypi/raven/json +md5 ba514edaca361a0edb476f76c959d8af raven-6.9.0.tar.gz +sha256 3fd787d19ebb49919268f06f19310e8112d619ef364f7989246fc8753d469888 raven-6.9.0.tar.gz +# Locally computed sha256 checksums sha256 5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233 LICENSE diff --git a/package/python-raven/python-raven.mk b/package/python-raven/python-raven.mk index 4aa49f5b37..b822fcda78 100644 --- a/package/python-raven/python-raven.mk +++ b/package/python-raven/python-raven.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RAVEN_VERSION = 6.7.0 +PYTHON_RAVEN_VERSION = 6.9.0 PYTHON_RAVEN_SOURCE = raven-$(PYTHON_RAVEN_VERSION).tar.gz -PYTHON_RAVEN_SITE = https://files.pythonhosted.org/packages/d7/54/7d199f893a0ac01f8df9b7ec39c0f3ac19146e78b33401b1f4984c9d3583 +PYTHON_RAVEN_SITE = https://files.pythonhosted.org/packages/8f/80/e8d734244fd377fd7d65275b27252642512ccabe7850105922116340a37b PYTHON_RAVEN_SETUP_TYPE = setuptools PYTHON_RAVEN_LICENSE = BSD-3-Clause PYTHON_RAVEN_LICENSE_FILES = LICENSE From 2ce4028d5ff53acc56c6f07b4c63ccc9105004d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Jun 2018 23:08:58 +0200 Subject: [PATCH 1847/2640] apache: add systemd init script Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apache/apache.mk | 8 ++++++++ package/apache/apache.service | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/apache/apache.service diff --git a/package/apache/apache.mk b/package/apache/apache.mk index f4c522916e..6ebd30ca40 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -97,4 +97,12 @@ define APACHE_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50apache endef +define APACHE_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/apache/apache.service \ + $(TARGET_DIR)/usr/lib/systemd/system/apache.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/apache.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/apache.service +endef + $(eval $(autotools-package)) diff --git a/package/apache/apache.service b/package/apache/apache.service new file mode 100644 index 0000000000..b8747e2658 --- /dev/null +++ b/package/apache/apache.service @@ -0,0 +1,13 @@ +[Unit] +Description=Apache HTTP Server +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/apachectl start +ExecReload=/usr/bin/apachectl graceful +ExecStop=/usr/bin/apachectl stop +Restart=always + +[Install] +WantedBy=multi-user.target From 902f537b14ffba28f65df299b32678aecd41d686 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Jun 2018 23:25:26 +0200 Subject: [PATCH 1848/2640] libnss: bump to version 3.38 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 2b79901a7c..2a7ca2b065 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_3_RTM/src/SHA256SUMS -sha256 9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be nss-3.37.3.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_38_RTM/src/SHA256SUMS +sha256 2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62 nss-3.38.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index dd84aafcbe..03f575014d 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,8 +4,7 @@ # ################################################################################ -LIBNSS_VERSION_MAJOR = 3.37 -LIBNSS_VERSION = $(LIBNSS_VERSION_MAJOR).3 +LIBNSS_VERSION = 3.38 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 889d904f8ad85ad3aeb6bf696a2f125c9deeb44e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Jun 2018 23:12:18 +0200 Subject: [PATCH 1849/2640] libxml2: bump to version 2.9.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index f7e046bff6..d114d98060 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c libxml2-2.9.7.tar.gz +sha256 0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732 libxml2-2.9.8.tar.gz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index a6285a6946..06a802eb10 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.7 +LIBXML2_VERSION = 2.9.8 LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT From d759195b44342c981175de6ddde6a71b7ce47b27 Mon Sep 17 00:00:00 2001 From: Paresh Chaudhary Date: Wed, 20 Jun 2018 16:04:33 -0500 Subject: [PATCH 1850/2640] strongswan: bump to version 5.6.3 Signed-off-by: Paresh Chaudhary Signed-off-by: Matt Weber Signed-off-by: Peter Korsgaard --- ...af_alg-fix-crypt-definition-conflict.patch | 55 ------------------- ...swan-add-missing-include-of-stdint.h.patch | 32 ----------- package/strongswan/strongswan.hash | 9 +-- package/strongswan/strongswan.mk | 6 +- 4 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch delete mode 100644 package/strongswan/0002-strongswan-add-missing-include-of-stdint.h.patch diff --git a/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch b/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch deleted file mode 100644 index 442e53eb9e..0000000000 --- a/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0b906cb025a506be1b73e5b485179585d1a90be2 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 11 May 2017 14:04:47 +0300 -Subject: [PATCH] af_alg: fix crypt() definition conflict - -Rename the crypt() method to avoid conflict with POSIX crypt(). Fixes the -following build failure with musl libc: - -In file included from ../../../../src/libstrongswan/utils/utils.h:53:0, - from ../../../../src/libstrongswan/library.h:101, - from af_alg_ops.h:24, - from af_alg_ops.c:16: -af_alg_ops.c:110:22: error: conflicting types for 'crypt' - METHOD(af_alg_ops_t, crypt, bool, - ^ -../../../../src/libstrongswan/utils/utils/object.h:99:13: note: in definition of macro 'METHOD' - static ret name(union {iface *_public; this;} \ - ^ -In file included from af_alg_ops.c:18:0: -.../host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/unistd.h:144:7: note: previous declaration of 'crypt' was here - char *crypt(const char *, const char *); - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/strongswan/strongswan/pull/72 - - src/libstrongswan/plugins/af_alg/af_alg_ops.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.c b/src/libstrongswan/plugins/af_alg/af_alg_ops.c -index 331d1e8010aa..452cd1ac30c9 100644 ---- a/src/libstrongswan/plugins/af_alg/af_alg_ops.c -+++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.c -@@ -107,7 +107,7 @@ METHOD(af_alg_ops_t, hash, bool, - return TRUE; - } - --METHOD(af_alg_ops_t, crypt, bool, -+METHOD(af_alg_ops_t, crypt_, bool, - private_af_alg_ops_t *this, u_int32_t type, chunk_t iv, chunk_t data, - char *out) - { -@@ -224,7 +224,7 @@ af_alg_ops_t *af_alg_ops_create(char *type, char *alg) - .public = { - .hash = _hash, - .reset = _reset, -- .crypt = _crypt, -+ .crypt = _crypt_, - .set_key = _set_key, - .destroy = _destroy, - }, --- -2.11.0 - diff --git a/package/strongswan/0002-strongswan-add-missing-include-of-stdint.h.patch b/package/strongswan/0002-strongswan-add-missing-include-of-stdint.h.patch deleted file mode 100644 index d5ca690b2d..0000000000 --- a/package/strongswan/0002-strongswan-add-missing-include-of-stdint.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a8fd708ce89d5ffb64a5e8873d49a55094dde898 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 2 Oct 2017 10:16:36 -0500 -Subject: [PATCH] strongswan: add missing include of stdint.h - -Recent releases of glibc don't include the full stdint.h -header in some network headers included by utils.h. -Upstream is targetting a 5.6.1 release of the fix. - -Ustream: https://wiki.strongswan.org/issues/2425 - -Signed-off-by: Matthew Weber ---- - src/libstrongswan/utils/utils/memory.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h -index aef318f..c11624d 100644 ---- a/src/libstrongswan/utils/utils/memory.h -+++ b/src/libstrongswan/utils/utils/memory.h -@@ -14,6 +14,8 @@ - * for more details. - */ - -+#include /* for uintptr_t */ -+ - /** - * @defgroup memory_i memory - * @{ @ingroup utils_i --- -1.9.1 - diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 820c712843..9a800572d7 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,10 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.4.0.tar.bz2.md5 -md5 9d7c77b0da9b69f859624897e5e9ebbf strongswan-5.4.0.tar.bz2 +# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5 +md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 # Calculated based on the hash above -sha256 f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89 strongswan-5.4.0.tar.bz2 +sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 # Locally calculated -sha256 f5ba7f46cf7ae81dd81bc86f9e4cfa0c5c7c6987149b3bc9c0b8bf08598a1063 strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch -sha256 03db8c7a4133e877e8992e155c046dd27ec4810d50f239abf55595f0280caf31 strongswan-5.0.0-5.5.2_asn1_choice.patch -sha256 c80e02c9a5eeaf10f0a8bdde3be6375dd2833e515af03dad3a700e93c4fd041a strongswan-4.4.0-5.5.3_gmp_mpz_export.patch sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 65618af33b..5c597d572a 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,13 +4,9 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.4.0 +STRONGSWAN_VERSION = 5.6.3 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org -STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/21_gmp_mpz_powm_sec_patch/strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch \ - $(STRONGSWAN_SITE)/patches/22_asn1_choice_patch/strongswan-5.0.0-5.5.2_asn1_choice.patch \ - $(STRONGSWAN_SITE)/patches/23_gmp_mpz_export_patch/strongswan-4.4.0-5.5.3_gmp_mpz_export.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf From e06bf3b28a45f069be24f77fe75c157d296409d4 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 23 Jun 2018 08:49:56 +0300 Subject: [PATCH 1851/2640] libuv: bump to version 1.21.0 Signed-off-by: Asaf Kahlon Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index e877e0a1e9..612f45b6ad 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 43a388687194a15d5f3cc1980d53c405020a3586254c620e5f3c4d241bb9da05 libuv-v1.20.3.tar.gz +sha256 c6f53e4a75d2601db8efe0e837839969de7667d36569110429a0bc8f8229bf59 libuv-v1.21.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 83b39ac7a2..591eaeb7c4 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.20.3 +LIBUV_VERSION = v1.21.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 3e80e66cc083af519e3b447cad1ccf45c86ecec9 Mon Sep 17 00:00:00 2001 From: Atanas Palavrov Updating wiringPi to add support for RPi3B+ Date: Fri, 22 Jun 2018 10:33:33 +0300 Subject: [PATCH 1852/2640] wiringpi: bump version to 2.46 Signed-off-by: Atanas Palavrov Reviewed-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- .../0001-Adjust-for-buildroot-build.patch | 16 ++++++++++------ package/wiringpi/wiringpi.hash | 2 +- package/wiringpi/wiringpi.mk | 3 +-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch index 520555c8e8..2f4f0c1f0a 100644 --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch @@ -12,6 +12,10 @@ Subject: [PATCH] Adjust for buildroot build. - add gpio-static linking target Signed-off-by: Peter Seiderer + + - Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a + +Signed-off-by: Atanas Palavrov --- devLib/Makefile | 9 +++++---- gpio/Makefile | 14 +++++++++----- @@ -54,7 +58,7 @@ index cf665d6..3fb41e8 100644 .PHONY: install-static diff --git a/gpio/Makefile b/gpio/Makefile -index f41a005..7095fa5 100644 +index 9ec160d..360d64c 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -32,11 +32,11 @@ endif @@ -89,7 +93,7 @@ index f41a005..7095fa5 100644 $Q echo [Compile] $< $Q $(CC) -c $(CFLAGS) $< -o $@ diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index e1868b9..68c950e 100644 +index 287fa58..81595d3 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile @@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) @@ -102,10 +106,10 @@ index e1868b9..68c950e 100644 DEFS = -D_GNU_SOURCE -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC + #CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC LIBS = -lm -lpthread -lrt -lcrypt - -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) +@@ -76,6 +76,7 @@ static: $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) @@ -113,7 +117,7 @@ index e1868b9..68c950e 100644 .c.o: $Q echo [Compile] $< -@@ -104,7 +105,7 @@ install: $(DYNAMIC) +@@ -101,7 +102,7 @@ install: $(DYNAMIC) $Q echo "[Install Dynamic Lib]" $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) @@ -121,7 +125,7 @@ index e1868b9..68c950e 100644 + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so $Q $(LDCONFIG) - .PHONY: install-static + .PHONY: install-deb -- 2.11.0 diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash index f4832e5fa8..9c4fe22f5f 100644 --- a/package/wiringpi/wiringpi.hash +++ b/package/wiringpi/wiringpi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz +sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk index f2e9e246d9..497a5d1ebe 100644 --- a/package/wiringpi/wiringpi.mk +++ b/package/wiringpi/wiringpi.mk @@ -4,8 +4,7 @@ # ################################################################################ -# using git commit id instead of (wrong) 2.44 git tag (Bug 10391) -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 +WIRINGPI_VERSION = 2.46 WIRINGPI_SITE = git://git.drogon.net/wiringPi WIRINGPI_LICENSE = LGPL-3.0+ From dff052827e41b63f3bf287cf44f1185f2b6c139e Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 23 Jun 2018 12:11:07 +0300 Subject: [PATCH 1853/2640] DEVELOPERS: add myself to package/libuv Signed-off-by: Asaf Kahlon Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d22ac527fa..d9b0d80a92 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -195,6 +195,7 @@ F: package/sqlcipher/ F: package/stress/ N: Asaf Kahlon +F: package/libuv F: package/python-jsonmodels/ F: package/python-reentry/ F: package/python-subprocess32/ From 8646a7fae998132cf468454be8b762211713d5ca Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 22 Jun 2018 23:09:49 +0200 Subject: [PATCH 1854/2640] package/gdb: fix gdbserver build for m68k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As for strace [1], when is included after , the build fails on m68k with the following diagnostics: In file included from ./../nat/linux-ptrace.h:28:0, from linux-low.h:27, from linux-m68k-low.c:20: [...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant PT_D1 = 0, ^ [...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant [...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant In file included from linux-m68k-low.c:27:0: [...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token }; ^ Fix this by moving on top of "linux-low.h". Fixes: https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006385 [1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Cc: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- .../0007-gdbserver-fix-build-for-m68k.patch | 62 +++++++++++++++++++ .../0005-gdbserver-fix-build-for-m68k.patch | 62 +++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch b/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..451bed312c --- /dev/null +++ b/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,62 @@ +From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c +index 5594f10f927..19b4ef7b259 100644 +--- a/gdb/gdbserver/linux-m68k-low.c ++++ b/gdb/gdbserver/linux-m68k-low.c +@@ -17,16 +17,17 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Defined in auto-generated file reg-m68k.c. */ + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.14.4 + diff --git a/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch b/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..451bed312c --- /dev/null +++ b/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,62 @@ +From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c +index 5594f10f927..19b4ef7b259 100644 +--- a/gdb/gdbserver/linux-m68k-low.c ++++ b/gdb/gdbserver/linux-m68k-low.c +@@ -17,16 +17,17 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Defined in auto-generated file reg-m68k.c. */ + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.14.4 + From f5b8f82346aa13ee8bf47a759ffc7c18390fef4f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Jun 2018 17:17:36 +0200 Subject: [PATCH 1855/2640] DEVELOPERS: add a trailing slash for libuv Reported-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index d9b0d80a92..cb55ad64b8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -195,7 +195,7 @@ F: package/sqlcipher/ F: package/stress/ N: Asaf Kahlon -F: package/libuv +F: package/libuv/ F: package/python-jsonmodels/ F: package/python-reentry/ F: package/python-subprocess32/ From d33f41a0fc31677c723eeb731a4f7dd5dea0298d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jun 2018 15:34:10 +0200 Subject: [PATCH 1856/2640] package/erlang: fix host build with host-pcre package https://git.buildroot.net/buildroot/commit/?id=bd12cd7d4633200ce01663df6528fd061d64b784 added an incompletely rebased patch to fix host-erlang when pcre is available on the host. Fixes http://autobuild.buildroot.net/results/484/484a54b005764958073674bf07f6a760bfedb071/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...002-erts-emulator-reorder-inclued-headers-paths.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch index 2c976f539e..7a6e469dff 100644 --- a/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch +++ b/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch @@ -35,3 +35,12 @@ index 7145824..d079487 100644 $(OBJDIR)/beam_emu.S: beam/beam_emu.c $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ +@@ -765,7 +765,7 @@ + # General targets + # + $(OBJDIR)/%.o: beam/%.c +- $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ ++ $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ + + $(OBJDIR)/%.o: $(TARGET)/%.c + $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@ From b7774990a3a39bf3323c8d3c337f84a1f92972d7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 23 Jun 2018 11:19:34 +0200 Subject: [PATCH 1857/2640] toolchain-external: bump version of Linaro AArch64 toolchain to 7.3-2018.05 https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05 Tested with qemu_aarch64_virt_defconfig. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-aarch64/Config.in | 2 +- .../toolchain-external-linaro-aarch64.hash | 4 ++-- .../toolchain-external-linaro-aarch64.mk | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 9134c27f3b..aabf2cffe8 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2017.11" + bool "Linaro AArch64 2018.05" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index fb24f1b34b..938e37c779 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3130033eaf18d7f7d775aa8ade1c7044683b0db6f332cae29cab7d1caaee97ed gcc-linaro-7.2.1-2017.11-i686_aarch64-linux-gnu.tar.xz -sha256 20181f828e1075f1a493947ff91e82dd578ce9f8638fbdfc39e24b62857d8f8d gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu.tar.xz +sha256 466b801a60491ae1e2ce9952e0615cf04cf611596c6ffd5bfe8a89ef5be47e03 gcc-linaro-7.3.1-2018.05-i686_aarch64-linux-gnu.tar.xz +sha256 73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345 gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk index 93e00669eb..1015d63014 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.11 -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2018.05 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/7.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz endif $(eval $(toolchain-external-package)) From 421864f01e606579652a13f7cec70df863457b32 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 23 Jun 2018 11:19:35 +0200 Subject: [PATCH 1858/2640] toolchain-external: bump version of Linaro ARM toolchain to 7.3-2018.05 https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05 Tested with qemu_arm_vexpress_defconfig. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-arm/Config.in | 6 +++--- .../toolchain-external-linaro-arm.hash | 4 ++-- .../toolchain-external-linaro-arm.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index d383273c1b..e880d5dbbd 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2017.11" + bool "Linaro ARM 2018.05" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -19,8 +19,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HAS_FORTRAN help Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2017.11 (based on gcc 7.2.1), Linaro GDB 2017.11 (based on - GDB 8.0), glibc 2.25, Binutils 2017.11 (based on 2.28). It + GCC 2018.05 (based on gcc 7.3.1), Linaro GDB 2018.05 (based on + GDB 8.1), glibc 2.25, Binutils 2018.05 (based on 2.28). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index 352cbb25c5..bd09cb5a89 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72919a3a99d4e28309bc8b0e615f44c65824ef012de50db3ffe9a34776e6f510 gcc-linaro-7.2.1-2017.11-i686_arm-linux-gnueabihf.tar.xz -sha256 cee0087b1f1205b73996651b99acd3a926d136e71047048f1758ffcec69b1ca2 gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabihf.tar.xz +sha256 0613b5be14eb7d50a772bbd72069c428558e6e53fa5fce7201d75a13a475ffff gcc-linaro-7.3.1-2018.05-i686_arm-linux-gnueabihf.tar.xz +sha256 7248bf105d0d468887a9b8a7120bb281ac8ad0223d9cb3d00dc7c2d498485d91 gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk index 5437fe2d07..fda356bcea 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.11 -TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2018.05 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/7.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 6090d3e916818872b75470ddacbfebd1cc258bbc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 23 Jun 2018 11:19:36 +0200 Subject: [PATCH 1859/2640] toolchain-external: bump version of Linaro ARMeb toolchain to 7.3-2018.05 https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-armeb/Config.in | 6 +++--- .../toolchain-external-linaro-armeb.hash | 4 ++-- .../toolchain-external-linaro-armeb.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index a3dd3c9035..ebc6edefb5 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2017.11" + bool "Linaro armeb 2018.05" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -18,8 +18,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_GCC_AT_LEAST_7 help Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2017.11 (based on gcc 7.2.1), Linaro GDB - 2017.11 (based on GDB 8.0), glibc 2.25, Binutils 2017.11 + uses Linaro GCC 2018.05 (based on gcc 7.3.1), Linaro GDB + 2018.05 (based on GDB 8.1), glibc 2.25, Binutils 2018.05 (based on 2.28). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index c61611c0c6..a3b6b88b7e 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1337734b61fa246ab20a371d2802d09ad80d7b17eb62327b3b69b9edfb6bc4a1 gcc-linaro-7.2.1-2017.11-i686_armeb-linux-gnueabihf.tar.xz -sha256 c313149b6ea14e31f643aeee39e1460ae4245b75c75befd042ff4b63a07971c0 gcc-linaro-7.2.1-2017.11-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 60bf9924a0c039c94deb85cb9b129d0f28b28eadbb1fb3f7e2e227679cc43fc9 gcc-linaro-7.3.1-2018.05-i686_armeb-linux-gnueabihf.tar.xz +sha256 c1bbd598b78458d6b7ea1c971fddf736c00d57890c7131fdafd4e789289c42f9 gcc-linaro-7.3.1-2018.05-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk index 1daa1c93a5..b8ea80ff60 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -4,14 +4,14 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.11 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2018.05 -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/7.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 63e7fea0bdbc122c7d146079a3653dc64f594fb7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jun 2018 20:56:44 +0200 Subject: [PATCH 1860/2640] package/pcre: bump version to 8.42 Updated license hash after upstream commit https://vcs.pcre.org/pcre/code/tags/pcre-8.42/LICENCE?r1=1674&r2=1726 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pcre/pcre.hash | 4 ++-- package/pcre/pcre.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash index fc0bb98d05..ca72a78cd2 100644 --- a/package/pcre/pcre.hash +++ b/package/pcre/pcre.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 pcre-8.41.tar.bz2 +sha256 2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301 pcre-8.42.tar.bz2 # License files, locally calculated -sha256 9ac4dfc82b2645ff77b56b759f95f28aa15ab15a03670fa6d4313a6b351e60f0 LICENCE +sha256 f998c0f52eb704eff28f503580cfca3f2547280aa212994f6cf2d8e317587c1c LICENCE diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index b12b00dd66..163e535ec3 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE_VERSION = 8.41 +PCRE_VERSION = 8.42 PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3-Clause From 9ee2d59ba8f03a18f086a748d5c3c422261ef076 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jun 2018 20:57:52 +0200 Subject: [PATCH 1861/2640] package/pcre2: bump version to 10.31 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 6 ++++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 7b125dda9d..210e2e58c1 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,2 +1,4 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.30.tar.bz2.sig -sha256 90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db pcre2-10.30.tar.bz2 +# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.31.tar.bz2.sig +sha256 e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac pcre2-10.31.tar.bz2 +# Locally computed +sha256 4806d1c067bffe106d97dac68744373a866bfdd65486c0532ed1b41595ec4b64 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 3844622858..49ece6b9dc 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.30 +PCRE2_VERSION = 10.31 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From c0d19a208300a850b04ddf397e937ba0b2599692 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Jun 2018 21:25:06 +0200 Subject: [PATCH 1862/2640] iproute2: fix rdma build Retrieve upstream patch Fixes: - http://autobuild.buildroot.net/results/63229f485f58be32238916cd997cbe92ac3ca953 Signed-off-by: Fabrice Fontaine Reviewed-by: Baruch Siach Tested-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...rdma-sync-some-IP-headers-with-glibc.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch diff --git a/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch b/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch new file mode 100644 index 0000000000..f78a5d6b43 --- /dev/null +++ b/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch @@ -0,0 +1,39 @@ +From 5887ff0922a06d978d3271df9f01fcb04fadc75f Mon Sep 17 00:00:00 2001 +From: Hoang Le +Date: Wed, 13 Jun 2018 11:09:56 +0700 +Subject: rdma: sync some IP headers with glibc + +In the commit 9a362cc71a45, new userspace header: + (i.e rdma/rdma_user_cm.h -> linux/in6.h) +is included before the kernel space header: + (i.e utils.h -> resolv.h -> netinet/in.h). + +This leads to unsynchronous some IP headers and compiler got failure +with error: redefinition of some structs IP. + +In this commit, just reorder this including to make them in-sync. + +Signed-off-by: Hoang Le +Acked-by: Leon Romanovsky +Signed-off-by: Stephen Hemminger +Signed-off-by: Fabrice Fontaine +[Retrieved from: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=5887ff0922a06d978d3271df9f01fcb04fadc75f] +--- + rdma/rdma.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rdma/rdma.h b/rdma/rdma.h +index fcaf9e6..d4b7ba1 100644 +--- a/rdma/rdma.h ++++ b/rdma/rdma.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + From d479ef78fddc2454f171d3c58a0d09a356d9d3e4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Jun 2018 18:40:18 +0200 Subject: [PATCH 1863/2640] protobuf-c: fix build with protobuf 3.6 Add two patches retrieved from upstream Fixes: - http://autobuild.buildroot.net/results/26b84f2614f75ac101078a59afeb63bc4c0d28b7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-std-to-some-types.patch | 110 ++++++++++++ .../0002-Fix-build-with-protobuf-3.6.x.patch | 160 ++++++++++++++++++ 2 files changed, 270 insertions(+) create mode 100644 package/protobuf-c/0001-Add-std-to-some-types.patch create mode 100644 package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch diff --git a/package/protobuf-c/0001-Add-std-to-some-types.patch b/package/protobuf-c/0001-Add-std-to-some-types.patch new file mode 100644 index 0000000000..8f1a5d0be0 --- /dev/null +++ b/package/protobuf-c/0001-Add-std-to-some-types.patch @@ -0,0 +1,110 @@ +From 034e603d2a5e629c1c3fbac405638f8afb3ead51 Mon Sep 17 00:00:00 2001 +From: Fredrik Gustafsson +Date: Sun, 11 Mar 2018 08:57:46 +0100 +Subject: [PATCH] Add std:: to some types + +This is required for compilation to succeed on debian jessie with g++ +6.3.0. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: https://github.com/protobuf-c/protobuf-c/pull/309] +--- + protoc-c/c_file.h | 2 +- + protoc-c/c_generator.cc | 8 ++++---- + protoc-c/c_helpers.cc | 12 ++++++------ + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h +index ed38ce4..84df522 100644 +--- a/protoc-c/c_file.h ++++ b/protoc-c/c_file.h +@@ -104,7 +104,7 @@ class FileGenerator { + scoped_array > extension_generators_; + + // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. +- vector package_parts_; ++ std::vector package_parts_; + + GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); + }; +diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc +index a0d0cb6..79a272f 100644 +--- a/protoc-c/c_generator.cc ++++ b/protoc-c/c_generator.cc +@@ -80,13 +80,13 @@ namespace c { + // "foo=bar,baz,qux=corge" + // parses to the pairs: + // ("foo", "bar"), ("baz", ""), ("qux", "corge") +-void ParseOptions(const string& text, vector >* output) { +- vector parts; ++void ParseOptions(const string& text, std::vector >* output) { ++ std::vector parts; + SplitStringUsing(text, ",", &parts); + + for (unsigned i = 0; i < parts.size(); i++) { + string::size_type equals_pos = parts[i].find_first_of('='); +- pair value; ++ std::pair value; + if (equals_pos == string::npos) { + value.first = parts[i]; + value.second = ""; +@@ -105,7 +105,7 @@ bool CGenerator::Generate(const FileDescriptor* file, + const string& parameter, + OutputDirectory* output_directory, + string* error) const { +- vector > options; ++ std::vector > options; + ParseOptions(parameter, &options); + + // ----------------------------------------------------------------- +diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc +index b79b5b0..71b8682 100644 +--- a/protoc-c/c_helpers.cc ++++ b/protoc-c/c_helpers.cc +@@ -177,7 +177,7 @@ string ToCamel(const string &name) { + } + + string FullNameToLower(const string &full_name) { +- vector pieces; ++ std::vector pieces; + SplitStringUsing(full_name, ".", &pieces); + string rv = ""; + for (unsigned i = 0; i < pieces.size(); i++) { +@@ -188,7 +188,7 @@ string FullNameToLower(const string &full_name) { + return rv; + } + string FullNameToUpper(const string &full_name) { +- vector pieces; ++ std::vector pieces; + SplitStringUsing(full_name, ".", &pieces); + string rv = ""; + for (unsigned i = 0; i < pieces.size(); i++) { +@@ -199,7 +199,7 @@ string FullNameToUpper(const string &full_name) { + return rv; + } + string FullNameToC(const string &full_name) { +- vector pieces; ++ std::vector pieces; + SplitStringUsing(full_name, ".", &pieces); + string rv = ""; + for (unsigned i = 0; i < pieces.size(); i++) { +@@ -214,7 +214,7 @@ void PrintComment (io::Printer* printer, string comment) + { + if (!comment.empty()) + { +- vector comment_lines; ++ std::vector comment_lines; + SplitStringUsing (comment, "\r\n", &comment_lines); + printer->Print ("/*\n"); + for (int i = 0; i < comment_lines.size(); i++) +@@ -503,8 +503,8 @@ void SplitStringToIteratorUsing(const string& full, + + void SplitStringUsing(const string& full, + const char* delim, +- vector* result) { +- std::back_insert_iterator< vector > it(*result); ++ std::vector* result) { ++ std::back_insert_iterator< std::vector > it(*result); + SplitStringToIteratorUsing(full, delim, it); + } + diff --git a/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch b/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch new file mode 100644 index 0000000000..1469e01015 --- /dev/null +++ b/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch @@ -0,0 +1,160 @@ +From 67e5187e96baac2e16d88ac01471c5ce7cdc3c53 Mon Sep 17 00:00:00 2001 +From: ilovezfs +Date: Wed, 20 Jun 2018 08:08:53 -0700 +Subject: [PATCH] Fix build with protobuf 3.6.x + +Adapt to changes from https://github.com/google/protobuf/pull/4387. + +scoped_ptr and scoped_array were removed in favor of std::unique_ptr + +Signed-off-by: Fabrice Fontaine +[Retrieved from: https://github.com/protobuf-c/protobuf-c/pull/328] +--- + protoc-c/c_field.cc | 2 +- + protoc-c/c_field.h | 2 +- + protoc-c/c_file.cc | 8 ++++---- + protoc-c/c_file.h | 8 ++++---- + protoc-c/c_generator.cc | 4 ++-- + protoc-c/c_helpers.cc | 2 +- + protoc-c/c_message.cc | 6 +++--- + protoc-c/c_message.h | 6 +++--- + 8 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc +index 9fa56ef..eaa38d2 100644 +--- a/protoc-c/c_field.cc ++++ b/protoc-c/c_field.cc +@@ -189,7 +189,7 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(io::Printer* printer, + FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) + : descriptor_(descriptor), + field_generators_( +- new scoped_ptr[descriptor->field_count()]) { ++ new std::unique_ptr[descriptor->field_count()]) { + // Construct all the FieldGenerators. + for (int i = 0; i < descriptor->field_count(); i++) { + field_generators_[i].reset(MakeGenerator(descriptor->field(i))); +diff --git a/protoc-c/c_field.h b/protoc-c/c_field.h +index 91f1a03..efd5a29 100644 +--- a/protoc-c/c_field.h ++++ b/protoc-c/c_field.h +@@ -117,7 +117,7 @@ class FieldGeneratorMap { + + private: + const Descriptor* descriptor_; +- scoped_array > field_generators_; ++ std::unique_ptr[] > field_generators_; + + static FieldGenerator* MakeGenerator(const FieldDescriptor* field); + +diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc +index 9851768..6dae516 100644 +--- a/protoc-c/c_file.cc ++++ b/protoc-c/c_file.cc +@@ -83,13 +83,13 @@ FileGenerator::FileGenerator(const FileDescriptor* file, + const string& dllexport_decl) + : file_(file), + message_generators_( +- new scoped_ptr[file->message_type_count()]), ++ new std::unique_ptr[file->message_type_count()]), + enum_generators_( +- new scoped_ptr[file->enum_type_count()]), ++ new std::unique_ptr[file->enum_type_count()]), + service_generators_( +- new scoped_ptr[file->service_count()]), ++ new std::unique_ptr[file->service_count()]), + extension_generators_( +- new scoped_ptr[file->extension_count()]) { ++ new std::unique_ptr[file->extension_count()]) { + + for (int i = 0; i < file->message_type_count(); i++) { + message_generators_[i].reset( +diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h +index ed38ce4..e86cc44 100644 +--- a/protoc-c/c_file.h ++++ b/protoc-c/c_file.h +@@ -98,10 +98,10 @@ class FileGenerator { + private: + const FileDescriptor* file_; + +- scoped_array > message_generators_; +- scoped_array > enum_generators_; +- scoped_array > service_generators_; +- scoped_array > extension_generators_; ++ std::unique_ptr[] > message_generators_; ++ std::unique_ptr[] > enum_generators_; ++ std::unique_ptr[] > service_generators_; ++ std::unique_ptr[] > extension_generators_; + + // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. + vector package_parts_; +diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc +index a0d0cb6..fe3ad26 100644 +--- a/protoc-c/c_generator.cc ++++ b/protoc-c/c_generator.cc +@@ -149,7 +149,7 @@ bool CGenerator::Generate(const FileDescriptor* file, + + // Generate header. + { +- scoped_ptr output( ++ std::unique_ptr output( + output_directory->Open(basename + ".h")); + io::Printer printer(output.get(), '$'); + file_generator.GenerateHeader(&printer); +@@ -157,7 +157,7 @@ bool CGenerator::Generate(const FileDescriptor* file, + + // Generate cc file. + { +- scoped_ptr output( ++ std::unique_ptr output( + output_directory->Open(basename + ".c")); + io::Printer printer(output.get(), '$'); + file_generator.GenerateSource(&printer); +diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc +index b79b5b0..f2ab448 100644 +--- a/protoc-c/c_helpers.cc ++++ b/protoc-c/c_helpers.cc +@@ -559,7 +559,7 @@ static int CEscapeInternal(const char* src, int src_len, char* dest, + } + string CEscape(const string& src) { + const int dest_length = src.size() * 4 + 1; // Maximum possible expansion +- scoped_array dest(new char[dest_length]); ++ std::unique_ptr dest(new char[dest_length]); + const int len = CEscapeInternal(src.data(), src.size(), + dest.get(), dest_length, false); + GOOGLE_DCHECK_GE(len, 0); +diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc +index 6b22c71..85a946e 100755 +--- a/protoc-c/c_message.cc ++++ b/protoc-c/c_message.cc +@@ -83,11 +83,11 @@ MessageGenerator::MessageGenerator(const Descriptor* descriptor, + : descriptor_(descriptor), + dllexport_decl_(dllexport_decl), + field_generators_(descriptor), +- nested_generators_(new scoped_ptr[ ++ nested_generators_(new std::unique_ptr[ + descriptor->nested_type_count()]), +- enum_generators_(new scoped_ptr[ ++ enum_generators_(new std::unique_ptr[ + descriptor->enum_type_count()]), +- extension_generators_(new scoped_ptr[ ++ extension_generators_(new std::unique_ptr[ + descriptor->extension_count()]) { + + for (int i = 0; i < descriptor->nested_type_count(); i++) { +diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h +index 8b115d1..63aa97a 100644 +--- a/protoc-c/c_message.h ++++ b/protoc-c/c_message.h +@@ -126,9 +126,9 @@ class MessageGenerator { + const Descriptor* descriptor_; + string dllexport_decl_; + FieldGeneratorMap field_generators_; +- scoped_array > nested_generators_; +- scoped_array > enum_generators_; +- scoped_array > extension_generators_; ++ std::unique_ptr[] > nested_generators_; ++ std::unique_ptr[] > enum_generators_; ++ std::unique_ptr[] > extension_generators_; + + GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); + }; From b0533643926ba9b2e9c9fcf46b53b85ce7b73e07 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Jun 2018 22:24:56 +0200 Subject: [PATCH 1864/2640] cmake: fix build with libuv 1.21.0 Retrieve patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229255#c1 Fixes: - http://autobuild.buildroot.net/results/86d67e5d30f7e3ba9a4932c06640a7924202d3f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...k-uv-version-h-for-version-detection.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch diff --git a/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch b/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch new file mode 100644 index 0000000000..9abf1a538f --- /dev/null +++ b/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch @@ -0,0 +1,32 @@ +From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Sat, 23 Jun 2018 20:30:07 +0200 +Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection + +Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. +Make FindLibUV aware of the file's new location for configuration to work. + +Upstream change: https://github.com/libuv/libuv/pull/1429 + +Signed-off-by: Fabrice Fontaine +[Retrieve from: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169] +--- + Source/Modules/FindLibUV.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake +index ba13d75f8b..0554d62c23 100644 +--- a/Source/Modules/FindLibUV.cmake ++++ b/Source/Modules/FindLibUV.cmake +@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR) + set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+") + if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h") + file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") ++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h") ++ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") + elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h") + file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") + else() +-- +2.16.4 + From c4e4110d22332fd35d629259ccdfe9b934c9c633 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Jun 2018 21:59:45 +0200 Subject: [PATCH 1865/2640] mosh: fix build with protobuf 3.6.0 protobuf now requires C++11 Fixes: - http://autobuild.buildroot.net/results/6e4550e080a9d558b441dcc735b6be14f39fb03f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mosh/mosh.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index fa6ab17010..f9e335799d 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -10,6 +10,9 @@ MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS +# protobuf needs c++11 (since 3.6.0) +MOSH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) MOSH_CONF_OPTS += --with-crypto-library=openssl MOSH_DEPENDENCIES += openssl From 5dd74dbd1abbe87e0e792e2922a06909af279b3b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Jun 2018 17:32:32 +0200 Subject: [PATCH 1866/2640] protobuf: add dependency on gcc >= 4.8 Since version 3.6.0, protobuf requires C++11 Fixes: - http://autobuild.buildroot.net/results/bb299008423edf4c65ade6c159e33c4216428bf1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 8 ++++---- package/mosh/Config.in | 8 ++++---- package/protobuf-c/Config.in | 6 +++--- package/protobuf/Config.in | 10 +++++----- package/python-protobuf/Config.in | 2 +- package/riemann-c-client/Config.in | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index ccd3fbe13f..c9e61a5622 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -559,7 +559,7 @@ config BR2_PACKAGE_COLLECTD_RIEMANN # riemann-c-client -> protobuf-c depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_5 + depends on BR2_HOST_GCC_AT_LEAST_4_8 select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help @@ -588,15 +588,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS bool "write_prometheus" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf-c select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF_C help Publishes values using an embedded HTTP server, in a format compatible with Prometheus' collectd_exporter. -comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.5" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_5 +comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" config BR2_PACKAGE_COLLECTD_WRITESENSU diff --git a/package/mosh/Config.in b/package/mosh/Config.in index da8a305a06..00da41c794 100644 --- a/package/mosh/Config.in +++ b/package/mosh/Config.in @@ -1,7 +1,7 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, host and target gcc >= 4.5" +comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, host and target gcc >= 4.8" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_4_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + || !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_MOSH @@ -9,8 +9,8 @@ config BR2_PACKAGE_MOSH depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # protobuf + depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_USE_WCHAR select BR2_PACKAGE_PROTOBUF diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in index 6f916c57fe..6d7e7e11df 100644 --- a/package/protobuf-c/Config.in +++ b/package/protobuf-c/Config.in @@ -4,14 +4,14 @@ config BR2_PACKAGE_PROTOBUF_C depends on BR2_TOOLCHAIN_HAS_THREADS # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_5 # host-protobuf + depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf help Code generator and runtime libraries to use Protocol Buffers from pure C (not C++). https://github.com/protobuf-c/protobuf-c -comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 4.5" +comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_HOST_GCC_AT_LEAST_4_5 + || !BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index c91e401508..2829b2a5a7 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -30,8 +30,8 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_5 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_STATIC_LIBS help Protocol buffers are Google's language-neutral, @@ -40,8 +40,8 @@ config BR2_PACKAGE_PROTOBUF https://developers.google.com/protocol-buffers -comment "protobuf needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.5" +comment "protobuf needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_5 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in index 500c82a531..8a70e80ad7 100644 --- a/package/python-protobuf/Config.in +++ b/package/python-protobuf/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_PROTOBUF bool "python-protobuf" # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_5 # host-protobuf + depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf select BR2_PACKAGE_PYTHON_SIX # runtime help Python implementation of the Google Protocol Buffers. diff --git a/package/riemann-c-client/Config.in b/package/riemann-c-client/Config.in index 91b13b7901..c241487c7f 100644 --- a/package/riemann-c-client/Config.in +++ b/package/riemann-c-client/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf-c select BR2_PACKAGE_PROTOBUF_C help Riemann-c-client is a C client library for the Riemann @@ -13,7 +13,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT https://github.com/algernon/riemann-c-client -comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 4.5" +comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_HOST_GCC_AT_LEAST_4_5 + || !BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" From 23c91395437febc641f2bd43d90b3344ed90c428 Mon Sep 17 00:00:00 2001 From: Roman Gorbenkov Date: Fri, 22 Jun 2018 15:33:25 +0200 Subject: [PATCH 1867/2640] davfs2: new package davfs2 is a Linux file system driver that allows to mount a WebDAV resource. WebDAV is an extension to HTTP/1.1 that allows remote collaborative authoring of Web resources. [Peter: Add patch to drop -fstack-protector-strong and update dependencies, Not available on musl and nommu, fixup .hash file comments, Fix _SITE and drop autoreconf, update DEVELOPERS] Signed-off-by: Roman Gorbenkov Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++ package/Config.in | 1 + ...do-not-hardcode-fstack-protector-str.patch | 45 +++++++++++++++++++ package/davfs2/Config.in | 18 ++++++++ package/davfs2/davfs2.hash | 4 ++ package/davfs2/davfs2.mk | 17 +++++++ 6 files changed, 88 insertions(+) create mode 100644 package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch create mode 100644 package/davfs2/Config.in create mode 100644 package/davfs2/davfs2.hash create mode 100644 package/davfs2/davfs2.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb55ad64b8..626fba3159 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1665,6 +1665,9 @@ F: package/chocolate-doom/ F: package/irssi/ F: package/vnstat/ +N: Roman Gorbenkov +F: package/davfs2/ + N: Romain Naour F: package/aubio/ F: package/bullet/ diff --git a/package/Config.in b/package/Config.in index a5ecfecbf9..c8e35fd99e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -175,6 +175,7 @@ menu "Filesystem and flash utilities" source "package/cpio/Config.in" source "package/cramfs/Config.in" source "package/curlftpfs/Config.in" + source "package/davfs2/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/e2tools/Config.in" diff --git a/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch b/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch new file mode 100644 index 0000000000..54ae62fc04 --- /dev/null +++ b/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch @@ -0,0 +1,45 @@ +From d209ef650cf2f760ef8217748ab10716bd22d60d Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sun, 24 Jun 2018 10:35:37 +0200 +Subject: [PATCH] src/Makefile.am: do not hardcode -fstack-protector-strong + +davfs2 does not truly require -fstack-protector-strong, so do not hardcode +it. + +Signed-off-by: Peter Korsgaard +--- + src/Makefile.am | 3 +-- + src/Makefile.in | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index f083462..ed6b682 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -32,8 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c \ + kernel_interface.h mount_davfs.h webdav.h + umount_davfs_SOURCES = umount_davfs.c defaults.h + +-AM_CFLAGS = -Wall -Werror=format-security \ +- -fstack-protector-strong --param=ssp-buffer-size=4 ++AM_CFLAGS = -Wall -Werror=format-security + DEFS = -DPROGRAM_NAME=\"mount.davfs\" \ + -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \ + -DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \ +diff --git a/src/Makefile.in b/src/Makefile.in +index 9fee542..e98758d 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -315,8 +315,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c \ + kernel_interface.h mount_davfs.h webdav.h + + umount_davfs_SOURCES = umount_davfs.c defaults.h +-AM_CFLAGS = -Wall -Werror=format-security \ +- -fstack-protector-strong --param=ssp-buffer-size=4 ++AM_CFLAGS = -Wall -Werror=format-security + + all: all-am + +-- +2.11.0 + diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in new file mode 100644 index 0000000000..162753be3e --- /dev/null +++ b/package/davfs2/Config.in @@ -0,0 +1,18 @@ +comment "davfs2 needs a glibc or uClibc toolchain" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_USES_MUSL + +config BR2_PACKAGE_DAVFS2 + bool "davfs2" + depends on !BR2_TOOLCHAIN_USES_MUSL # error.h + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NEON + select BR2_PACKAGE_NEON_XML + help + davfs2 is a Linux file system driver that allows to + mount a WebDAV resource. WebDAV is an extension to HTTP/1.1 + that allows remote collaborative authoring of Web resources. + To use davfs2 via /etc/fstab, FEATURE_MOUNT_HELPERS + must be selected in busybox configuration. + + http://savannah.nongnu.org/projects/davfs2 diff --git a/package/davfs2/davfs2.hash b/package/davfs2/davfs2.hash new file mode 100644 index 0000000000..102659a38d --- /dev/null +++ b/package/davfs2/davfs2.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 c9c4e0f0912a782386216b2147eb9c36c47f193b8fcf3d637719e0b9fe7c96e0 davfs2-1.5.4.tar.gz +# License file, locally calculated +sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk new file mode 100644 index 0000000000..c1f8477f8b --- /dev/null +++ b/package/davfs2/davfs2.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# davfs2 +# +################################################################################ + +DAVFS2_VERSION = 1.5.4 +DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 +DAVFS2_LICENSE = GPL-3.0+ +DAVFS2_LICENSE_FILES = COPYING + +DAVFS2_DEPENDENCIES = neon + +DAVFS2_CONF_ENV += \ + ac_cv_path_NEON_CONFIG=$(STAGING_DIR)/usr/bin/neon-config + +$(eval $(autotools-package)) From 8b990639b60e71bc91bf4c80d0cdafb990eb13ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 10:52:19 +0200 Subject: [PATCH 1868/2640] host-protobuf-c: fix build with gcc 4.8 protobuf requires C++11 so add -std=c++11 for host-protobuf-c as it is experimental in gcc 4.8 Fixes: - http://autobuild.buildroot.net/results/7fe12457ccac7e8c95b1d4c1fa20d6753599742d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/protobuf-c/protobuf-c.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 4306610533..34f8294412 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -16,5 +16,8 @@ PROTOBUF_C_LICENSE_FILES = LICENSE PROTOBUF_C_AUTORECONF = YES HOST_PROTOBUF_C_AUTORECONF = YES +# host-protobuf needs c++11 (since 3.6.0) +HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From d5fa317f2dc2317d5d2526c61a6f88af92cdfc73 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 14:03:23 +0200 Subject: [PATCH 1869/2640] collectd: fix license - Since version 5.5, daemon is licensed under MIT: https://github.com/collectd/collectd/commit/889e5e6bd51d38d490289332053a238a4f1c70b3 - Plugins are licensed under MIT, GPL-2.0 or LGPL-2.1 - Add libltdl/COPYING.LIB to license files to have a copy of LGPL-2.1 as it is not in COPYING - Add hash for both license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.hash | 4 ++++ package/collectd/collectd.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/collectd/collectd.hash b/package/collectd/collectd.hash index be2f646c9c..cf7e0b83f9 100644 --- a/package/collectd/collectd.hash +++ b/package/collectd/collectd.hash @@ -1,2 +1,6 @@ # From https://collectd.org/files/SHA256SUM sha256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 collectd-5.7.1.tar.bz2 + +# Hash for license files +sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa libltdl/COPYING.LIB diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 6c987b2e36..ef45f342ae 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -9,8 +9,8 @@ COLLECTD_SITE = http://collectd.org/files COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES -COLLECTD_LICENSE = GPL-2.0, LGPL-2.1 -COLLECTD_LICENSE_FILES = COPYING +COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) +COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ From a4a6dd3e023fbdff4e1d834179c11b52072e747d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 11:56:37 +0200 Subject: [PATCH 1870/2640] domoticz: bump to version 4.9700 Remove patch (not needed anymore) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...0001-Fix-compilation-with-boost-1.66.patch | 56 ------------------- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/domoticz/0001-Fix-compilation-with-boost-1.66.patch diff --git a/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch b/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch deleted file mode 100644 index d73ea4f002..0000000000 --- a/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b9481d3382d416d72f523a0442d662e49b4192d1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Jan 2018 18:18:32 +0100 -Subject: [PATCH] Fix compilation with boost 1.66 - -Patch fetch from one of the answer of - https://github.com/domoticz/domoticz/issues/2034 -(issue still opened, no official PR sent upstream) - -Boost asio changed its API: - - http://www.boost.org/doc/libs/1_66_0/doc/html/boost_asio/net_ts.html - -Signed-off-by: Fabrice Fontaine ---- - webserver/proxyclient.cpp | 2 +- - webserver/server.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index 203ee619..efc9815a 100644 ---- a/webserver/proxyclient.cpp -+++ b/webserver/proxyclient.cpp -@@ -639,7 +639,7 @@ namespace http { - void CProxyManager::StartThread() - { - try { -- boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23); -+ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); - ctx.set_verify_mode(boost::asio::ssl::verify_none); - - proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm)); -diff --git a/webserver/server.cpp b/webserver/server.cpp -index 5255aa34..0c1af08a 100644 ---- a/webserver/server.cpp -+++ b/webserver/server.cpp -@@ -148,7 +148,7 @@ void server::handle_accept(const boost::system::error_code& e) { - ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) : - server_base(ssl_settings, user_request_handler), - settings_(ssl_settings), -- context_(io_service_, ssl_settings.get_ssl_method()) -+ context_(ssl_settings.get_ssl_method()) - { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str()); -@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler - ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) : - server_base(settings, user_request_handler), - settings_(dynamic_cast(settings)), -- context_(io_service_, dynamic_cast(settings).get_ssl_method()) { -+ context_(dynamic_cast(settings).get_ssl_method()) { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str()); - #endif --- -2.14.1 - diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 00dcf713b2..106d242d0d 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5ea8f37f2ef900e9bd17b1b5375e75bfdec4f09001e3e2e0b647a260989d014c domoticz-3.8153.tar.gz +sha256 c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 domoticz-4.9700.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index bd25708a14..af58563436 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 3.8153 +DOMOTICZ_VERSION = 4.9700 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From 85a49834caaad9083c4f8480880287253e9be9ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 12:03:37 +0200 Subject: [PATCH 1871/2640] boost: bump to version 1.67.0 Remove fifth patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/0005-fix-build-with-g-5.patch | 32 --------------------- package/boost/boost.hash | 4 +-- package/boost/boost.mk | 2 +- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/boost/0005-fix-build-with-g-5.patch diff --git a/package/boost/0005-fix-build-with-g-5.patch b/package/boost/0005-fix-build-with-g-5.patch deleted file mode 100644 index 49149e6ebf..0000000000 --- a/package/boost/0005-fix-build-with-g-5.patch +++ /dev/null @@ -1,32 +0,0 @@ -From da2793fcde5c4e3ff448b4b21348ef8b1482c678 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 16 Jan 2018 14:51:32 +0100 -Subject: [PATCH] fix build with g++5 - -Patch needed to build domoticz - -Patch fetch from one of the answer of - https://github.com/domoticz/domoticz/issues/2034: - workaround suggested to the boost developers - -Signed-off-by: Fabrice Fontaine ---- - boost/asio/detail/consuming_buffers.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/asio/detail/consuming_buffers.hpp b/boost/asio/detail/consuming_buffers.hpp -index a429f97..b7a887c 100644 ---- a/boost/asio/detail/consuming_buffers.hpp -+++ b/boost/asio/detail/consuming_buffers.hpp -@@ -102,7 +102,7 @@ public: - - std::advance(next, next_elem_); - std::size_t elem_offset = next_elem_offset_; -- while (next != end && max_size > 0 && result.count < result.max_buffers) -+ while (next != end && max_size > 0 && (result.count) < result.max_buffers) - { - Buffer next_buf = Buffer(*next) + elem_offset; - result.elems[result.count] = boost::asio::buffer(next_buf, max_size); --- -2.7.4 - diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 7eb675d5b1..fb1eb4291f 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From http://www.boost.org/users/history/version_1_66_0.html -sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 boost_1_66_0.tar.bz2 +# From http://www.boost.org/users/history/version_1_67_0.html +sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba boost_1_67_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 9ad83d5aeb..981d701bdf 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.66.0 +BOOST_VERSION = 1.67.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) BOOST_INSTALL_STAGING = YES From 960f58a2d8bf123ac91201d793bd033130b29dba Mon Sep 17 00:00:00 2001 From: Jan Dohl Date: Wed, 13 Jun 2018 16:28:16 +0200 Subject: [PATCH 1872/2640] python-tornado: bump to version 5.0.2 Tornado got a requirement on the SSL module in version 5.0.2 which is also checked in the setup.py script before installing. Since the check in buildroot runs against the host-python which is built without SSL support, these checks fail. Adding OpenSSL support to host-python does not make sense since the Python on the target will be a different one. Instead, remove the checks (which, according to the source code comments essentially check for Python >= 2.7.9 / Python3 >= 3.4 which is true for current Buildroot) and select the SSL option of Python/Python3 when Tornado is selected. Signed-off-by: Jan Dohl [Thomas: adjust commit title, convert patch to a Git formatted one.] Signed-off-by: Thomas Petazzoni --- .../0001-Disable-SSL-checks.patch | 45 +++++++++++++++++++ package/python-tornado/Config.in | 2 + package/python-tornado/python-tornado.hash | 6 +-- package/python-tornado/python-tornado.mk | 5 ++- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 package/python-tornado/0001-Disable-SSL-checks.patch diff --git a/package/python-tornado/0001-Disable-SSL-checks.patch b/package/python-tornado/0001-Disable-SSL-checks.patch new file mode 100644 index 0000000000..272afd64fe --- /dev/null +++ b/package/python-tornado/0001-Disable-SSL-checks.patch @@ -0,0 +1,45 @@ +From 82a3bbc2ac41b5a1b34a53f97459558efe131f14 Mon Sep 17 00:00:00 2001 +From: Jan Dohl +Date: Sun, 24 Jun 2018 16:00:54 +0200 +Subject: [PATCH] Disable SSL checks + +Checking for SSL support in the Python used on the build system is not +relevant, as we need SSL support in the Python on the target system. + +Signed-off-by: Jan Dohl +--- + setup.py | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/setup.py b/setup.py +index 6fbb10a8..1a9220c7 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,7 +15,6 @@ + + import os + import platform +-import ssl + import sys + import warnings + +@@ -137,16 +136,6 @@ if setuptools is not None: + python_requires = '>= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*' + kwargs['python_requires'] = python_requires + +-# Verify that the SSL module has all the modern upgrades. Check for several +-# names individually since they were introduced at different versions, +-# although they should all be present by Python 3.4 or 2.7.9. +-if (not hasattr(ssl, 'SSLContext') or +- not hasattr(ssl, 'create_default_context') or +- not hasattr(ssl, 'match_hostname')): +- raise ImportError("Tornado requires an up-to-date SSL module. This means " +- "Python 2.7.9+ or 3.4+ (although some distributions have " +- "backported the necessary changes to older versions).") +- + setup( + name="tornado", + version=version, +-- +2.14.4 + diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in index a0ee78fb7a..1afbdc5729 100644 --- a/package/python-tornado/Config.in +++ b/package/python-tornado/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_TORNADO bool "python-tornado" select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SINGLEDISPATCH if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_BACKPORTS_ABC if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_CERTIFI if BR2_PACKAGE_PYTHON # runtime diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index 662db6f258..c64e537eed 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed -md5 838687d20923360af5ab59f101e9e02e tornado-4.5.1.tar.gz -sha256 db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd tornado-4.5.1.tar.gz +# md5, sha256 from https://pypi.python.org/pypi/tornado/json +md5 e5e24ce1c8a4e6442dc38d470172f59e tornado-5.0.2.tar.gz +sha256 1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7 tornado-5.0.2.tar.gz diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 6e6167564f..ed3a61fcf8 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 4.5.1 +PYTHON_TORNADO_VERSION = 5.0.2 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://pypi.python.org/packages/df/42/a180ee540e12e2ec1007ac82a42b09dd92e5461e09c98bf465e98646d187 +PYTHON_TORNADO_SITE = https://pypi.python.org/packages/cf/d1/3be271ae5eba9fb59df63c9891fdc7d8044b999e8ac145994cdbfd2ae66a PYTHON_TORNADO_LICENSE = Apache-2.0 +PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_SETUP_TYPE = setuptools $(eval $(python-package)) From 50a0f56bca65cd04d6803359f0b01a2e6fc57f19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 17:44:52 +0200 Subject: [PATCH 1873/2640] collectd: use --disable-werror Since version 5.6.0, --disable-werror is available: https://github.com/collectd/collectd/pull/1222 So use this option, instead of adding a hook to remove it from Makefile.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index ef45f342ae..589324e612 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -42,6 +42,7 @@ COLLECTD_CONF_OPTS += \ --with-nan-emulation \ --with-fp-layout=$(COLLECTD_FP_LAYOUT) \ --with-perl-bindings=no \ + --disable-werror \ $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ $(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \ @@ -194,14 +195,6 @@ else COLLECTD_CONF_OPTS += --with-libgcrypt=no endif -# released software should not break on minor warnings -define COLLECTD_DROP_WERROR - $(SED) 's/-Werror//' \ - $(@D)/src/Makefile.in $(@D)/src/libcollectdclient/Makefile.in -endef - -COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR - define COLLECTD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install rm -f $(TARGET_DIR)/usr/bin/collectd-nagios From fe5fcdfdbd209177cf8f4a5368ae2324540d4d67 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 24 Jun 2018 21:15:00 +0300 Subject: [PATCH 1874/2640] dos2unix: fix static build Pass the -static flag to the final link command. Otherwise, the generated executables are not static when the external toolchain provides both shared and static libraries. Should also fix: http://autobuild.buildroot.net/results/a5a/a5a64bc3ff5a91a8680ac52f3505362491923b26/ http://autobuild.buildroot.net/results/ebf/ebfe81e65751d7a5ca3aa4e20cc708a24ba65204/ Cc: David Bachelart Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/dos2unix/dos2unix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 9b82340590..5001397f05 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -24,6 +24,10 @@ ifeq ($(BR2_USE_WCHAR),) DOS2UNIX_MAKE_OPTS += UCS= endif +ifeq ($(BR2_STATIC_LIBS),y) +DOS2UNIX_MAKE_OPTS += LDFLAGS_USER=-static +endif + define DOS2UNIX_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS) endef From 9255fd9fc7bb302fcb69282becea7273827c64e1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Jun 2018 16:12:42 +0200 Subject: [PATCH 1875/2640] uboot: don't override HOSTCC/HOSTLDFLAGS for kconfig So the host ncurses includes and library are used instead of a mix of both, causing corrupted characters. Similar to the linux fix in commit 6d3d09e23213e8 (linux: don't override HOSTCC for kconfig), except that we pass the linker flags in HOSTLDFLAGS. Signed-off-by: Peter Korsgaard Acked-by: Jagan Teki Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 03bd7ea743..6ef275e842 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -211,7 +211,15 @@ endif # BR2_TARGET_UBOOT_USE_DEFCONFIG UBOOT_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES)) UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig -UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) + +# UBOOT_MAKE_OPTS overrides HOSTCC / HOSTLDFLAGS to allow the build to +# find our host-openssl. However, this triggers a bug in the kconfig +# build script that causes it to build with /usr/include/ncurses.h +# (which is typically wchar) but link with +# $(HOST_DIR)/lib/libncurses.so (which is not). We don't actually +# need any host-package for kconfig, so remove the HOSTCC/HOSTLDFLAGS +# override again. +UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC)" HOSTLDFLAGS="" define UBOOT_HELP_CMDS @echo ' uboot-menuconfig - Run U-Boot menuconfig' @echo ' uboot-savedefconfig - Run U-Boot savedefconfig' From 1e3738db42919cb4487f7a64381ac7d3090d0e1f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Jun 2018 15:53:06 +0200 Subject: [PATCH 1876/2640] package/gdb: rework dependency for C++11 As we are about to switch to 8.0 as the default gdb version, we need to adjust how the gdb dependencies are handled. Indeed, from 8.0 onwards, gdb needs a C++11 capable compiler, i.e at least gcc 4.8. Until now, Config.in.host was making sure that gdb 8.0 was not selectable if the cross-compilation toolchain did not have C++ support with gcc >= 4.8. This worked fine because the default version of gdb, used as the target gdb version when no host gdb is built, was 7.11, and did not require C++11. With the switch to 8.0 as the default version, when target gdb is enabled but not host gdb, 8.0 is used, which means we need a C++11 capable compiler. The dependencies in Config.in.host are no longer sufficient. So instead, we remove the target-related dependencies from Config.in.host and move them properly to Config.in. The overall logic is the following: - In Config.in.host, BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS ensures that we have at least host gcc 4.8 if we're on ARC, because the ARC gdb needs C++11. We remove the target toolchain related dependencies from here. - In Config.in.host, the version selection ensures that 8.0 cannot be selected if the host toolchain does not have at least gcc 4.8. We remove the target toolchain related dependencies from here. - In Config.in.host, we introduce a BR2_PACKAGE_GDB_NEEDS_CXX11 option, that indicates whether the currently selected version of gdb requires C++11 support in the toolchain to build the target variant. Even though this option is more related to the target variant of gdb, we keep it in Config.in.host so that it appears next to the definition of BR2_GDB_VERSION, to make sure they are kept in sync. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gdb/Config.in | 8 ++++++++ package/gdb/Config.in.host | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6eea73b071..9a71c008a0 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -10,15 +10,23 @@ comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG +comment "gdb/gdbserver >= 8.x needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_PACKAGE_GDB_NEEDS_CXX11 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_GDB bool "gdb" depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_PACKAGE_GDB_NEEDS_CXX11 + depends on BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_GDB_NEEDS_CXX11 # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. select BR2_PACKAGE_GDB_SERVER if \ (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY) + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_PACKAGE_GDB_NEEDS_CXX11 + depends on BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_GDB_NEEDS_CXX11 help GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 0011966d88..8736908b6b 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS default y # The ARC version needs C++11, thus gcc >= 4.8, like gdb-8.0.x depends on BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_arc - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_arc depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze depends on !BR2_nios2 @@ -63,14 +62,24 @@ config BR2_GDB_VERSION_7_12 config BR2_GDB_VERSION_8_0 bool "gdb 8.0.x" # Needs a C++11 compiler - depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOST_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 endchoice endif +# Tells whether the currently selected gdb version requires C++11 +# support in the toolchain. When host-gdb is not enabled, the target +# gdb built is 7.11, which doesn't require C++11 support. So it's only +# if host-gdb is built, with the version set to 8.0 that C++11 support +# is needed in the toolchain to build gdb for the target. +# +# Even though this option is related to target gdb dependencies, we +# keep it next to the BR2_GDB_VERSION so that they are kept in sync. +config BR2_PACKAGE_GDB_NEEDS_CXX11 + bool + default y if BR2_GDB_VERSION_8_0 + # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string From c2a39ba528370937de236fb9fe6752212bcdd36d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 24 Jun 2018 15:53:07 +0200 Subject: [PATCH 1877/2640] package/gdb: add version 8.1 https://sourceware.org/ml/gdb-announce/2018/msg00001.html gdb 8.1 has a new optional dependency on mpfr, which according to the NEWS file: GDB now uses the GNU MPFR library, if available, to emulate target floating-point arithmetic during expression evaluation when the target uses different floating-point formats than the host. At least version 3.1 of GNU MPFR is required. So for the target gdb, this is unnecessary, and therefore we forcefully disable mpfr support by passing --without-mpfr. For the host gdb, it would potentially be useful, but since it's a new feature that isn't essential, we for now keep it disabled as well. An option may be added later if needed. To avoid gnulib issues with uClibc/musl, we need to pass additional configure/make variables, like is done in OpenEmbedded [1]. [1] http://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/gdb/gdb_8.1.bb?id=02664a8dcd1ebb6cd77248e1b97a78390ea06033#n9 We re-add the same patches as the ones present for gdb 8.0.1, except 0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch, which was merged upstream. Signed-off-by: Romain Naour [Thomas: change mpfr handling.] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++ ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++ package/gdb/8.1/0003-use-asm-sgidefs.h.patch | 40 ++++++++++++ .../0004-gdbserver-fix-build-for-m68k.patch | 62 +++++++++++++++++++ package/gdb/Config.in.host | 11 +++- package/gdb/gdb.hash | 1 + package/gdb/gdb.mk | 14 ++++- 7 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/8.1/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 0000000000..9e011c728d --- /dev/null +++ b/package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From 2acd9d3eb703b9a64ac92b3880ed546bec92af95 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-ppc-low.c | 6 ++++++ + gdb/nat/ppc-linux.h | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c +index 33a9feb..1a9141f 100644 +--- a/gdb/gdbserver/linux-ppc-low.c ++++ b/gdb/gdbserver/linux-ppc-low.c +@@ -21,7 +21,13 @@ + #include "linux-low.h" + + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "nat/ppc-linux.h" + #include "linux-ppc-tdesc.h" +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index 5837ea1..7233929 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef PPC_LINUX_H + #define PPC_LINUX_H 1 + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +-- +2.9.4 + diff --git a/package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 0000000000..d31e5dd11a --- /dev/null +++ b/package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From dfe4a40bc9d2fc1fd1b1a11ed733a0c0a1f59f3c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on + !GLIBC systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-sh-low.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c +index ac084c9..08e104a 100644 +--- a/gdb/gdbserver/linux-sh-low.c ++++ b/gdb/gdbserver/linux-sh-low.c +@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; + #include + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.9.4 + diff --git a/package/gdb/8.1/0003-use-asm-sgidefs.h.patch b/package/gdb/8.1/0003-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..d30336904f --- /dev/null +++ b/package/gdb/8.1/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index f2df1b9907..d24664cb56 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.13.1 + diff --git a/package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..451bed312c --- /dev/null +++ b/package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,62 @@ +From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c +index 5594f10f927..19b4ef7b259 100644 +--- a/gdb/gdbserver/linux-m68k-low.c ++++ b/gdb/gdbserver/linux-m68k-low.c +@@ -17,16 +17,17 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Defined in auto-generated file reg-m68k.c. */ + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.14.4 + diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 8736908b6b..333da6bad2 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -64,6 +64,11 @@ config BR2_GDB_VERSION_8_0 # Needs a C++11 compiler depends on BR2_HOST_GCC_AT_LEAST_4_8 +config BR2_GDB_VERSION_8_1 + bool "gdb 8.1.x" + # Needs a C++11 compiler + depends on BR2_HOST_GCC_AT_LEAST_4_8 + endchoice endif @@ -71,14 +76,15 @@ endif # Tells whether the currently selected gdb version requires C++11 # support in the toolchain. When host-gdb is not enabled, the target # gdb built is 7.11, which doesn't require C++11 support. So it's only -# if host-gdb is built, with the version set to 8.0 that C++11 support -# is needed in the toolchain to build gdb for the target. +# if host-gdb is built, with the version set to 8.0 or 8.1 that C++11 +# support is needed in the toolchain to build gdb for the target. # # Even though this option is related to target gdb dependencies, we # keep it next to the BR2_GDB_VERSION so that they are kept in sync. config BR2_PACKAGE_GDB_NEEDS_CXX11 bool default y if BR2_GDB_VERSION_8_0 + default y if BR2_GDB_VERSION_8_1 # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION @@ -88,4 +94,5 @@ config BR2_GDB_VERSION default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB default "7.12.1" if BR2_GDB_VERSION_7_12 default "8.0.1" if BR2_GDB_VERSION_8_0 + default "8.1" if BR2_GDB_VERSION_8_1 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index cfbaac40f6..e5c60a916b 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -3,6 +3,7 @@ sha512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe5049 sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 gdb-7.12.1.tar.xz sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz +sha512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 gdb-8.1.tar.xz # Locally calculated (fetched from Github) sha512 0c58dd3e8fff8b51a459aba78f4acd1beaa3427e00a63a7242827f22c6af157e4aea91ab754cdc021e0075a5bf2b70df903dba67dbff2415fd0f82c8aab99087 gdb-arc-2018.03-rc2-gdb.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 5661b4a465..062f3a730c 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -87,6 +87,16 @@ GDB_CONF_ENV = \ GDB_CONF_ENV += gl_cv_func_gettimeofday_clobber=no GDB_MAKE_ENV += gl_cv_func_gettimeofday_clobber=no +# Similarly, starting with gdb 8.1, the bundled gnulib tries to use +# rpl_strerror. Let's tell gnulib the C library implementation works +# well enough. +GDB_CONF_ENV += \ + gl_cv_func_working_strerror=yes \ + gl_cv_func_strerror_0_works=yes +GDB_MAKE_ENV += \ + gl_cv_func_working_strerror=yes \ + gl_cv_func_strerror_0_works=yes + # Starting with glibc 2.25, the proc_service.h header has been copied # from gdb to glibc so other tools can use it. However, that makes it # necessary to make sure that declaration of prfpregset_t declaration @@ -113,7 +123,8 @@ GDB_CONF_OPTS = \ --with-curses \ --without-included-gettext \ --disable-werror \ - --enable-static + --enable-static \ + --without-mpfr # When gdb is built as C++ application for ARC it segfaults at runtime # So we pass --disable-build-with-cxx config option to force gdb not to @@ -202,6 +213,7 @@ HOST_GDB_CONF_OPTS = \ --disable-werror \ --without-included-gettext \ --with-curses \ + --without-mpfr \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) From 8f3d8623145505f751c2235a4ae40705cff6e05d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 24 Jun 2018 15:53:08 +0200 Subject: [PATCH 1878/2640] package/gdb: switch to 8.0 as the default version 8.1 is around, 8.0 has already seen a point release, so it's time to make 8.0 the default version for gdb. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 333da6bad2..02b3b1093b 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -45,7 +45,7 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_7_11 + default BR2_GDB_VERSION_8_0 depends on !BR2_arc help Select the version of gdb you wish to use. @@ -75,14 +75,17 @@ endif # Tells whether the currently selected gdb version requires C++11 # support in the toolchain. When host-gdb is not enabled, the target -# gdb built is 7.11, which doesn't require C++11 support. So it's only -# if host-gdb is built, with the version set to 8.0 or 8.1 that C++11 -# support is needed in the toolchain to build gdb for the target. +# gdb built is 8.0, which requires C++11 support, which is why +# BR2_PACKAGE_GDB_NEEDS_CXX11 is 'y' when BR2_PACKAGE_HOST_GDB is not +# enabled. When host-gdb is built, with the version set to 8.0 or 8.1 +# then C++11 support is needed in the toolchain to build gdb for the +# target. # # Even though this option is related to target gdb dependencies, we # keep it next to the BR2_GDB_VERSION so that they are kept in sync. config BR2_PACKAGE_GDB_NEEDS_CXX11 bool + default y if !BR2_PACKAGE_HOST_GDB default y if BR2_GDB_VERSION_8_0 default y if BR2_GDB_VERSION_8_1 @@ -91,8 +94,8 @@ config BR2_GDB_VERSION string default "arc-2018.03-rc2-gdb" if BR2_arc default "7.10.1" if BR2_GDB_VERSION_7_10 - default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB + default "7.11.1" if BR2_GDB_VERSION_7_11 default "7.12.1" if BR2_GDB_VERSION_7_12 - default "8.0.1" if BR2_GDB_VERSION_8_0 + default "8.0.1" if BR2_GDB_VERSION_8_0 || !BR2_PACKAGE_HOST_GDB default "8.1" if BR2_GDB_VERSION_8_1 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB From 54a2e7a3b72778c9ec26cb184a1dd7a356e514c9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 24 Jun 2018 15:53:09 +0200 Subject: [PATCH 1879/2640] package/gdb: remove 7.10 Now that 8.1 has been added and 8.0 is the default version, let's remove the old 7.10 release. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Config.in.legacy | 10 ++++++++++ package/gdb/Config.in.host | 4 ---- package/gdb/gdb.hash | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7fc4792aed..deefae2fbb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,16 @@ comment "unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2018.08" + +config BR2_GDB_VERSION_7_10 + bool "gdb 7.10 has been removed" + select BR2_LEGACY + help + The 7.10 version of gdb has been removed. Use a newer version + instead. + ############################################################################### comment "Legacy options removed in 2018.05" diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 02b3b1093b..f3be717376 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -50,9 +50,6 @@ choice help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_7_10 - bool "gdb 7.10.x" - config BR2_GDB_VERSION_7_11 bool "gdb 7.11.x" @@ -93,7 +90,6 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11 config BR2_GDB_VERSION string default "arc-2018.03-rc2-gdb" if BR2_arc - default "7.10.1" if BR2_GDB_VERSION_7_10 default "7.11.1" if BR2_GDB_VERSION_7_11 default "7.12.1" if BR2_GDB_VERSION_7_12 default "8.0.1" if BR2_GDB_VERSION_8_0 || !BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index e5c60a916b..4d871ae732 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 gdb-7.10.1.tar.xz sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 gdb-7.12.1.tar.xz sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz From bae35c80128fce6b5b4260186f9020308efbce4b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 24 Jun 2018 15:53:10 +0200 Subject: [PATCH 1880/2640] package/gdb: remove 7.11 Now that 8.1 has been added and 8.0 is the default version, let's remove the old 7.11 release. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/gdb/Config.in.host | 4 ---- package/gdb/gdb.hash | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index deefae2fbb..bfa96a9380 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2018.08" +config BR2_GDB_VERSION_7_11 + bool "gdb 7.11 has been removed" + select BR2_LEGACY + help + The 7.11 version of gdb has been removed. Use a newer version + instead. + config BR2_GDB_VERSION_7_10 bool "gdb 7.10 has been removed" select BR2_LEGACY diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index f3be717376..646146eea3 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -50,9 +50,6 @@ choice help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_7_11 - bool "gdb 7.11.x" - config BR2_GDB_VERSION_7_12 bool "gdb 7.12.x" @@ -90,7 +87,6 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11 config BR2_GDB_VERSION string default "arc-2018.03-rc2-gdb" if BR2_arc - default "7.11.1" if BR2_GDB_VERSION_7_11 default "7.12.1" if BR2_GDB_VERSION_7_12 default "8.0.1" if BR2_GDB_VERSION_8_0 || !BR2_PACKAGE_HOST_GDB default "8.1" if BR2_GDB_VERSION_8_1 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 4d871ae732..16e45ca0e4 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 gdb-7.12.1.tar.xz sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz sha512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 gdb-8.1.tar.xz From 74319f85e6f9e3ff84dc184b2bd740241a52b10d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 22:12:34 +0200 Subject: [PATCH 1881/2640] gnuradio: bump to version 3.7.13.3 - This bump to 3.7.13.x fixes build with boost 1.67 - Remove patch (not needed as boost unit_test_framework has been removed since https://github.com/gnuradio/volk/commit/6dda1a1e9545d24a1c6f0b2a5d4b5d018fdcbff9) - Add host-python-mako and host-python-six dependencies - Add hash for license file Fixes: - http://autobuild.buildroot.net/results/ca3b01a13cb0c580266aae5f3673b2c0a19ac6a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...001-suppress-boost_unitest-detection.patch | 41 ------------------- package/gnuradio/gnuradio.hash | 5 ++- package/gnuradio/gnuradio.mk | 7 +++- 3 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 package/gnuradio/0001-suppress-boost_unitest-detection.patch diff --git a/package/gnuradio/0001-suppress-boost_unitest-detection.patch b/package/gnuradio/0001-suppress-boost_unitest-detection.patch deleted file mode 100644 index f1713dc349..0000000000 --- a/package/gnuradio/0001-suppress-boost_unitest-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ -By default, the boost test option is mandatory for build environment -detection. -This patch suppress this dependency and allows the test part only if -build_test is enabled at the Buildroot level. - -Signed-off-by: Gwenhael Goavec-Merou ---- -Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake -=================================================================== ---- gnuradio-3.7.5.orig/volk/cmake/Modules/VolkBoost.cmake -+++ gnuradio-3.7.5/volk/cmake/Modules/VolkBoost.cmake -@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE) - set(BOOST_REQUIRED_COMPONENTS - filesystem - system -- unit_test_framework - program_options - ) - -Index: gnuradio-3.7.5/volk/lib/CMakeLists.txt -=================================================================== ---- gnuradio-3.7.5.orig/volk/lib/CMakeLists.txt -+++ gnuradio-3.7.5/volk/lib/CMakeLists.txt -@@ -580,7 +580,10 @@ - ######################################################################## - # Build the QA test application - ######################################################################## --if(ENABLE_TESTING) -+ -+find_package(Boost "1.35" COMPONENTS "unit_test_framework") -+ -+if(ENABLE_TESTING AND BUILD_TEST) - - #include Boost headers - include_directories(${Boost_INCLUDE_DIRS}) -@@ -597,4 +600,4 @@ - TARGET_DEPS volk - ) - --endif(ENABLE_TESTING) -+endif(ENABLE_TESTING AND BUILD_TEST) diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index 86944f48c4..884f7ae758 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,2 +1,5 @@ # From http://gnuradio.org/releases/gnuradio/sha256sums -sha256 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4 gnuradio-3.7.11.tar.gz +sha256 1e07ce40fa3c3eede1fb54e320dad8a221a3c01de341e9cef2d7b265ed06a6e9 gnuradio-3.7.13.3.tar.gz + +# Hash for license file: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index a55c116118..e79f848388 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,16 +4,19 @@ # ################################################################################ -GNURADIO_VERSION = 3.7.11 +GNURADIO_VERSION = 3.7.13.3 GNURADIO_SITE = http://gnuradio.org/releases/gnuradio GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# host-python-cheetah is needed for volk to compile +# host-python-cheetah, host-python-mako and host-python-six are needed for volk +# to compile GNURADIO_DEPENDENCIES = \ host-python-cheetah \ + host-python-mako \ + host-python-six \ host-swig \ boost From 6be346cec40dda8ab762e11471fa6ff951fdbfa0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 16:15:05 +0200 Subject: [PATCH 1882/2640] domoticz: remove boost hack for powerpc64le Since boost 1.67, seed_rng.hpp has been removed: https://github.com/boostorg/uuid/commit/a8a1ec3d826b04d2c842e79ecd18cff6a991fd29 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/domoticz/domoticz.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index af58563436..6421fd0dd5 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -18,21 +18,6 @@ DOMOTICZ_DEPENDENCIES = \ sqlite \ zlib -# Fixes: -# http://autobuild.buildroot.org/results/454c0ea393615bae2d1b44be9920f25b5c49fc33 -# There is an issue with powerpc64le and boost::uuids::random_generator on the -# following line of code (from include/boost/uuid/seed_rng.hpp): -# sha.process_bytes( (unsigned char const*)&std::rand, sizeof( void(*)() ) ) -# This line "inspects the first couple bytes (here eight) of the std::rand -# function to seed some rng. Due to the implementation of process_bytes and -# inlining happening, it seems that one of the loops therein uses &rand-1 as -# some boundary, compiling with -O0 makes that reloc come out as 'rand + 0' and -# the link will succeed." -# See: https://bugzilla.suse.com/show_bug.cgi?id=955832#c7 -ifeq ($(BR2_powerpc64le),y) -DOMOTICZ_CXXFLAGS += -O0 -endif - # Due to the dependency on mosquitto, domoticz depends on # !BR2_STATIC_LIBS so set USE_STATIC_BOOST to OFF DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF From 4da82c82364c75da9d8e011ffd73aaabe91b3106 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 20:24:43 +0200 Subject: [PATCH 1883/2640] boost: add option for contract library Contract library has been added in boost 1.67 and depends on NPTL Fixes: - http://autobuild.buildroot.net/results/a3dd35cfa50a1862c585a648298351c0aba257db Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 10 ++++++++++ package/boost/boost.mk | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index ec0e19ccb5..781bc47c00 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -77,6 +77,16 @@ config BR2_PACKAGE_BOOST_CONTEXT help C++11 context switching library. +config BR2_PACKAGE_BOOST_CONTRACT + bool "boost-contract" + # pthread_condattr_setclock + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + help + Contract programming for C++. + +comment "boost-contract needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 981d701bdf..cf0cea7edd 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -14,15 +14,16 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt # keep host variant as minimal as possible HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - coroutine date_time exception filesystem graph graph_parallel iostreams \ - locale log math mpi program_options python random regex serialization \ - signals system test thread timer type_erasure \ + contract coroutine date_time exception filesystem graph graph_parallel \ + iostreams locale log math mpi program_options python random regex \ + serialization signals system test thread timer type_erasure \ wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTRACT),,contract) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception) From d9d47b20b55268e8f9897dd2f40325f6c907b2da Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 25 Jun 2018 19:20:17 +0300 Subject: [PATCH 1884/2640] configs/solidrun_clearfog: bump kernel and bootloader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the kernel version to 4.17.2. Update U-Boot version to 2018.05. Migrate to U-Boot generic distro configuration which is easier than the hand written boot script. Improve the 'dd' command example in readme.txt. Cc: Jan Kundrát Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- board/solidrun/clearfog/boot.scr.txt | 5 ----- board/solidrun/clearfog/extlinux.conf | 4 ++++ board/solidrun/clearfog/post-build.sh | 4 +++- board/solidrun/clearfog/readme.txt | 2 +- configs/solidrun_clearfog_defconfig | 10 ++++------ 5 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 board/solidrun/clearfog/boot.scr.txt create mode 100644 board/solidrun/clearfog/extlinux.conf diff --git a/board/solidrun/clearfog/boot.scr.txt b/board/solidrun/clearfog/boot.scr.txt deleted file mode 100644 index a2332e3960..0000000000 --- a/board/solidrun/clearfog/boot.scr.txt +++ /dev/null @@ -1,5 +0,0 @@ -setenv fdtfile armada-388-clearfog-base.dtb -setenv bootargs root=/dev/mmcblk0p1 -load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}/${fdtfile} -load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}/zImage -bootz ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/solidrun/clearfog/extlinux.conf b/board/solidrun/clearfog/extlinux.conf new file mode 100644 index 0000000000..f35974e3ef --- /dev/null +++ b/board/solidrun/clearfog/extlinux.conf @@ -0,0 +1,4 @@ +label Clearfog Linux + kernel /boot/zImage + devicetree /boot/armada-388-clearfog-base.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/solidrun/clearfog/post-build.sh b/board/solidrun/clearfog/post-build.sh index ff22ebd6e5..1f5ff6a611 100755 --- a/board/solidrun/clearfog/post-build.sh +++ b/board/solidrun/clearfog/post-build.sh @@ -1,3 +1,5 @@ #!/bin/sh -install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/solidrun/clearfog/readme.txt b/board/solidrun/clearfog/readme.txt index b56f0a9b49..6046836f01 100644 --- a/board/solidrun/clearfog/readme.txt +++ b/board/solidrun/clearfog/readme.txt @@ -47,7 +47,7 @@ Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on a microSD card. Launch the following command as root: - dd if=./output/images/sdcard.img of=/dev/ + dd if=output/images/sdcard.img of=/dev/ conv=fdatasync *** WARNING! The script will destroy all the card content. Use with care! *** diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig index 7c426e5ad9..8c6cb83a59 100644 --- a/configs/solidrun_clearfog_defconfig +++ b/configs/solidrun_clearfog_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # System configuration BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog/post-build.sh" @@ -16,7 +16,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,12 +33,10 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-spl.kwb" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/solidrun/clearfog/boot.scr.txt" From cf10728757f0daec097e72a037fb27a38de2b0e6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Jun 2018 19:50:45 +0200 Subject: [PATCH 1885/2640] python-libconfig: fix build with boost 1.67 Since boost 1.67, python3 boost library is boost_python36.so instead of boost_python3.so so update first patch Fixes: - http://autobuild.buildroot.net/results/6f973f2945727b302409405288ef0b9808c7317b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...termine-boost_python-name-depending-on-current-Pyt.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch index b30efc124d..53000cd678 100644 --- a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch +++ b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch @@ -4,9 +4,11 @@ Date: Thu, 27 Jul 2017 09:46:07 +0200 Subject: [PATCH] Determine boost_python name depending on current Python version -Python2 requires boost_python and Python3 requires boost_python3. +Python2 requires boost_python and Python3 requires boost_python36 (since +boost 1.67). Signed-off-by: Yegor Yefremov +Signed-off-by: Fabrice Fontaine --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) @@ -19,7 +21,7 @@ index fdf5c27..4b38569 100644 from setuptools import setup, find_packages, Extension import sys, os -+boostlib = "boost_python3" ++boostlib = "boost_python36" +if sys.version_info < (3, 0): + boostlib = "boost_python" + From a98ee4582f127819c1978c8ee43b66b5acf981ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Jun 2018 10:07:38 +0200 Subject: [PATCH 1886/2640] gdb: add patch to fix noMMU build issue This commit adds a patch to fix a build issue encountered on noMMU architectures when building gdbserver, due to the use of fork() instead of vfork(). The patch has been submitted upstream: https://sourceware.org/ml/gdb-patches/2018-06/msg00569.html Signed-off-by: Thomas Petazzoni --- ...fork-inferior-include-linux-ptrace.h.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 0000000000..dea24725fc --- /dev/null +++ b/package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,51 @@ +From 887c667089e5417fdc7c5bbb364b027e86a7c113 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index 8b59387fa5..05167628a6 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -26,6 +26,7 @@ + #include "common-gdbthread.h" + #include "signals-state-save-restore.h" + #include "gdb_tilde_expand.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.14.4 + From 68503bac9c671e74862c90e82d84f7074e14ab02 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Mon, 25 Jun 2018 18:45:35 +0300 Subject: [PATCH 1887/2640] toolchain: bump ARC tools to arc-2018.03 release This commit finally bumps ARC tools to the most recent arc-2018.03 release version. ARC GNU tools of version arc-2018.03 bring some quite significant changes like: * Binutils v2.29.51 with additional ARC patches * GCC 7.3.1 with additional ARC patches * GDB 8.0.50 with ARC patches More information on this release could be found here: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2018.03-release Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- .../{arc-2018.03-rc2 => arc-2018.03}/0002-ld-makefile.patch | 0 .../0003-check-ldrunpath-length.patch | 0 .../0004-add-sysroot-fix-from-bug-3049.patch | 0 .../0005-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 4 ++-- package/gcc/Config.in.host | 2 +- .../{arc-2018.03-rc2 => arc-2018.03}/0100-uclibc-conf.patch | 0 .../0860-cilk-fix-build-without-wchar.patch | 0 .../0900-remove-selftests.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename package/binutils/{arc-2018.03-rc2 => arc-2018.03}/0002-ld-makefile.patch (100%) rename package/binutils/{arc-2018.03-rc2 => arc-2018.03}/0003-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2018.03-rc2 => arc-2018.03}/0004-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2018.03-rc2 => arc-2018.03}/0005-poison-system-directories.patch (100%) rename package/gcc/{arc-2018.03-rc2 => arc-2018.03}/0100-uclibc-conf.patch (100%) rename package/gcc/{arc-2018.03-rc2 => arc-2018.03}/0860-cilk-fix-build-without-wchar.patch (100%) rename package/gcc/{arc-2018.03-rc2 => arc-2018.03}/0900-remove-selftests.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index de229895c1..ed4475ade9 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -26,7 +26,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2018.03-rc2" if BR2_BINUTILS_VERSION_ARC + default "arc-2018.03" if BR2_BINUTILS_VERSION_ARC default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X diff --git a/package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch b/package/binutils/arc-2018.03/0002-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2018.03-rc2/0002-ld-makefile.patch rename to package/binutils/arc-2018.03/0002-ld-makefile.patch diff --git a/package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch b/package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2018.03-rc2/0003-check-ldrunpath-length.patch rename to package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2018.03-rc2/0004-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch b/package/binutils/arc-2018.03/0005-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2018.03-rc2/0005-poison-system-directories.patch rename to package/binutils/arc-2018.03/0005-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index c938222804..cc13686cc8 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,4 +4,4 @@ sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e8262 sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz # Locally calculated (fetched from Github) -sha512 c9d41001bd41d96f1cd78748c1e8df9715aab1158c0a1c9c90a2010e335c357d0d6816202b7fcf7c7d8d4a65e25920b0b35af6a59edd0d29fd9edddd8be95a48 binutils-arc-2018.03-rc2.tar.gz +sha512 bea88164ed48733bad63393fe702e12e651efd113aa4f3fe2e253e05c4c1e5da20b5a99333f0b5528df6d32ce806f799211c568e1916845a87999901dde28817 binutils-arc-2018.03.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 1c05958f9c..cb6022f7fa 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2018.03-rc2 +BINUTILS_VERSION = arc-2018.03 else BINUTILS_VERSION = 2.29.1 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2018.03-rc2) +ifeq ($(BINUTILS_VERSION),arc-2018.03) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index c9a20f6d77..899a862dcc 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -81,7 +81,7 @@ config BR2_GCC_VERSION default "6.4.0" if BR2_GCC_VERSION_6_X default "7.3.0" if BR2_GCC_VERSION_7_X default "8.1.0" if BR2_GCC_VERSION_8_X - default "arc-2018.03-rc2" if BR2_GCC_VERSION_ARC + default "arc-2018.03" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch b/package/gcc/arc-2018.03/0100-uclibc-conf.patch similarity index 100% rename from package/gcc/arc-2018.03-rc2/0100-uclibc-conf.patch rename to package/gcc/arc-2018.03/0100-uclibc-conf.patch diff --git a/package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch b/package/gcc/arc-2018.03/0860-cilk-fix-build-without-wchar.patch similarity index 100% rename from package/gcc/arc-2018.03-rc2/0860-cilk-fix-build-without-wchar.patch rename to package/gcc/arc-2018.03/0860-cilk-fix-build-without-wchar.patch diff --git a/package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch b/package/gcc/arc-2018.03/0900-remove-selftests.patch similarity index 100% rename from package/gcc/arc-2018.03-rc2/0900-remove-selftests.patch rename to package/gcc/arc-2018.03/0900-remove-selftests.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 6d2fcda13e..a6dddb0813 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -10,6 +10,6 @@ sha512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19 sha512 c96246f34a7aeb404c4525b754dc7f7708a18e06271aadb2b32fef00e6e0940f584e52430bfe2ab01e699c93e3cb418adc113d2622fa826facbec0ec8ce3eb2c gcc-8.1.0.tar.xz # Locally calculated (fetched from Github) -sha512 a0faf2bb34f6c72b6460c6432639d89915cfc63456cfdf016896b3ef075655b2e9f26e745d841bbc38e776bc7a3729359cca88f1e4fb83489fa6775a3ccb55b8 gcc-arc-2018.03-rc2.tar.gz +sha512 7c6555d629957d154c9c0524fc2c82301c9ab9192f5b9175c47b1f2dde298ac032e86360d91866c3c4d001cf8e191a90dc88f3c900ebfc367c5888ab7bf2ce79 gcc-arc-2018.03.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 646146eea3..ae855a3673 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -86,7 +86,7 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11 # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2018.03-rc2-gdb" if BR2_arc + default "arc-2018.03-gdb" if BR2_arc default "7.12.1" if BR2_GDB_VERSION_7_12 default "8.0.1" if BR2_GDB_VERSION_8_0 || !BR2_PACKAGE_HOST_GDB default "8.1" if BR2_GDB_VERSION_8_1 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 16e45ca0e4..1530a852a2 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -4,4 +4,4 @@ sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2 sha512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 gdb-8.1.tar.xz # Locally calculated (fetched from Github) -sha512 0c58dd3e8fff8b51a459aba78f4acd1beaa3427e00a63a7242827f22c6af157e4aea91ab754cdc021e0075a5bf2b70df903dba67dbff2415fd0f82c8aab99087 gdb-arc-2018.03-rc2-gdb.tar.gz +sha512 b17e4066730491f6a75b00eab78012f67cc445fe95ecd82c06cda7c1255190e6c471ac89b92f2fcdba4790b0046756b9cecf1f827537afcb44e1e578345852ad gdb-arc-2018.03-gdb.tar.gz diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 1fab3a245c..81dd5ad5ed 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) sha256 33189b3f10c88730a1f686fac794bc01f31765f12ffd75bc5e8a0f2a690d217a glibc-glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e.tar.gz # Locally calculated (fetched from Github) -sha256 ddc63360393ab88ab6a4a0c81d33481f34c5a9ebd758eec2e6bb35385058b4cb glibc-arc-2018.03-rc2.tar.gz +sha256 e08ab67b2db2d0f0e8f3311d23c54fb8f6d4c1ef6fa0b4047fd5da400e3ce9de glibc-arc-2018.03-release.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index f764b5da9c..6d21ae7ac0 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2018.03-rc2 +GLIBC_VERSION = arc-2018.03-release GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else # Generate version string using: From cec133e873e991e26b7fa8bbeb7162c4433cadcf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Jun 2018 21:54:43 +0200 Subject: [PATCH 1888/2640] gdb: ARC version is based on GDB 8.0, needs C++11 support The special gdb version used for ARC is based on GDB 8.0, so it needs C++11 support. Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index ae855a3673..5f5e402a0e 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -82,6 +82,7 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11 default y if !BR2_PACKAGE_HOST_GDB default y if BR2_GDB_VERSION_8_0 default y if BR2_GDB_VERSION_8_1 + default y if BR2_arc # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION From c6b66b14806003f84dadbf8d7663700b90aeb6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 18 Jun 2018 18:49:06 -0400 Subject: [PATCH 1889/2640] qt5charts: allow to build with qt5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This module is available for Qt 5.6 since version 5.6.3 under the version number 2.1.3. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5charts/Config.in | 4 ---- package/qt5/qt5charts/qt5charts.hash | 3 +++ package/qt5/qt5charts/qt5charts.mk | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5charts/Config.in b/package/qt5/qt5charts/Config.in index 78f08fe637..db199922db 100644 --- a/package/qt5/qt5charts/Config.in +++ b/package/qt5/qt5charts/Config.in @@ -1,9 +1,5 @@ -comment "qt5charts needs at least qt-5.7" - depends on !BR2_PACKAGE_QT5_VERSION_LATEST - config BR2_PACKAGE_QT5CHARTS bool "qt5charts" - depends on BR2_PACKAGE_QT5_VERSION_LATEST select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 5a5845ef9f..ce1189d0e1 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,3 +1,6 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist +sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz + # Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9 qtcharts-everywhere-src-5.10.1.tar.xz diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 123cb658fe..71d0e54027 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,12 @@ # ################################################################################ +# Qt5Charts does not follow Qt versionning for 5.6 +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CHARTS_VERSION = $(QT5_VERSION) +else +QT5CHARTS_VERSION = 2.1.3 +endif QT5CHARTS_SITE = $(QT5_SITE) QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz QT5CHARTS_DEPENDENCIES = qt5base From b236b4edaf38abe7d4f67bf628dd9115496e09a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 18 Jun 2018 18:49:07 -0400 Subject: [PATCH 1890/2640] qt5charts: bump hash for 5.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hash bump was missing commit 4fbb2d143d (qt5: bump latest version to 5.11.0). Signed-off-by: Gaël PORTAY Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5charts/qt5charts.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index ce1189d0e1..6bd9a9d51b 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz.mirrorlist -sha256 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9 qtcharts-everywhere-src-5.10.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz.mirrorlist +sha256 c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351 qtcharts-everywhere-src-5.11.0.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 From 23e18c4036315f4b621d9291a3a647e69ef9d563 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jun 2018 20:55:44 +0200 Subject: [PATCH 1891/2640] package/tvheadend: bump version Removed patch 0002, applied upstream: https://github.com/tvheadend/tvheadend/commit/068e5f921ddc22e648ebe006e515baf3e1ea12d1 Added patch to fix musl & uclibc build. Renamed option dvbcsa to tvhcsa. Upstream removed the dvbcsa configure option with this commit: https://github.com/tvheadend/tvheadend/commit/4e7f837c7055f4cb173164ca31af139e0a7858a5#diff-e2d5a00791bce9a01f99bc6fd613a39d and moved the optional dvbcsa support inside the tvhcsa option block: https://github.com/tvheadend/tvheadend/blob/c76c7e0604977305498221f83c049d6d4fc715ed/configure#L645 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-configure-check-for-strlcat-strlcpy.patch | 97 +++++++++++++++++++ ...02-sbuf-fix-uclibc-compilation-error.patch | 33 ------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 6 +- 4 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch delete mode 100644 package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch diff --git a/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch b/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch new file mode 100644 index 0000000000..71c01e2f48 --- /dev/null +++ b/package/tvheadend/0002-configure-check-for-strlcat-strlcpy.patch @@ -0,0 +1,97 @@ +From 1f879e4b930fef71f030e5b6e5fae359f27d1aec Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 23 Jun 2018 20:47:26 +0200 +Subject: [PATCH] configure: check for strlcat & strlcpy + +Building tvheadend with uclibc and musl fails: + +src/tvh_string.h:50:22: error: static declaration of 'strlcpy' follows non-static declaration + static inline size_t strlcpy(char *dst, const char *src, size_t size) + +src/tvh_string.h:61:22: error: static declaration of 'strlcat' follows non-static declaration + static inline size_t strlcat(char *dst, const char *src, size_t count) + +because they provide strlcat & strlcpy: +https://sourceware.org/glibc/wiki/strlcpy + +This patch adds configure checks and makes the implementation in +tvh_string.h optional, the configure log looks like this: + +glibc + checking for cc strlcat ... fail + checking for cc strlcpy ... fail + +musl + checking for cc strlcat ... ok + checking for cc strlcpy ... ok + +uclibc + checking for cc strlcat ... ok + checking for cc strlcpy ... ok + +Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1133 + +Signed-off-by: Bernd Kuhls +--- + configure | 14 ++++++++++++++ + src/tvh_string.h | 4 ++++ + 2 files changed, 18 insertions(+) + +diff --git a/configure b/configure +index 0857a1958..b183d02b3 100755 +--- a/configure ++++ b/configure +@@ -159,6 +159,20 @@ else + COMPILER=gcc + fi + ++check_cc_snippet strlcat '#include ++int test(int argc, char **argv) { ++ char dst[10]; ++ strlcat("test", dst, sizeof(dst)); ++ return 0; ++}' ++ ++check_cc_snippet strlcpy '#include ++int test(int argc, char **argv) { ++ char dst[10]; ++ strlcpy("test", dst, sizeof(dst)); ++ return 0; ++}' ++ + check_cc_snippet getloadavg '#include + void test() { getloadavg(NULL,0); }' + +diff --git a/src/tvh_string.h b/src/tvh_string.h +index 87d8c3320..13ef2f308 100644 +--- a/src/tvh_string.h ++++ b/src/tvh_string.h +@@ -47,6 +47,7 @@ static inline const char *tvh_strbegins(const char *s1, const char *s2) + return s1; + } + ++#ifndef ENABLE_STRLCPY + static inline size_t strlcpy(char *dst, const char *src, size_t size) + { + size_t ret = strlen(src); +@@ -57,7 +58,9 @@ static inline size_t strlcpy(char *dst, const char *src, size_t size) + } + return ret; + } ++#endif + ++#ifndef ENABLE_STRLCAT + static inline size_t strlcat(char *dst, const char *src, size_t count) + { + size_t dlen = strlen(dst); +@@ -72,6 +75,7 @@ static inline size_t strlcat(char *dst, const char *src, size_t count) + dst[len] = '\0'; + return res; + } ++#endif + + #define tvh_strlcatf(buf, size, ptr, fmt...) \ + do { int __r = snprintf((buf) + ptr, (size) - ptr, fmt); \ +-- +2.17.1 + diff --git a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch b/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch deleted file mode 100644 index deed9f98f7..0000000000 --- a/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b16ad4d258409fbd6acf843d62a7a84f621e3b70 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 18 Dec 2017 20:52:06 +0100 -Subject: [PATCH] sbuf: fix uclibc compilation error - -Fixes build error - -tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3/src/sbuf.h:77:1: - error: unknown type name 'ssize_t'; did you mean 'size_t'? - ssize_t sbuf_read(sbuf_t *sb, int fd); - -Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1062 - -Signed-off-by: Bernd Kuhls ---- - src/sbuf.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/sbuf.h b/src/sbuf.h -index 78aa546b3..d5aa53042 100644 ---- a/src/sbuf.h -+++ b/src/sbuf.h -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - /** - * Simple dynamically growing buffer --- -2.11.0 - diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 4e890a8272..06820d6193 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 32f96937a3ffa72b5bdbfde9a5f9f9535f88e94e44864d4c8c6a152985c16569 tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3.tar.gz +sha256 f12ad165d5abd464fe38c358b385eb030ae4daa01b940c348525d5bfc876e514 tvheadend-66d6161c563181e5a572337ab3509a835c5a57e2.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 45ea7bfc28..8e06165e3b 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = e06ffd87beff16103c47d6fa542df2374fca6fd3 +TVHEADEND_VERSION = 66d6161c563181e5a572337ab3509a835c5a57e2 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md @@ -65,9 +65,9 @@ endif ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) TVHEADEND_DEPENDENCIES += libdvbcsa -TVHEADEND_CONF_OPTS += --enable-dvbcsa +TVHEADEND_CONF_OPTS += --enable-tvhcsa else -TVHEADEND_CONF_OPTS += --disable-dvbcsa +TVHEADEND_CONF_OPTS += --disable-tvhcsa endif ifeq ($(BR2_PACKAGE_LIBHDHOMERUN),y) From 624f65d428a568f3866e9317833b68c1b068145d Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 21 Jun 2018 17:33:35 -0700 Subject: [PATCH 1892/2640] at-spi2-core: new package Signed-off-by: Joseph Kogut [Thomas: - drop host-meson dependency, unneeded since the meson-package infrastructure is used - add -Ddbus_daemon=/usr/bin/dbus-daemon, otherwise at-spi2-core meson build system tries to find dbus-daemon on the host machine, where it may not be available.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/at-spi2-core/Config.in | 25 +++++++++++++++++++++++++ package/at-spi2-core/at-spi2-core.hash | 3 +++ package/at-spi2-core/at-spi2-core.mk | 17 +++++++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 package/at-spi2-core/Config.in create mode 100644 package/at-spi2-core/at-spi2-core.hash create mode 100644 package/at-spi2-core/at-spi2-core.mk diff --git a/DEVELOPERS b/DEVELOPERS index 626fba3159..b3148a0270 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -975,6 +975,7 @@ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig N: Joseph Kogut +F: package/at-spi2-core/ F: package/gconf/ F: package/libnss/ F: package/python-cython/ diff --git a/package/Config.in b/package/Config.in index c8e35fd99e..63db543d87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1131,6 +1131,7 @@ endmenu menu "Graphics" source "package/assimp/Config.in" + source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bullet/Config.in" diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in new file mode 100644 index 0000000000..f56c5b93c4 --- /dev/null +++ b/package/at-spi2-core/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_AT_SPI2_CORE + bool "at-spi2-core" + depends on BR2_PACKAGE_XORG7 # xlib-libxtst + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_XLIB_LIBXTST + help + The At-Spi2 Core package is a part of the GNOME + Accessibility Project. It provides a Service Provider + Interface for the Assistive Technologies available on the + GNOME platform and a library against which applications + can be linked. + + https://wiki.gnome.org/Accessibility + +comment "at-spi2-core needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +comment "at-spi2-core depends on X.org" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash new file mode 100644 index 0000000000..9c96da312b --- /dev/null +++ b/package/at-spi2-core/at-spi2-core.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz +sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk new file mode 100644 index 0000000000..40b29bdb3f --- /dev/null +++ b/package/at-spi2-core/at-spi2-core.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# at-spi2-core +# +################################################################################ + +AT_SPI2_CORE_VERSION_MAJOR = 2.28 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz +AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) +AT_SPI2_CORE_LICENSE = LGPL-2.0+ +AT_SPI2_CORE_LICENSE_FILES = COPYING +AT_SPI2_CORE_INSTALL_STAGING = YES +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst +AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon + +$(eval $(meson-package)) From b4db8e7ed2bbd813921fb499d03e961cdc23b542 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 21 Jun 2018 17:33:36 -0700 Subject: [PATCH 1893/2640] at-spi2-atk: new package Signed-off-by: Joseph Kogut [Thomas: drop unneeded AT_SPI2_ATK_INSTALL_STAGING_OPTS variable.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/at-spi2-atk/Config.in | 22 ++++++++++++++++++++++ package/at-spi2-atk/at-spi2-atk.hash | 3 +++ package/at-spi2-atk/at-spi2-atk.mk | 16 ++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/at-spi2-atk/Config.in create mode 100644 package/at-spi2-atk/at-spi2-atk.hash create mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/DEVELOPERS b/DEVELOPERS index b3148a0270..27e24896fb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -975,6 +975,7 @@ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig N: Joseph Kogut +F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/gconf/ F: package/libnss/ diff --git a/package/Config.in b/package/Config.in index 63db543d87..13b34aed04 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1131,6 +1131,7 @@ endmenu menu "Graphics" source "package/assimp/Config.in" + source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in new file mode 100644 index 0000000000..9a7cfde0af --- /dev/null +++ b/package/at-spi2-atk/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk" + depends on BR2_PACKAGE_XORG7 # at-spi2-core + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE + select BR2_PACKAGE_LIBGLIB2 + help + The At-Spi2 Atk package contains a library that bridges + ATK to At-Spi2 D-Bus service. + + https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ + +comment "at-spi2-atk needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +comment "at-spi2-atk depends on X.org" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash new file mode 100644 index 0000000000..77c8f68e47 --- /dev/null +++ b/package/at-spi2-atk/at-spi2-atk.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e at-spi2-atk-2.26.2.tar.xz +sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk new file mode 100644 index 0000000000..4ef681b3b1 --- /dev/null +++ b/package/at-spi2-atk/at-spi2-atk.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# at-spi2-atk +# +################################################################################ + +AT_SPI2_ATK_VERSION_MAJOR = 2.26 +AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 +AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz +AT_SPI2_ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) +AT_SPI2_ATK_LICENSE = LGPL-2.0+ +AT_SPI2_ATK_LICENSE_FILES = COPYING +AT_SPI2_ATK_INSTALL_STAGING = YES +AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf + +$(eval $(autotools-package)) From 5b71204fe373541bd66eae7e0274d9c5ddaa6a17 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 25 Jun 2018 17:39:09 -0300 Subject: [PATCH 1894/2640] package/Config.in: fix alphabetical order Commit a098636a6b6 inserted LLVM between linux-pam and its plugins. Change-Id: Idd298321da5742c8dcc75191c79cf22c663a95ff Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index 13b34aed04..c5365547a4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1569,13 +1569,13 @@ menu "Other" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" - source "package/llvm/Config.in" if BR2_PACKAGE_LINUX_PAM comment "linux-pam plugins" source "package/libpam-radius-auth/Config.in" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/mpc/Config.in" source "package/mpdecimal/Config.in" From cf9100d3f20dd87bbd8de473b0b0321db5f31f83 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 26 Jun 2018 13:28:22 +0300 Subject: [PATCH 1895/2640] libnss: drop obsolete patch uClibc implements RTLD_NOLOAD for quite some time now. Remove the patch adding a dummy definition of RTLD_NOLOAD. Cc: Joseph Kogut Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libnss/0001-uclibc.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 package/libnss/0001-uclibc.patch diff --git a/package/libnss/0001-uclibc.patch b/package/libnss/0001-uclibc.patch deleted file mode 100644 index b81db930be..0000000000 --- a/package/libnss/0001-uclibc.patch +++ /dev/null @@ -1,20 +0,0 @@ -uCLibc does not define RTLD_NOLOAD. - -[Gustavo: update for nss 3.16.1] -Signed-off-by: Will Newton - -diff -Nura nss-3.16.1.orig/nss/lib/freebl/stubs.c nss-3.16.1/nss/lib/freebl/stubs.c ---- nss-3.16.1.orig/nss/lib/freebl/stubs.c 2014-06-18 10:34:30.529997002 -0300 -+++ nss-3.16.1/nss/lib/freebl/stubs.c 2014-06-18 10:36:25.508882650 -0300 -@@ -594,6 +594,11 @@ - return SECSuccess; - } - -+/* uClibc does not define RTLD_NOLOAD. */ -+#ifndef RTLD_NOLOAD -+#define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ From 1a9f539d97850ef1a53a3c64a31c24330a2bcd8f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 26 Jun 2018 13:28:23 +0300 Subject: [PATCH 1896/2640] libnss: fix build with uClibc Add a patch defining AT_HWCAP2 locally since uClibc is missing this macro. Once uClibc updates its elf.h copy we can remove this patch. Fixes: http://autobuild.buildroot.net/results/06f/06f5ee4bc9e623fa08d77278acdcb447148ae997/ http://autobuild.buildroot.net/results/7cd/7cd7586f5854f9447c37adeedb9c113ba37ebea4/ http://autobuild.buildroot.net/results/335/335bee755fbec45a6d5336c2501dc2687859ec0e/ Cc: Joseph Kogut Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libnss/0001-fix-uclibc-build.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/libnss/0001-fix-uclibc-build.patch diff --git a/package/libnss/0001-fix-uclibc-build.patch b/package/libnss/0001-fix-uclibc-build.patch new file mode 100644 index 0000000000..a9e84c264b --- /dev/null +++ b/package/libnss/0001-fix-uclibc-build.patch @@ -0,0 +1,22 @@ +Fix build with uClibc-ng + +The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in +the code. + +Signed-off-by: Baruch Siach +--- +Upstream status: Not upstreamable; uClibc needs to update elf.h + +diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c +--- nss-3.38.orig/nss/lib/freebl/blinit.c 2018-06-21 12:24:45.000000000 +0300 ++++ nss-3.38/nss/lib/freebl/blinit.c 2018-06-26 13:13:55.636434720 +0300 +@@ -100,6 +100,9 @@ + defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__) + #include + extern unsigned long getauxval(unsigned long type) __attribute__((weak)); ++#ifndef AT_HWCAP2 ++#define AT_HWCAP2 26 ++#endif + #else + static unsigned long (*getauxval)(unsigned long) = NULL; + #define AT_HWCAP2 0 From 022b5306618157f5ebdbbee1981e9017675b2c63 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 26 Jun 2018 08:24:45 -0300 Subject: [PATCH 1897/2640] linux: bump default to version 4.17.3 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 75a175391b..a25e02193b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 24b658c002d2cdc922ac06117a11237b4e371b80 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 26 Jun 2018 08:24:46 -0300 Subject: [PATCH 1898/2640] linux-headers: bump 4.{9, 14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 97d43e681b..ebaae8807e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -259,13 +259,13 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 default "4.4.138" if BR2_KERNEL_HEADERS_4_4 - default "4.9.109" if BR2_KERNEL_HEADERS_4_9 + default "4.9.110" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.51" if BR2_KERNEL_HEADERS_4_14 + default "4.14.52" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.2" if BR2_KERNEL_HEADERS_4_17 + default "4.17.3" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 2c9c47c6b298c3c553e1d2672ec1aaa29f9c163b Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Tue, 26 Jun 2018 11:09:41 +0200 Subject: [PATCH 1899/2640] libostree: bump to version 2018.6 Also, add upstream patch for not fail builds on 32bit architectures. The patch will be removed when bumping to v2018.7. Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...-repo-Fix-32-bit-format-string-error.patch | 35 +++++++++++++++++++ package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch diff --git a/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch new file mode 100644 index 0000000000..d74afcd412 --- /dev/null +++ b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch @@ -0,0 +1,35 @@ +From 1174d9f5ba537562c67084caf0214544fbb14ffc Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 21 Jun 2018 14:17:28 +0000 +Subject: [PATCH] lib/repo: Fix 32 bit format string error + +Signed-off-by: Marcus Folkesson +--- + src/libostree/ostree-repo-commit.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c +index 37be748b..7e1d707b 100644 +--- a/src/libostree/ostree-repo-commit.c ++++ b/src/libostree/ostree-repo-commit.c +@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self, + return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required", + self->min_free_space_percent, formatted_required); + else +- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required", ++ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required", + self->min_free_space_mb, formatted_required); + } + /* This is the main bit that needs mutex protection */ +@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self, + return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available", + self->min_free_space_percent, formatted_free); + else +- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available", ++ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available", + self->min_free_space_mb, formatted_free); + } + g_mutex_unlock (&self->txn_lock); +-- +2.18.0 + diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 9ee0c7bdb2..c694a90e22 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ad0f5a0e7a7f22f87c72b318b2cfdbe8cf908a1a469ec94eb72984bbb3690261 libostree-2018.5.tar.xz +sha256 8dd49a1ab94924e351ff9cfd8ea2bf725770400900f4875ad2cc95712c6cc905 libostree-2018.6.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index ddb230517b..bf5118413b 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2018.5 +LIBOSTREE_VERSION = 2018.6 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From 17c9810fe76377fb928579e2b99f03f8ae31addb Mon Sep 17 00:00:00 2001 From: Bryce Ferguson Date: Mon, 25 Jun 2018 16:44:07 -0500 Subject: [PATCH 1900/2640] patchelf: add patch to fix relative rpath issue on big-endian systems This commit adds a patch to the host package patchelf to fix an issue with endianness when the --make-rpath-relative option is specified. Currently, patchelf does not take into account the architecture of the target ELF when it performs the fixup on the RPATH. Thus, if it differs from the host in endianness, the RUNPATH field will be invalid. The patch fixes the bug reported here: https://bugs.busybox.net/show_bug.cgi?id=11101 Signed-off-by: Bryce Ferguson Signed-off-by: Thomas Petazzoni --- ...LF-endianness-before-writing-new-run.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch diff --git a/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch b/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch new file mode 100644 index 0000000000..8a89d3a631 --- /dev/null +++ b/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch @@ -0,0 +1,40 @@ +From 8c75599b674c73fbfe9c15afeccad54ae88243f5 Mon Sep 17 00:00:00 2001 +From: Bryce Ferguson +Date: Mon, 25 Jun 2018 13:05:07 -0500 +Subject: [PATCH] patchelf: Check ELF endianness before writing new runpath + +This commit modifies the way fields are written in the dynamic +section in order to account the architecture of the target ELF +file. Instead of copying the raw data, use the helper functions +to convert endianness. + +Link to upstream PR: https://github.com/NixOS/patchelf/pull/151 + +Signed-off-by: Bryce Ferguson +--- + src/patchelf.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 35b4a33..a33f644 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -1315,13 +1315,13 @@ void ElfFile::modifyRPath(RPathOp op, string rootDir, string + debug("new rpath is `%s'\n", newRPath.c_str()); + + if (!forceRPath && dynRPath && !dynRunPath) { /* convert DT_RPATH to DT_RUNPATH */ +- dynRPath->d_tag = DT_RUNPATH; ++ wri(dynRPath->d_tag, DT_RUNPATH); + dynRunPath = dynRPath; + dynRPath = 0; + } + + if (forceRPath && dynRPath && dynRunPath) { /* convert DT_RUNPATH to DT_RPATH */ +- dynRunPath->d_tag = DT_IGNORE; ++ wri(dynRunPath->d_tag, DT_IGNORE); + } + + if (newRPath.size() <= rpathSize) { +-- +2.17.0 + From eba2622fa4259b7afa3be37d7dd5cc401dcf6f5e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:21 +0200 Subject: [PATCH 1901/2640] gstreamer1: bump to 1.14.1 Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.hash | 5 +++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f8af907562..7e75489337 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz.sha256sum -sha256 5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674 gstreamer-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.1.tar.xz.sha256sum +sha256 28d82b0d261544a9bf85b429399929e4986eb00efcf1ce16cc71d269a4c3186c gstreamer-1.14.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index ea9f29a4f3..02158f5238 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.12.4 +GSTREAMER1_VERSION = 1.14.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 3f2aef56127fbe71378e6a2d55192a0835d962ab Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:22 +0200 Subject: [PATCH 1902/2640] gst1-plugins-${base, good, bad, ugly}: bump to 1.14.1 These are grouped together because several plugins have been re-arranged and there is no way to individually update each plugin package. Changes: Add the following to gst1-plugins-base and remove them from plugins-bad: - opengl - gles2 - glx - egl - x11 - dispmanx - audiomixer Add the following to plugins-good and remove them from plugins-ugly: - lame - mpg123 moved --disable-qt from plugins-bad to plugins-good Delete upstream patch from gst1-plugins-ugly ([1]) - 0001-x264enc-fix-build-with-newer-x264-with-support-for-m.patch Also add hashes for the license files. [1] https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=83c38dc44622611c1f67dd26e4cb383c5aef90f6 Signed-off-by: Adam Duskett [Upate to 1.14.1] [Removed legacy lame/mpg123 option, add Config.in.legacy handling] [remove leftover audiomixer handling from gst1-plugins-bad.mk] [remove upstream patch from gst1-plugins-ugly] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 80 ++++++++++ package/gstreamer1/gst1-plugins-bad/Config.in | 139 +----------------- .../gst1-plugins-bad/gst1-plugins-bad.hash | 5 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 58 +------- .../gstreamer1/gst1-plugins-base/Config.in | 130 ++++++++++++++++ .../gst1-plugins-base/gst1-plugins-base.hash | 5 +- .../gst1-plugins-base/gst1-plugins-base.mk | 63 +++++++- .../gstreamer1/gst1-plugins-good/Config.in | 12 ++ .../gst1-plugins-good/gst1-plugins-good.hash | 5 +- .../gst1-plugins-good/gst1-plugins-good.mk | 20 ++- ...d-with-newer-x264-with-support-for-m.patch | 106 ------------- .../gstreamer1/gst1-plugins-ugly/Config.in | 12 -- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 5 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 16 +- 14 files changed, 319 insertions(+), 337 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-ugly/0001-x264enc-fix-build-with-newer-x264-with-support-for-m.patch diff --git a/Config.in.legacy b/Config.in.legacy index bfa96a9380..9743ebd08f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,86 @@ endif ############################################################################### comment "Legacy options removed in 2018.08" +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL + bool "gst1-plugins-bad opengl option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + help + The opengl option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2 + bool "gst1-plugins-bad gles2 option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2 + help + The gles2 option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX + bool "gst1-plugins-bad glx option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX + help + The glx option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL + bool "gst1-plugins-bad egl option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL + help + The egl option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 + bool "gst1-plugins-bad x11 option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11 + help + The x11 option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND + bool "gst1-plugins-bad wayland option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND + help + The wayland option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX + bool "gst1-plugins-bad dispmanx option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX + help + The dispmanx option has been moved from gst1-plugins-mad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER + bool "gst1-plugins-bad audiomixer option moved to gst1-plugins-base" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER + help + The audiomixer option has been moved from gst1-plugins-bad to + gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME + bool "gst1-plugins-ugly lame option moved to gst1-plugins-good" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME + help + The lame option has been moved from gst1-plugins-ugly to + gst1-plugins-good. + +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123 + bool "gst1-plugins-ugly mpg123 option moved to gst1-plugins-good" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123 + help + The mpg123 option has been moved from gst1-plugins-ugly to + gst1-plugins-good. + config BR2_GDB_VERSION_7_11 bool "gdb 7.11 has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index b09e515f5a..3ce6daf544 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -9,134 +9,6 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD if BR2_PACKAGE_GST1_PLUGINS_BAD -comment "libraries with external dependencies" - -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL - bool "opengl" - depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES - -if BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - def_bool BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "The opengl library needs an API, a platform and a window system" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - -comment "APIs" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL - bool "opengl" - default y - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - -comment "opengl needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2 - bool "gles2" - default y - depends on BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - -comment "gles2 needs an OpenGL ES backend" - depends on !BR2_PACKAGE_HAS_LIBGLES - -comment "Platforms" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX - bool "glx" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X - depends on !BR2_PACKAGE_RPI_USERLAND # x11 - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - help - OpenGL Extension to the X Window System - -comment "glx not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - -comment "glx needs the opengl API and modular X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL || \ - !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - bool "egl" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - depends on BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - -comment "egl needs an API and an EGL backend" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API || \ - !BR2_PACKAGE_HAS_LIBEGL - -comment "Window systems" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 - bool "x11" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - depends on !BR2_PACKAGE_RPI_USERLAND - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "x11 not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - -comment "x11 needs a platform and X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM || \ - !BR2_PACKAGE_XORG7) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND - bool "wayland" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - depends on BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "wayland needs the egl platform and the wayland package" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \ - !BR2_PACKAGE_WAYLAND - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX - bool "dispmanx" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - depends on BR2_PACKAGE_RPI_USERLAND - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - help - Raspberry Pi's Dispmanx windowing system - -comment "dispmanx needs the egl platform and rpi-userland" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \ - !BR2_PACKAGE_RPI_USERLAND - -endif - -comment "opengl needs an OpenGL or OpenGL ES backend" - depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES - comment "dependency-less plugins" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP @@ -174,11 +46,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD help Audio filters plugin -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER - bool "audiomixer" - help - Audio mixer plugin - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX bool "audiomixmatrix" help @@ -513,10 +380,10 @@ comment "fdk-aac needs a toolchain w/ C++" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL bool "gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL -comment "gl needs the gst1-plugins-bad opengl library" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL +comment "gl needs the gst1-plugins-base opengl library" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS bool "hls" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 752d50a56d..927e45b7e9 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz.sha256sum -sha256 0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08 gst-plugins-bad-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.1.tar.xz.sha256sum +sha256 2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a gst-plugins-bad-1.14.1.tar.xz +sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index b041014f81..53b4038f1f 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.12.4 +GST1_PLUGINS_BAD_VERSION = 1.14.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -58,8 +58,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ --disable-schro \ --disable-zbar \ --disable-spandsp \ - --disable-gtk3 \ - --disable-qt + --disable-gtk3 GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 @@ -72,58 +71,13 @@ GST1_PLUGINS_BAD_CONF_ENV += \ -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opengl -GST1_PLUGINS_BAD_DEPENDENCIES += libgl libglu -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opengl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gles2 -GST1_PLUGINS_BAD_DEPENDENCIES += libgles -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gles2 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-glx -GST1_PLUGINS_BAD_DEPENDENCIES += xproto_glproto xlib_libXrender -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-glx -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl -GST1_PLUGINS_BAD_DEPENDENCIES += libegl -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`" -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x11 -GST1_PLUGINS_BAD_DEPENDENCIES += xlib_libX11 xlib_libXext -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x11 -endif - -ifneq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND)$(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),) +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols else GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dispmanx -GST1_PLUGINS_BAD_DEPENDENCIES += rpi-userland -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dispmanx -endif - ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BAD_DEPENDENCIES += orc GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc @@ -178,12 +132,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixer -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix else diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index 6b08b68cf2..531fac4f47 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -28,6 +28,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT help Convert audio to different formats +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER + bool "audiomixer" + help + Audio mixer plugin + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE bool "audiorate" help @@ -111,6 +116,131 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME comment "plugins with external dependencies" +menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL + bool "opengl" + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + +if BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL + +config BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + def_bool BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW + +comment "The opengl library needs an API, a platform and a window system" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + +comment "APIs" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API + bool + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + bool "opengl" + default y + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API + +comment "opengl needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2 + bool "gles2" + default y + depends on BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API + +comment "gles2 needs an OpenGL ES backend" + depends on !BR2_PACKAGE_HAS_LIBGLES + +comment "Platforms" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM + bool + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX + bool "glx" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X + depends on !BR2_PACKAGE_RPI_USERLAND # x11 + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_XPROTO_GLPROTO + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11 + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM + help + OpenGL Extension to the X Window System + +comment "glx not supported with rpi-userland" + depends on BR2_PACKAGE_RPI_USERLAND + +comment "glx needs the opengl API and modular X.org" + depends on !BR2_PACKAGE_RPI_USERLAND && \ + (!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL || \ + !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR) + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL + bool "egl" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM + +comment "egl needs an API and an EGL backend" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API || \ + !BR2_PACKAGE_HAS_LIBEGL + +comment "Window systems" + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW + bool + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11 + bool "x11" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM + depends on !BR2_PACKAGE_RPI_USERLAND + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW + +comment "x11 not supported with rpi-userland" + depends on BR2_PACKAGE_RPI_USERLAND + +comment "x11 needs a platform and X.org" + depends on !BR2_PACKAGE_RPI_USERLAND && \ + (!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM || \ + !BR2_PACKAGE_XORG7) + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND + bool "wayland" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL + depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW + +comment "wayland needs the egl platform and the wayland package" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \ + !BR2_PACKAGE_WAYLAND + +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX + bool "dispmanx" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL + depends on BR2_PACKAGE_RPI_USERLAND + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW + help + Raspberry Pi's Dispmanx windowing system + +comment "dispmanx needs the egl platform and rpi-userland" + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \ + !BR2_PACKAGE_RPI_USERLAND +endif + +comment "opengl needs an OpenGL or OpenGL ES backend" + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA bool "alsa (mandatory for audio playback)" select BR2_PACKAGE_ALSA_LIB diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index b935f2f6dc..65c9f29c2f 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz.sha256sum -sha256 4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282 gst-plugins-base-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.1.tar.xz.sha256sum +sha256 1026c7c3082d825d9b5d034c1a6dd8a4ebab60eb3738b0a0afde4ad2dc0b0db5 gst-plugins-base-1.14.1.tar.xz +sha256 78fb5977f177ab71cba77a4a127d29b93cb1ca5c25962204b31f183a20cf5c7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 10361ee3c6..3ad841bdd3 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.12.4 +GST1_PLUGINS_BASE_VERSION = 1.14.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES @@ -24,13 +24,64 @@ GST1_PLUGINS_BASE_CONF_OPTS += \ GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 -# These plugins are liste in the order from ./configure --help - +# These plugins are listed in the order from ./configure --help ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-opengl +GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-opengl +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-gles2 +GST1_PLUGINS_BASE_DEPENDENCIES += libgles +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-gles2 +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx +GST1_PLUGINS_BASE_DEPENDENCIES += xproto_glproto xlib_libXrender +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-egl +GST1_PLUGINS_BASE_DEPENDENCIES += libegl +GST1_PLUGINS_BASE_CONF_ENV += \ + CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ + LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`" +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-egl +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-x11 +GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-x11 +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-wayland +GST1_PLUGINS_BASE_DEPENDENCIES += wayland wayland-protocols +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-wayland +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-dispmanx +GST1_PLUGINS_BASE_DEPENDENCIES += rpi-userland +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-dispmanx +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y) GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder else @@ -49,6 +100,12 @@ else GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiomixer +else +GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiomixer +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y) GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate else diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index eea3a3eda8..3bb98a4308 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -261,6 +261,18 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M comment "plugins with external dependencies" +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME + bool "lame (*.mp3 audio encoder)" + select BR2_PACKAGE_LAME + help + Encode MP3s with LAME + +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123 + bool "mpg123 (*.mp3 audio)" + select BR2_PACKAGE_MPG123 + help + mp3 decoding based on the mpg123 library + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS bool "ossaudio (OSS audio)" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index c6f6138154..1254c4cde0 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz.sha256sum -sha256 649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957 gst-plugins-good-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.1.tar.xz.sha256sum +sha256 34ec062ddb766a32377532e039781f4a16fbc3e8b449e642605bacab26a99172 gst-plugins-good-1.14.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 53e2341586..26ea8a961a 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.12.4 +GST1_PLUGINS_GOOD_VERSION = 1.14.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING @@ -20,7 +20,8 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \ --disable-osx_video \ --disable-aalib \ --disable-aalibtest \ - --disable-libcaca + --disable-libcaca \ + --disable-qt # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ @@ -175,6 +176,21 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME),y) +GST1_PLUGINS_GOOD_CONF_OPTS += --enable-lame +GST1_PLUGINS_GOOD_DEPENDENCIES += lame +else +GST1_PLUGINS_GOOD_CONF_OPTS += --disable-lame +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123),y) +GST1_PLUGINS_GOOD_CONF_OPTS += --enable-mpg123 +GST1_PLUGINS_GOOD_DEPENDENCIES += mpg123 +else +GST1_PLUGINS_GOOD_CONF_OPTS += --disable-mpg123 +endif + + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y) GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law else diff --git a/package/gstreamer1/gst1-plugins-ugly/0001-x264enc-fix-build-with-newer-x264-with-support-for-m.patch b/package/gstreamer1/gst1-plugins-ugly/0001-x264enc-fix-build-with-newer-x264-with-support-for-m.patch deleted file mode 100644 index c7460470ae..0000000000 --- a/package/gstreamer1/gst1-plugins-ugly/0001-x264enc-fix-build-with-newer-x264-with-support-for-m.patch +++ /dev/null @@ -1,106 +0,0 @@ -From ffa7ce1e19ec3930de667f213dcaedb7eb10508e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Wed, 28 Feb 2018 10:07:13 +0000 -Subject: [PATCH] x264enc: fix build with newer x264 with support for multiple - bit depths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libx264 used to be built for one specific bit depth, and if we -wanted to support multiple bit depths we would have to dynamically -load the right .so from different paths. That has changed now, and -libx264 can include support for multiple depths in the same lib, -so we don't need to do the dlopen() dance any more. We'll keep -the vtable stuff around until we can drop support for older x264. - -gstx264enc.c:2927:36: error: ‘x264_bit_depth’ undeclared - -https://bugzilla.gnome.org/show_bug.cgi?id=792111 - -Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/patch/ext/x264?id=83c38dc44622611c1f67dd26e4cb383c5aef90f6 -Signed-off-by: Peter Seiderer ---- - ext/x264/gstx264enc.c | 35 ++++++++++++++++++++++++++++++++++- - 1 file changed, 34 insertions(+), 1 deletion(-) - -diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c -index 4287cf9..d1e4f2b 100644 ---- a/ext/x264/gstx264enc.c -+++ b/ext/x264/gstx264enc.c -@@ -117,7 +117,9 @@ struct _GstX264EncVTable - { - GModule *module; - -+#if X264_BUILD < 153 - const int *x264_bit_depth; -+#endif - const int *x264_chroma_format; - void (*x264_encoder_close) (x264_t *); - int (*x264_encoder_delayed_frames) (x264_t *); -@@ -170,8 +172,9 @@ load_x264 (const gchar * filename) - "' from '%s'. Incompatible version?", filename); - goto error; - } -- -+#if X264_BUILD < 153 - LOAD_SYMBOL (x264_bit_depth); -+#endif - LOAD_SYMBOL (x264_chroma_format); - LOAD_SYMBOL (x264_encoder_close); - LOAD_SYMBOL (x264_encoder_delayed_frames); -@@ -288,6 +291,7 @@ gst_x264_enc_add_x264_chroma_format (GstStructure * s, - return ret; - } - -+#if X264_BUILD < 153 - static gboolean - load_x264_libraries (void) - { -@@ -326,6 +330,33 @@ load_x264_libraries (void) - return TRUE; - } - -+#else /* X264_BUILD >= 153 */ -+ -+static gboolean -+load_x264_libraries (void) -+{ -+#if X264_BIT_DEPTH == 0 /* all */ -+ vtable_8bit = &default_vtable; -+ vtable_10bit = &default_vtable; -+#elif X264_BIT_DEPTH == 8 -+ vtable_8bit = &default_vtable; -+#elif X264_BIT_DEPTH == 10 -+ vtable_10bit = &default_vtable; -+#else -+#error "unexpected X264_BIT_DEPTH value" -+#endif -+ -+#ifdef HAVE_X264_ADDITIONAL_LIBRARIES -+ GST_WARNING ("Ignoring configured additional libraries %s, using libx264 " -+ "version enabled for multiple bit depths", -+ HAVE_X264_ADDITIONAL_LIBRARIES); -+#endif -+ -+ return TRUE; -+} -+ -+#endif -+ - enum - { - ARG_0, -@@ -2897,7 +2928,9 @@ plugin_init (GstPlugin * plugin) - * if needed. We can't initialize statically because these values are not - * constant on Windows. */ - default_vtable.module = NULL; -+#if X264_BUILD < 153 - default_vtable.x264_bit_depth = &x264_bit_depth; -+#endif - default_vtable.x264_chroma_format = &x264_chroma_format; - default_vtable.x264_encoder_close = x264_encoder_close; - default_vtable.x264_encoder_delayed_frames = x264_encoder_delayed_frames; --- -2.16.3 - diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index c997411021..c24ec7ae7b 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -44,18 +44,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD help Access a DVD with dvdread -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME - bool "lame (*.mp3 audio encoder)" - select BR2_PACKAGE_LAME - help - Encode MP3s with LAME - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123 - bool "mpg123 (*.mp3 audio)" - select BR2_PACKAGE_MPG123 - help - mp3 decoding based on the mpg123 library - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC bool "mpeg2dec" select BR2_PACKAGE_LIBMPEG2 diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d0581531d4..4fe4d091a8 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz.sha256sum -sha256 1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522 gst-plugins-ugly-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.1.tar.xz.sha256sum +sha256 cff2430bb13f54ef81409a0b3d65ce409a376d4a7bab57a14a97d602539fe1d3 gst-plugins-ugly-1.14.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index af02a560a8..1b4842fb92 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.12.4 +GST1_PLUGINS_UGLY_VERSION = 1.14.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -70,20 +70,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-lame -GST1_PLUGINS_UGLY_DEPENDENCIES += lame -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-lame -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpg123 -GST1_PLUGINS_UGLY_DEPENDENCIES += mpg123 -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpg123 -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 From dee9ebc0dc10d2378830425e5f3fc3111c29117b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:23 +0200 Subject: [PATCH 1903/2640] gst-omx: bump to 1.14.1 Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst-omx/gst-omx.hash | 5 +++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index c4f8b10bce..5535a75812 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.12.4.tar.xz.sha256sum -sha256 a025fa24242ec868fe0ff1e66d806a1070bcbc7c14a987a89cdc3395d0d56d5f gst-omx-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.14.1.tar.xz.sha256sum +sha256 7cb6c39301dfa3960abce195305c7cf431736bf6b47bde1fd4412c81c3e75cd8 gst-omx-1.14.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 68cb7f6696..8242d24a1f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.12.4 +GST_OMX_VERSION = 1.14.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 0d5965fd61eb0e2edcfd55177bc4af0238cb70ef Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:24 +0200 Subject: [PATCH 1904/2640] gst1-rtsp-server: bump to 1.14.1 Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 5 +++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 95c8eef832..4eabe12cef 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.12.4.tar.xz.sha256sum -sha256 7660112ebd59838f1054796b38109dcbe32f0a040e3a252a68a81055aeaa56a9 gst-rtsp-server-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.1.tar.xz.sha256sum +sha256 38634f3b25c2bf2967b1ff914b54ff384f8612f5aefc18accd72c78bf3b02d7c gst-rtsp-server-1.14.1.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d6a82ee654..4aa7c0b0c7 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.12.4 +GST1_RTSP_SERVER_VERSION = 1.14.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ From 5961332dc40fd0ce28c0d9fbff78dc051715065a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:25 +0200 Subject: [PATCH 1905/2640] gst1-vaapi: bump to 1.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add upstream patch to fix the following compile failure: gstvaapipluginutil.c:259:12: error: ‘GstGLDisplay’ undeclared (first use in this function); did you mean ‘GstVaapiDisplay’? (GstGLDisplay **) & plugin->gl_display, ^~~~~~~~~~~~ GstVaapiDisplay gstvaapipluginutil.c:259:12: note: each undeclared identifier is reported only once for each function it appears in gstvaapipluginutil.c:259:27: error: expected expression before ‘)’ token (GstGLDisplay **) & plugin->gl_display, ^ Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../0001-plugins-guard-GstGL-code.patch | 35 +++++++++++++++++++ package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 5 +-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 package/gstreamer1/gst1-vaapi/0001-plugins-guard-GstGL-code.patch diff --git a/package/gstreamer1/gst1-vaapi/0001-plugins-guard-GstGL-code.patch b/package/gstreamer1/gst1-vaapi/0001-plugins-guard-GstGL-code.patch new file mode 100644 index 0000000000..a85d666e31 --- /dev/null +++ b/package/gstreamer1/gst1-vaapi/0001-plugins-guard-GstGL-code.patch @@ -0,0 +1,35 @@ +From 73e31146a5c6bcd48eb3089a2a140833a401623b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= + +Date: Mon, 21 May 2018 13:27:14 +0200 +Subject: [PATCH] plugins: guard GstGL code + +Upstream: https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi/patch/?id=45fb111850955d9192e43b9dbcb2ef8e3974e58d +Signed-off-by: Peter Seiderer +--- + gst/vaapi/gstvaapipluginutil.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c +index fa25131..648c91b 100644 +--- a/gst/vaapi/gstvaapipluginutil.c ++++ b/gst/vaapi/gstvaapipluginutil.c +@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object) + static void + gst_vaapi_find_gl_context (GstElement * element) + { ++#if USE_GST_GL_HELPERS + GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element); + + /* if the element is vaapisink or any vaapi encoder it doesn't need +@@ -282,6 +283,7 @@ no_valid_gl_display: + gst_object_replace (&plugin->gl_other_context, NULL); + return; + } ++#endif + } + + gboolean +-- +2.17.1 + diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 3eebc0afe7..b3c72310c2 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.12.4.tar.xz.sha256sum -sha256 1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9 gstreamer-vaapi-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.1.tar.xz.sha256sum +sha256 585c3ddb0c39220de0a33e5d0ed6196a108b8407ec3538d7c64617713b4434e8 gstreamer-vaapi-1.14.1.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 6b637416f5..1e7e6f1c86 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.12.4 +GST1_VAAPI_VERSION = 1.14.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From e1d18f1a7a44067b5cbe1e79690258878eb4b468 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:26 +0200 Subject: [PATCH 1906/2640] gst1-libav: bump to 1.14.1 Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-libav/gst1-libav.hash | 5 +++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index f9a287c590..d67968557d 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz.sha256sum -sha256 2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62 gst-libav-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.1.tar.xz.sha256sum +sha256 eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d gst-libav-1.14.1.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 7450b759f1..b7566f0161 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.12.4 +GST1_LIBAV_VERSION = 1.14.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From e34f0d1274dd9180d77d0c00cf3d38838f2ac936 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:27 +0200 Subject: [PATCH 1907/2640] gst1-validate: bump to 1.14.1 Also add hash for license file. Signed-off-by: Adam Duskett [Update to 1.14.1] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-validate/gst1-validate.hash | 5 +++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index 50bddd0a9f..cb1046b9f7 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.12.4.tar.xz.sha256sum -sha256 f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1 gst-validate-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.14.1.tar.xz.sha256sum +sha256 68e3f38f66e0d04837b60090fe5d9ca1127f5df124669f34ca82e241209171e4 gst-validate-1.14.1.tar.xz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index d276490160..104cc0150d 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.12.4 +GST1_VALIDATE_VERSION = 1.14.1 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPL-2.1+ From 9d291ff00c000ceb8d5968d783134cb5ffb16536 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 24 Jun 2018 00:35:28 +0200 Subject: [PATCH 1908/2640] gstreamer1-editing-services: bump to 1.14.1 - change legacy select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER to new select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1-editing-services/Config.in | 3 +-- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 716a4e5ef7..fe46870491 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -3,15 +3,14 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_GOOD - select BR2_PACKAGE_GST1_PLUGINS_BAD select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER # runtime help GStreamer Editing Services is a high-level library for facilitating the creation of audio/video non-linear editors. diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index ddf9cecaed..c738db6f88 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.4.tar.xz.sha256sum -sha256 bd7eaa2c9572db9e7e535064024b6f69250de864fe8a5d5be86fa8c7edacca0c gstreamer-editing-services-1.12.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.1.tar.xz.sha256sum +sha256 7e7c0962f39388cdf81b5e0d9f768eb15e30f58b346fd79f1ea778979eae113e gstreamer-editing-services-1.14.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 9b5a93eb75..215582bf15 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.14.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ @@ -15,7 +15,6 @@ GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ gst1-plugins-good \ - gst1-plugins-bad \ $(if $(BR2_PACKAGE_GST1_VALIDATE),gst1-validate) \ libxml2 From 534d91c9e5701f9612d06aa633c178d26ea3bf56 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Jun 2018 00:35:29 +0200 Subject: [PATCH 1909/2640] gst1-imx: add hash for license file Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-imx/gst1-imx.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index 58ff4be225..0ef01d71e9 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,2 +1,3 @@ # locally computed hash sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026 gst1-imx-0.13.0.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE From 04bdded6ffac100aed7e27d87482682693213a21 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Jun 2018 23:36:20 +0200 Subject: [PATCH 1910/2640] qt5base: fix license - Since QT 5.11, LICENSE.GPLv3 doesn't exist anymore so use LICENSE.GPL3 and add its hash - Update hash of LICENSE.LGPLv3 (as it now makes a reference to LICENSE.GPL3 instead of LICENSE.GPLv3) - Update hash of header.BSD (year is now YYYY instead of 2016) Fixes: - http://autobuild.buildroot.net/results/b8add9b9a2defe5e64330714e9768ffa6393adc0 Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.hash | 6 +++--- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 263fb84acc..896cfb5f06 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -6,9 +6,9 @@ sha256 ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66 qtbase- # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3 +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 8fdefa0b45d9f791f687da6c2c4c83c1b701aaee2c08008f55d522af214b88f0 header.BSD +sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 1eabd7a15b..d5b25abcb8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -56,7 +56,7 @@ endif QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) -QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL From a7404a79c6355343253353ba9fdd0d227e638df5 Mon Sep 17 00:00:00 2001 From: Dan Walkes Date: Sun, 17 Jun 2018 17:51:53 +0000 Subject: [PATCH 1911/2640] package/hidapi: select glibc gconv libs copy Hidapi source uses iconv_open UTF-16 conversion [1] which requires gconv libararies when buiding with glibc in order to successfully find serial number, manufacturer and product strings [2]. Use select in the config file to autmatically select gconv libararies for inclusion on the target when building with glibc Tested with ./utils/test-pkg -c hidapi.cfg -p hidapi and hidapi.cfg file contents: BR2_PACKAGE_HIDAPI=y BR2_PACKAGE_EUDEV=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_USE_MMU=y BR2_USE_WCHAR=y Also tested on x86-64 build target with application using hidapi [1]: https://github.com/signal11/hidapi/blob/a6a622ffb680c55da0de787ff93b80280498330f/libusb/hid.c#L446 [2]: https://www.silabs.com/community/interface/forum.topic.html/cp2114_linux_sta-RtWg Signed-off-by: Dan Walkes Tested-by: Dan Walkes Signed-off-by: Thomas Petazzoni --- package/hidapi/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/hidapi/Config.in b/package/hidapi/Config.in index f6a31bacd3..b98c2db91c 100644 --- a/package/hidapi/Config.in +++ b/package/hidapi/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_HIDAPI select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + # runtime UTF conversion support + select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC help HIDAPI is a multi-platform library which allows an application to interface with USB and Bluetooth HID-Class devices on From 2257c18c259b52abf3dda0aea98a59cce29f3eab Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 18 Jun 2018 14:13:09 +0200 Subject: [PATCH 1912/2640] package/dehydrated: new package dehydrated is an ACME client written in bash. It should be able to run under zsh as well, but this hasn't been tested so it isn't enabled for now. Normally, we would want an init script to start dehydrated, and an example configuration file. However, it is very difficult to do this in a generic way in Buildroot: - we normally don't have cron running; - we have no standard location for webroot; - we have no standard location for certificates; - we have no standard way to restart/reload the webserver. So instead, provide brief documentation of how to use dehydrated in the help text. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/dehydrated/Config.in | 33 ++++++++++++++++++++++++++++++ package/dehydrated/dehydrated.hash | 6 ++++++ package/dehydrated/dehydrated.mk | 18 ++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 package/dehydrated/Config.in create mode 100644 package/dehydrated/dehydrated.hash create mode 100644 package/dehydrated/dehydrated.mk diff --git a/DEVELOPERS b/DEVELOPERS index 27e24896fb..8b1cb0c1d7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,6 +185,7 @@ F: package/espeak/ N: Arnout Vandecappelle F: package/arp-scan/ +F: package/dehydrated/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ F: package/gstreamer/gst-fsl-plugins/ diff --git a/package/Config.in b/package/Config.in index c5365547a4..b689017be5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1712,6 +1712,7 @@ menu "Networking applications" source "package/cups-filters/Config.in" source "package/dante/Config.in" source "package/darkhttpd/Config.in" + source "package/dehydrated/Config.in" source "package/dhcp/Config.in" source "package/dhcpcd/Config.in" source "package/dhcpdump/Config.in" diff --git a/package/dehydrated/Config.in b/package/dehydrated/Config.in new file mode 100644 index 0000000000..f14ae0f611 --- /dev/null +++ b/package/dehydrated/Config.in @@ -0,0 +1,33 @@ +config BR2_PACKAGE_DEHYDRATED + bool "dehydrated" + depends on BR2_USE_MMU # bash + select BR2_PACKAGE_BASH + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_CURL + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL + help + Dehydrated is a client for signing certificates with an + ACME-server (e.g. Let's Encrypt) implemented as a relatively + simple (zsh-compatible) bash-script. This client supports + both ACME v1 and the new ACME v2 including support for + wildcard certificates! + + To use this script in Buildroot: + - Create /etc/dehydrated/domains.txt + - Make sure that "dehydrated -c" is called regularly, e.g. + from cron. + - Make sure /etc/dehydrated is writable. + - Configure the webserver to export the WELLKNOWN directory + (/var/www/dehydrated) as /.well-known/acme-challenge + - Configure the webserver to use the certificates under + /etc/dehydrated/certs/ + - Register a HOOK to reload the webserver after the + certificates have been renewed. + + You probably need to install a custom /etc/dehydrated/config + with the rootfs overlay. + + https://github.com/lukas2511/dehydrated diff --git a/package/dehydrated/dehydrated.hash b/package/dehydrated/dehydrated.hash new file mode 100644 index 0000000000..1d194e5a7d --- /dev/null +++ b/package/dehydrated/dehydrated.hash @@ -0,0 +1,6 @@ +# Locally computed after verifying +# https://github.com/lukas2511/dehydrated/releases/download/v0.6.2/dehydrated-0.6.2.tar.gz.asc +# with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511 +sha256 163384479199f06f59382ceb6291a299567a2f4f0b963b9b61f2db65a407e80e dehydrated-0.6.2.tar.gz +# License, locally computed +sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE diff --git a/package/dehydrated/dehydrated.mk b/package/dehydrated/dehydrated.mk new file mode 100644 index 0000000000..b7de27a407 --- /dev/null +++ b/package/dehydrated/dehydrated.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# dehydrated +# +################################################################################ + +DEHYDRATED_VERSION = 0.6.2 +DEHYDRATED_SITE = https://github.com/lukas2511/dehydrated/releases/download/v$(DEHYDRATED_VERSION) + +DEHYDRATED_LICENSE = MIT +DEHYDRATED_LICENSE_FILES = LICENSE + +define DEHYDRATED_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/dehydrated $(TARGET_DIR)/usr/bin/dehydrated + $(INSTALL) -D -m 0644 $(@D)/docs/examples/config $(TARGET_DIR)/etc/dehydrated/config +endef + +$(eval $(generic-package)) From b54c1e0730764548eb3bcc0cbe3142a247941033 Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Wed, 20 Jun 2018 16:26:11 -0600 Subject: [PATCH 1913/2640] cmocka: new package Signed-off-by: Nimai Mahajan Signed-off-by: Joel Carlson Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com>
            Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...cmocka-cmake-fix-stack-protect-check.patch | 34 +++++++++++++++++++ package/cmocka/Config.in | 15 ++++++++ package/cmocka/cmocka.hash | 2 ++ package/cmocka/cmocka.mk | 23 +++++++++++++ 6 files changed, 76 insertions(+) create mode 100644 package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch create mode 100644 package/cmocka/Config.in create mode 100644 package/cmocka/cmocka.hash create mode 100644 package/cmocka/cmocka.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8b1cb0c1d7..c52a57c507 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -968,6 +968,7 @@ N: Jeremy Rosen F: package/fxload/ N: Joel Carlson +F: package/cmocka/ F: package/flatcc/ N: Joel Stanley diff --git a/package/Config.in b/package/Config.in index b689017be5..a012d2c809 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1504,6 +1504,7 @@ menu "Other" source "package/clang/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in" + source "package/cmocka/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" diff --git a/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch new file mode 100644 index 0000000000..c7a2c2742a --- /dev/null +++ b/package/cmocka/0001-cmocka-cmake-fix-stack-protect-check.patch @@ -0,0 +1,34 @@ +From f9a964edde4011adf88902018cbb87723d78d0a2 Mon Sep 17 00:00:00 2001 +From: Joel Carlson +Date: Wed, 20 Jun 2018 14:35:13 -0600 +Subject: [PATCH 1/1] cmocka cmake: fix stack protect check + +The cmake check for if -fstack-protect is supported needs to use +CMAKE_REQUIRED_FLAGS and not CMAKE_REQUIRED_DEFINITIONS. + +Signed-off-by: Joel Carlson +--- +Upstream status: submitted to cmocka mailing list + + cmake/Modules/CheckCCompilerFlagSSP.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/Modules/CheckCCompilerFlagSSP.cmake b/cmake/Modules/CheckCCompilerFlagSSP.cmake +index 2fe4395..ed34eb3 100644 +--- a/cmake/Modules/CheckCCompilerFlagSSP.cmake ++++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake +@@ -19,8 +19,8 @@ + include(CheckCSourceCompiles) + + function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) +- set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") +- set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") ++ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") ++ set(CMAKE_REQUIRED_FLAGS "${_FLAG}") + check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) +- set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") ++ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") + endfunction(CHECK_C_COMPILER_FLAG_SSP) +-- +2.7.4 + diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in new file mode 100644 index 0000000000..cf49d0f6be --- /dev/null +++ b/package/cmocka/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CMOCKA + bool cmocka + depends on !BR2_STATIC_LIBS + help + cmocka is an elegant unit testing framework for C with support + for mock objects. It only requires the standard C library, + works on a range of computing platforms (including embedded) + and with different compilers. It is a fork of Google's very + popular cmockery unit testing framework to fix bugs and + support it in the future. + + https://cmocka.org + +comment "cmocka needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash new file mode 100644 index 0000000000..1de4a1240f --- /dev/null +++ b/package/cmocka/cmocka.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389 cmocka-1.1.1.tar.xz diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk new file mode 100644 index 0000000000..64f5a4ae18 --- /dev/null +++ b/package/cmocka/cmocka.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cmocka +# +################################################################################ + +CMOCKA_VERSION = 1.1.1 +CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz +CMOCKA_SITE = https://cmocka.org/files/1.1 +CMOCKA_LICENSE = Apache-2.0 +CMOCKA_LICENSE_FILES = COPYING +CMOCKA_INSTALL_STAGING = YES + +# cmocka only supports out of source builds +CMOCKA_SUPPORTS_IN_SOURCE_BUILD = NO + +# cmocka always builds a shared library, but you can optionally build a static +# library as well +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON +endif + +$(eval $(cmake-package)) From 751df64eb344eee6a583755de09d3d506ac2fe33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 26 Jun 2018 22:27:15 +0200 Subject: [PATCH 1914/2640] wine: Bump to version 3.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 176e0ee653..0c4a14e7d2 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec wine-3.0.tar.xz +sha256 cad771375409e24244eab252da044306158af8a8bea4432e7ca81c1dc6b463ff wine-3.0.2.tar.xz diff --git a/package/wine/wine.mk b/package/wine/wine.mk index b6b3aae504..36b3cfa7b3 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,7 +4,7 @@ # ################################################################################ -WINE_VERSION = 3.0 +WINE_VERSION = 3.0.2 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz WINE_SITE = https://dl.winehq.org/wine/source/3.0 WINE_LICENSE = LGPL-2.1+ From 6a3e3c1d0d6956c35af4177f71710debcd692954 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 26 Jun 2018 19:11:32 -0300 Subject: [PATCH 1915/2640] configs/imx6-sabresd: bump U-Boot and Linux kernel Bump U-Boot to version 2018.05 and kernel to 4.7.3. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabresd_defconfig | 8 ++++---- configs/imx6-sabresd_qt5_defconfig | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 9999513914..7f42e55d1f 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 8e6065db5b..cee7244ddc 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From 985009e9c0f2526cd878a2fe1ebadfe9dcebcab0 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 28 Jun 2018 15:50:08 +0200 Subject: [PATCH 1916/2640] wampcc: new package Signed-off-by: Sven Neumann [Thomas: - add entry to DEVELOPERS file - add missing dependency on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - rework comments on the dependencies] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/wampcc/Config.in | 25 +++++++++++++++++++++++++ package/wampcc/wampcc.hash | 3 +++ package/wampcc/wampcc.mk | 14 ++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/wampcc/Config.in create mode 100644 package/wampcc/wampcc.hash create mode 100644 package/wampcc/wampcc.mk diff --git a/DEVELOPERS b/DEVELOPERS index c52a57c507..d26c53b2de 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1883,6 +1883,7 @@ F: package/python-influxdb/ N: Sven Neumann F: package/gstreamer1/gst1-libav/ +F: package/wampcc/ N: Sven Neumann F: package/glib-networking/ diff --git a/package/Config.in b/package/Config.in index a012d2c809..f72670c4e5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1487,6 +1487,7 @@ menu "Networking" source "package/sofia-sip/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" + source "package/wampcc/Config.in" source "package/zeromq/Config.in" source "package/zmqpp/Config.in" source "package/zyre/Config.in" diff --git a/package/wampcc/Config.in b/package/wampcc/Config.in new file mode 100644 index 0000000000..d9d82df3ef --- /dev/null +++ b/package/wampcc/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_WAMPCC + bool "wampcc" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_USE_MMU # libuv + depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_OPENSSL + help + wampcc is a C++ library that implements the Web Application + Messaging Protocol. + + https://github.com/darrenjs/wampcc + +comment "wampcc needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + +comment "wampcc needs a toolchain not affected by GCC bug 64735" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/wampcc/wampcc.hash b/package/wampcc/wampcc.hash new file mode 100644 index 0000000000..162dcab0ec --- /dev/null +++ b/package/wampcc/wampcc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b3c3633b4c6a74d7ac8a676a7ea30fbfde7ae19aa1fc37de3b8aa3a553b674a2 wampcc-v1.6.tar.gz +sha256 bd185b1ec8a292d42b42346757ff6e198073e13c1e080e9ea548d34dd42d30d8 LICENSE diff --git a/package/wampcc/wampcc.mk b/package/wampcc/wampcc.mk new file mode 100644 index 0000000000..d8e093f679 --- /dev/null +++ b/package/wampcc/wampcc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# wampcc +# +################################################################################ + +WAMPCC_VERSION = v1.6 +WAMPCC_SITE = $(call github,darrenjs,wampcc,$(WAMPCC_VERSION)) +WAMPCC_DEPENDENCIES = host-pkgconf libuv jansson openssl +WAMPCC_INSTALL_STAGING = YES +WAMPCC_LICENSE = MIT +WAMPCC_LICENSE_FILES = LICENSE + +$(eval $(cmake-package)) From 33576bb26f38ef395ead1405b9aef79bb3f0eca6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 28 Jun 2018 15:50:09 +0200 Subject: [PATCH 1917/2640] DEVELOPERS: regroup entries for Sven Neumann Move all entries from Sven Neumann under his new e-mail address. Signed-off-by: Sven Neumann Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d26c53b2de..0a9decbb55 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1882,13 +1882,11 @@ F: package/lcdproc/ F: package/python-influxdb/ N: Sven Neumann -F: package/gstreamer1/gst1-libav/ -F: package/wampcc/ - -N: Sven Neumann F: package/glib-networking/ +F: package/gstreamer1/gst1-libav/ F: package/libmms/ F: package/orc/ +F: package/wampcc/ N: Sébastien Szymanski F: package/mmc-utils/ From 9b3eda0f71b37034175b06737d1a64bb0deacc9b Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Wed, 27 Jun 2018 21:29:31 +0300 Subject: [PATCH 1918/2640] toolchain: bump ARC prebuild toolchain to arc-2018.03 Lets update prebuilt ARC toolchain to the most recent arc-2018.03. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- .../toolchain-external-synopsys-arc/Config.in | 4 ++-- .../toolchain-external-synopsys-arc.hash | 10 +++++----- .../toolchain-external-synopsys-arc.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index fefbb47b1e..423e4c7db3 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2017.09 toolchain" + bool "Synopsys ARC 2018.03 toolchain" depends on BR2_arc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" @@ -11,7 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 help Toolchain for the ARC cores, from diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash index 3479e18c6d..df95897e41 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -1,5 +1,5 @@ -# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2017.09-release -sha256 ef74a7567a7341bc5e5d7bf6bcff64c2515be175d08a7def52df847583080ac2 arc_gnu_2017.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 8a7620dd7500641de40adb2ae490d90d53fcad01d13f77ba305fc00df32a26e3 arc_gnu_2017.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 ef7afba0da38cc08d863850f4987ebd16c71c8920c51990f490ad79389f102c1 arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 eab1d4872298008bd141104368ec0b7873af600a09704827f767ae57b067c874 arc_gnu_2017.09_prebuilt_uclibc_be_archs_linux_install.tar.gz +# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2018.03-release +sha256 32e8500b65737b51058d84f443d7919d5b33c43f7dc5b8562e08d4e92c53a77f arc_gnu_2018.03_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 722e3656f60bafd632b6f2ae2c6efa6b9d3eae1bc1840f4d004aa30f5cb419ff arc_gnu_2018.03_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 8e736178343cea9a6cbe63a7d86fa9e81db6671f27fc8a9a7cea98cc6183bbcc arc_gnu_2018.03_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 14024daa36f6ae7cf1e474780687e79af5aaa35d374b077f7036685d7eab3d72 arc_gnu_2018.03_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk index d751934c11..c60f296a89 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2017.09 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2018.03 TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release ifeq ($(BR2_arc750d)$(BR2_arc770d),y) From f0b2df1c20b8fcd87017aaf2b17c2e769d47e9ec Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 28 Jun 2018 13:56:58 +0300 Subject: [PATCH 1919/2640] mpd: enable for ARC external toolchain With the latest prebuilt ARC toolchain this package is building without any errors. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/mpd/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 857f212477..1d50c7bf44 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -7,8 +7,6 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr - # ARC toolchain issue - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) @@ -338,7 +336,6 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC comment "mpd needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From d2b5b6b59bd4136cda66eb4e3ae6ea1df3ea6ced Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 28 Jun 2018 13:56:59 +0300 Subject: [PATCH 1920/2640] mpv: enable for ARC external toolchain With the latest prebuilt ARC toolchain this package is building without any errors. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/mpv/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index ce6f367d72..69810038f1 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -4,8 +4,6 @@ config BR2_PACKAGE_MPV depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 - # ARC toolchain issue - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE @@ -29,4 +27,3 @@ comment "mpv needs a toolchain w/ threads, gcc >= 4.5" depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC From c667a10fc396c4dc0b195f0546b8a69e2d2fa944 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 28 Jun 2018 13:57:00 +0300 Subject: [PATCH 1921/2640] xterm: enable for ARC external toolchain With the latest prebuilt ARC toolchain this package is building without any errors. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/xterm/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/xterm/Config.in b/package/xterm/Config.in index f3bc4500a8..eaa756a441 100644 --- a/package/xterm/Config.in +++ b/package/xterm/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_XTERM bool "xterm" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() - # ARC toolchain issue - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_NCURSES select BR2_PACKAGE_XLIB_LIBXAW help From a65194b3fe945e301ea7f0089186d5482a458fd9 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 28 Jun 2018 13:58:14 +0300 Subject: [PATCH 1922/2640] trousers/tpm-tools: enable on ARC With the latest ARC toolchain arc-2018.03 builds of "trousers" and "tpm-tools" packages perform without errors. Lets enable these packages for ARC. With the exception, building tpm-tools for ARC770/750 requires to pass "-mno-compact-casesi" as it was made for trousers before: see patch f4cd8ceb9cfa "trousers: Pass "-mno-compact-casesi" when building for ARCv1". This change is a temporary workaround and the feature is going to be fixed in the next ARC toolchain release version. Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/tpm-tools/Config.in | 2 -- package/tpm-tools/tpm-tools.mk | 4 ++++ package/trousers/Config.in | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/tpm-tools/Config.in b/package/tpm-tools/Config.in index e115687281..ca70adc80c 100644 --- a/package/tpm-tools/Config.in +++ b/package/tpm-tools/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_TPM_TOOLS bool "tpm-tools" depends on BR2_TOOLCHAIN_HAS_THREADS # trousers depends on !BR2_STATIC_LIBS # trousers - depends on !BR2_arc # trousers select BR2_PACKAGE_TROUSERS select BR2_PACKAGE_OPENSSL help @@ -12,4 +11,3 @@ config BR2_PACKAGE_TPM_TOOLS comment "tpm-tools needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !BR2_arc diff --git a/package/tpm-tools/tpm-tools.mk b/package/tpm-tools/tpm-tools.mk index b6738251ff..623e06fb98 100644 --- a/package/tpm-tools/tpm-tools.mk +++ b/package/tpm-tools/tpm-tools.mk @@ -16,4 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) TPM_TOOLS_CONF_ENV += LIBS='-liconv' endif +ifeq ($(BR2_arc770d)$(BR2_arc750d),y) +TPM_TOOLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-casesi" +endif + $(eval $(autotools-package)) diff --git a/package/trousers/Config.in b/package/trousers/Config.in index 7a1470629a..998df98398 100644 --- a/package/trousers/Config.in +++ b/package/trousers/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_TROUSERS depends on BR2_TOOLCHAIN_HAS_THREADS # doesn't build properly in static only configurations depends on !BR2_STATIC_LIBS - # ARC toolchain issue - depends on !BR2_arc select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -18,4 +16,3 @@ config BR2_PACKAGE_TROUSERS comment "trousers needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !BR2_arc From 680047e3b77ae8ff7cdcc9bca65be1b7677a433e Mon Sep 17 00:00:00 2001 From: Ofer Heifetz Date: Thu, 28 Jun 2018 10:24:22 +0300 Subject: [PATCH 1923/2640] toolchain-external-linaro-aarch64-be: new package This commit adds a new package for the Linaro external toolchain for the AArch64 Big Endian architecture. https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05 Signed-off-by: Ofer Heifetz Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 6 ++++++ .../Config.in | 15 +++++++++++++++ .../Config.in.options | 9 +++++++++ .../toolchain-external-linaro-aarch64-be.hash | 3 +++ .../toolchain-external-linaro-aarch64-be.mk | 16 ++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 6759e5cefa..273910699f 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -15,6 +15,9 @@ comment "glibc toolchains only available with shared lib support" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" +# Aarch64 big-endian +source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in" + # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" @@ -110,6 +113,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" +# Aarch64 big-endian +source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options" + # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in new file mode 100644 index 0000000000..9e7d2a6233 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in @@ -0,0 +1,15 @@ +config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE + bool "Linaro AArch64 BE 2018.05" + depends on BR2_aarch64_be + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Toolchain for the AArch64 Big Endian architecture, from + http://www.linaro.org/engineering/armv8/ diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options new file mode 100644 index 0000000000..d44750ff08 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "aarch64_be-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-linaro-aarch64-be" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash new file mode 100644 index 0000000000..f93642ecaa --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 412da19c1d1bff0f3172bc19fd2c024207d8d716dbe7a8dad4bf9e3d6b71d149 gcc-linaro-7.3.1-2018.05-i686_aarch64_be-linux-gnu.tar.xz +sha256 277c1483f8dbd6007c945ffeb706fa1ba1da8ec1c397cf5cf1e29c25081426e5 gcc-linaro-7.3.1-2018.05-x86_64_aarch64_be-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk new file mode 100644 index 0000000000..7a01151bf1 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# toolchain-external-linaro-aarch64-be +# +################################################################################ + +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_VERSION = 2018.05 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_SITE = https://releases.linaro.org/components/toolchain/binaries/7.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_VERSION)/aarch64_be-linux-gnu + +ifeq ($(HOSTARCH),x86) +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_VERSION)-i686_aarch64_be-linux-gnu.tar.xz +else +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_SOURCE = gcc-linaro-7.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE_VERSION)-x86_64_aarch64_be-linux-gnu.tar.xz +endif + +$(eval $(toolchain-external-package)) From 78968330e3293f622e5f4a4dbbe98ba5665034fa Mon Sep 17 00:00:00 2001 From: Ofer Heifetz Date: Thu, 28 Jun 2018 10:24:23 +0300 Subject: [PATCH 1924/2640] support/config-fragments/autobuild: add Linaro AArch64 BE support Signed-off-by: Ofer Heifetz Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/config-fragments/autobuild/linaro-aarch64-be.config | 3 +++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + utils/genrandconfig | 1 + 3 files changed, 5 insertions(+) create mode 100644 support/config-fragments/autobuild/linaro-aarch64-be.config diff --git a/support/config-fragments/autobuild/linaro-aarch64-be.config b/support/config-fragments/autobuild/linaro-aarch64-be.config new file mode 100644 index 0000000000..e075fe7eb0 --- /dev/null +++ b/support/config-fragments/autobuild/linaro-aarch64-be.config @@ -0,0 +1,3 @@ +BR2_aarch64_be=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 64abfb3fd4..136a67f54b 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -58,6 +58,7 @@ support/config-fragments/autobuild/br-xtensa-full.config,x86_64 support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/i686-ctng-linux-gnu.config,x86 support/config-fragments/autobuild/linaro-aarch64.config,x86 +support/config-fragments/autobuild/linaro-aarch64-be.config,x86 support/config-fragments/autobuild/linaro-arm.config,x86 support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config,x86 support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config,x86 diff --git a/utils/genrandconfig b/utils/genrandconfig index 06701ce565..27f84ea555 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -187,6 +187,7 @@ def is_toolchain_usable(configfile, config): if platform.machine() == 'x86_64': if 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ + 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: ldd_version_output = subprocess.check_output(['ldd', '--version']) glibc_version = ldd_version_output.splitlines()[0].split()[-1] From b28d859c0655cb95ddb194bf244c213fad03eb9c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Jun 2018 20:11:04 +0200 Subject: [PATCH 1925/2640] pixiewps: fix static linking with uclibc-ng Fixes following linking error with uClibc-ng: /home/peko/autobuild/instance-0/output/host/lib/gcc/powerpc-buildroot-linux-uclibc/7.3.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE': /home/peko/autobuild/instance-0/output/build/host-gcc-final-7.3.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:469: undefined reference to `dl_iterate_phdr' collect2: error: ld returned 1 exit status Since uClibc-ng 1.0.18 a circular dependency between libc and libgcc exist, when static linking is used. It can be resolved by the compiler when -static is correctly passed in the linking step. So use TARGET_CONFIGURE_OPTS to pass CC as well as LDFLAGS to make Fixes: - http://autobuild.buildroot.net/results/d9f0311538c8db1196839e36af3f6ef4e403be2b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pixiewps/pixiewps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pixiewps/pixiewps.mk b/package/pixiewps/pixiewps.mk index 95a253ab83..1f84bbeb34 100644 --- a/package/pixiewps/pixiewps.mk +++ b/package/pixiewps/pixiewps.mk @@ -10,7 +10,7 @@ PIXIEWPS_LICENSE = GPL-3.0+ PIXIEWPS_LICENSE_FILES = LICENSE.md define PIXIEWPS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define PIXIEWPS_INSTALL_TARGET_CMDS From b092df866f0e8369002ceffcdcaccccc6fd1d384 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Mon, 21 May 2018 10:53:07 -0700 Subject: [PATCH 1926/2640] package/protobuf: add a patch to fix building on mips big endian The patch was submitted upstream as https://github.com/google/protobuf/pull/4657. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- ...ompilation-under-mips-big-endian-wit.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch diff --git a/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch b/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch new file mode 100644 index 0000000000..d2b34f15e6 --- /dev/null +++ b/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch @@ -0,0 +1,38 @@ +From d105213bccfa4392eda889a95f808dd9cdf84494 Mon Sep 17 00:00:00 2001 +From: Charles Hardin +Date: Mon, 21 May 2018 09:19:30 -0700 +Subject: [PATCH] Fix to allow a compilation under mips big endian with gcc + +The __MIPSEL__ is mips little endian specific, but we needed to +compile for a big endian mips target that also happened to be a +mips64. This commit replaces the __MIPSEL__ test with a __mips__ test +which preserves the build on little endian and allows building for a +big endian setup. + + $ echo | mips64-linux-gcc -E -dM - + ... snip snip ... + #define __mips__ 1 + #define __MIPSEB__ 1 + +Signed-off-by: Charles Hardin +Upstream-status: https://github.com/google/protobuf/pull/4657 +--- + src/google/protobuf/stubs/platform_macros.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h +index c3a64dd2..f9e2bff6 100644 +--- a/src/google/protobuf/stubs/platform_macros.h ++++ b/src/google/protobuf/stubs/platform_macros.h +@@ -56,7 +56,7 @@ + #elif defined(__aarch64__) + #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 + #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 +-#elif defined(__MIPSEL__) ++#elif defined(__mips__) + #if defined(__LP64__) + #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 + #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 +-- +2.15.1 (Apple Git-101) + From 78af2a63625a0893259ceb2f6cfb5b6ab1431419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 12 Jun 2018 15:49:39 -0400 Subject: [PATCH 1927/2640] package/gcc: backport arm acle bugfix 81497 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compiler g++ reports an error when the header arm_acle.h is included from version 7. This patch backports the bugfix upstreamed [1] for gcc-7 and gcc-8. Fixes: In file included from ../../include/QtCore/5.10.1/QtCore/private/../../../../../src/corelib/tools/qsimd_p.h:333, from ../../include/QtCore/5.10.1/QtCore/private/qsimd_p.h:1, from global/qlogging.cpp:58: /home/gportay/src/buildroot/output/host/lib/gcc/arm-buildroot-linux-gnueabihf/8.1.0/include/arm_acle.h: In function ‘void __arm_ldc(unsigned int, unsigned int, const void*)’: /home/gportay/src/buildroot/output/host/lib/gcc/arm-buildroot-linux-gnueabihf/8.1.0/include/arm_acle.h:48:46: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive] return __builtin_arm_ldc (__coproc, __CRd, __p); ^~~ : note: initializing argument 3 of ‘void __builtin_arm_ldc(unsigned int, unsigned int, const int*)’ ... Makefile:196: recipe for target 'sub-corelib-make_first' failed make[3]: *** [sub-corelib-make_first] Error 2 Makefile:48: recipe for target 'sub-src-make_first' failed make[2]: *** [sub-src-make_first] Error 2 package/pkg-generic.mk:229: recipe for target '/home/gportay/src/buildroot/output/build/qt5base-5.10.1/.stamp_built' failed make[1]: *** [/home/gportay/src/buildroot/output/build/qt5base-5.10.1/.stamp_built] Error 2 Makefile:16: recipe for target '_all' failed make: *** [_all] Error 2 [1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81497 Signed-off-by: Gaël PORTAY Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...PR-target-81497-Fix-arm_acle.h-for-C.patch | 324 ++++++++++++++++++ ...PR-target-81497-Fix-arm_acle.h-for-C.patch | 305 +++++++++++++++++ 2 files changed, 629 insertions(+) create mode 100644 package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch create mode 100644 package/gcc/8.1.0/0005-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch diff --git a/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch b/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch new file mode 100644 index 0000000000..37acc8b651 --- /dev/null +++ b/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch @@ -0,0 +1,324 @@ +From 1a259ac3e39bf87e6e6a5eface8b0ebc6b2a0dfe Mon Sep 17 00:00:00 2001 +From: ktkachov +Date: Tue, 5 Jun 2018 09:50:16 +0000 +Subject: [PATCH] [arm] PR target/81497: Fix arm_acle.h for C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When trying to compile something with arm_acle.h using G++ we get a number of nasty errors: +arm_acle.h:48:49: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive] + return __builtin_arm_ldc (__coproc, __CRd, __p); + +This is because the intrinsics that are supposed to be void return the "result" of their builtin, +which is void. C lets that slide but C++ complains. + +After fixing that we run into further errors: +arm_acle.h:48:46: error: invalid conversion from 'const void*' to 'const int*' [-fpermissive] + return __builtin_arm_ldc (__coproc, __CRd, __p); + ^~~ +Because the pointer arguments in these intrinsics are void pointers but the builtin +expects int pointers. So this patch introduces new qualifiers for void pointers and their +const-qualified versions and uses that in the specification of these intrinsics. + +This gives us the opportunity of creating an arm subdirectory in g++.dg and inaugurates it +with the first arm-specific C++ tests (in that directory). + + + PR target/81497 + * config/arm/arm-builtins.c (arm_type_qualifiers): Add + qualifier_void_pointer and qualifier_const_void_pointer. + (arm_ldc_qualifiers, arm_stc_qualifiers): Use the above. + (arm_init_builtins): Handle the above. + * config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc, + __arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2, + __arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for + void intrinsics. + + * g++.target/arm/arm.exp: New file. + * g++.target/arm/pr81497.C: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4 +Upstream-Status: Merged (gcc-8-branch) +Signed-off-by: Gaël PORTAY +[gportay: drop gcc/{,testsuite/}ChangeLog changes] +--- + gcc/config/arm/arm-builtins.c | 42 +++++++++++++--------- + gcc/config/arm/arm_acle.h | 28 +++++++-------- + gcc/testsuite/g++.target/arm/arm.exp | 50 ++++++++++++++++++++++++++ + gcc/testsuite/g++.target/arm/pr81497.C | 9 +++++ + 4 files changed, 99 insertions(+), 30 deletions(-) + create mode 100644 gcc/testsuite/g++.target/arm/arm.exp + create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C + +diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c +index 7fde7a04672..183a7b907f6 100644 +--- a/gcc/config/arm/arm-builtins.c ++++ b/gcc/config/arm/arm-builtins.c +@@ -78,7 +78,11 @@ enum arm_type_qualifiers + /* Lane indices - must be within range of previous argument = a vector. */ + qualifier_lane_index = 0x200, + /* Lane indices for single lane structure loads and stores. */ +- qualifier_struct_load_store_lane_index = 0x400 ++ qualifier_struct_load_store_lane_index = 0x400, ++ /* A void pointer. */ ++ qualifier_void_pointer = 0x800, ++ /* A const void pointer. */ ++ qualifier_const_void_pointer = 0x802 + }; + + /* The qualifier_internal allows generation of a unary builtin from +@@ -202,7 +206,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_const_pointer }; ++ qualifier_unsigned_immediate, qualifier_const_void_pointer }; + #define LDC_QUALIFIERS \ + (arm_ldc_qualifiers) + +@@ -210,7 +214,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_pointer }; ++ qualifier_unsigned_immediate, qualifier_void_pointer }; + #define STC_QUALIFIERS \ + (arm_stc_qualifiers) + +@@ -1095,19 +1099,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d, + if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode)) + op_mode = GET_MODE_INNER (op_mode); + +- eltype = arm_simd_builtin_type +- (op_mode, +- (qualifiers & qualifier_unsigned) != 0, +- (qualifiers & qualifier_poly) != 0); +- gcc_assert (eltype != NULL); +- +- /* Add qualifiers. */ +- if (qualifiers & qualifier_const) +- eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); +- +- if (qualifiers & qualifier_pointer) +- eltype = build_pointer_type (eltype); +- ++ /* For void pointers we already have nodes constructed by the midend. */ ++ if (qualifiers & qualifier_void_pointer) ++ eltype = qualifiers & qualifier_const ++ ? const_ptr_type_node : ptr_type_node; ++ else ++ { ++ eltype ++ = arm_simd_builtin_type (op_mode, ++ (qualifiers & qualifier_unsigned) != 0, ++ (qualifiers & qualifier_poly) != 0); ++ gcc_assert (eltype != NULL); ++ ++ /* Add qualifiers. */ ++ if (qualifiers & qualifier_const) ++ eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); ++ ++ if (qualifiers & qualifier_pointer) ++ eltype = build_pointer_type (eltype); ++ } + /* If we have reached arg_num == 0, we are at a non-void + return type. Otherwise, we are still processing + arguments. */ +diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h +index 9a2f0ba30dc..c0f6ea2d156 100644 +--- a/gcc/config/arm/arm_acle.h ++++ b/gcc/config/arm/arm_acle.h +@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc (__coproc, __CRd, __p); ++ __builtin_arm_ldc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldcl (__coproc, __CRd, __p); ++ __builtin_arm_ldcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc (__coproc, __CRd, __p); ++ __builtin_arm_stc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stcl (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stcl (__coproc, __CRd, __p); ++ __builtin_arm_stcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, const unsigned int __CRm, + const unsigned int __opc2) + { +- return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2 (__coproc, __CRd, __p); ++ __builtin_arm_ldc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2l (__coproc, __CRd, __p); ++ __builtin_arm_ldc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2 (__coproc, __CRd, __p); ++ __builtin_arm_stc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2l (__coproc, __CRd, __p); ++ __builtin_arm_stc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp +new file mode 100644 +index 00000000000..1a169d2f220 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/arm.exp +@@ -0,0 +1,50 @@ ++# Specific regression driver for arm. ++# Copyright (C) 2009-2018 Free Software Foundation, Inc. ++# ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# . */ ++ ++# GCC testsuite that uses the `dg.exp' driver. ++ ++# Exit immediately if this isn't an arm target. ++if {![istarget arm*-*-*] } then { ++ return ++} ++ ++# Load support procs. ++load_lib g++-dg.exp ++ ++global DEFAULT_CXXFLAGS ++if ![info exists DEFAULT_CXXFLAGS] then { ++ set DEFAULT_CXXFLAGS " -pedantic-errors" ++} ++ ++ ++global dg_runtest_extra_prunes ++set dg_runtest_extra_prunes "" ++lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" ++ ++# Initialize `dg'. ++dg-init ++ ++# Main loop. ++dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ ++ "" $DEFAULT_CXXFLAGS ++ ++# All done. ++set dg_runtest_extra_prunes "" ++dg-finish ++ +diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C +new file mode 100644 +index 00000000000..0519a3a3045 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/pr81497.C +@@ -0,0 +1,9 @@ ++/* { dg-do compile } */ ++/* { dg-require-effective-target arm_thumb2_ok } */ ++ ++#include ++ ++int main () ++{ ++ return 0; ++} +-- +2.17.1 + diff --git a/package/gcc/8.1.0/0005-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch b/package/gcc/8.1.0/0005-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch new file mode 100644 index 0000000000..a383fb18f9 --- /dev/null +++ b/package/gcc/8.1.0/0005-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch @@ -0,0 +1,305 @@ +From 4f147efb77e565d28a23c493986b57e2de15443e Mon Sep 17 00:00:00 2001 +From: ktkachov +Date: Fri, 8 Jun 2018 08:18:43 +0000 +Subject: [PATCH] [arm] PR target/81497: Fix arm_acle.h for C++ + + Backport from mainline + 2018-06-05 Kyrylo Tkachov + + PR target/81497 + * config/arm/arm-builtins.c (arm_type_qualifiers): Add + qualifier_void_pointer and qualifier_const_void_pointer. + (arm_ldc_qualifiers, arm_stc_qualifiers): Use the above. + (arm_init_builtins): Handle the above. + * config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc, + __arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2, + __arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for + void intrinsics. + + * g++.target/arm/arm.exp: New file. + * g++.target/arm/pr81497.C: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@261305 138bc75d-0d04-0410-961f-82ee72b054a4 +Upstream-Status: Backport (gcc-8-branch) +Signed-off-by: Gaël PORTAY +[gportay: drop gcc/{,testsuite/}ChangeLog changes] +--- + gcc/config/arm/arm-builtins.c | 42 +++++++++++++--------- + gcc/config/arm/arm_acle.h | 28 +++++++-------- + gcc/testsuite/g++.target/arm/arm.exp | 50 ++++++++++++++++++++++++++ + gcc/testsuite/g++.target/arm/pr81497.C | 9 +++++ + 4 files changed, 99 insertions(+), 30 deletions(-) + create mode 100644 gcc/testsuite/g++.target/arm/arm.exp + create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C + +diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c +index 7fde7a04672..183a7b907f6 100644 +--- a/gcc/config/arm/arm-builtins.c ++++ b/gcc/config/arm/arm-builtins.c +@@ -78,7 +78,11 @@ enum arm_type_qualifiers + /* Lane indices - must be within range of previous argument = a vector. */ + qualifier_lane_index = 0x200, + /* Lane indices for single lane structure loads and stores. */ +- qualifier_struct_load_store_lane_index = 0x400 ++ qualifier_struct_load_store_lane_index = 0x400, ++ /* A void pointer. */ ++ qualifier_void_pointer = 0x800, ++ /* A const void pointer. */ ++ qualifier_const_void_pointer = 0x802 + }; + + /* The qualifier_internal allows generation of a unary builtin from +@@ -202,7 +206,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_const_pointer }; ++ qualifier_unsigned_immediate, qualifier_const_void_pointer }; + #define LDC_QUALIFIERS \ + (arm_ldc_qualifiers) + +@@ -210,7 +214,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_pointer }; ++ qualifier_unsigned_immediate, qualifier_void_pointer }; + #define STC_QUALIFIERS \ + (arm_stc_qualifiers) + +@@ -1095,19 +1099,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d, + if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode)) + op_mode = GET_MODE_INNER (op_mode); + +- eltype = arm_simd_builtin_type +- (op_mode, +- (qualifiers & qualifier_unsigned) != 0, +- (qualifiers & qualifier_poly) != 0); +- gcc_assert (eltype != NULL); +- +- /* Add qualifiers. */ +- if (qualifiers & qualifier_const) +- eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); +- +- if (qualifiers & qualifier_pointer) +- eltype = build_pointer_type (eltype); +- ++ /* For void pointers we already have nodes constructed by the midend. */ ++ if (qualifiers & qualifier_void_pointer) ++ eltype = qualifiers & qualifier_const ++ ? const_ptr_type_node : ptr_type_node; ++ else ++ { ++ eltype ++ = arm_simd_builtin_type (op_mode, ++ (qualifiers & qualifier_unsigned) != 0, ++ (qualifiers & qualifier_poly) != 0); ++ gcc_assert (eltype != NULL); ++ ++ /* Add qualifiers. */ ++ if (qualifiers & qualifier_const) ++ eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); ++ ++ if (qualifiers & qualifier_pointer) ++ eltype = build_pointer_type (eltype); ++ } + /* If we have reached arg_num == 0, we are at a non-void + return type. Otherwise, we are still processing + arguments. */ +diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h +index 9a2f0ba30dc..c0f6ea2d156 100644 +--- a/gcc/config/arm/arm_acle.h ++++ b/gcc/config/arm/arm_acle.h +@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc (__coproc, __CRd, __p); ++ __builtin_arm_ldc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldcl (__coproc, __CRd, __p); ++ __builtin_arm_ldcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc (__coproc, __CRd, __p); ++ __builtin_arm_stc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stcl (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stcl (__coproc, __CRd, __p); ++ __builtin_arm_stcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, const unsigned int __CRm, + const unsigned int __opc2) + { +- return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2 (__coproc, __CRd, __p); ++ __builtin_arm_ldc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2l (__coproc, __CRd, __p); ++ __builtin_arm_ldc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2 (__coproc, __CRd, __p); ++ __builtin_arm_stc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2l (__coproc, __CRd, __p); ++ __builtin_arm_stc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp +new file mode 100644 +index 00000000000..1a169d2f220 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/arm.exp +@@ -0,0 +1,50 @@ ++# Specific regression driver for arm. ++# Copyright (C) 2009-2018 Free Software Foundation, Inc. ++# ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# . */ ++ ++# GCC testsuite that uses the `dg.exp' driver. ++ ++# Exit immediately if this isn't an arm target. ++if {![istarget arm*-*-*] } then { ++ return ++} ++ ++# Load support procs. ++load_lib g++-dg.exp ++ ++global DEFAULT_CXXFLAGS ++if ![info exists DEFAULT_CXXFLAGS] then { ++ set DEFAULT_CXXFLAGS " -pedantic-errors" ++} ++ ++ ++global dg_runtest_extra_prunes ++set dg_runtest_extra_prunes "" ++lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" ++ ++# Initialize `dg'. ++dg-init ++ ++# Main loop. ++dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ ++ "" $DEFAULT_CXXFLAGS ++ ++# All done. ++set dg_runtest_extra_prunes "" ++dg-finish ++ +diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C +new file mode 100644 +index 00000000000..0519a3a3045 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/pr81497.C +@@ -0,0 +1,9 @@ ++/* { dg-do compile } */ ++/* { dg-require-effective-target arm_thumb2_ok } */ ++ ++#include ++ ++int main () ++{ ++ return 0; ++} +-- +2.17.1 + From edca2cd08664eb234c0b7dfcbd04991aa4c1c281 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 30 Jun 2018 18:00:30 +0200 Subject: [PATCH 1928/2640] support/config-fragments/autobuild: update pre-built Buildroot toolchains All pre-built Buildroot toolchains have been rebuilt with Buildroot 2018.05, so this commit updates the corresponding configuration fragments to make sure the autobuilders use the new toolchains. Signed-off-by: Thomas Petazzoni --- support/config-fragments/autobuild/br-aarch64-glibc.config | 2 +- support/config-fragments/autobuild/br-arm-basic.config | 2 +- .../config-fragments/autobuild/br-arm-cortex-a9-glibc.config | 2 +- support/config-fragments/autobuild/br-arm-cortex-a9-musl.config | 2 +- support/config-fragments/autobuild/br-arm-cortex-m4-full.config | 2 +- support/config-fragments/autobuild/br-arm-full-nothread.config | 2 +- support/config-fragments/autobuild/br-arm-full-static.config | 2 +- support/config-fragments/autobuild/br-arm-full.config | 2 +- .../config-fragments/autobuild/br-i386-pentium-mmx-musl.config | 2 +- support/config-fragments/autobuild/br-i386-pentium4-full.config | 2 +- support/config-fragments/autobuild/br-m68k-5208-full.config | 2 +- support/config-fragments/autobuild/br-m68k-68040-full.config | 2 +- support/config-fragments/autobuild/br-microblazeel-full.config | 2 +- .../config-fragments/autobuild/br-mips32r6-el-hf-glibc.config | 2 +- support/config-fragments/autobuild/br-mips64-n64-full.config | 2 +- .../config-fragments/autobuild/br-mips64r6-el-hf-glibc.config | 2 +- support/config-fragments/autobuild/br-mipsel-o32-full.config | 2 +- support/config-fragments/autobuild/br-nios2-glibc.config | 2 +- .../config-fragments/autobuild/br-powerpc-603e-basic-cpp.config | 2 +- .../config-fragments/autobuild/br-powerpc-e500mc-full.config | 2 +- .../config-fragments/autobuild/br-powerpc64-power7-glibc.config | 2 +- .../autobuild/br-powerpc64le-power8-glibc.config | 2 +- support/config-fragments/autobuild/br-sh4-full.config | 2 +- support/config-fragments/autobuild/br-sparc-uclibc.config | 2 +- support/config-fragments/autobuild/br-sparc64-glibc.config | 2 +- support/config-fragments/autobuild/br-x86-64-core2-full.config | 2 +- support/config-fragments/autobuild/br-x86-64-musl.config | 2 +- support/config-fragments/autobuild/br-xtensa-full.config | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/support/config-fragments/autobuild/br-aarch64-glibc.config b/support/config-fragments/autobuild/br-aarch64-glibc.config index 71b3a26356..19c9473a75 100644 --- a/support/config-fragments/autobuild/br-aarch64-glibc.config +++ b/support/config-fragments/autobuild/br-aarch64-glibc.config @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-arm-basic.config b/support/config-fragments/autobuild/br-arm-basic.config index e77d5e9ecc..eadf78f717 100644 --- a/support/config-fragments/autobuild/br-arm-basic.config +++ b/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config index 160484dfb4..f67d955e88 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +++ b/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config @@ -4,7 +4,7 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_7=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config index 19ee4174f2..8db615c13b 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config +++ b/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config @@ -4,7 +4,7 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y diff --git a/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/support/config-fragments/autobuild/br-arm-cortex-m4-full.config index 6a299922c6..1ce4bdc5be 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-m4-full.config +++ b/support/config-fragments/autobuild/br-arm-cortex-m4-full.config @@ -3,7 +3,7 @@ BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-arm-full-nothread.config b/support/config-fragments/autobuild/br-arm-full-nothread.config index 6433d072de..1120f4619e 100644 --- a/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,7 +3,7 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-arm-full-static.config b/support/config-fragments/autobuild/br-arm-full-static.config index 443d3fa6f4..157fc02223 100644 --- a/support/config-fragments/autobuild/br-arm-full-static.config +++ b/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,7 +3,7 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-arm-full.config b/support/config-fragments/autobuild/br-arm-full.config index 72052a0772..07c773e90e 100644 --- a/support/config-fragments/autobuild/br-arm-full.config +++ b/support/config-fragments/autobuild/br-arm-full.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index a6eb584526..9eee780799 100644 --- a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,7 +2,7 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y diff --git a/support/config-fragments/autobuild/br-i386-pentium4-full.config b/support/config-fragments/autobuild/br-i386-pentium4-full.config index 7abd54927d..e7a97351c3 100644 --- a/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,7 +2,7 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-m68k-5208-full.config b/support/config-fragments/autobuild/br-m68k-5208-full.config index b8ea08e868..3f809ea4a5 100644 --- a/support/config-fragments/autobuild/br-m68k-5208-full.config +++ b/support/config-fragments/autobuild/br-m68k-5208-full.config @@ -2,7 +2,7 @@ BR2_m68k=y BR2_m68k_cf5208=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-m68k-68040-full.config b/support/config-fragments/autobuild/br-m68k-68040-full.config index ca9753379b..27ce4e3490 100644 --- a/support/config-fragments/autobuild/br-m68k-68040-full.config +++ b/support/config-fragments/autobuild/br-m68k-68040-full.config @@ -1,7 +1,7 @@ BR2_m68k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-microblazeel-full.config b/support/config-fragments/autobuild/br-microblazeel-full.config index 4bb5f2adff..8c4778770b 100644 --- a/support/config-fragments/autobuild/br-microblazeel-full.config +++ b/support/config-fragments/autobuild/br-microblazeel-full.config @@ -1,7 +1,7 @@ BR2_microblazeel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config index 1ed280f7a7..818f99e536 100644 --- a/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +++ b/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config @@ -4,7 +4,7 @@ BR2_mips_32r6=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-mips64-n64-full.config b/support/config-fragments/autobuild/br-mips64-n64-full.config index e90f5d56fe..ca625c9e4b 100644 --- a/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,7 +3,7 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index bb15d3168c..96a333c6b2 100644 --- a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,7 +5,7 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-mipsel-o32-full.config b/support/config-fragments/autobuild/br-mipsel-o32-full.config index b985dbb8a8..aae01a919b 100644 --- a/support/config-fragments/autobuild/br-mipsel-o32-full.config +++ b/support/config-fragments/autobuild/br-mipsel-o32-full.config @@ -2,7 +2,7 @@ BR2_mipsel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-nios2-glibc.config b/support/config-fragments/autobuild/br-nios2-glibc.config index 1e10e34a76..be5cb7e29d 100644 --- a/support/config-fragments/autobuild/br-nios2-glibc.config +++ b/support/config-fragments/autobuild/br-nios2-glibc.config @@ -2,7 +2,7 @@ BR2_nios2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index 71694eee13..37c3989b5b 100644 --- a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,7 +3,7 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/support/config-fragments/autobuild/br-powerpc-e500mc-full.config index 5f2a513904..08cb3f382e 100644 --- a/support/config-fragments/autobuild/br-powerpc-e500mc-full.config +++ b/support/config-fragments/autobuild/br-powerpc-e500mc-full.config @@ -3,7 +3,7 @@ BR2_powerpc_e500mc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index 6be80574a0..bc99682637 100644 --- a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,7 +2,7 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config index 48c47621d9..15703e60d1 100644 --- a/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +++ b/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config @@ -2,7 +2,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-sh4-full.config b/support/config-fragments/autobuild/br-sh4-full.config index 87796fb65e..018706d9e6 100644 --- a/support/config-fragments/autobuild/br-sh4-full.config +++ b/support/config-fragments/autobuild/br-sh4-full.config @@ -2,7 +2,7 @@ BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-sparc-uclibc.config b/support/config-fragments/autobuild/br-sparc-uclibc.config index 4b6b819578..2e13937b93 100644 --- a/support/config-fragments/autobuild/br-sparc-uclibc.config +++ b/support/config-fragments/autobuild/br-sparc-uclibc.config @@ -1,7 +1,7 @@ BR2_sparc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-sparc64-glibc.config b/support/config-fragments/autobuild/br-sparc64-glibc.config index 5dbe6df5bd..78a8216e29 100644 --- a/support/config-fragments/autobuild/br-sparc64-glibc.config +++ b/support/config-fragments/autobuild/br-sparc64-glibc.config @@ -1,7 +1,7 @@ BR2_sparc64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-x86-64-core2-full.config b/support/config-fragments/autobuild/br-x86-64-core2-full.config index 50edff5f7b..7cdb738b36 100644 --- a/support/config-fragments/autobuild/br-x86-64-core2-full.config +++ b/support/config-fragments/autobuild/br-x86-64-core2-full.config @@ -3,7 +3,7 @@ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-x86-64-musl.config b/support/config-fragments/autobuild/br-x86-64-musl.config index 6f5b23d301..5a59485aad 100644 --- a/support/config-fragments/autobuild/br-x86-64-musl.config +++ b/support/config-fragments/autobuild/br-x86-64-musl.config @@ -3,7 +3,7 @@ BR2_x86_atom=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y diff --git a/support/config-fragments/autobuild/br-xtensa-full.config b/support/config-fragments/autobuild/br-xtensa-full.config index d60a71a192..44845cd326 100644 --- a/support/config-fragments/autobuild/br-xtensa-full.config +++ b/support/config-fragments/autobuild/br-xtensa-full.config @@ -1,7 +1,7 @@ BR2_xtensa=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2018.02-891-g046c5e2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2018.05.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y From 1d3fa007dc35b21ced60a4048ed51358fff8aeac Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 30 Jun 2018 18:04:15 +0200 Subject: [PATCH 1929/2640] gstreamer: fix build on AArch64 BE We recently enabled AArch64 big-endian testing in the autobuilders, and gstreamer started failing because it does an AC_TRY_RUN() test to check if unaligned accesses are allowed or not. We already handled the AArch64 LE case, but not the AArch64 BE case, so let's handle it. Fixes: http://autobuild.buildroot.net/results/b061948b04b42e753e52607f395ed7c597a52c68/ Signed-off-by: Thomas Petazzoni --- package/gstreamer/gstreamer/gstreamer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk index 91230aac28..88cc798828 100644 --- a/package/gstreamer/gstreamer/gstreamer.mk +++ b/package/gstreamer/gstreamer/gstreamer.mk @@ -18,7 +18,7 @@ GSTREAMER_LICENSE_FILES = COPYING ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k),y) GSTREAMER_CONF_ENV = as_cv_unaligned_access=no endif -ifeq ($(BR2_aarch64),y) +ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes endif From b0241095a67bc87faf19b52a2be21915b2ac44aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 30 Jun 2018 08:57:13 -0400 Subject: [PATCH 1930/2640] qt5base: remove unused definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since commit 81fb33af2a (qt5base: correct eglfs support in qmake.conf.in) the definition QT5BASE_CONFIGURE_QMAKE_CONFIG is left unused. Remove it since it is not used anymore. Signed-off-by: Gaël PORTAY Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index d5b25abcb8..9eafd593f1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -269,7 +269,6 @@ define QT5BASE_CONFIGURE_CMDS sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \ $(QT5BASE_PKGDIR)/qmake.conf.in > \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf - $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) From 7544295d30d3e2ce6e169d4033a2bf2d36f646d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 30 Jun 2018 02:29:27 -0400 Subject: [PATCH 1931/2640] qt5base: fix typo in qmake.conf.in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A blank space is missing. Signed-off-by: Gaël PORTAY Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qmake.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index d62ee7cebe..f14527aa7f 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -21,7 +21,7 @@ CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl QMAKE_CFLAGS_ISYSTEM = -# Architecturespecific configuration +# Architecture specific configuration include(arch.conf) @EGLFS_DEVICE@ From e642310af1c3e53de9b1c7d79b9fa25f6d43140c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 30 Jun 2018 13:14:11 +0200 Subject: [PATCH 1932/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.1.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 846091eb57..c598444b5f 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.1.2 +MESA3D_HEADERS_VERSION = 18.1.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 77b3eb1c67..f4564d0da7 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-June/000437.html -md5 a2d4f031eb6bd6111d44d84004476918 mesa-18.1.2.tar.xz -sha1 938d22b966e9861a5387d31c44cd4753931d3076 mesa-18.1.2.tar.xz -sha256 070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9 mesa-18.1.2.tar.xz -sha512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5 mesa-18.1.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-June/000439.html +md5 b34273403a605f6f98ead00f0bdf8e0b mesa-18.1.3.tar.xz +sha1 0a5fb3096108a95f913411267b8a374f9ff547b2 mesa-18.1.3.tar.xz +sha256 54f08deeda0cd2f818e8d40140040ed013de7852573002453b7f50da9ea738ce mesa-18.1.3.tar.xz +sha512 f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887 mesa-18.1.3.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 3a0cf6c7835f98f86d5579b2cc517f84254da7411f764fb0095a383fb0759771 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6e1e27f62f..79e8e25a34 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.1.2 +MESA3D_VERSION = 18.1.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From bcc3a15bafc2c708a464486dffad1b324a6f7795 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 30 Jun 2018 13:29:07 +0200 Subject: [PATCH 1933/2640] package/samba4: bump version to 4.8.3 Removed patch applied upstream. Release notes: https://www.samba.org/samba/history/samba-4.8.3.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0004-libgpo-fix-build-without-ads.patch | 49 ------------------- package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 2 +- 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 package/samba4/0004-libgpo-fix-build-without-ads.patch diff --git a/package/samba4/0004-libgpo-fix-build-without-ads.patch b/package/samba4/0004-libgpo-fix-build-without-ads.patch deleted file mode 100644 index 5e3af3c322..0000000000 --- a/package/samba4/0004-libgpo-fix-build-without-ads.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a222b7506b53e689708834237f18877231dca589 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Sat, 3 Feb 2018 07:07:55 +0100 -Subject: [PATCH] libgpo: Fix the build --without-ads - -Signed-off-by: Volker Lendecke -Reviewed-by: David Disseldorp - -Autobuild-User(master): David Disseldorp -Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 - -Downloaded from upstream commit: -https://git.samba.org/samba.git/?p=samba.git;a=commit;h=a222b7506b53e689708834237f18877231dca589 - -Fixes https://bugzilla.samba.org/show_bug.cgi?id=13331 - -Signed-off-by: Bernd Kuhls ---- - libgpo/pygpo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c -index 7a02a0dc2aa..b6b53b76212 100644 ---- a/libgpo/pygpo.c -+++ b/libgpo/pygpo.c -@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, - return result; - } - -+#ifdef HAVE_ADS - static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const char *samaccountname, - uint32_t *uac_ret, const char **dn_ret) -@@ -468,11 +469,15 @@ static PyObject *py_ads_get_gpo_list(ADS *self, PyObject *args, PyObject *kwds) - return ret; - } - -+#endif -+ - static PyMethodDef ADS_methods[] = { - { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, - "Connect to the LDAP server" }, -+#ifdef HAVE_ADS - { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, - NULL }, -+#endif - { NULL } - }; - diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index cadb88b260..4b1b1218ac 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.asc -sha256 62e552296d49e6ab44bb87d120a288813fa52e42435d53a1f71b77596512bf22 samba-4.8.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.8.3.tar.asc +sha256 e0569a8a605d5dfb49f1fdd11db796f4d36fe0351c4a7f21387ef253010b82ed samba-4.8.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index f75b350375..52d59ffeb9 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.8.2 +SAMBA4_VERSION = 4.8.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 07d4d97171a3ed293da07aa9d20bae572c4c5e1b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 09:03:10 +0200 Subject: [PATCH 1934/2640] package/heimdal: fix build when the host has some DB libs When the host has a DB library installed, namely LMDB, host-heimdal will detect it and try to use, resulting in a build failure due to missing symbols. Really disable all the DB backends, we don't need them. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/heimdal/heimdal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 79aaacbd30..5f7b6c6853 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -24,7 +24,10 @@ HOST_HEIMDAL_CONF_OPTS = \ --without-libedit \ --without-hesiod \ --without-x \ + --disable-mdb-db \ + --disable-ndbm-db \ --disable-heimdal-documentation + HOST_HEIMDAL_CONF_ENV = MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE From b1ef2944a356c648ee04309de1b21bdfe5f46b4e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Jun 2018 21:52:47 +0200 Subject: [PATCH 1935/2640] libv4l: add optional sdl2_image dependency The configure.ac script simply uses PKG_CHECK_MODULES(), so there is not --enable/--disable option. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libv4l/libv4l.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 11061306c7..95a700b2d5 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -73,6 +73,10 @@ else LIBV4L_CONF_OPTS += --disable-v4l-utils endif +ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y) +LIBV4L_DEPENDENCIES += sdl2_image +endif + LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)" $(eval $(autotools-package)) From 5d08d34b3dd44b7d4d9421ae020b80d9a5065015 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Fri, 29 Jun 2018 14:40:12 -0700 Subject: [PATCH 1936/2640] package/Makefile.in: replace invocation of tempfile w/ mktemp in try-run mktemp is included in GNU Coreutils, and its usage is preferred over tempfile. http://lists.gnu.org/archive/html/bug-coreutils/2007-10/msg00134.html Additionally, some distributions no longer package tempfile, causing the try-run macro to not work as expected. For example, due to try-run not behaving as expected, testing for the -no-pie option in the aespipe package doesn't work, and we build without -no-pie, causing a build failure. See also commit 91a08ecc998 (package/Makefile.in: add host-cc-option macro) which introduced that initial code, explicitly to add -no-pie when needed. Fixes: http://autobuild.buildroot.net/results/db50f4415d18441f94b641ef6dc5a3672678b8b9/ http://autobuild.buildroot.net/results/76d73f767d3aab3c97d61188f5666899d72ed82d/ http://autobuild.buildroot.net/results/6aa9031962603354086b49bc49add92fde496ec2/ http://autobuild.buildroot.net/results/33d22f4d96fb439be8551355290896ef6d3649df/ http://autobuild.buildroot.net/results/eeec2ed80e147c172ec2d50958b12cfa38b2cc8d/ Signed-off-by: Joseph Kogut Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index a268016cdf..f2962767cc 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -239,7 +239,7 @@ HOST_LDFLAGS += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib # Exit code chooses option. "$$TMP" is can be used as temporary file and # is automatically cleaned up. try-run = $(shell set -e; \ - TMP="$$(tempfile)"; \ + TMP="$$(mktemp)"; \ if ($(1)) >/dev/null 2>&1; \ then echo "$(2)"; \ else echo "$(3)"; \ From 5b64a489bf27ae89efec6cd78d489cf0fb94ea5e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 29 Jun 2018 13:31:47 +0300 Subject: [PATCH 1937/2640] fftw: bump to version 3.3.8 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/fftw/fftw.hash | 6 +++--- package/fftw/fftw.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index faf4b904c9..1c4a17d8c4 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,5 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.7.tar.gz.md5sum -md5 0d5915d7d39b3253c1cc05030d79ac47 fftw-3.3.7.tar.gz +# From http://www.fftw.org/fftw-3.3.8.tar.gz.md5sum +md5 8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz # Locally computed -sha256 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573 fftw-3.3.7.tar.gz +sha256 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 fftw-3.3.7.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index b3aa4b6b14..b167a2f6f7 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.7 +FFTW_VERSION = 3.3.8 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ From 037b8616257067282e375edca9af19418a0e7a4a Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 29 Jun 2018 09:21:09 -0300 Subject: [PATCH 1938/2640] dropbear: enable PAM authentication if linux-pam is selected - Disable password file authentication, since it's not possible to have both at once. - Install a /etc/pam.d/sshd file, based on the one installed by openssh. Signed-off-by: Carlos Santos Reviewed-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dropbear/dropbear.mk | 14 ++++++++++++++ package/dropbear/etc-pam.d-sshd | 7 +++++++ 2 files changed, 21 insertions(+) create mode 100644 package/dropbear/etc-pam.d-sshd diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index fc41a84c1f..bb902bc7ce 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -34,6 +34,19 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) DROPBEAR_CONF_OPTS += --disable-static endif +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +define DROPBEAR_SVR_PAM_AUTH + echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SVR_PAM_AUTH 1' >> $(@D)/localoptions.h +endef +define DROPBEAR_INSTALL_PAM_CONF + $(INSTALL) -D -m 644 package/dropbear/etc-pam.d-sshd $(TARGET_DIR)/etc/pam.d/sshd +endef +DROPBEAR_DEPENDENCIES += linux-pam +DROPBEAR_CONF_OPTS += --enable-pam +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PAM_AUTH +DROPBEAR_POST_INSTALL_TARGET_HOOKS += DROPBEAR_INSTALL_PAM_CONF +else # Ensure that dropbear doesn't use crypt() when it's not available define DROPBEAR_SVR_PASSWORD_AUTH echo '#if !HAVE_CRYPT' >> $(@D)/localoptions.h @@ -41,6 +54,7 @@ define DROPBEAR_SVR_PASSWORD_AUTH echo '#endif' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH +endif define DROPBEAR_ENABLE_REVERSE_DNS echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h diff --git a/package/dropbear/etc-pam.d-sshd b/package/dropbear/etc-pam.d-sshd new file mode 100644 index 0000000000..5e13fc0d60 --- /dev/null +++ b/package/dropbear/etc-pam.d-sshd @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so shadow nodelay +account required pam_nologin.so +account required pam_unix.so +password required pam_unix.so shadow nullok use_authtok +session required pam_unix.so +session required pam_limits.so From 35c3f7d3ab453b5d36683f018a83e7745e2142ba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 May 2018 18:05:31 +0200 Subject: [PATCH 1939/2640] Revert "zeromq: needs NPTL" This reverts commit 1e2a8d4111f57e79c1848c7a70c6501e2bdacd58. Since version 1.0.30, uClibc-ng release supports the missing functions even for Linuxthreads, therefore the dependency on NPTL is no longer needed. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/circus/Config.in | 6 +++--- package/cppzmq/Config.in | 6 +++--- package/czmq/Config.in | 6 +++--- package/filemq/Config.in | 6 +++--- package/mongrel2/Config.in | 6 +++--- package/php-zmq/Config.in | 6 +++--- package/python-pyzmq/Config.in | 6 +++--- package/zeromq/Config.in | 6 +++--- package/zmqpp/Config.in | 6 +++--- package/zyre/Config.in | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package/circus/Config.in b/package/circus/Config.in index e09d87549c..f1cd93c733 100644 --- a/package/circus/Config.in +++ b/package/circus/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_CIRCUS bool "circus" depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pyzmq -> zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq select BR2_PACKAGE_PYTHON_IOWAIT # runtime select BR2_PACKAGE_PYTHON_PSUTIL # runtime select BR2_PACKAGE_PYTHON_PYZMQ # runtime @@ -14,6 +14,6 @@ config BR2_PACKAGE_CIRCUS https://circus.readthedocs.org/en/latest/ -comment "circus needs Python and a toolchain w/ C++, NPTL" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ +comment "circus needs Python and a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in index d0ae0c22c2..c984c15c96 100644 --- a/package/cppzmq/Config.in +++ b/package/cppzmq/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_CPPZMQ bool "cppzmq" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ help C++ binding for zeromq (ZeroMQ, 0MQ, zmq). http://github.com/zeromq/cppzmq -comment "cppzmq needs a toolchain w/ C++, NPTL" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) +comment "cppzmq needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/czmq/Config.in b/package/czmq/Config.in index d4ca46c36c..71389fce51 100644 --- a/package/czmq/Config.in +++ b/package/czmq/Config.in @@ -2,13 +2,13 @@ config BR2_PACKAGE_CZMQ bool "czmq" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ help High-level C Binding for 0MQ http://czmq.zeromq.org/ -comment "czmq needs a toolchain w/ C++, NPTL" +comment "czmq needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/filemq/Config.in b/package/filemq/Config.in index b015e2ead1..b4720c1d4c 100644 --- a/package/filemq/Config.in +++ b/package/filemq/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_FILEMQ bool "filemq" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_CZMQ @@ -11,6 +11,6 @@ config BR2_PACKAGE_FILEMQ http://github.com/zeromq/filemq -comment "filemq needs a toolchain w/ C++, NPTL" +comment "filemq needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in index 09bc8bd0a2..a9b09b786c 100644 --- a/package/mongrel2/Config.in +++ b/package/mongrel2/Config.in @@ -7,15 +7,15 @@ config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_sparc || BR2_x86_64) -comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, NPTL, dynamic library" +comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS config BR2_PACKAGE_MONGREL2 bool "mongrel2" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on !BR2_STATIC_LIBS # uses dlopen() depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS select BR2_PACKAGE_SQLITE diff --git a/package/php-zmq/Config.in b/package/php-zmq/Config.in index 3f7406b262..058f93d9a8 100644 --- a/package/php-zmq/Config.in +++ b/package/php-zmq/Config.in @@ -1,11 +1,11 @@ -comment "php-zmq needs a toolchain w/ C++, NPTL" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) +comment "php-zmq needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) config BR2_PACKAGE_PHP_ZMQ bool "php-zmq" depends on BR2_PACKAGE_PHP depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZEROMQ help ZeroMQ messaging bindings for PHP diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in index 2501912519..8f33a635c8 100644 --- a/package/python-pyzmq/Config.in +++ b/package/python-pyzmq/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_PYTHON_PYZMQ bool "python-pyzmq" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ help This package contains the python language binding for zeromq. http://zeromq.org/bindings:python -comment "python-pyzmq needs a toolchain w/ C++, NPTL" +comment "python-pyzmq needs a toolchain w/ C++, threads" depends on BR2_PACKAGE_PYTHON - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in index 25e438ae07..69be9f002c 100644 --- a/package/zeromq/Config.in +++ b/package/zeromq/Config.in @@ -1,10 +1,10 @@ -comment "zeromq needs a toolchain w/ C++, NPTL" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) +comment "zeromq needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) config BR2_PACKAGE_ZEROMQ bool "zeromq" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in index e9209543a6..2c80e2883d 100644 --- a/package/zmqpp/Config.in +++ b/package/zmqpp/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_ZMQPP # c++1x support depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_ZEROMQ help @@ -14,8 +14,8 @@ config BR2_PACKAGE_ZMQPP http://github.com/benjamg/zmqpp -comment "zmqpp needs a toolchain w/ C++, NPTL, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ +comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 comment "zmqpp needs exception_ptr" diff --git a/package/zyre/Config.in b/package/zyre/Config.in index 340e9775c5..21a0884ec6 100644 --- a/package/zyre/Config.in +++ b/package/zyre/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZYRE bool "zyre" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # zeromq + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq select BR2_PACKAGE_CZMQ select BR2_PACKAGE_ZEROMQ @@ -11,6 +11,6 @@ config BR2_PACKAGE_ZYRE http://zyre.org -comment "zyre needs a toolchain w/ C++, NPTL" +comment "zyre needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) From 27e0cad2da0acbaeeb9fd840eaa2a46b294e6e09 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 16:21:23 +0200 Subject: [PATCH 1940/2640] package/lua-flu: fix to use the system xattr header We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is. Signed-off-by: "Yann E. MORIN" Cc: Marcin Niestroj Cc: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-flu/0001-use-system-xattr-h.patch | 169 ++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch new file mode 100644 index 0000000000..1cd44b4617 --- /dev/null +++ b/package/lua-flu/0001-use-system-xattr-h.patch @@ -0,0 +1,169 @@ +Use system + +The one from attr is no longer installed with latest version. + +ENOATTR was in fact defined as ENODATA, so switch to using that instead. + +Signed-off-by: "Yann E. MORIN" + +--- +Upstream status: merged: + https://bitbucket.org/doub/flu/pull-requests/1 + https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70 + + +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua 2018-05-06 09:22:28.499324049 +0200 +@@ -327,7 +327,7 @@ + name = "fs.getxattr"; + parameters = {"path", "name"}; + results = {"value"}; +- doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]]; ++ doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]]; + }, + { + name = "fs.listxattr"; +@@ -338,7 +338,7 @@ + { + name = "fs.removexattr"; + parameters = {"path", "name"}; +- doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]]; ++ doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]]; + }, + { + name = "fs.opendir"; +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua 2018-05-06 09:22:28.495324054 +0200 +@@ -222,8 +222,8 @@ + -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs + + function luafs.getxattr(path, name) +- local attrs = assert(xattrs[path], errno.ENOATTR) +- return assert(attrs[name], errno.ENOATTR) ++ local attrs = assert(xattrs[path], errno.ENODATA) ++ return assert(attrs[name], errno.ENODATA) + end + + function luafs.setxattr(path, name, value, flags) +@@ -236,7 +236,7 @@ + end + + function luafs.removexattr(path, name) +- local attrs = assert(xattrs[path], errno.ENOATTR) ++ local attrs = assert(xattrs[path], errno.ENODATA) + attrs[name] = nil + if next(attrs)==nil then + xattrs[path] = nil +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html 2018-05-06 09:22:28.499324049 +0200 +@@ -347,7 +347,7 @@ +
            +

            value = fs.getxattr (path, name)

            + +-

            Get an extended attribute. If the attribute doesn't exist ENOATTR should be thrown.

            ++

            Get an extended attribute. If the attribute doesn't exist ENODATA should be thrown.

            +
            + +
            +@@ -359,7 +359,7 @@ +
            +

            fs.removexattr (path, name)

            + +-

            Remove an extended attribute. If the attribute doesn't exist ENOATTR should be thrown.

            ++

            Remove an extended attribute. If the attribute doesn't exist ENODATA should be thrown.

            +
            + +
            +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c 2018-05-06 09:23:06.323282527 +0200 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#include ++#include + #include "compat.h" + + /****************************************************************************/ +@@ -103,7 +103,7 @@ + REGISTER_ERROR(EDOM) + REGISTER_ERROR(ERANGE) + REGISTER_ERROR(ENOSYS) +- REGISTER_ERROR(ENOATTR) ++ REGISTER_ERROR(ENODATA) + #undef REGISTER_ERROR + } + +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:22:04.123351349 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200 +@@ -14,7 +14,7 @@ + library = 'fuse', + }, + ATTR = { +- header = 'attr/xattr.h', ++ header = 'sys/xattr.h', + }, + } + dependencies = { +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c 2018-05-06 09:23:06.323282527 +0200 +@@ -15,7 +15,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in 2018-05-06 09:23:06.323282527 +0200 +@@ -14,7 +14,7 @@ + library = 'fuse', + }, + ATTR = { +- header = 'attr/xattr.h', ++ header = 'sys/xattr.h', + }, + } + dependencies = { +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md 2015-03-31 18:54:19.000000000 +0200 ++++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md 2018-05-06 09:22:28.495324054 +0200 +@@ -345,7 +345,7 @@ + + ### `value = fs.getxattr (path, name)` + +-Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown. ++Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown. + + --- + +@@ -357,7 +357,7 @@ + + ### `fs.removexattr (path, name)` + +-Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown. ++Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown. + + --- + +diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec +--- lua-flu-20150331-1.orig/flu-20150331-1.rockspec 2015-04-02 23:44:11.000000000 +0200 ++++ lua-flu-20150331-1/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200 +@@ -14,7 +14,7 @@ + library = 'fuse', + }, + ATTR = { +- header = 'attr/xattr.h', ++ header = 'sys/xattr.h', + }, + } + dependencies = { From 18a3556220d0cec58fccff990fcf271375eeda1b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 16:21:24 +0200 Subject: [PATCH 1941/2640] package/stress-ng: bump version Signed-off-by: "Yann E. MORIN" Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index e735439a7e..7455288c17 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d stress-ng-0.06.15.tar.gz +sha256 0de97212a83b2f8a34ee31ef32a7bc69066ed49ebdc59b51aa4060cb95e29321 stress-ng-0.09.32.tar.xz diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 794e87554e..d83240817a 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,8 @@ # ################################################################################ -STRESS_NG_VERSION = 0.06.15 +STRESS_NG_VERSION = 0.09.32 +STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING From caddfa6237c75096fb6d883101d6ce161acc56a6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 29 Jun 2018 13:44:04 +0300 Subject: [PATCH 1942/2640] Revert "gnutls: drop wchar dependency" This reverts commit 694cdb9273433e8a1278e2e3bb2a7fe2004aa813. Just like commit 68c3f5257d94 (Revert "gnutls: make it non-wchar friendly") before. It turns out that gnulib expects some other library to provide a wctomb() implementation. So when the C library does not provide one it is left as undefined symbol in libgnutls.so. Add a comment to reduce the chance of repeating the same mistake again. Fixes: http://autobuild.buildroot.net/results/86f/86f08276fcb0cc557ab3cc5f57229b2c0c6ac2d7/ http://autobuild.buildroot.net/results/7c4/7c4bcb839f0ad5bc0496b4115ff391a3b312581a/ http://autobuild.buildroot.net/results/1c3/1c353f542c49bbe5520266c0ebb6a58589032453/ Reported-by: Matt Weber Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/gnutls/Config.in | 7 +++++-- package/libmicrohttpd/Config.in | 5 +++-- package/libsoup/Config.in | 2 +- package/taskd/Config.in | 2 +- package/vpnc/Config.in | 5 +++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 61b4b239ff..7e8dcc1e4f 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -2,6 +2,9 @@ config BR2_PACKAGE_GNUTLS bool "gnutls" # https://gitlab.com/gnutls/gnutls/issues/203 depends on !BR2_STATIC_LIBS + # gnulib requires a library that implements wctomb(). + # This is noticed only when linking with libgnutls.so. + depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_NETTLE select BR2_PACKAGE_PCRE @@ -23,5 +26,5 @@ config BR2_PACKAGE_GNUTLS_TOOLS endif -comment "gnutls needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "gnutls needs a toolchain w/ wchar, dynamic library" + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index f3386a63f2..7f3c9bb8fd 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -12,12 +12,13 @@ if BR2_PACKAGE_LIBMICROHTTPD config BR2_PACKAGE_LIBMICROHTTPD_SSL bool "https support" depends on !BR2_STATIC_LIBS # gnutls + depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS help Enable HTTPS (SSL) support. -comment "libmicrohttpd https support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library" + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS endif diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index f583322913..236d3c428a 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBSOUP bool "libsoup" - depends on BR2_USE_WCHAR # glib2 + depends on BR2_USE_WCHAR # glib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 diff --git a/package/taskd/Config.in b/package/taskd/Config.in index c068b34724..19d123fb59 100644 --- a/package/taskd/Config.in +++ b/package/taskd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_TASKD bool "taskd" depends on !BR2_STATIC_LIBS # gnutls - depends on BR2_USE_WCHAR + depends on BR2_USE_WCHAR # gnutls depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_GNUTLS diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in index b988ba342b..6455b0d87a 100644 --- a/package/vpnc/Config.in +++ b/package/vpnc/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_VPNC depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # gnutls select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_GNUTLS @@ -15,6 +16,6 @@ config BR2_PACKAGE_VPNC http://www.unix-ag.uni-kl.de/~massar/vpnc -comment "vpnc needs a toolchain w/ dynamic library" +comment "vpnc needs a toolchain w/ wchar, dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS From b8c3ec57e7f60be86e6d5613848f67b1a700ad39 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Fri, 29 Jun 2018 10:13:00 +0200 Subject: [PATCH 1943/2640] libostree: fix libsoup configure option name The option used by configure script is actually --with-soup/--without-soup. Fixes: http://autobuild.buildroot.net/results/cf8ab76b8ea1a555d42f0625df1d58543e88efb1/ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libostree/libostree.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index bf5118413b..d9739b7901 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -40,7 +40,7 @@ endif #cURL support depends on libsoup ifeq ($(BR2_PACKAGE_LIBSOUP),y) -LIBOSTREE_CONF_OPTS += --with-libsoup +LIBOSTREE_CONF_OPTS += --with-soup LIBOSTREE_DEPENDENCIES += libsoup ifeq ($(BR2_PACKAGE_LIBCURL),y) LIBOSTREE_CONF_OPTS += --with-curl @@ -49,7 +49,7 @@ else LIBOSTREE_CONF_OPTS += --without-curl endif else -LIBOSTREE_CONF_OPTS += --without-libsoup --without-curl +LIBOSTREE_CONF_OPTS += --without-soup --without-curl endif ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) From 95537dd7557d169880fdc8e3f983eba7fdb62bf9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 29 Jun 2018 08:02:58 +0300 Subject: [PATCH 1944/2640] linux-pam: bump to version 1.3.1 The tarball is now at github. Switch to .tar.xz, that's the only format that upstream provides. Add a note on tarball signature and key. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/linux-pam/linux-pam.hash | 6 ++++-- package/linux-pam/linux-pam.mk | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index b9c91ef0f6..183bcca401 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,2 +1,4 @@ -# Locally computed hashes, not provided by upstream -sha256 241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb Linux-PAM-1.3.0.tar.bz2 +# Locally computed hashes after checking signature at +# https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz.asc +# signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB +sha256 eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db Linux-PAM-1.3.1.tar.xz diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 5c80e78416..63610fcc57 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,9 +4,9 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.3.0 -LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 -LINUX_PAM_SITE = http://linux-pam.org/library +LINUX_PAM_VERSION = 1.3.1 +LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz +LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES LINUX_PAM_CONF_OPTS = \ --disable-prelude \ From 473390a30c5f0a4aa38f2f2304b433a5ec3aad9e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 29 Jun 2018 08:18:58 +0300 Subject: [PATCH 1945/2640] qpdf: security bump to version 8.1.0 Fixes CVE-2018-9918: mishandle certain "expected dictionary key but found non-name object" cases, allowing remote attackers to cause a denial of service (stack exhaustion) https://github.com/qpdf/qpdf/issues/202 Drop local SHA256 hash since we use upstream provided SHA512. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/qpdf/qpdf.hash | 6 ++---- package/qpdf/qpdf.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/qpdf/qpdf.hash b/package/qpdf/qpdf.hash index 1fbef66e6f..d27c9834b9 100644 --- a/package/qpdf/qpdf.hash +++ b/package/qpdf/qpdf.hash @@ -1,4 +1,2 @@ -# From https://sourceforge.net/projects/qpdf/files/qpdf/7.0.0/qpdf-7.0.0.sha512/download -sha512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256 qpdf-7.0.0.tar.gz -# Locally computed -sha256 fed08de14caad0fe5efd148d9eca886d812588b2cbb35d13e61993ee8eb8c65f qpdf-7.0.0.tar.gz +# From https://sourceforge.net/projects/qpdf/files/qpdf/8.1.0/qpdf-8.1.0.sha512/download +sha512 1831bcaaed87dae268db5d61805d1483ec5c101f6ce594be660664c119597ae67cf011c2b50092964d785a814d5f6c780935127a89401fe37a1026ae4d3af15c qpdf-8.1.0.tar.gz diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index 27e4d09978..4776d22b16 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -4,7 +4,7 @@ # ################################################################################ -QPDF_VERSION = 7.0.0 +QPDF_VERSION = 8.1.0 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Artistic-2.0 From d92d3ddeb1374325a7d92c885dc827317a5c90f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Jun 2018 20:40:32 +0200 Subject: [PATCH 1946/2640] libv4l: fix build with sdl2_image sdlcam test includes jpeglib.h so add a patch to disable it if jpeg is disabled Fixes: - http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Build-sdlcam-only-if-jpeg-is-enabled.patch | 31 +++++++++++++++++++ package/libv4l/libv4l.mk | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch diff --git a/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch b/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch new file mode 100644 index 0000000000..4c4365f907 --- /dev/null +++ b/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch @@ -0,0 +1,31 @@ +From 5c407e130f8d0416f91f5a12bcdc2709f00dda65 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 29 Jun 2018 21:15:10 +0200 +Subject: [PATCH] Build sdlcam only if jpeg is enabled + +Fixes: + - http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44 + +Signed-off-by: Fabrice Fontaine +--- + contrib/test/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am +index 0188fe21..c7c38e7a 100644 +--- a/contrib/test/Makefile.am ++++ b/contrib/test/Makefile.am +@@ -17,8 +17,10 @@ noinst_PROGRAMS += v4l2gl + endif + + if HAVE_SDL ++if HAVE_JPEG + noinst_PROGRAMS += sdlcam + endif ++endif + + driver_test_SOURCES = driver-test.c + driver_test_LDADD = ../../utils/libv4l2util/libv4l2util.la +-- +2.14.1 + diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 95a700b2d5..c95b2778cd 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -10,6 +10,10 @@ LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf LIBV4L_CONF_OPTS = --disable-doxygen-doc +# We're patching contrib/test/Makefile.am +LIBV4L_AUTORECONF = YES +# add host-gettext for AM_ICONV macro +LIBV4L_DEPENDENCIES += host-gettext # fix uclibc-ng configure/compile LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 798d1ec30936cc31e784d40af126f509e69d7b0d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 16:21:25 +0200 Subject: [PATCH 1947/2640] package/xorriso: fix to use the system xattr header We don't carry a git-formatted patch, because upstream is in fact a collection of git trees, while the release tarball is an aggregate of those repositories. Thus, the layout is different between the tarball and the SCM... Signed-off-by: "Yann E. MORIN" Cc: Steve Kenton [Thomas: - add host-pkgconf as a dependency of host-xorriso, since it's needed for autoreconf to work - drop HOST_XORRISO_AUTORECONF = YES, since it's implied by XORRISO_AUTORECONF = YES.] Signed-off-by: Thomas Petazzoni --- package/xorriso/0001-use-sys-xattr.h.patch | 33 ++++++++++++++++++++++ package/xorriso/xorriso.mk | 13 +++++++++ 2 files changed, 46 insertions(+) create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch diff --git a/package/xorriso/0001-use-sys-xattr.h.patch b/package/xorriso/0001-use-sys-xattr.h.patch new file mode 100644 index 0000000000..5ae1aae72e --- /dev/null +++ b/package/xorriso/0001-use-sys-xattr.h.patch @@ -0,0 +1,33 @@ +Use system + +The one from attr is no longer installed with latest version. + +Signed-off-by: "Yann E. MORIN" + +--- +Upstream status: alternate, more complex patch pending... + +diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac +--- xorriso-1.4.6.orig/configure.ac 2016-09-16 15:51:33.000000000 +0200 ++++ xorriso-1.4.6/configure.ac 2018-05-06 23:45:38.377153069 +0200 +@@ -264,7 +264,7 @@ + dnl Check whether there is the header for Linux xattr. + dnl If not, erase this macro which would enable use of listxattr and others + XATTR_DEF="-DLibisofs_with_aaip_xattR" +- AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , ++ AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= , + XATTR_DEF= ), XATTR_DEF= ) + fi + elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr +diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c +--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c 2016-09-16 15:51:34.000000000 +0200 ++++ xorriso-1.4.6/libisofs/aaip-os-linux.c 2018-05-06 23:47:25.764941583 +0200 +@@ -30,7 +30,7 @@ + #endif + + #ifdef Libisofs_with_aaip_xattR +-#include ++#include + #endif + + diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk index 1f095911f8..de431c3ab6 100644 --- a/package/xorriso/xorriso.mk +++ b/package/xorriso/xorriso.mk @@ -8,6 +8,19 @@ XORRISO_VERSION = 1.4.6 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso XORRISO_LICENSE = GPL-3.0+ XORRISO_LICENSE_FILES = COPYING COPYRIGHT + +# 0001-use-sys-xattr.h.patch +XORRISO_DEPENDENCIES = host-pkgconf +HOST_XORRISO_DEPENDENCIES = host-pkgconf +XORRISO_AUTORECONF = YES + +# Make autoreconf happy +define XORRISO_NEWS + touch $(@D)/NEWS +endef +XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS +HOST_XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS + # Disable everything until we actually need those features, and add the correct # host libraries HOST_XORRISO_CONF_OPTS = \ From f50578ab98bbc99139838375f6221411d420b298 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 30 Jun 2018 22:02:38 +0200 Subject: [PATCH 1948/2640] gdb: drop duplicate dependencies Commit 1e3738db42919cb4487f7a64381ac7d3090d0e1f ("package/gdb: rework dependency for C++11") erroneously added duplicate dependencies in package/gdb/Config.in related to gcc 4.8 and C++ dependency. One copy of those dependencies was below the select causing a check-package warning. Fixes: package/gdb/Config.in:28: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 9a71c008a0..55c1b194ce 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -25,8 +25,6 @@ config BR2_PACKAGE_GDB # one from the external toolchain should be used. select BR2_PACKAGE_GDB_SERVER if \ (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_PACKAGE_GDB_NEEDS_CXX11 - depends on BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_GDB_NEEDS_CXX11 help GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or From 722c11ce7b25a1925498483ef58f59d0931b2ca7 Mon Sep 17 00:00:00 2001 From: "J. Tang" Date: Sat, 30 Jun 2018 15:14:25 -0400 Subject: [PATCH 1949/2640] board/raspberrypi: update firmware option to use 64-bit mode As per latest Raspberry Pi firmware documentation, the option 'arm_control' has been deprecated in favor of 'arm_64bit'. Fixes https://bugs.busybox.net/show_bug.cgi?id=11111. Signed-off-by: Jason Tang Signed-off-by: Thomas Petazzoni --- board/raspberrypi/post-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 3c6c938407..70447cd48b 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -23,11 +23,11 @@ __EOF__ --aarch64) # Run a 64bits kernel (armv8) sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt" - if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then + if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" # enable 64bits support -arm_control=0x200 +arm_64bit=1 __EOF__ fi From 2fe054a7ecf145be002ed2bf75c662fa397792d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20Gaw=C4=99dzki?= Date: Wed, 27 Jun 2018 15:51:46 +0200 Subject: [PATCH 1950/2640] nginx: bump to version 1.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following patches have been updated to apply on 1.15.0: 0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch 0006-auto-lib-openssl-conf-use-pkg-config.patch The follow patch has been removed, because it was applied upstream: 0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch The license file hash has changed because the copyright years were updated in the LICENSE file: - * Copyright (C) 2002-2017 Igor Sysoev - * Copyright (C) 2011-2017 Nginx, Inc. + * Copyright (C) 2002-2018 Igor Sysoev + * Copyright (C) 2011-2018 Nginx, Inc. Signed-off-by: Ignacy Gawędzki [Thomas: drop unneeded patch updates, improve commit log.] Signed-off-by: Thomas Petazzoni --- ...ture_run_force_result-for-each-featu.patch | 56 ++-- ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ++++++++++++++++-- ...x-PCRE-condition-WRT-the-http-and-ht.patch | 33 --- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 2 +- 5 files changed, 266 insertions(+), 80 deletions(-) delete mode 100644 package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch diff --git a/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch index be1df7fb33..f186becdf8 100644 --- a/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +++ b/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch @@ -1,4 +1,4 @@ -From 71939b727a8fa9f722934700948a5b68960f6183 Mon Sep 17 00:00:00 2001 +From 57d9d632be9a9f7e3ac00f9eb10b069afd0b1543 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Thu, 29 May 2014 18:52:10 +0200 Subject: [PATCH] auto/*: set ngx_feature_run_force_result for each feature @@ -25,18 +25,18 @@ Signed-off-by: Danomi Manchego 6 files changed, 20 insertions(+) diff --git a/auto/cc/conf b/auto/cc/conf -index edc6d74..a61ade4 100644 +index afbca62b..ad42c800 100644 --- a/auto/cc/conf +++ b/auto/cc/conf -@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="gcc builtin atomic operations" - ngx_feature_name=NGX_HAVE_GCC_ATOMIC - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" - ngx_feature_incs= - ngx_feature_path= - ngx_feature_libs= -@@ -201,6 +203,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +@@ -184,6 +184,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then + ngx_feature="gcc builtin atomic operations" + ngx_feature_name=NGX_HAVE_GCC_ATOMIC + ngx_feature_run=yes ++ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" + ngx_feature_incs= + ngx_feature_path= + ngx_feature_libs= +@@ -205,6 +206,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then ngx_feature="C99 variadic macros" ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" ngx_feature_run=yes @@ -44,7 +44,7 @@ index edc6d74..a61ade4 100644 ngx_feature_incs="#include #define var(dummy, ...) sprintf(__VA_ARGS__)" ngx_feature_path= -@@ -215,6 +220,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +@@ -219,6 +221,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then ngx_feature="gcc variadic macros" ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" ngx_feature_run=yes @@ -53,7 +53,7 @@ index edc6d74..a61ade4 100644 #define var(dummy, args...) sprintf(args)" ngx_feature_path= diff --git a/auto/cc/name b/auto/cc/name -index 51a7ed9..d237d47 100644 +index ded93f5b..7c3cb74a 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then @@ -65,7 +65,7 @@ index 51a7ed9..d237d47 100644 ngx_feature_path= ngx_feature_libs= diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf -index d1e484a..3724916 100644 +index d1e484ab..37249161 100644 --- a/auto/lib/libatomic/conf +++ b/auto/lib/libatomic/conf @@ -15,6 +15,7 @@ else @@ -77,10 +77,10 @@ index d1e484a..3724916 100644 #include " ngx_feature_path= diff --git a/auto/os/darwin b/auto/os/darwin -index 1d3e3d3..11b7276 100644 +index 429468f7..1ed47cca 100644 --- a/auto/os/darwin +++ b/auto/os/darwin -@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES +@@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES ngx_feature="kqueue's EVFILT_TIMER" ngx_feature_name="NGX_HAVE_TIMER_EVENT" ngx_feature_run=yes @@ -88,7 +88,7 @@ index 1d3e3d3..11b7276 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -60,6 +61,7 @@ ngx_feature_test="int kq; +@@ -63,6 +64,7 @@ ngx_feature_test="int kq; ngx_feature="Darwin 64-bit kqueue millisecond timeout bug" ngx_feature_name=NGX_DARWIN_KEVENT_BUG ngx_feature_run=bug @@ -96,7 +96,7 @@ index 1d3e3d3..11b7276 100644 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS" +@@ -92,6 +94,7 @@ ngx_feature_test="int kq; ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" ngx_feature_run=yes @@ -105,7 +105,7 @@ index 1d3e3d3..11b7276 100644 #include #include diff --git a/auto/os/linux b/auto/os/linux -index 19bf832..16848b2 100644 +index 2c8a9bb8..eb4513ee 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -37,6 +37,7 @@ fi @@ -141,7 +141,7 @@ index 19bf832..16848b2 100644 ngx_feature_path= ngx_feature_libs= diff --git a/auto/unix b/auto/unix -index 6e54531..7dbf9d1 100755 +index 43d3b25a..3da00537 100644 --- a/auto/unix +++ b/auto/unix @@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then @@ -152,7 +152,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -702,6 +703,7 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0); +@@ -730,6 +731,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n; ngx_feature="sys_nerr" ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value @@ -160,7 +160,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs='#include #include ' ngx_feature_path= -@@ -716,6 +718,7 @@ if [ $ngx_found = no ]; then +@@ -744,6 +746,7 @@ if [ $ngx_found = no ]; then ngx_feature="_sys_nerr" ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value @@ -168,7 +168,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs='#include #include ' ngx_feature_path= -@@ -731,6 +734,7 @@ if [ $ngx_found = no ]; then +@@ -759,6 +762,7 @@ if [ $ngx_found = no ]; then ngx_feature='maximum errno' ngx_feature_name=NGX_SYS_NERR ngx_feature_run=value @@ -176,7 +176,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs='#include #include #include ' -@@ -789,6 +793,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); +@@ -841,6 +845,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); ngx_feature="mmap(MAP_ANON|MAP_SHARED)" ngx_feature_name="NGX_HAVE_MAP_ANON" ngx_feature_run=yes @@ -184,7 +184,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -802,6 +807,7 @@ ngx_feature_test="void *p; +@@ -854,6 +859,7 @@ ngx_feature_test="void *p; ngx_feature='mmap("/dev/zero", MAP_SHARED)' ngx_feature_name="NGX_HAVE_MAP_DEVZERO" ngx_feature_run=yes @@ -192,7 +192,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs="#include #include #include " -@@ -817,6 +823,7 @@ ngx_feature_test='void *p; int fd; +@@ -869,6 +875,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" ngx_feature_run=yes @@ -200,7 +200,7 @@ index 6e54531..7dbf9d1 100755 ngx_feature_incs="#include #include " ngx_feature_path= -@@ -831,6 +838,7 @@ ngx_feature_test="int id; +@@ -883,6 +890,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" ngx_feature_run=yes @@ -209,5 +209,5 @@ index 6e54531..7dbf9d1 100755 ngx_feature_path= ngx_feature_libs= -- -1.9.1 +2.17.1 diff --git a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch index 0bd4d337c8..4338729658 100644 --- a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ b/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch @@ -1,4 +1,4 @@ -From 756556d127da291cad8a2c007a89124a692aef7f Mon Sep 17 00:00:00 2001 +From 4ba4b1e0bd1b69e124eb34c95ae9e7c087370efa Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Fri, 6 May 2016 14:48:31 +0100 Subject: [PATCH] auto/lib/openssl/conf: use pkg-config @@ -8,25 +8,244 @@ dependencies. Signed-off-by: Martin Bark --- - auto/lib/openssl/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + auto/lib/openssl/conf | 187 +++++++++++++++++++++--------------------- + 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf -index 39d9602..995c6f3 100644 +index 4fb52df7..9f30490d 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf -@@ -58,8 +58,9 @@ else - ngx_feature_name="NGX_OPENSSL" - ngx_feature_run=no - ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL" -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| -+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" - ngx_feature_test="SSL_CTX_set_options(NULL, 0)" - . auto/feature +@@ -1,4 +1,3 @@ +- + # Copyright (C) Igor Sysoev + # Copyright (C) Nginx, Inc. +@@ -7,123 +6,125 @@ if [ $OPENSSL != NONE ]; then + + case "$CC" in + +- cl | bcc32) +- have=NGX_OPENSSL . auto/have +- have=NGX_SSL . auto/have +- +- CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" +- +- CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" +- CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" +- +- if [ -f $OPENSSL/ms/do_ms.bat ]; then +- # before OpenSSL 1.1.0 +- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" +- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" +- else +- # OpenSSL 1.1.0+ +- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" +- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" +- fi +- +- # libeay32.lib requires gdi32.lib +- CORE_LIBS="$CORE_LIBS gdi32.lib" +- # OpenSSL 1.0.0 requires crypt32.lib +- CORE_LIBS="$CORE_LIBS crypt32.lib" +- ;; +- +- *) +- have=NGX_OPENSSL . auto/have +- have=NGX_SSL . auto/have +- +- CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" +- CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" +- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" +- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" +- CORE_LIBS="$CORE_LIBS $NGX_LIBDL" +- CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" +- +- if [ "$NGX_PLATFORM" = win32 ]; then +- CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" +- fi +- ;; ++ cl | bcc32) ++ have=NGX_OPENSSL . auto/have ++ have=NGX_SSL . auto/have ++ ++ CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" ++ ++ CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" ++ CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" ++ ++ if [ -f $OPENSSL/ms/do_ms.bat ]; then ++ # before OpenSSL 1.1.0 ++ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" ++ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" ++ else ++ # OpenSSL 1.1.0+ ++ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" ++ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" ++ fi ++ ++ # libeay32.lib requires gdi32.lib ++ CORE_LIBS="$CORE_LIBS gdi32.lib" ++ # OpenSSL 1.0.0 requires crypt32.lib ++ CORE_LIBS="$CORE_LIBS crypt32.lib" ++ ;; ++ ++ *) ++ have=NGX_OPENSSL . auto/have ++ have=NGX_SSL . auto/have ++ ++ CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" ++ CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" ++ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" ++ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" ++ CORE_LIBS="$CORE_LIBS $NGX_LIBDL" ++ CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" ++ ++ if [ "$NGX_PLATFORM" = win32 ]; then ++ CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" ++ fi ++ ;; + esac + + else + + if [ "$NGX_PLATFORM" != win32 ]; then + +- OPENSSL=NO ++ OPENSSL=NO + +- ngx_feature="OpenSSL library" +- ngx_feature_name="NGX_OPENSSL" +- ngx_feature_run=no +- ngx_feature_incs="#include " +- ngx_feature_path= +- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" +- ngx_feature_test="SSL_CTX_set_options(NULL, 0)" +- . auto/feature ++ ngx_feature="OpenSSL library" ++ ngx_feature_name="NGX_OPENSSL" ++ ngx_feature_run=no ++ ngx_feature_incs="#include " ++ ngx_feature_path= ++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| ++ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" ++ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" ++ ngx_feature_test="SSL_CTX_set_options(NULL, 0)" ++ . auto/feature + +- if [ $ngx_found = no ]; then ++ if [ $ngx_found = no ]; then + +- # FreeBSD port ++ # FreeBSD port + +- ngx_feature="OpenSSL library in /usr/local/" +- ngx_feature_path="/usr/local/include" ++ ngx_feature="OpenSSL library in /usr/local/" ++ ngx_feature_path="/usr/local/include" + +- if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" +- else +- ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" +- fi ++ if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" ++ else ++ ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" ++ fi + +- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" ++ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + +- . auto/feature +- fi ++ . auto/feature ++ fi + +- if [ $ngx_found = no ]; then ++ if [ $ngx_found = no ]; then + +- # NetBSD port ++ # NetBSD port + +- ngx_feature="OpenSSL library in /usr/pkg/" +- ngx_feature_path="/usr/pkg/include" ++ ngx_feature="OpenSSL library in /usr/pkg/" ++ ngx_feature_path="/usr/pkg/include" + +- if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" +- else +- ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" +- fi ++ if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" ++ else ++ ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" ++ fi + +- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" ++ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + +- . auto/feature +- fi ++ . auto/feature ++ fi + +- if [ $ngx_found = no ]; then ++ if [ $ngx_found = no ]; then + +- # MacPorts ++ # MacPorts + +- ngx_feature="OpenSSL library in /opt/local/" +- ngx_feature_path="/opt/local/include" ++ ngx_feature="OpenSSL library in /opt/local/" ++ ngx_feature_path="/opt/local/include" + +- if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" +- else +- ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" +- fi ++ if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" ++ else ++ ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" ++ fi + +- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" ++ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" + +- . auto/feature +- fi ++ . auto/feature ++ fi + +- if [ $ngx_found = yes ]; then +- have=NGX_SSL . auto/have +- CORE_INCS="$CORE_INCS $ngx_feature_path" +- CORE_LIBS="$CORE_LIBS $ngx_feature_libs" +- OPENSSL=YES +- fi ++ if [ $ngx_found = yes ]; then ++ have=NGX_SSL . auto/have ++ CORE_INCS="$CORE_INCS $ngx_feature_path" ++ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" ++ OPENSSL=YES ++ fi + fi + + if [ $OPENSSL != YES ]; then +@@ -136,7 +137,7 @@ into the system, or build the OpenSSL library statically from the source + with nginx by using --with-openssl= option. + + END +- exit 1 ++ exit 1 + fi + + fi -- -2.8.2 +2.17.1 diff --git a/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch b/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch deleted file mode 100644 index 08456511dc..0000000000 --- a/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9668f0d5ecd2382fd36b7ff6a3a29abd04f6533f Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Fri, 14 Jul 2017 11:50:08 +0200 -Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and - http_rewrite options - -http_rewrite module cannot be selected when http server is disabled, so -fix the PCRE check condition to avoid irrelevant check failure. - -Fixes: - http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log - -Signed-off-by: Samuel Martin ---- - auto/lib/conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auto/lib/conf b/auto/lib/conf -index 0b8545a3..2c7af104 100644 ---- a/auto/lib/conf -+++ b/auto/lib/conf -@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then - . auto/lib/pcre/conf - - else -- if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then -+ if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then - - cat << END - --- -2.13.2 - diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 9936ca1dfa..51284aefbe 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 nginx-1.12.2.tar.gz +sha256 b0b58c9a3fd73aa8b89edf5cfadc6641a352e0e6d3071db1eb3215d72b7fb516 nginx-1.15.0.tar.gz # License files, locally calculated -sha256 75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780 LICENSE +sha256 e18f05bcaad47528f8b21861d4a0fb9815ca1bbb4be946c51a51d36623758bcc LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index e5652af6df..23cf2b46d5 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.12.2 +NGINX_VERSION = 1.15.0 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From 8360fb0150fcc65d75cdbfeaa3da811cd17c2ea5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Jun 2018 00:02:35 +0200 Subject: [PATCH 1951/2640] boost: add BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS Rework boost-context dependencies and manage them through the hidden BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 781bc47c00..bb53adccdd 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -69,10 +69,18 @@ config BR2_PACKAGE_BOOST_CONTAINER # http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html # for the list of supported architectures. Sparc pretends to be # supported, but it doesn't build. +config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + bool + default y if ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_powerpc + default y if BR2_x86_64 + config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" - depends on ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_i386 || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_x86_64 + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 help C++11 context switching library. From cb3dc94501415220c52c87843b908658d700968c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Jun 2018 00:02:36 +0200 Subject: [PATCH 1952/2640] boost: coroutine selects context Replace the coroutine dependency on context by a select Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index bb53adccdd..b390c6fce8 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -97,12 +97,18 @@ comment "boost-contract needs a toolchain w/ NPTL" config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" - depends on BR2_PACKAGE_BOOST_CONTEXT + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + select BR2_PACKAGE_BOOST_CONTEXT help deprecated coroutine library, the non-depricated coroutine2 library is a header-only library and does not need to be selected. +comment "boost-coroutine needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_BOOST_DATE_TIME bool "boost-date_time" help From 0ede7241d50839d53ab0c845d2d099b07fa5aae1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Jun 2018 00:02:37 +0200 Subject: [PATCH 1953/2640] boost: make fiber module select the context module The boost fiber module uses the boost context module, so it should select it. Due to this, the boost fiber module inherits the dependencies of boost context: it needs exception_ptr handling, and is only available on the architectures where boost context is supported. Fixes: http://autobuild.buildroot.net/results/56509d315defb95d4ac6e278a9d40cd98f61baa7 Signed-off-by: Fabrice Fontaine [Thomas: use only one comment for both gcc bug dependencies.] Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index b390c6fce8..ac79bb345b 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -124,19 +124,24 @@ config BR2_PACKAGE_BOOST_EXCEPTION config BR2_PACKAGE_BOOST_FIBER bool "boost-fiber" + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mips support uses the "pause" instruction, only available # since mips32r2/mips64r2. depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 + select BR2_PACKAGE_BOOST_CONTEXT help C++11 userland threads library. comment "boost-fiber needs a toolchain w/ NPTL" + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL -comment "boost-fiber needs a toolchain not affected by GCC bug 85180" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180 +comment "boost-fiber needs a toolchain not affected by GCC bug 64735, 85180" + depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || BR2_TOOLCHAIN_HAS_GCC_BUG_85180 config BR2_PACKAGE_BOOST_FILESYSTEM bool "boost-filesystem" From 3d2445ba1c99c4825c399fda0cd7d5362d9e1253 Mon Sep 17 00:00:00 2001 From: Pierre Ducroquet Date: Thu, 15 Feb 2018 21:48:11 +0100 Subject: [PATCH 1954/2640] package/kf5: base infrastructure KDE Frameworks 5 is a set of libraries built on the Qt framework providing a lot of powerfull classes and solutions for developers building Qt applications. Unlike the previous KDE libraries, they are split in tiny packages, reducing dependencies as much as possible, making them usable even for embedded projects. This first commit introduce the kf5 packages folder. Signed-off-by: Pierre Ducroquet [Thomas: - Needs Qt >= 5.8, so added a dependency on BR2_PACKAGE_QT5_VERSION_LATEST - Update to version 5.47.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/kf5/Config.in | 10 ++++++++++ package/kf5/kf5.mk | 11 +++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/kf5/Config.in create mode 100644 package/kf5/kf5.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0a9decbb55..b1307e2bbf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2141,3 +2141,6 @@ F: package/qjson/ F: package/quazip/ F: package/shapelib/ F: package/tinc/ + +N: Pierre Ducroquet +F: package/kf5/ diff --git a/package/Config.in b/package/Config.in index f72670c4e5..e94a6a8c12 100644 --- a/package/Config.in +++ b/package/Config.in @@ -310,6 +310,7 @@ comment "Graphic libraries" comment "Other GUIs" source "package/qt/Config.in" source "package/qt5/Config.in" + source "package/kf5/Config.in" if BR2_PACKAGE_QT || BR2_PACKAGE_QT5 comment "QT libraries and helper libraries" source "package/grantlee/Config.in" diff --git a/package/kf5/Config.in b/package/kf5/Config.in new file mode 100644 index 0000000000..cbc3d0b70d --- /dev/null +++ b/package/kf5/Config.in @@ -0,0 +1,10 @@ +menuconfig BR2_PACKAGE_KF5 + bool "KF5" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_VERSION_LATEST + help + This option enables the KF5 KDE Frameworks. Sub-options + allow to select which modules should be built. + +if BR2_PACKAGE_KF5 +endif diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk new file mode 100644 index 0000000000..8360fc9b63 --- /dev/null +++ b/package/kf5/kf5.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# kf5 +# +################################################################################ + +KF5_VERSION_MAJOR = 5.47 +KF5_VERSION = $(KF5_VERSION_MAJOR).0 +KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) + +include $(sort $(wildcard package/kf5/*/*.mk)) From 77f70f8b88a7b8a157bb6032afa884e1dc84f6ed Mon Sep 17 00:00:00 2001 From: Pierre Ducroquet Date: Thu, 15 Feb 2018 21:48:12 +0100 Subject: [PATCH 1955/2640] package/kf5/kf5-extra-cmake-modules: new package kf5-extra-cmake-modules contains several additional CMake modules used by the other KF5 packages. It does not install anything on the target and contain only CMake files for the host. Signed-off-by: Pierre Ducroquet [Thomas: - update to version 5.47 - add hash for license file] Signed-off-by: Thomas Petazzoni --- package/kf5/Config.in | 1 + package/kf5/kf5-extra-cmake-modules/Config.in | 10 ++++++++++ .../kf5-extra-cmake-modules.hash | 3 +++ .../kf5-extra-cmake-modules.mk | 17 +++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/kf5/kf5-extra-cmake-modules/Config.in create mode 100644 package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash create mode 100644 package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk diff --git a/package/kf5/Config.in b/package/kf5/Config.in index cbc3d0b70d..1db0fbfe51 100644 --- a/package/kf5/Config.in +++ b/package/kf5/Config.in @@ -7,4 +7,5 @@ menuconfig BR2_PACKAGE_KF5 allow to select which modules should be built. if BR2_PACKAGE_KF5 +source "package/kf5/kf5-extra-cmake-modules/Config.in" endif diff --git a/package/kf5/kf5-extra-cmake-modules/Config.in b/package/kf5/kf5-extra-cmake-modules/Config.in new file mode 100644 index 0000000000..7cb1036c75 --- /dev/null +++ b/package/kf5/kf5-extra-cmake-modules/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES + bool "kf5-extra-cmake-modules" + help + KF5 is a set of Qt framework addons, extending Qt in various + ways, not only restricted in helping integration in KDE. + + This package corresponds to the extra CMake modules, + required for most KF5 libraries. + + https://api.kde.org/frameworks/extra-cmake-modules/html/index.html diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash new file mode 100644 index 0000000000..733e267fdb --- /dev/null +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk new file mode 100644 index 0000000000..7b96e1f1bb --- /dev/null +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# kf5-extra-cmake-modules +# +################################################################################ + +KF5_EXTRA_CMAKE_MODULES_VERSION = $(KF5_VERSION) +KF5_EXTRA_CMAKE_MODULES_SITE = $(KF5_SITE) +KF5_EXTRA_CMAKE_MODULES_SOURCE = extra-cmake-modules-$(KF5_EXTRA_CMAKE_MODULES_VERSION).tar.xz +KF5_EXTRA_CMAKE_MODULES_LICENSE = BSD-3-Clause +KF5_EXTRA_CMAKE_MODULES_LICENSE_FILE = COPYING-CMAKE-SCRIPTS + +KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf +KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES +KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From 6815f429f7faa6b43b559a0599dd446ea07f3a72 Mon Sep 17 00:00:00 2001 From: Pierre Ducroquet Date: Thu, 15 Feb 2018 21:48:13 +0100 Subject: [PATCH 1956/2640] package/kf5/kf5-networkmanager-qt: new package networkmanager-qt is a simple Qt wrapper on the NetworkManager API. Signed-off-by: Pierre Ducroquet [Thomas: - Update to version 5.47. - Instead of selecting network-manager, depend on it, it avoids replicating all its complicated dependencies, and it's pretty obvious if you want to use network-manager that you need network manager. - Needs Qt5Dbus support, so added a select BR2_PACKAGE_QT5DBUS, and propagated the corresponding dependencies. - Add missing dependency on qt5base in KF5_NETWORKMANAGER_QT_DEPENDENCIES - add hash for license file.] Signed-off-by: Thomas Petazzoni --- package/kf5/Config.in | 1 + package/kf5/kf5-networkmanager-qt/Config.in | 19 +++++++++++++++++++ .../kf5-networkmanager-qt.hash | 3 +++ .../kf5-networkmanager-qt.mk | 16 ++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/kf5/kf5-networkmanager-qt/Config.in create mode 100644 package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash create mode 100644 package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk diff --git a/package/kf5/Config.in b/package/kf5/Config.in index 1db0fbfe51..5a2d2cca2a 100644 --- a/package/kf5/Config.in +++ b/package/kf5/Config.in @@ -8,4 +8,5 @@ menuconfig BR2_PACKAGE_KF5 if BR2_PACKAGE_KF5 source "package/kf5/kf5-extra-cmake-modules/Config.in" +source "package/kf5/kf5-networkmanager-qt/Config.in" endif diff --git a/package/kf5/kf5-networkmanager-qt/Config.in b/package/kf5/kf5-networkmanager-qt/Config.in new file mode 100644 index 0000000000..277e08866a --- /dev/null +++ b/package/kf5/kf5-networkmanager-qt/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_KF5_NETWORKMANAGER_QT + bool "kf5-networkmanager-qt" + depends on BR2_USE_MMU # qt5dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # qt5dbus + depends on BR2_PACKAGE_NETWORK_MANAGER + select BR2_PACKAGE_QT5BASE_DBUS + select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES + help + KF5 is a set of Qt framework addons, extending Qt in various + ways, not only restricted in helping integration in KDE. + + This package contains the NetworkManager Qt5 bindings from + the KF5 project. + + https://api.kde.org/frameworks/networkmanager-qt/html/index.html + +comment "kf5-networkmanager-qt needs toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash new file mode 100644 index 0000000000..8ccada455e --- /dev/null +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk new file mode 100644 index 0000000000..52e70e3c41 --- /dev/null +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# kf5-networkmanager-qt +# +################################################################################ + +KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) +KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) +KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz +KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ +KF5_NETWORKMANAGER_QT_LICENSE_FILE = COPYING.LIB + +KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base +KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES + +$(eval $(cmake-package)) From 872474624f3c29a17ce88bec4034ffd89c9746e0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 00:04:51 +0200 Subject: [PATCH 1957/2640] gst1-plugins-good: remove consecutive empty lines Fixes the following check-package warning: package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk:193: consecutive empty lines Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 26ea8a961a..6fa989d6bd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -190,7 +190,6 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += --disable-mpg123 endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y) GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law else From 760dc48e15110e90b9aebb49ffcd35648b013c5e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 00:19:15 +0200 Subject: [PATCH 1958/2640] network-manager: sync kernel headers comment with actual dependency In commit 52282828f06dc8aa3f721727f68a5096b9ed8b49 ("package/network-manager: add patches to build with kernel headers 3.2"), network-manager was changed to build with kernel headers as old as 3.2, instead of 3.7 before. The dependency was changed accordingly, but the Config.in comment was not. This commit fixes this inconsistency. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 9602cc4a1a..ca508185f0 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -64,8 +64,8 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library" +comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \ !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS From cb97d9473b55326374a3868c7d7c21930dda4e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 30 Jun 2018 23:07:03 -0400 Subject: [PATCH 1959/2640] qt5virtualkeyboard: allow to build with qt5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This module is available for Qt 5.6 since version 5.6.3 under the version number 2.0. Signed-off-by: Gaël PORTAY Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...emove-weird-install-path-for-example.patch | 38 +++++++++++++++++++ package/qt5/qt5virtualkeyboard/Config.in | 6 +-- .../qt5virtualkeyboard.hash | 3 ++ .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 5 +++ 4 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch diff --git a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch new file mode 100644 index 0000000000..2f8ea3bc94 --- /dev/null +++ b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch @@ -0,0 +1,38 @@ +From aef55eb7b3470ba6dee4abc67acda1d308c90e97 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Mon, 4 Apr 2016 14:25:54 +0200 +Subject: [PATCH 1/1] remove weird install path for example + +the deployment system on top should deal with this. + +Upstream-Status: Backport [with adaptations] +Change-Id: I1befb3e0c9bb6546afc59a40e525d1d600475a86 +Reviewed-by: Joerg Bornemann +Signed-off-by: Gaël PORTAY +[gportay: update basic.pro path] +--- + examples/virtualkeyboard/basic/basic.pro | 8 ++----- + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro +index 28cc4dc..0f71e0e 100644 +--- a/examples/virtualkeyboard/basic/basic.pro ++++ b/examples/virtualkeyboard/basic/basic.pro +@@ -7,12 +7,8 @@ static { + QT += svg + QTPLUGIN += qtvirtualkeyboardplugin + } +-android-no-sdk|!isEmpty(CROSS_COMPILE) { +- TARGETPATH = /data/user/qt/virtualkeyboard +-} else { +- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard +-} +-target.path = $$TARGETPATH ++ ++target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard + INSTALLS += target + + RESOURCES += \ +-- +2.17.1 + diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in index f0e4f03f61..57b0c703b0 100644 --- a/package/qt5/qt5virtualkeyboard/Config.in +++ b/package/qt5/qt5virtualkeyboard/Config.in @@ -1,11 +1,9 @@ -comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend" +comment "qt5virtualkeyboard needs an OpenGL-capable backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE config BR2_PACKAGE_QT5VIRTUALKEYBOARD bool "qt5virtualkeyboard" - # needs at least Qt 5.7 - depends on BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index fd147e28e8..ee463b314c 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,3 +1,6 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz.mirrorlist +sha256 1d543a851e83fc3de40f48c2935f70278e842589b9a235c2b22f41733e561aec qtvirtualkeyboard-opensource-src-2.0.tar.xz + # Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz.mirrorlist sha256 914de601a81b32acdddc572d3ade41129b018f3693d9cecdc5dad32424913cbd qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index bd943b08ac..cbe24d27dc 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,12 @@ # ################################################################################ +# Module does not follow Qt versionning for 5.6 +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) +else +QT5VIRTUALKEYBOARD_VERSION = 2.0 +endif QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg From 9dd707ce5bc382743c8695f8f6f19438848bb204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 30 Jun 2018 23:11:53 -0400 Subject: [PATCH 1960/2640] DEVELOPERS: add myself to package qt5webkit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index b1307e2bbf..803d248b4f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -803,6 +803,7 @@ F: package/zxing-cpp/ N: Gaël Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ +F: package/qt5/qt5webkit/ F: package/qt5/qt5webkit-examples/ N: Gary Bisson From efe67ac14a7fffbc64633bd70f2e72fd0cc92500 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Sun, 1 Jul 2018 07:26:07 +0300 Subject: [PATCH 1961/2640] package/nano: bump version to 2.9.8 Upgrade nano to 2.9.8, the latest version as of 2 June 2018: https://www.nano-editor.org/dist/v2.9/ChangeLog Signed-off-by: Leon Anavi Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index c09f0313d3..2f372933b7 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 d2d30c39caef53aba1ec1b4baff4186d4496f35d2411b0848242a5f2e27e129e nano-2.9.0.tar.xz +sha256 c2deac31ba4d3fd27a42fafcc47ccf499296cc69a422bbecab63f2933ea85488 nano-2.9.8.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 458174a473..3815cdcc1c 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 2.9 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).8 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From 12aa96d253580f47d5382b2c6e2c752e6256c5c0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 10:41:02 +0200 Subject: [PATCH 1962/2640] libv4l: bump to version 1.14.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libv4l/libv4l.hash | 4 ++-- package/libv4l/libv4l.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index aea9cc988f..5e0df1f7a9 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,6 +1,6 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2.asc -sha256 7974e5626447407d8a1ed531da0461c0fe00e599a696cb548a240d17d3519005 v4l-utils-1.14.1.tar.bz2 +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.2.tar.bz2.asc +sha256 e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692 v4l-utils-1.14.2.tar.bz2 # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index c95b2778cd..55f02b7e8e 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.14.1 +LIBV4L_VERSION = 1.14.2 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES From a475e0d874c66d5c0e478942cfb9ee84b1e58d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 29 Jun 2018 10:35:21 -0400 Subject: [PATCH 1963/2640] qt5webengine: propagate parallel flag to ninja MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WebEngine is a big project to build. It uses ninja which is a build system that does everything in parallel[1]. Builds are always run in parallel, based by default on the number of CPUs your system has. Underspecified build dependencies will result in incorrect builds. QtWebEngine does not propagate the parallel flag from the running instance of make to ninja. Thus, all the machine cores are used to build this single project. make -j 10 -> ninja -j # all cores This behavior disrupts powerful machines which are setup to build many projects in parallel. Even worse, the build fails on machines where the ratio CPU-cores / amount of RAM (including swap) is not appropriate. g++ may have not enough of memory to build all those files in parallel. Unfortunatly, the target `run_ninja' is hardcoded in the Makefile src/core/Makefile.run_gn; there is no way to propagate flags using a variable through the make command-line. run_ninja: /home/gportay/src/buildroot/output-qt5.11/build/qt5webengine-5.11.1/src/3rdparty/ninja/ninja -C /home/gportay/src/buildroot/output-qt5.11/build/qt5webengine-5.11.1/src/core/release QtWebEngineCore Luckily, the Qt gn_run.pro[2] can hardcode ninja extra flags through the variable NINJAFLAGS when the Makefile is generated (which is performed during the build and not during configure step). This commit sets the NINJAFLAGS using the variable PARALLEL_JOBS to limit the number of cores used by ninja. Fixes: virtual memory exhausted: Cannot allocate memory [1]: https://ninja-build.org/manual.html#_comparison_to_make [2]: https://github.com/qt/qtwebengine/blob/v5.11.1/src/core/gn_run.pro#L49-L53 CC: Damien Riegel CC: Jean-François Têtu Signed-off-by: Gaël PORTAY Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/qt5webengine.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index e527e6bc36..986ed0ec79 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -48,6 +48,8 @@ define QT5WEBENGINE_PYTHON2_SYMLINK endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" + ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config From 2d685d762d22b5b52b74e73199a19ccb0094cd99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 28 Jun 2018 16:29:10 -0400 Subject: [PATCH 1964/2640] qt5: bump latest version to 5.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtwebengine: Remove 0001-Fix-build-with-GCC-8.1.0.patch (upstream since [1]). [1]: https://github.com/qt/qtwebengine/commit/08db7562bf7709122807f151cab710b3fd9d7c19 Signed-off-by: Gaël PORTAY Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 +- ...tbase-Fix-build-error-when-using-EGL.patch | 0 package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +- package/qt5/qt5charts/qt5charts.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- .../0001-Fix-build-with-GCC-8.1.0.patch | 86 ------------------- package/qt5/qt5webengine/qt5webengine.hash | 4 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 29 files changed, 53 insertions(+), 139 deletions(-) rename package/qt5/qt5base/{5.11.0 => 5.11.1}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) delete mode 100644 package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 193ae8b49c..e323a27f09 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5_VERSION_MAJOR = 5.11 -QT5_VERSION = $(QT5_VERSION_MAJOR).0 +QT5_VERSION = $(QT5_VERSION_MAJOR).1 QT5_SOURCE_TARBALL_PREFIX = everywhere-src else QT5_VERSION_MAJOR = 5.6 diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 8bc8b43cd5..86cc84f4ce 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qt3d-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0 qt3d-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d qt3d-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from package/qt5/qt5base/5.11.0/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 896cfb5f06..80397e23cc 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtbase-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66 qtbase-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46 qtbase-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 32d981224a..2f40e81a5c 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcanvas3d-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 3fc60eafbe8737a8ff126eb9e2becc010d94f3db99dfa1d365e84f6af4540ccf qtcanvas3d-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 0fb51102bdd595673e2cc4f4878b8fb8b7da4c8b1f026885a75912e2421d2ede qtcanvas3d-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 6bd9a9d51b..705384d6c3 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351 qtcharts-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 62f65f08b08c1fdce4f358103be1f7d7aba54d21774e1a9bfff91314ad667a2b qtcharts-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 9cd732fa58..be9d3ab1b6 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtconnectivity-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 cd2e53b1a7bee098b651cbedcecf0717036ae4bec5de0daf3a0038a50b2e1873 qtconnectivity-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 738ed4eb058334fe7cfd6d68f2e2e7c9b2a97f3477b36ae26ed82703dcaae657 qtconnectivity-everywhere-src-5.11.1.tar.xz diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 0ca9b29088..830f95478f 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtdeclarative-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 eea9378b17b1c16d3b5235629b9128349bf98cba7d9c61122653d976b25f57c0 qtdeclarative-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 9ecf5ef6bf618fcb6719a4b22e3d9f9ce7623c2344667038171d5662624c4f3a qtdeclarative-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index dff8d9ad1b..e153a1dccc 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtgraphicaleffects-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 727846c9d8985be402f573ea28995f4a2bc13847a6d9deeca32d1e1e0421f977 qtgraphicaleffects-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 d9d27236696221098e832d6fee8c0fbb2834b1670d9ca1e5bf3d0fbc8e5448f3 qtgraphicaleffects-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 6064700c6a..49c1590823 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtimageformats-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 58406fef507a9f1e1cd97c0834b94d0a6484e19f5dea796a3b7b58fafff11e70 qtimageformats-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 eb50deeccce12ede0a5faeb3e411f34920ba43092c65f063ab23d37970f65616 qtimageformats-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index bbe3183471..14e548ed35 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtlocation-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 28f6911e3f00173005c0348c0b59f45e59ccda7feae724b1a6b8929021968c1c qtlocation-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 172c9a39e8267739e20d60bda45de3db02b13163245776bdc696d8c5ab5f790f qtlocation-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 272007c2c5..cbdd5096da 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtmultimedia-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c qtmultimedia-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c qtmultimedia-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 0e96f4e03e..8fb7609769 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 26627d592193094c65f842d5dd20c771d77c554591b9375659b03945dc8af107 qtquickcontrols-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 baea7f59513ffade3f8041c1756722334b7d04245667fa8faaeace07a430c656 qtquickcontrols-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index bfe86465a0..bdd3088561 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols2-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 feac87e9a6ecff47bd8c18baffb93f4cea9ebb86014f817bfafe62da88454ac3 qtquickcontrols2-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 bdb066fa0d51ad36a2c756d4cba63892587638e5df9b9b6ee63b963ff39ec442 qtquickcontrols2-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 0629c89cdc..27d205c82e 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtscript-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 25926ae733b31baac7af51f489ad26570d4f4f02ad4892a4a82babae5f5168c5 qtscript-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 1c430fd06e8eb25dbca43422453a16588d1aade936770df2e4b4e8961659da7c qtscript-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index ef99bc7d24..7c153f0507 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtscxml-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 531c204860e381808714486bd9703570de5fc5b1f8e2f4e18ede211d73428b03 qtscxml-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 f0463f02c0bb81d214b04ec82ff0d22744cdae1966cd8dfb53cd2b31ad233338 qtscxml-everywhere-src-5.11.1.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index a3861f0063..6917b8f593 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtsensors-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 0fc4e6d6b3281610551226cb6ffd9ef4e61b2f3bd0b7b1302135b03b5b16e2ab qtsensors-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 cbe90f58b73c344d67098eaa333f2d2562fa7a9f1794448e7543ff696831c0fa qtsensors-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index e76ed95ccc..202e045123 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtserialbus-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 05dde5528c5b710da50d5166eef4a86a279d329a82ef172637ba03fececc6c64 qtserialbus-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 d3bbee3c579a6d7a06956d653bcdfc2e2cd054d639dcaff08f45efb94d6b554a qtserialbus-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 5e901f7aec..965124f949 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtserialport-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 85eef7533a18fce59551fe26bb0055dd290d5d33cbb313fcb8e5daf8b40c6eb1 qtserialport-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 56a7993821d556d84494c6dfc22759eb6f2a979e21685403a2b9da75f0ba64a3 qtserialport-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index a96c0e9f07..9c9f53fcba 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtsvg-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 4b8efe60678a37c731356cc146886360e5852a1cd4a8ba6339fb950a2e7d1f54 qtsvg-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 1d6aff3e3304ceec670c0f19029771ff21279553d561158063436b26c18b3037 qtsvg-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 747be9057c..015735215f 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qttools-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 9d93ca84272cdf9031913cb3a6876716aa8a174e91693839f0de0ea3dd3a67d9 qttools-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe qttools-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index ee463b314c..bb916c06d3 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz.mirrorlist sha256 1d543a851e83fc3de40f48c2935f70278e842589b9a235c2b22f41733e561aec qtvirtualkeyboard-opensource-src-2.0.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 914de601a81b32acdddc572d3ade41129b018f3693d9cecdc5dad32424913cbd qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index c36fbfff78..947778345e 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwayland-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 68814e8f207f3a90cae29ae49ce2c1f4bf9d06709a7a7962adf23120f1644127 qtwayland-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 e09abc202082f719b868f595a46e0df5c903fac53cc40a7188b223a2bea644ea qtwayland-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 39f06cd2f4..31afb7790b 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebchannel-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 b0761a3b8260bae7f76bf26626ccd1d4ee92541d7c5d53d1958c88b9f92dca15 qtwebchannel-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 b9a476af15ae0c68a930f0b0aa8d988b8dc3e63c3d2134abebbf2148d6942e87 qtwebchannel-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch b/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch deleted file mode 100644 index dae4ecdc84..0000000000 --- a/package/qt5/qt5webengine/5.11.0/0001-Fix-build-with-GCC-8.1.0.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 96f354df27c2f3c7c1b221b676c7a1af6b3da375 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?J=C3=BCri=20Valdmann?= -Date: Mon, 14 May 2018 10:15:50 +0200 -Subject: [PATCH] Fix build with GCC 8.1.0 - -Task-number: QTBUG-68203 -Change-Id: I780d884d5e20ef04e902d7b449da4aa3f97d8d0b -Reviewed-by: Allan Sandfeld Jensen -Signed-off-by: Gaël PORTAY -[gportay: prepend chromium changes with src/3rdparty/chromium] ---- - .../mojo/public/cpp/bindings/associated_interface_ptr_info.h | 2 +- - .../mojo/public/cpp/bindings/associated_interface_request.h | 2 +- - .../mojo/public/cpp/bindings/interface_request.h | 2 +- - .../mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | 2 ++ - .../mojo/public/cpp/system/handle.h | 2 +- - 5 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h -index 1f79662bd7..184ba6a9e8 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h -@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { - - bool is_valid() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return !!handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { - return std::move(handle_); -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h -index 12d2f3ce1d..fcdc2b9321 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h -@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { - // handle. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return !!handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } - -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h -index 1007cb0b8c..da1f3244a3 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h -@@ -54,7 +54,7 @@ class InterfaceRequest { - // Indicates whether the request currently contains a valid message pipe. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return !!handle_; } - - // Removes the message pipe from the request and returns it. - ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h -index 5d00e5019e..ef8a927ba6 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h -@@ -45,6 +45,8 @@ class MOJO_CPP_BINDINGS_EXPORT ScopedInterfaceEndpointHandle { - - bool is_valid() const; - -+ explicit operator bool() const { return is_valid(); } -+ - // Returns true if the interface hasn't associated with a message pipe. - bool pending_association() const; - -diff --git a/src/3rdparty/chromium/mojo/public/cpp/system/handle.h b/src/3rdparty/chromium/mojo/public/cpp/system/handle.h -index 7c886e8825..c9f9e961db 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/system/handle.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/system/handle.h -@@ -121,7 +121,7 @@ class ScopedHandleBase { - - bool is_valid() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return !!handle_; } - - bool operator==(const ScopedHandleBase& other) const { - return handle_.value() == other.get().value(); --- -2.17.1 - diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index b9a226d6ec..ad34e0d8b4 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebengine-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 5dd754d603c66d36e93b96b4f7c24a6e6269ae6a1682a524b8baa664d5c44b45 qtwebengine-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 389d9f42ca393ac11ec8932ce9771766dec91a4c761ffb685cc429c2a760d48c qtwebengine-everywhere-src-5.11.1.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index da44b4d815..2c977b003d 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtwebsockets-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 7d5845805bec42de121ecc063ee40ac1438975adcec395c6af97cfd5bb3539b7 qtwebsockets-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 7aaa12f719e853a195a670ff51697b73914e37c94ed2216d53a2d9e0861748ae qtwebsockets-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index b8eefc24af..8beabd2934 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtx11extras-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 116690a9b4e14267d8be0a252dae3c7a807a8b31b9c831dfb51735c683e96b8f qtx11extras-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 bcf219c8befb9777f891ed7844799f26aecb6d4d92064274277822f261bd8c65 qtx11extras-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 39d9438f5f..67e90059d9 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtxmlpatterns-everywhere-src-5.11.0.tar.xz.mirrorlist -sha256 19a378cba26e243ebb97c29a9ec02499c5eb49f2672fbcc8415e1b70d415d28e qtxmlpatterns-everywhere-src-5.11.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz.mirrorlist +sha256 6117e120c87b32dd07877dd0a6bf862b6285cb0d8b547190882980682f53af58 qtxmlpatterns-everywhere-src-5.11.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 From 7684637bf6274fdfde514d3320b1fc686fea5773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Sat, 30 Jun 2018 00:25:50 +0200 Subject: [PATCH 1965/2640] systemd: bump to v239 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove upstreamed patches * refresh patch 0002 which didn't apply cleanly * update patch 0001 to catch more uses of agetty * the README file hash has changed because some parts of this file were modified between v237 and v239, but the modifications are not related to licensing aspects Signed-off-by: Jérémy Rosen [Thomas: regenerate patches with less "noise", update README file hash.] Signed-off-by: Thomas Petazzoni --- package/systemd/0001-fix-getty-unit.patch | 47 +++- .../0002-install-don-t-use-ln-relative.patch | 12 +- .../0003-fix-am-path-libgcrypt-no-found.patch | 6 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 4 +- package/systemd/systemd.mk | 2 +- 7 files changed, 52 insertions(+), 295 deletions(-) delete mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch delete mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patch diff --git a/package/systemd/0001-fix-getty-unit.patch b/package/systemd/0001-fix-getty-unit.patch index b6947626c5..d546e1ab32 100644 --- a/package/systemd/0001-fix-getty-unit.patch +++ b/package/systemd/0001-fix-getty-unit.patch @@ -1,7 +1,10 @@ -From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001 +From 69e440f9b7a0e9a43ef582d4bb521722b448a7c2 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 31 Jul 2017 10:08:46 -0400 Subject: [PATCH] fix-getty-unit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Prefer getty to agetty in console setup systemd units @@ -9,13 +12,43 @@ Signed-off-by: Maxime Ripard Signed-off-by: Eric Le Bihan [aduskett@gmail.com: Update for systemd v237] Signed-off-by: Adam Duskett +[Jérémy: replace additional usage of agetty by getty.] +Signed-off-by: Jérémy Rosen --- - units/getty@.service.m4 | 5 +---- - units/serial-getty@.service.m4 | 2 +- - 2 files changed, 2 insertions(+), 5 deletions(-) + units/console-getty.service.m4 | 2 +- + units/container-getty@.service.m4 | 2 +- + units/getty@.service.m4 | 5 +---- + units/serial-getty@.service.m4 | 2 +- + 4 files changed, 4 insertions(+), 7 deletions(-) +diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4 +index 3c553240a..fd5ad9456 100644 +--- a/units/console-getty.service.m4 ++++ b/units/console-getty.service.m4 +@@ -23,7 +23,7 @@ ConditionPathExists=/dev/console + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM ++ExecStart=-/sbin/getty -L %I 115200 vt100 + Type=idle + Restart=always + UtmpIdentifier=cons +diff --git a/units/container-getty@.service.m4 b/units/container-getty@.service.m4 +index 087ab7f9b..30f7b66fe 100644 +--- a/units/container-getty@.service.m4 ++++ b/units/container-getty@.service.m4 +@@ -28,7 +28,7 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM ++ExecStart=-/sbin/getty -L %I 115200 vt100 + Type=idle + Restart=always + RestartSec=0 diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index 2a84061..7ad588f 100644 +index 80e793bb7..385758c61 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0 @@ -31,7 +64,7 @@ index 2a84061..7ad588f 100644 Restart=always RestartSec=0 diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 -index b7caeaf..c663612 100644 +index 757b86ab2..3d60efdb6 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -33,7 +33,7 @@ Before=rescue.service @@ -44,5 +77,5 @@ index b7caeaf..c663612 100644 Restart=always UtmpIdentifier=%I -- -2.13.3 +2.14.4 diff --git a/package/systemd/0002-install-don-t-use-ln-relative.patch b/package/systemd/0002-install-don-t-use-ln-relative.patch index 61a139e2a2..a024ac4a23 100644 --- a/package/systemd/0002-install-don-t-use-ln-relative.patch +++ b/package/systemd/0002-install-don-t-use-ln-relative.patch @@ -1,4 +1,4 @@ -From 17560d52e9ec0afebbfe31e694870c6433b36f60 Mon Sep 17 00:00:00 2001 +From 7f4a12d25bbb5859d266f32f7a3d794bb62c354e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 31 Dec 2017 12:46:04 -0500 Subject: [PATCH] install: don't use ln --relative @@ -30,15 +30,15 @@ Signed-off-by: Trent Piepho 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d4af95a44..d75f2b34c 100644 +index 04331dd41..359042c04 100644 --- a/meson.build +++ b/meson.build -@@ -586,7 +586,7 @@ endforeach +@@ -559,7 +559,7 @@ endforeach conf.set_quoted('TELINIT', get_option('telinit-path')) if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative') -+ message('ln does not support --relative') +- error('ln does not support --relative (added in coreutils 8.16)') ++ message('ln does not support --relative (added in coreutils 8.16)') endif ############################################################ @@ -76,5 +76,5 @@ index 70f7172ae..bb8155075 100755 +dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')" +ln -vfs "$dds$unitpath" "$dir" -- -2.14.3 +2.14.4 diff --git a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch index 1861a42126..9935c44292 100644 --- a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch +++ b/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch @@ -1,4 +1,4 @@ -From cb47c1da9c4a8f69662f9c17497aeeb8a922d41a Mon Sep 17 00:00:00 2001 +From 621d9b32d0a5598ea7f258b96f7110de4d1c48b6 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Fri, 28 Jul 2017 07:13:51 -0400 Subject: [PATCH] Fix AM_PATH_LIBGCRYPT not found @@ -27,7 +27,7 @@ Signed-off-by: Adam Duskett diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 new file mode 100644 -index 0000000..831dc0c +index 000000000..831dc0c6f --- /dev/null +++ b/m4/libgcrypt.m4 @@ -0,0 +1,123 @@ @@ -155,5 +155,5 @@ index 0000000..831dc0c + AC_SUBST(LIBGCRYPT_LIBS) +]) -- -2.13.3 +2.14.4 diff --git a/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch b/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch deleted file mode 100644 index b91d09722b..0000000000 --- a/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Mon, 26 Mar 2018 17:34:53 +0200 -Subject: [PATCH] core: don't include libmount.h in a header file (#8580) - -linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* -definitions. - -To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h -should be included. And missing.h must be included last. - -Without this, building systemd may fail with: - -In file included from [...]/libmount/libmount.h:31:0, - from ../systemd-238/src/core/manager.h:23, - from ../systemd-238/src/core/emergency-action.h:37, - from ../systemd-238/src/core/unit.h:34, - from ../systemd-238/src/core/dbus-timer.h:25, - from ../systemd-238/src/core/timer.c:26: -[...]/sys/mount.h:57:2: error: expected identifier before numeric constant - -Upstream: https://github.com/systemd/systemd/pull/8580 -Signed-off-by: Stefan Becker ---- - src/core/dbus-execute.c | 1 + - src/core/manager.h | 3 ++- - src/core/mount.c | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 7344623ebf6..c342093bca4 100644 ---- a/src/core/dbus-execute.c -+++ b/src/core/dbus-execute.c -@@ -18,6 +18,7 @@ - along with systemd; If not, see . - ***/ - -+#include - #include - #include - -diff --git a/src/core/manager.h b/src/core/manager.h -index 28c5da225b1..e09e0cdf5e9 100644 ---- a/src/core/manager.h -+++ b/src/core/manager.h -@@ -20,7 +20,6 @@ - along with systemd; If not, see . - ***/ - --#include - #include - #include - -@@ -34,6 +33,8 @@ - #include "list.h" - #include "ratelimit.h" - -+struct libmnt_monitor; -+ - /* Enforce upper limit how many names we allow */ - #define MANAGER_MAX_NAMES 131072 /* 128K */ - -diff --git a/src/core/mount.c b/src/core/mount.c -index 0e755da5c02..0154ebda5d6 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - #include "sd-messages.h" - - #include "alloc-util.h" diff --git a/package/systemd/0005-basic-macros-rename-noreturn.patch b/package/systemd/0005-basic-macros-rename-noreturn.patch deleted file mode 100644 index 6cd847098e..0000000000 --- a/package/systemd/0005-basic-macros-rename-noreturn.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 848e863acc51ecfb0f3955c498874588201d9130 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 15 Mar 2018 06:23:46 +0100 -Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -"noreturn" is reserved and can be used in other header files we include: - - [ 16s] In file included from /usr/include/gcrypt.h:30:0, - [ 16s] from ../src/journal/journal-file.h:26, - [ 16s] from ../src/journal/journal-vacuum.c:31: - [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token - [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); - -Here we include grcrypt.h (which in turns include gpg-error.h) *after* we -"noreturn" was defined in macro.h. - -Upstream: https://github.com/systemd/systemd/pull/8456 -Signed-off-by: Stefan Becker ---- - src/basic/log.c | 4 ++-- - src/basic/log.h | 4 ++-- - src/basic/macro.h | 19 +++++++++---------- - src/basic/process-util.c | 2 +- - src/basic/process-util.h | 2 +- - src/core/main.c | 4 ++-- - src/journal/test-journal-interleaving.c | 2 +- - src/shared/pager.c | 2 +- - src/udev/collect/collect.c | 2 +- - 9 files changed, 20 insertions(+), 21 deletions(-) - -diff --git a/src/basic/log.c b/src/basic/log.c -index 7a7f2cbec13..16a2431c548 100644 ---- a/src/basic/log.c -+++ b/src/basic/log.c -@@ -814,7 +814,7 @@ static void log_assert( - log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); - } - --noreturn void log_assert_failed_realm( -+_noreturn_ void log_assert_failed_realm( - LogRealm realm, - const char *text, - const char *file, -@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm( - abort(); - } - --noreturn void log_assert_failed_unreachable_realm( -+_noreturn_ void log_assert_failed_unreachable_realm( - LogRealm realm, - const char *text, - const char *file, -diff --git a/src/basic/log.h b/src/basic/log.h -index efcf0f1bfc1..314be128a23 100644 ---- a/src/basic/log.h -+++ b/src/basic/log.h -@@ -186,7 +186,7 @@ int log_dump_internal( - char *buffer); - - /* Logging for various assertions */ --noreturn void log_assert_failed_realm( -+_noreturn_ void log_assert_failed_realm( - LogRealm realm, - const char *text, - const char *file, -@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm( - #define log_assert_failed(text, ...) \ - log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) - --noreturn void log_assert_failed_unreachable_realm( -+_noreturn_ void log_assert_failed_unreachable_realm( - LogRealm realm, - const char *text, - const char *file, -diff --git a/src/basic/macro.h b/src/basic/macro.h -index 95be63a2040..8911edfc4be 100644 ---- a/src/basic/macro.h -+++ b/src/basic/macro.h -@@ -53,6 +53,15 @@ - #else - #define _fallthrough_ - #endif -+/* Define C11 noreturn without and even on older gcc -+ * compiler versions */ -+#ifndef _noreturn_ -+#if __STDC_VERSION__ >= 201112L -+#define _noreturn_ _Noreturn -+#else -+#define _noreturn_ __attribute__((noreturn)) -+#endif -+#endif - - /* Temporarily disable some warnings */ - #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ -@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { - #endif - #endif - --/* Define C11 noreturn without and even on older gcc -- * compiler versions */ --#ifndef noreturn --#if __STDC_VERSION__ >= 201112L --#define noreturn _Noreturn --#else --#define noreturn __attribute__((noreturn)) --#endif --#endif -- - #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ - static inline void func##p(type *p) { \ - if (*p) \ -diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index aa9846db5dc..e6120af5b68 100644 ---- a/src/basic/process-util.c -+++ b/src/basic/process-util.c -@@ -987,7 +987,7 @@ bool is_main_thread(void) { - return cached > 0; - } - --noreturn void freeze(void) { -+_noreturn_ void freeze(void) { - - log_close(); - -diff --git a/src/basic/process-util.h b/src/basic/process-util.h -index 93029e36e5f..5170adec7bb 100644 ---- a/src/basic/process-util.h -+++ b/src/basic/process-util.h -@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid); - - bool is_main_thread(void); - --noreturn void freeze(void); -+_noreturn_ void freeze(void); - - bool oom_score_adjust_is_valid(int oa); - -diff --git a/src/core/main.c b/src/core/main.c -index 076846a41c0..4b2d1492373 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; - static sd_id128_t arg_machine_id = {}; - static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; - --noreturn static void freeze_or_reboot(void) { -+_noreturn_ static void freeze_or_reboot(void) { - - if (arg_crash_reboot) { - log_notice("Rebooting in 10s..."); -@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { - freeze(); - } - --noreturn static void crash(int sig) { -+_noreturn_ static void crash(int sig) { - struct sigaction sa; - pid_t pid; - -diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c -index 5a88b2774fa..d87bdbdd32a 100644 ---- a/src/journal/test-journal-interleaving.c -+++ b/src/journal/test-journal-interleaving.c -@@ -37,7 +37,7 @@ - - static bool arg_keep = false; - --noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { -+_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { - log_internal(LOG_CRIT, error, file, line, func, - "'%s' failed at %s:%u (%s): %m", text, file, line, func); - abort(); -diff --git a/src/shared/pager.c b/src/shared/pager.c -index 75db3c985bd..681af9c40e3 100644 ---- a/src/shared/pager.c -+++ b/src/shared/pager.c -@@ -47,7 +47,7 @@ static int stored_stderr = -1; - static bool stdout_redirected = false; - static bool stderr_redirected = false; - --noreturn static void pager_fallback(void) { -+_noreturn_ static void pager_fallback(void) { - int r; - - r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); -diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c -index 2821640e93b..c8fa47b3d7d 100644 ---- a/src/udev/collect/collect.c -+++ b/src/udev/collect/collect.c -@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) - return container_of(node, struct _mate, node); - } - --noreturn static void sig_alrm(int signo) -+_noreturn_ static void sig_alrm(int signo) - { - exit(4); - } diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index d580a29b83..012f1e595e 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c systemd-237.tar.gz +sha256 8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14 systemd-239.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 9c7709aa401a41c4c3f33ea75c34ae5d5354d62c310c3391c2a5958952d8aadd README +sha256 37ab495827a3cdbbc35ceaba3066764d69b6490e514e0c8a1acdb3c2fdb9e921 README diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 82d0e1a027..16c9d9f290 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 237 +SYSTEMD_VERSION = 239 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README From 48a3afc12c858de22818412c3fb05ee2ba163e5a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 13:56:53 +0200 Subject: [PATCH 1966/2640] systemd: drop patch 0003-fix-am-path-libgcrypt-no-found.patch Since commit db860d7837ca8665524f4046030beaf3d7f5e932 ("systemd: bump to 236, convert to meson"), we're no longer using the autotools build system, and have switched to meson. Therefore, patching m4 files is no longer useful. Suggested-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../0003-fix-am-path-libgcrypt-no-found.patch | 159 ------------------ 1 file changed, 159 deletions(-) delete mode 100644 package/systemd/0003-fix-am-path-libgcrypt-no-found.patch diff --git a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch deleted file mode 100644 index 9935c44292..0000000000 --- a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 621d9b32d0a5598ea7f258b96f7110de4d1c48b6 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Fri, 28 Jul 2017 07:13:51 -0400 -Subject: [PATCH] Fix AM_PATH_LIBGCRYPT not found - -This patch installs a copy of libgcrypt.m4 from the libgcrypt source tarball -to systemd m4 directory. - -Libgcrypt uses a custom m4 macro and not pkg-config to check if the -development files are available. Though libgcrypt support is optional in -systemd, this macro should be available whenever autoreconf is used, otherwise -the re-configuration will fail with: - - configure.ac:616: warning: macro 'AM_PATH_LIBGCRYPT' not found in library - -As asking the user to install the development package of libgcrypt on the host -machine or adding libgcrypt as a build dependency to systemd is not -acceptable, the required file is added to the m4 directory. - -Signed-off-by: Eric Le Bihan -[Adam: Refresh for 234] -Signed-off-by: Adam Duskett ---- - m4/libgcrypt.m4 | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 123 insertions(+) - create mode 100644 m4/libgcrypt.m4 - -diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 -new file mode 100644 -index 000000000..831dc0c6f ---- /dev/null -+++ b/m4/libgcrypt.m4 -@@ -0,0 +1,123 @@ -+dnl Autoconf macros for libgcrypt -+dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. -+dnl -+dnl This file is free software; as a special exception the author gives -+dnl unlimited permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+dnl This file is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -+dnl with the API version to also check the API compatibility. Example: -+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -+dnl this features allows to prevent build against newer versions of libgcrypt -+dnl with a changed API. -+dnl -+AC_DEFUN([AM_PATH_LIBGCRYPT], -+[ AC_ARG_WITH(libgcrypt-prefix, -+ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], -+ [prefix where LIBGCRYPT is installed (optional)]), -+ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") -+ if test x$libgcrypt_config_prefix != x ; then -+ if test x${LIBGCRYPT_CONFIG+set} != xset ; then -+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config -+ fi -+ fi -+ -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ tmp=ifelse([$1], ,1:1.2.0,$1) -+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` -+ else -+ req_libgcrypt_api=0 -+ min_libgcrypt_version="$tmp" -+ fi -+ -+ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) -+ ok=no -+ if test "$LIBGCRYPT_CONFIG" != "no" ; then -+ req_major=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ req_minor=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ req_micro=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` -+ major=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -+ minor=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -+ micro=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` -+ if test "$major" -gt "$req_major"; then -+ ok=yes -+ else -+ if test "$major" -eq "$req_major"; then -+ if test "$minor" -gt "$req_minor"; then -+ ok=yes -+ else -+ if test "$minor" -eq "$req_minor"; then -+ if test "$micro" -ge "$req_micro"; then -+ ok=yes -+ fi -+ fi -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ if test $ok = yes; then -+ # If we have a recent libgcrypt, we should also check that the -+ # API is compatible -+ if test "$req_libgcrypt_api" -gt 0 ; then -+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` -+ if test "$tmp" -gt 0 ; then -+ AC_MSG_CHECKING([LIBGCRYPT API version]) -+ if test "$req_libgcrypt_api" -eq "$tmp" ; then -+ AC_MSG_RESULT([okay]) -+ else -+ ok=no -+ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` -+ ifelse([$2], , :, [$2]) -+ if test x"$host" != x ; then -+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` -+ if test x"$libgcrypt_config_host" != xnone ; then -+ if test x"$libgcrypt_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBGCRYPT_CONFIG was -+*** built for $libgcrypt_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libgcrypt-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi -+ fi -+ else -+ LIBGCRYPT_CFLAGS="" -+ LIBGCRYPT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(LIBGCRYPT_CFLAGS) -+ AC_SUBST(LIBGCRYPT_LIBS) -+]) --- -2.14.4 - From b8dd03de565296698ceaff2aca22867ef365613c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Sat, 30 Jun 2018 00:25:51 +0200 Subject: [PATCH 1967/2640] systemd: add optional dependency on pcre2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit systemd can use libpcre2 when available, so this commit adds the detection of this library. Signed-off-by: Jérémy Rosen Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 16c9d9f290..0d5e348594 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -144,6 +144,13 @@ else SYSTEMD_CONF_OPTS += -Dgcrypt=false endif +ifeq ($(BR2_PACKAGE_PCRE2),y) +SYSTEMD_DEPENDENCIES += pcre2 +SYSTEMD_CONF_OPTS += -Dpcre2=true +else +SYSTEMD_CONF_OPTS += -Dpcre2=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd SYSTEMD_CONF_OPTS += -Dmicrohttpd=true From 9d912e619d48a7dfaed29d490bf389603974cfd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Sat, 30 Jun 2018 00:25:52 +0200 Subject: [PATCH 1968/2640] systemd: fix nogroup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The special 65534 group is named nogroup (not nobody) in buildroot tell systemd about that Signed-off-by: Jérémy Rosen Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0d5e348594..10e11a9277 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -43,7 +43,8 @@ SYSTEMD_CONF_OPTS += \ -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ -Dmount-path=/usr/bin/mount \ - -Dumount-path=/usr/bin/umount + -Dumount-path=/usr/bin/umount \ + -Dnobody-group=nogroup # disable unsupported features for non-glibc toolchains ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) From e46257264ed773a9c2b94e0e4f0131187a8940ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Jun 2018 15:54:34 +0200 Subject: [PATCH 1969/2640] libwebsockets: add optional libevent dependency libevent is supported since 2.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libwebsockets/libwebsockets.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 28fd183393..81e398bedd 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -35,6 +35,13 @@ else LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF endif +ifeq ($(BR2_PACKAGE_LIBEVENT),y) +LIBWEBSOCKETS_DEPENDENCIES += libevent +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF +endif + ifeq ($(BR2_PACKAGE_LIBUV),y) LIBWEBSOCKETS_DEPENDENCIES += libuv LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=ON From f00e599ccd75161e23e9fc882817b02f904a95ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 14:52:57 +0200 Subject: [PATCH 1970/2640] libucl: add optional libcurl dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libucl/libucl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libucl/libucl.mk b/package/libucl/libucl.mk index 087fea683d..9f0378ad9c 100644 --- a/package/libucl/libucl.mk +++ b/package/libucl/libucl.mk @@ -12,4 +12,11 @@ LIBUCL_LICENSE = BSD-2-Clause LIBUCL_LICENSE_FILES = COPYING LIBUCL_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBUCL_DEPENDENCIES += libcurl +LIBUCL_CONF_OPTS += --enable-urls +else +LIBUCL_CONF_OPTS += --disable-urls +endif + $(eval $(autotools-package)) From 8645c350997dc662c234c6901c11c8f0efeb62e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Jul 2018 14:55:13 +0200 Subject: [PATCH 1971/2640] package/dovecot-pigeonhole: bump version to 0.5.2 Switched _SITE to https. Release notes: https://www.dovecot.org/list/dovecot-news/2018-June/000384.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 2950476102..8d34ee2d48 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 e3b0aa59261881bcb0d33a6c398f3cb5f9f75e077e67bae175cf33c362577547 dovecot-2.3-pigeonhole-0.5.1.tar.gz +sha256 950e8e15c58e539761255e140dd3678dd2477fa432a5f2b804e53821bdc02535 dovecot-2.3-pigeonhole-0.5.2.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index f70ae5c02d..f78b1acccc 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,9 +4,9 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.1 +DOVECOT_PIGEONHOLE_VERSION = 0.5.2 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz -DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.3 +DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot From 326d466e46cb7e9e02c7420adb72cd46260d8bdc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Jul 2018 14:55:14 +0200 Subject: [PATCH 1972/2640] package/dovecot: bump version to 2.3.2 Switched _SITE to https. Release notes: https://www.dovecot.org/list/dovecot-news/2018-June/000383.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index cd2a0809fe..46774e0d2e 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 0883821b97fd02a084a84b9469a681f7e6edc56541d854b5419d98891c51fb93 dovecot-2.3.1.tar.gz +sha256 6e48f0fa60768427f03035b0a3e93d1ae29b972bb2bd9ca998ccc6a0f6dae393 dovecot-2.3.2.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 1a10b30e16..3923ee9e05 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,8 +5,8 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).1 -DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).2 +DOVECOT_SITE = https://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT From 58dcd28dfbed481becb822b009583a63efbc6ffa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 21 May 2018 18:17:06 +0200 Subject: [PATCH 1973/2640] arch: drop now useless support for FDPIC Now that we dropped support for blackfin, we no longer have any architecture that supports FDPIC, so BR2_ARCH_HAS_FDPIC_SUPPORT is never selected, so we can't select BR2_BINFMT_FDPIC. Drop all of that now. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in | 14 -------------- package/uclibc/uclibc.mk | 8 -------- 2 files changed, 22 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index a16012bdfd..7d1aeb2174 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -15,9 +15,6 @@ config BR2_ARCH_HAS_MMU_MANDATORY config BR2_ARCH_HAS_MMU_OPTIONAL bool -config BR2_ARCH_HAS_FDPIC_SUPPORT - bool - choice prompt "Target Architecture" default BR2_i386 @@ -344,7 +341,6 @@ config BR2_READELF_ARCH_NAME choice prompt "Target Binary Format" default BR2_BINFMT_ELF if BR2_USE_MMU - default BR2_BINFMT_FDPIC if BR2_ARCH_HAS_FDPIC_SUPPORT default BR2_BINFMT_FLAT config BR2_BINFMT_ELF @@ -356,16 +352,6 @@ config BR2_BINFMT_ELF and executables used across different architectures and operating systems. -config BR2_BINFMT_FDPIC - bool "FDPIC" - depends on BR2_ARCH_HAS_FDPIC_SUPPORT - select BR2_BINFMT_SUPPORTS_SHARED - help - ELF FDPIC binaries are based on ELF, but allow the individual - load segments of a binary to be located in memory - independently of each other. This makes this format ideal for - use in environments where no MMU is available. - config BR2_BINFMT_FLAT bool "FLAT" depends on !BR2_USE_MMU diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index bb44da28b4..63d36943ed 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -52,14 +52,6 @@ UCLIBC_LOCALES = \ endif # noMMU binary formats -ifeq ($(BR2_BINFMT_FDPIC),y) -define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) -endef -endif ifeq ($(BR2_BINFMT_FLAT_ONE),y) define UCLIBC_BINFMT_CONFIG $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) From 4e77bafd28435c1444e02ca1c0c3d1cab9245258 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:44:44 +0200 Subject: [PATCH 1974/2640] poco: regenerate patch 0001-poco-add-the-staging-path-to-search-path.patch This commit regenerates the patch 0001-poco-add-the-staging-path-to-search-path.patch to not have numbering. Signed-off-by: Thomas Petazzoni --- ...0001-poco-add-the-staging-path-to-search-path.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch index 5695b62618..5453cba13f 100644 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch @@ -1,7 +1,7 @@ -From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001 +From a3cb6e42fc2cfa0620ba737148fcbea0cf96a984 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH 1/2] poco: add the staging path to search path +Subject: [PATCH] poco: add the staging path to search path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -19,10 +19,10 @@ Signed-off-by: Jörg Krause 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 0b18ca5..094e807 100644 +index c6fc2ac1c..955fee2d4 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile -@@ -8,8 +8,8 @@ +@@ -6,8 +6,8 @@ include $(POCO_BASE)/build/rules/global @@ -34,5 +34,5 @@ index 0b18ca5..094e807 100644 objects = Binder Extractor SessionImpl Connector \ -- -2.5.0 +2.14.4 From d8dd945b2d31f310fdb010e0416edf5e2ea617f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:45:29 +0200 Subject: [PATCH 1975/2640] poco: replace m68k support patch by upstream backport The m68k fix was merged upstream, so let's backport the upstream commit. Signed-off-by: Thomas Petazzoni --- .../0002-Add-support-for-m68000-1856.patch | 30 +++++++++++++++++++ .../0002-fix-m68k-double-conv-detect.patch | 19 ------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 package/poco/0002-Add-support-for-m68000-1856.patch delete mode 100644 package/poco/0002-fix-m68k-double-conv-detect.patch diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch new file mode 100644 index 0000000000..1cf99bf09c --- /dev/null +++ b/package/poco/0002-Add-support-for-m68000-1856.patch @@ -0,0 +1,30 @@ +From e49753f7654dc62087e47731832d5992cc4d194e Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof +Date: Wed, 23 Aug 2017 16:50:51 +0200 +Subject: [PATCH] Add support for m68000 (#1856) + +Originally taken from + +https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da + +Signed-off-by: Thomas Petazzoni +--- + Foundation/src/utils.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 69cea1aca..a7bda0171 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -65,6 +65,8 @@ + defined(__AARCH64EL__) || \ + defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++#elif defined(__mc68000__) ++#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) + // Windows uses a 64bit wide floating point stack. +-- +2.14.4 + diff --git a/package/poco/0002-fix-m68k-double-conv-detect.patch b/package/poco/0002-fix-m68k-double-conv-detect.patch deleted file mode 100644 index 3ca03fc7be..0000000000 --- a/package/poco/0002-fix-m68k-double-conv-detect.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes compile for m68k. - -From upstream double-conversion commit da111796231: -https://github.com/google/double-conversion/blob/master/double-conversion/utils.h - -Signed-off-by: Waldemar Brodkorb - -diff -Nur poco-poco-1.7.2-release.orig/Foundation/src/utils.h poco-poco-1.7.2-release/Foundation/src/utils.h ---- poco-poco-1.7.2-release.orig/Foundation/src/utils.h 2016-03-19 08:19:35.000000000 +0100 -+++ poco-poco-1.7.2-release/Foundation/src/utils.h 2016-08-11 02:55:02.827238119 +0200 -@@ -63,6 +63,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. From a33e5c9a3a78c1717f7f07795bbabdbc84e837bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:46:02 +0200 Subject: [PATCH 1976/2640] poco: fix build on AArch 64 BE The build of Poco currently fails on AArch64 BE due to the built-in double-conversion code. This commit adds a patch that adapts an upstream double-conversion fix to the Poco code base. Fixes: http://autobuild.buildroot.net/results/d8d17f3cb669585af592afb5e824088ae82ccbcf/ Signed-off-by: Thomas Petazzoni --- ...tils.h-backport-double-conversion-ch.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch new file mode 100644 index 0000000000..8193457f97 --- /dev/null +++ b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch @@ -0,0 +1,32 @@ +From b077b4a5afbfde47288baed072152a6b7f318250 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 1 Jul 2018 15:37:47 +0200 +Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for + AArch64 BE support + +This commit, identical to upstream double-conversion commit +https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a +allows Poco to build on AArch64 big-endian. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/pocoproject/poco/pull/2378 +--- + Foundation/src/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index a7bda0171..fd49e1768 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -62,7 +62,7 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || \ ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ + defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) +-- +2.14.4 + From 3c59813b52f480268af6229738e2b65f944e26d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Jun 2018 20:39:45 +0200 Subject: [PATCH 1977/2640] python-libconfig: fix build with python2 Since boost 1.67, libboost_python is now named libboost_python27 when python2 is enabled Fixes: - http://autobuild.buildroot.net/results/a1feb4c4b70b3c939ae1127417130ea33a91159b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...termine-boost_python-name-depending-on-current-Pyt.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch index 53000cd678..478bac76f6 100644 --- a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch +++ b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch @@ -4,8 +4,8 @@ Date: Thu, 27 Jul 2017 09:46:07 +0200 Subject: [PATCH] Determine boost_python name depending on current Python version -Python2 requires boost_python and Python3 requires boost_python36 (since -boost 1.67). +Python2 requires boost_python27 and Python3 requires boost_python36 +(since boost 1.67). Signed-off-by: Yegor Yefremov Signed-off-by: Fabrice Fontaine @@ -23,7 +23,7 @@ index fdf5c27..4b38569 100644 +boostlib = "boost_python36" +if sys.version_info < (3, 0): -+ boostlib = "boost_python" ++ boostlib = "boost_python27" + setup( name = 'pylibconfig', From a20893f827e74b9af2bc587ff36a903d016fd63e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 15:52:40 +0200 Subject: [PATCH 1978/2640] boost: filesystem needs system output/host/usr/bin/m68k-linux-readelf -d output/staging/usr/lib/libboost_filesystem.so Dynamic section at offset 0x17f00 contains 28 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index ac79bb345b..f5369d7cf2 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -145,6 +145,7 @@ comment "boost-fiber needs a toolchain not affected by GCC bug 64735, 85180" config BR2_PACKAGE_BOOST_FILESYSTEM bool "boost-filesystem" + select BR2_PACKAGE_BOOST_SYSTEM help The Boost Filesystem Library provides portable facilities to query and manipulate paths, files, and directories. From 103f3557fbba10b2509d966bfb6edb8dde14b88d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 16:00:43 +0200 Subject: [PATCH 1979/2640] boost: chrono needs system output/host/usr/bin/mips-linux-gnu-readelf -d output/staging/usr/lib/libboost_chrono.so Dynamic section at offset 0x2c0 contains 30 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index f5369d7cf2..12eb98ae21 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -57,6 +57,7 @@ config BR2_PACKAGE_BOOST_ATOMIC config BR2_PACKAGE_BOOST_CHRONO bool "boost-chrono" + select BR2_PACKAGE_BOOST_SYSTEM help Useful time utilities. C++11. From 0567cd37c5bf4f11747f6674a0b3f9a2da9440ab Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 1 Jul 2018 20:06:00 +0200 Subject: [PATCH 1980/2640] perl-cross: bump to version 1.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl/perl.hash | 4 ++-- package/perl/perl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 210f6d581b..6936b22e03 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -3,5 +3,5 @@ md5 1fa1b53eeff76aa37b17bfc9b2771671 perl-5.2 sha1 bfa5c7921ed7bf5e035dbf2f7ff81367b81e372c perl-5.26.2.tar.xz sha256 0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c perl-5.26.2.tar.xz -# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.hash -sha256 0bbb450e48d07e7fdf867d578b1780ac8f0e8dc284d52301dac4d763b42f6041 perl-cross-1.1.9.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2/perl-cross-1.2.hash +sha256 599077beb86af5e6097da8922a84474a5484f61475d2899eae0f8634e9619109 perl-cross-1.2.tar.gz diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f7e5604edb..b0eea3eff4 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -13,7 +13,7 @@ PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.1.9 +PERL_CROSS_VERSION = 1.2 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From 855295b6588abd1878419c9ada1b7cef387a57c5 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 25 Jun 2018 21:12:37 +0200 Subject: [PATCH 1981/2640] gnuradio: add zeromq support This patch adds support for sink/source GNURadio blocks to send/receive zeromq data stream. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 7 +++++++ package/gnuradio/gnuradio.mk | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 178bdc8861..d2892faff2 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -69,6 +69,13 @@ config BR2_PACKAGE_GNURADIO_UTILS help Misc python utilities +config BR2_PACKAGE_GNURADIO_ZEROMQ + bool "gr-zeromq support" + select BR2_PACKAGE_CPPZMQ + select BR2_PACKAGE_PYTHON_PYZMQ if BR2_PACKAGE_GNURADIO_PYTHON + help + zeromq communication support + comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision" depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index e79f848388..9573b65b73 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -147,4 +147,14 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_ZEROMQ),y) +GNURADIO_DEPENDENCIES += cppzmq +ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) +GNURADIO_DEPENDENCIES += python-pyzmq +endif +GNURADIO_CONF_OPTS += -DENABLE_GR_ZEROMQ=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_ZEROMQ=OFF +endif + $(eval $(cmake-package)) From 48f869f3147d1aafffb3e46717b375badc8d9225 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 21:16:44 +0200 Subject: [PATCH 1982/2640] boost: timer needs chrono and system output/host/usr/bin/m68k-linux-readelf -d output/staging/usr/lib/libboost_timer.so Dynamic section at offset 0x5ef8 contains 29 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 12eb98ae21..1dc7924a2f 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -300,6 +300,8 @@ config BR2_PACKAGE_BOOST_THREAD config BR2_PACKAGE_BOOST_TIMER bool "boost-timer" + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_SYSTEM help Event timer, progress timer, and progress display classes. From 3ad3c41213694ab22f27ae518263a6eb1961adb6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 21:17:12 +0200 Subject: [PATCH 1983/2640] boost: test needs system and timer output/host/usr/bin/m68k-linux-readelf -d output/staging/usr/lib/libboost_prg_exec_monitor.so Dynamic section at offset 0xdef8 contains 29 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_timer.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1dc7924a2f..c0da58475e 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -289,6 +289,8 @@ config BR2_PACKAGE_BOOST_SYSTEM config BR2_PACKAGE_BOOST_TEST bool "boost-test" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_TIMER help Support for simple program testing, full unit testing, and for program execution monitoring. From a315d2c7fe5d6bfa186a5dd7c521f55905177ca1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 21:17:32 +0200 Subject: [PATCH 1984/2640] boost: random needs system output/host/usr/bin/m68k-linux-readelf -d output/staging/usr/lib/libboost_random.so Dynamic section at offset 0x5f20 contains 24 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index c0da58475e..f8eb9422f9 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -252,6 +252,7 @@ config BR2_PACKAGE_BOOST_PYTHON config BR2_PACKAGE_BOOST_RANDOM bool "boost-random" + select BR2_PACKAGE_BOOST_SYSTEM help A complete system for random number generation. From c33ae99b26a7bea9d448e515942559aab65b7d14 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Jul 2018 21:18:07 +0200 Subject: [PATCH 1985/2640] boost: contract needs system output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_contract.so Dynamic section at offset 0x19f00 contains 28 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index f8eb9422f9..cfad03f55a 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -90,6 +90,7 @@ config BR2_PACKAGE_BOOST_CONTRACT bool "boost-contract" # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_BOOST_SYSTEM help Contract programming for C++. From ca54f17a0ec7f3722e339eb2772c2f2e5e004bbd Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 2 Jul 2018 21:15:37 +0300 Subject: [PATCH 1986/2640] stress-ng: fix build with kernel headers v3.9 Add a patch correcting the kernel headers version test macro. Fixes: http://autobuild.buildroot.net/results/cbf/cbfb80117840bddd5712bcda3caeaaff61745b0b/ http://autobuild.buildroot.net/results/649/64941ac5b7dcd9c100bdc47cdfe73cce5f23c3d8/ http://autobuild.buildroot.net/results/741/741f5881d3cb745d1003ede3f762c20eb72de0b5/ Cc: Romain Naour Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...link-proc-fix-build-with-kernel-v3.9.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch diff --git a/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch b/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch new file mode 100644 index 0000000000..6cbba5e729 --- /dev/null +++ b/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch @@ -0,0 +1,38 @@ +From f3aa381322a4b73b9ca4e7940f802d74324ef24b Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Mon, 2 Jul 2018 21:06:43 +0300 +Subject: [PATCH] stress-netlink-proc: fix build with kernel v3.9 + +The PROC_EVENT_COREDUMP has been introduced in kernel version 3.10. +Don't use it with 3.9 headers. + +Fixes build failure: + +stress-netlink-proc.c: In function 'monitor': +stress-netlink-proc.c:108:8: error: 'PROC_EVENT_COREDUMP' undeclared (first use in this function) + case PROC_EVENT_COREDUMP: + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/ColinIanKing/stress-ng/pull/24 + + stress-netlink-proc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stress-netlink-proc.c b/stress-netlink-proc.c +index 5845610dc816..6114a0b92af1 100644 +--- a/stress-netlink-proc.c ++++ b/stress-netlink-proc.c +@@ -104,7 +104,7 @@ static int monitor(const args_t *args, const int sock) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) + case PROC_EVENT_SID: + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) + case PROC_EVENT_COREDUMP: + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) +-- +2.18.0 + From 5e62da7f88e9eb75d4afb1092d15af3d6c539ff7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jul 2018 17:51:52 +0200 Subject: [PATCH 1987/2640] luasec: bump to version 0.7 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luasec/Config.in | 2 +- package/luasec/luasec.hash | 2 +- package/luasec/luasec.mk | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/luasec/Config.in b/package/luasec/Config.in index 9391cd9d37..d7900a081f 100644 --- a/package/luasec/Config.in +++ b/package/luasec/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_LUASEC LuaSec is a binding for OpenSSL library to provide TLS/SSL communication. - http://www.inf.puc-rio.br/~brunoos/luasec/ + https://github.com/brunoos/luasec/wiki diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 9d721ed485..1fdbe7d7e5 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1d04e2f70bc055348dda3cc3566d27d8408094bc944aa5c6a4ae18bffe5c0007 luasec-0.6-1.src.rock +sha256 383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a luasec-0.7-1.src.rock diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 28c4b2c64b..7ae7290937 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,8 +4,9 @@ # ################################################################################ -LUASEC_VERSION = 0.6-1 -LUASEC_SUBDIR = luasec +LUASEC_VERSION_UPSTREAM = 0.7 +LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-1 +LUASEC_SUBDIR = luasec-luasec-$(LUASEC_VERSION_UPSTREAM) LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE LUASEC_DEPENDENCIES = openssl From bfb6aef1eaf222a3a673746b7f6c78989900aa01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 2 Jul 2018 10:49:22 -0400 Subject: [PATCH 1988/2640] qt5webkit: fix installation of headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Qt 5.11, the headers are not installed anymore. The issue comes from a update in qt5base [1] which is not backported to qt5webkit because it is not officially supported anymore by Qt. Fixes build issues with qt5webkit-examples that requires QtWebKit headers: In file included from main.cpp:42: window.h:46:10: fatal error: QWebElement: No such file or directory #include ^~~~~~~~~~~~~ compilation terminated. [1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- ...05-Fix-installation-of-class-headers.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch diff --git a/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch new file mode 100644 index 0000000000..abddfe5d14 --- /dev/null +++ b/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch @@ -0,0 +1,31 @@ +Fix installation of class headers + +Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been +removed. It has been replaced by a new variable GENERATED_HEADER_FILES. + +The class headers were not generated, this commit moves them directly to +HEADER_FILES. + +[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 + +Signed-off-by: Gaël PORTAY +diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri +--- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri 2018-06-29 09:21:06.395038976 -0400 ++++ qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri 2018-06-29 17:37:52.500020060 -0400 +@@ -1,5 +1,4 @@ +-SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit +-SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion ++SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion + SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h + SYNCQT.INJECTED_PRIVATE_HEADER_FILES = + SYNCQT.QPA_HEADER_FILES = +diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri +--- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri 2018-06-29 09:21:06.391705602 -0400 ++++ qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri 2018-06-29 17:38:47.660648435 -0400 +@@ -1,5 +1,4 @@ +-SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets +-SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion ++SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion + SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h + SYNCQT.INJECTED_PRIVATE_HEADER_FILES = + SYNCQT.QPA_HEADER_FILES = From d0505b849f20ad7396c767cc18159df6af40099f Mon Sep 17 00:00:00 2001 From: "David De Grave (Essensium/Mind)" Date: Mon, 2 Jul 2018 14:38:20 +0200 Subject: [PATCH 1989/2640] support/dependencies/dependencies.sh: add details for Redhat/Fedora Add the i686 package list to install when using pre-built 32 bits binaries with a redhat/fedora host distribution (glibc.i686 and zlib.i686). Signed-off-by: David De Grave (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index e570a9ee1a..58c34d880f 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -222,6 +222,8 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then echo "If you're running a Debian/Ubuntu distribution, install the libc6-i386," echo "lib32stdc++6, and lib32z1 packages (or alternatively libc6:i386," echo "libstdc++6:i386, and zlib1g:i386)." + echo "If you're running a RedHat/Fedora distribution, install the glibc.i686 and" + echo "zlib.i686 packages." echo "For other distributions, refer to the documentation on how to install the 32 bits" echo "compatibility libraries." exit 1 From 9086de8e15d98abda64850c52b66756646e0c2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 2 Jul 2018 11:21:37 +0200 Subject: [PATCH 1990/2640] qt5charts: fix license information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5charts-2.1.3 (build with Qt 5.6) doesn't contain any license files so remove LICENSE.GPL3 from QT5CHARTS_LICENSE_FILES when building Qt 5.6. Fixes: http://autobuild.buildroot.net/results/c95d34129902a0511b8d64c9d50f1ffa293b33fd http://autobuild.buildroot.net/results/b9c14ce7c2fdaa412eb6416ae12a0376aaf05770 http://autobuild.buildroot.net/results/1bde69c515d9140ef0f9a5571475c2850c7b8dee Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- package/qt5/qt5charts/qt5charts.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 71d0e54027..9e2e6de881 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -16,7 +16,9 @@ QT5CHARTS_DEPENDENCIES = qt5base QT5CHARTS_INSTALL_STAGING = YES QT5CHARTS_LICENSE = GPL-3.0 +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 +endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5CHARTS_DEPENDENCIES += qt5declarative From 83b40e1ea2e3ce046d7db442b01c3bfe52886ce8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Jul 2018 20:34:08 +0200 Subject: [PATCH 1991/2640] btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs Fixes: http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/ btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs, but our patch to also install headers for 'install-static' installed directly into $(prefix)/include, confusing other packages as btrfs-progs headers have very common names such as version, sizes.h, list.h, ioctl.h, .. Fix it by adjusting the patch to also install under $(prefix)/include/btrfs. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...Makefile-install-static-library-and-headers-in-insta.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch index 1cdedfd984..de2db2f16f 100644 --- a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch +++ b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch @@ -41,8 +41,8 @@ index 67fbc48..d9e34be 100644 $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static + $(INSTALL) -m755 -d $(DESTDIR)$(libdir) + $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) -+ $(INSTALL) -m755 -d $(DESTDIR)$(incdir) -+ $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir) ++ $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs ++ $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)" From 8e615852790a2235dfad3b11ad82aafe0eb0f3ab Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Sun, 1 Jul 2018 12:21:14 +0300 Subject: [PATCH 1992/2640] package/vim: bump version to v8.1.0133 A few new features have been add and a lot of bugs have been fixed in minor release Vim 8.1. Signed-off-by: Leon Anavi Signed-off-by: Thomas Petazzoni --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 28c6b97e31..bfbd55d1a5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6fbe0ec1228f951ba598b48ac8033f41ca4934cc34689a6008685e7c26477ae2 vim-v8.0.0329.tar.gz +sha256 a6dab137949097fbe0b67aafedf4c24a3b0d9c41716db35f5beb4834924d7b00 vim-v8.1.0133.tar.gz diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 5ee889882a..0c02ead7b5 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = v8.0.0329 +VIM_VERSION = v8.1.0133 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) # Win over busybox vi since vim is more feature-rich VIM_DEPENDENCIES = \ @@ -14,6 +14,7 @@ VIM_SUBDIR = src VIM_CONF_ENV = \ vim_cv_toupper_broken=no \ vim_cv_terminfo=yes \ + vim_cv_tgetent=zero \ vim_cv_tty_group=world \ vim_cv_tty_mode=0620 \ vim_cv_getcwd_broken=no \ From 5b40992da224b2ec277d22f88c7a00bf8ac41651 Mon Sep 17 00:00:00 2001 From: Pierre Ducroquet Date: Thu, 15 Feb 2018 21:48:14 +0100 Subject: [PATCH 1993/2640] kf5-modemmanager-qt: new package modemmanager-qt is a simple Qt wrapper on the ModemManager API. Signed-off-by: Pierre Ducroquet [Thomas: - fix commit title - update to 5.47 - add hash for license file - add missing dependency on qt5base - add missing dependency on Qt5 DBus module - use "depends on" instead of "select" for modemmanager dependency] Signed-off-by: Thomas Petazzoni --- package/kf5/Config.in | 1 + package/kf5/kf5-modemmanager-qt/Config.in | 19 +++++++++++++++++++ .../kf5-modemmanager-qt.hash | 3 +++ .../kf5-modemmanager-qt.mk | 16 ++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/kf5/kf5-modemmanager-qt/Config.in create mode 100644 package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash create mode 100644 package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk diff --git a/package/kf5/Config.in b/package/kf5/Config.in index 5a2d2cca2a..075b246269 100644 --- a/package/kf5/Config.in +++ b/package/kf5/Config.in @@ -8,5 +8,6 @@ menuconfig BR2_PACKAGE_KF5 if BR2_PACKAGE_KF5 source "package/kf5/kf5-extra-cmake-modules/Config.in" +source "package/kf5/kf5-modemmanager-qt/Config.in" source "package/kf5/kf5-networkmanager-qt/Config.in" endif diff --git a/package/kf5/kf5-modemmanager-qt/Config.in b/package/kf5/kf5-modemmanager-qt/Config.in new file mode 100644 index 0000000000..c291b886f5 --- /dev/null +++ b/package/kf5/kf5-modemmanager-qt/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_KF5_MODEMMANAGER_QT + bool "kf5-modemmanager-qt" + depends on BR2_USE_MMU # qt5dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # qt5dbus + depends on BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_QT5BASE_DBUS + select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES + help + KF5 is a set of Qt framework addons, extending Qt in various + ways, not only restricted in helping integration in KDE. + + This package contains the ModemManager Qt5 bindings from the + KF5 project. + + https://api.kde.org/frameworks/modemmanager-qt/html/index.html + +comment "kf5-modemmanager-qt needs toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash new file mode 100644 index 0000000000..408eb0c0b0 --- /dev/null +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk new file mode 100644 index 0000000000..9bbeeaa760 --- /dev/null +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# kf5-modemmanager-qt +# +################################################################################ + +KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) +KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) +KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz +KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ +KF5_MODEMMANAGER_QT_LICENSE_FILE = COPYING.LIB + +KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base +KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES + +$(eval $(cmake-package)) From adf2cf0b42b346cfa7e50e615b66d0e8756fcf59 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Jul 2018 19:56:21 +0300 Subject: [PATCH 1994/2640] libsoup: update homepage link Cc: Fabrice Fontaine Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libsoup/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 236d3c428a..599f9594d9 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LIBSOUP and the GLib main loop, to integrate well with GNOME applications. - http://live.gnome.org/LibSoup + https://wiki.gnome.org/Projects/libsoup if BR2_PACKAGE_LIBSOUP From f52f95b1f9a20d4eebcfa56dc66eacfa0fd31c30 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Jul 2018 20:05:17 +0300 Subject: [PATCH 1995/2640] kf5-modemmanager-qt: correct dependencies comment display conditions Display the dependencies comment only when modem-manager is enabled. Otherwise, a toolchain configuration change would not make the package selectable. Cc: Pierre Ducroquet Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/kf5/kf5-modemmanager-qt/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kf5/kf5-modemmanager-qt/Config.in b/package/kf5/kf5-modemmanager-qt/Config.in index c291b886f5..f08de55672 100644 --- a/package/kf5/kf5-modemmanager-qt/Config.in +++ b/package/kf5/kf5-modemmanager-qt/Config.in @@ -16,4 +16,5 @@ config BR2_PACKAGE_KF5_MODEMMANAGER_QT comment "kf5-modemmanager-qt needs toolchain w/ threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_MODEM_MANAGER depends on !BR2_TOOLCHAIN_HAS_THREADS From aa46b41ecd9484bcba9f55ca8ec0a27b65a77900 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Jul 2018 20:05:18 +0300 Subject: [PATCH 1996/2640] kf5-networkmanager-qt: correct dependencies comment display conditions Display the dependencies comment only when network-manager is enabled. Otherwise, a toolchain configuration change would not make the package selectable. Cc: Pierre Ducroquet Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/kf5/kf5-networkmanager-qt/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kf5/kf5-networkmanager-qt/Config.in b/package/kf5/kf5-networkmanager-qt/Config.in index 277e08866a..6b309f0804 100644 --- a/package/kf5/kf5-networkmanager-qt/Config.in +++ b/package/kf5/kf5-networkmanager-qt/Config.in @@ -16,4 +16,5 @@ config BR2_PACKAGE_KF5_NETWORKMANAGER_QT comment "kf5-networkmanager-qt needs toolchain w/ threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_NETWORK_MANAGER depends on !BR2_TOOLCHAIN_HAS_THREADS From 05f4c8096abfd367266aaba2642e3c18c67ac67c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Jul 2018 10:11:58 -0300 Subject: [PATCH 1997/2640] linux: bump default to version 4.17.4 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index a25e02193b..d3ea3440da 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.4" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 32899448b4a45ad52430a7de68dc36a78901d029 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Jul 2018 10:11:59 -0300 Subject: [PATCH 1998/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ebaae8807e..0c9b1022b5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.138" if BR2_KERNEL_HEADERS_4_4 - default "4.9.110" if BR2_KERNEL_HEADERS_4_9 + default "4.4.139" if BR2_KERNEL_HEADERS_4_4 + default "4.9.111" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.52" if BR2_KERNEL_HEADERS_4_14 + default "4.14.53" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.3" if BR2_KERNEL_HEADERS_4_17 + default "4.17.4" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 55eb96a26a4fb3662116e6b0111e0250dd489727 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Jul 2018 10:12:00 -0300 Subject: [PATCH 1999/2640] configs/mx53loco: Bump to kernel 4.17.4 Kernel 4.17.4 contains commit 32c319d4f120 ("pinctrl: devicetree: Fix pctldev pointer overwrite"), which fixes audio support on imx53loco board, so bump to this kernel version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx53loco_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index b42b280f80..ca6ec446f1 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" From 8c504d898d1261eac2c8e252f3affc24610a562d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Jul 2018 10:12:01 -0300 Subject: [PATCH 2000/2640] configs/imx6-sabresd: Bump to kernel 4.17.4 Kernel 4.17.4 contains commit 32c319d4f120 ("pinctrl: devicetree: Fix pctldev pointer overwrite"), which fixes camera support on imx6-sabresd board, so bump to this kernel version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabresd_defconfig | 2 +- configs/imx6-sabresd_qt5_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 7f42e55d1f..89ffa02916 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index cee7244ddc..7457af3135 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From 8ae70adc52f1d01d04a68ad62df8e66168ac4af8 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 3 Jul 2018 08:08:09 +0200 Subject: [PATCH 2001/2640] libtomcrypt: bump to version 1.18.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libtomcrypt/libtomcrypt.hash | 5 ++++- package/libtomcrypt/libtomcrypt.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libtomcrypt/libtomcrypt.hash b/package/libtomcrypt/libtomcrypt.hash index be8e9b1bc3..3820f8d727 100644 --- a/package/libtomcrypt/libtomcrypt.hash +++ b/package/libtomcrypt/libtomcrypt.hash @@ -1,2 +1,5 @@ # Locally computed -sha256 57c13a34fbfd45696189d19e47864e48f4e5c11590c29b444accb8edbf047f14 crypt-1.18.1.tar.xz +sha256 96ad4c3b8336050993c5bc2cf6c057484f2b0f9f763448151567fbab5e767b84 crypt-1.18.2.tar.xz + +# Hash for license file: +sha256 8f196cb13afd271f5e267fd29543fc454596382ad580e7592709492843996ac8 LICENSE diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/libtomcrypt.mk index ff6222cc91..583bcb15ff 100644 --- a/package/libtomcrypt/libtomcrypt.mk +++ b/package/libtomcrypt/libtomcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTOMCRYPT_VERSION = 1.18.1 +LIBTOMCRYPT_VERSION = 1.18.2 LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/v$(LIBTOMCRYPT_VERSION) LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.xz LIBTOMCRYPT_LICENSE = WTFPL From 74bbe20356b846b52a0fbb712c39f8170a0a1f7e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Jul 2018 23:18:45 +0200 Subject: [PATCH 2002/2640] boost: add selects for wave wave needs filesystem, thread, date_time, chrono and system output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_wave.so Dynamic section at offset 0x143edc contains 32 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_filesystem.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_thread.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_date_time.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index cfad03f55a..bacefacab1 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -319,6 +319,11 @@ config BR2_PACKAGE_BOOST_WAVE # limitation of assembler for coldfire # error: Tried to convert PC relative branch to absolute jump depends on !BR2_m68k_cf + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD help The Boost.Wave library is a Standards conformant, and highly configurable implementation of the mandated C99/C++ From f7407d1f09110702504081d98be677627efa6bd7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Jul 2018 23:19:22 +0200 Subject: [PATCH 2003/2640] boost: fiber needs filesystem and system output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_fiber.so Dynamic section at offset 0x44ee8 contains 31 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_context.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_filesystem.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index bacefacab1..aef0303094 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -134,6 +134,8 @@ config BR2_PACKAGE_BOOST_FIBER depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 select BR2_PACKAGE_BOOST_CONTEXT + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SYSTEM help C++11 userland threads library. From f3ebd7fb0cb3f7f6d89f353b09bde4aaddfa8dd9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Jul 2018 23:22:28 +0200 Subject: [PATCH 2004/2640] boost: locale needs system output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_locale.so Dynamic section at offset 0x76ef4 contains 29 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index aef0303094..f989a7448b 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -185,6 +185,7 @@ config BR2_PACKAGE_BOOST_LOCALE # https://svn.boost.org/trac/boost/ticket/9685 for more # details. depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU) + select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Provide localization and Unicode handling tools for C++. From 11843ec75cfd7c6b3bc20c230e1ede3cd0a54db9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 2 Jul 2018 23:25:04 +0200 Subject: [PATCH 2005/2640] boost: add selects for log log needs atomic, chrono, thread, date_time, filesystem, system and regex output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_log.so Dynamic section at offset 0xb9ed0 contains 34 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_atomic.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_thread.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_date_time.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_filesystem.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_regex.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index f989a7448b..d0c759a122 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -200,6 +200,13 @@ config BR2_PACKAGE_BOOST_LOG # for some reason, uClibc on PowerPC fails to build the boost # log module depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) + select BR2_PACKAGE_BOOST_ATOMIC + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_REGEX + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD help Logging library. From 3ed82fab6159494c5aff49f94ed4d5fb50e64395 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 4 Jul 2018 20:45:41 +0200 Subject: [PATCH 2006/2640] package/gdb: remove gdb 7.10.1 patches gdb 7.10.x support was removed since commit 54a2e7a3b72778c9ec26cb184a1dd7a356e514c9 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...-Add-some-casts-for-building-on-musl.patch | 90 ------ ...Move-W_STOPCODE-to-common-gdb_wait-h.patch | 63 ---- package/gdb/7.10.1/0003-move-__SIGRTMIN.patch | 58 ---- .../0004-xtensa-implement-NPTL-helpers.patch | 267 ---------------- .../0005-target.h-include-sys-types.h.patch | 30 -- ...c-proc_service-definition-with-GLIBC.patch | 287 ------------------ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 53 ---- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 41 --- ...-Fix-gdbserver-build-on-uClibc-noMMU.patch | 32 -- .../gdb/7.10.1/0010-use-asm-sgidefs.h.patch | 41 --- 10 files changed, 962 deletions(-) delete mode 100644 package/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch delete mode 100644 package/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch delete mode 100644 package/gdb/7.10.1/0003-move-__SIGRTMIN.patch delete mode 100644 package/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch delete mode 100644 package/gdb/7.10.1/0005-target.h-include-sys-types.h.patch delete mode 100644 package/gdb/7.10.1/0006-Sync-proc_service-definition-with-GLIBC.patch delete mode 100644 package/gdb/7.10.1/0007-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/7.10.1/0008-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/7.10.1/0009-Fix-gdbserver-build-on-uClibc-noMMU.patch delete mode 100644 package/gdb/7.10.1/0010-use-asm-sgidefs.h.patch diff --git a/package/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch b/package/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch deleted file mode 100644 index 863e26aac3..0000000000 --- a/package/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d41401ace01c234f42697e190a2ac95991780626 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:20:12 -0700 -Subject: [PATCH] Add some casts for building on musl. - -gdb/ChangeLog: - - * linux-thread-db.c (find_new_threads_callback): Cast ti.ti_tid to - unsigned long for debug_printf. - (thread_db_pid_to_str): Ditto. - -gdb/gdbserver/ChangeLog: - - * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long - for debug_printf. - (attach_thread, find_new_threads_callback): Ditto. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 5 +++++ - gdb/gdbserver/ChangeLog | 6 ++++++ - gdb/gdbserver/thread-db.c | 9 +++++---- - gdb/linux-thread-db.c | 5 +++-- - 4 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c -index ffe722d..3df10ff 100644 ---- a/gdb/gdbserver/thread-db.c -+++ b/gdb/gdbserver/thread-db.c -@@ -278,7 +278,7 @@ find_one_thread (ptid_t ptid) - - if (debug_threads) - debug_printf ("Found thread %ld (LWP %d)\n", -- ti.ti_tid, ti.ti_lid); -+ (unsigned long) ti.ti_tid, ti.ti_lid); - - if (lwpid != ti.ti_lid) - { -@@ -319,12 +319,12 @@ attach_thread (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p) - - if (debug_threads) - debug_printf ("Attaching to thread %ld (LWP %d)\n", -- ti_p->ti_tid, ti_p->ti_lid); -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid); - err = linux_attach_lwp (ptid); - if (err != 0) - { - warning ("Could not attach to thread %ld (LWP %d): %s\n", -- ti_p->ti_tid, ti_p->ti_lid, -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid, - linux_ptrace_attach_fail_reason_string (ptid, err)); - return 0; - } -@@ -392,7 +392,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) - glibc PR17707. */ - if (debug_threads) - debug_printf ("thread_db: skipping exited and " -- "joined thread (0x%lx)\n", ti.ti_tid); -+ "joined thread (0x%lx)\n", -+ (unsigned long) ti.ti_tid); - return 0; - } - -diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c -index 66e9595..41db29a 100644 ---- a/gdb/linux-thread-db.c -+++ b/gdb/linux-thread-db.c -@@ -1585,7 +1585,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) - if (libthread_db_debug) - fprintf_unfiltered (gdb_stdlog, - "thread_db: skipping exited and " -- "joined thread (0x%lx)\n", ti.ti_tid); -+ "joined thread (0x%lx)\n", -+ (unsigned long) ti.ti_tid); - return 0; - } - -@@ -1816,7 +1817,7 @@ thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid) - - tid = thread_info->priv->tid; - snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)", -- tid, ptid_get_lwp (ptid)); -+ (unsigned long) tid, ptid_get_lwp (ptid)); - - return buf; - } --- -1.9.4 - diff --git a/package/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch b/package/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch deleted file mode 100644 index 60c357cd80..0000000000 --- a/package/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 963843d4d07aef6caa296dacf191f8adc9518596 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:24:01 -0700 -Subject: [PATCH] musl: Move W_STOPCODE to common/gdb_wait.h. - -gdb/ChangeLog: - - * common/gdb_wait.h (W_STOPCODE): Define, moved here from - gdbserver/linux-low.c. - (WSETSTOP): Simplify. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (W_STOPCODE): Moved to common/gdb_wait.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 6 ++++++ - gdb/common/gdb_wait.h | 8 ++++---- - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 4 ---- - 4 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h -index 9b250d2..412f813 100644 ---- a/gdb/common/gdb_wait.h -+++ b/gdb/common/gdb_wait.h -@@ -85,12 +85,12 @@ - # endif - #endif - -+#ifndef W_STOPCODE -+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) -+#endif -+ - #ifndef WSETSTOP --# ifdef W_STOPCODE - #define WSETSTOP(w,sig) ((w) = W_STOPCODE(sig)) --# else --#define WSETSTOP(w,sig) ((w) = (0177 | ((sig) << 8))) --# endif - #endif - - /* For native GNU/Linux we may use waitpid and the __WCLONE option. -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 0c552b8..7ed67c7 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,10 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --#ifndef W_STOPCODE --#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) --#endif -- - /* This is the kernel's hard limit. Not to be confused with - SIGRTMIN. */ - #ifndef __SIGRTMIN --- -1.9.4 - diff --git a/package/gdb/7.10.1/0003-move-__SIGRTMIN.patch b/package/gdb/7.10.1/0003-move-__SIGRTMIN.patch deleted file mode 100644 index 38ba1f028a..0000000000 --- a/package/gdb/7.10.1/0003-move-__SIGRTMIN.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 682b25469e66ea45b214e95962671373983c118f Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:30:57 -0700 -Subject: [PATCH] Move __SIGRTMIN. - -gdb/ChangeLog: - - * nat/linux-nat.h (__SIGRTMIN): Move here from gdbserver/linux-low.c. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (__SIGRTMIN): Move to nat/linux-nat.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 4 ++++ - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 6 ------ - gdb/nat/linux-nat.h | 5 +++++ - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 7ed67c7..e778c4c 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,12 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --/* This is the kernel's hard limit. Not to be confused with -- SIGRTMIN. */ --#ifndef __SIGRTMIN --#define __SIGRTMIN 32 --#endif -- - /* Some targets did not define these ptrace constants from the start, - so gdbserver defines them locally here. In the future, these may - be removed after they are added to asm/ptrace.h. */ -diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 0633fa9..70e6274 100644 ---- a/gdb/nat/linux-nat.h -+++ b/gdb/nat/linux-nat.h -@@ -25,6 +25,11 @@ - struct lwp_info; - struct arch_lwp_info; - -+/* This is the kernel's hard limit. Not to be confused with SIGRTMIN. */ -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+ - /* Unlike other extended result codes, WSTOPSIG (status) on - PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but - instead SIGTRAP with bit 7 set. */ --- -1.9.4 - diff --git a/package/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch b/package/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch deleted file mode 100644 index e7bc74ea53..0000000000 --- a/package/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch +++ /dev/null @@ -1,267 +0,0 @@ -From d4eb69fc4b50f9a0babd70b28d0601b40f31bd0f Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 2 Jul 2015 15:10:58 +0300 -Subject: [PATCH] xtensa: implement NPTL helpers - -These changes allow debugging multithreaded NPTL xtensa applications. - -2015-08-20 Max Filippov -gdb/gdbserver/ - * configure.srv (xtensa*-*-linux*): Add srv_linux_thread_db=yes. - * linux-xtensa-low.c (arch/xtensa.h gdb_proc_service.h): New - #includes. - (ps_get_thread_area): New function. - -2015-08-20 Max Filippov -gdb/ - * arch/xtensa.h: New file. - * xtensa-linux-nat.c (gdb_proc_service.h): New #include. - (ps_get_thread_area): New function. - * xtensa-linux-tdep.c (xtensa_linux_init_abi): Add call to - set_gdbarch_fetch_tls_load_module_address to enable TLS support. - * xtensa-tdep.c (osabi.h): New #include. - (xtensa_gdbarch_init): Call gdbarch_init_osabi to register - xtensa-specific hooks. - * xtensa-tdep.h (struct xtensa_elf_gregset_t): Add threadptr - member and move the structure to arch/xtensa.h. - -Signed-off-by: Max Filippov ---- -Backported from: 40045d91812b25c88c8275b8c08d27c234b68ba8 -Changes to ChangeLog files are dropped. - - gdb/arch/xtensa.h | 46 ++++++++++++++++++++++++++++++++++++++++ - gdb/gdbserver/configure.srv | 1 + - gdb/gdbserver/linux-xtensa-low.c | 21 ++++++++++++++++++ - gdb/xtensa-linux-nat.c | 22 ++++++++++++++++++ - gdb/xtensa-linux-tdep.c | 4 ++++ - gdb/xtensa-tdep.c | 4 ++++ - gdb/xtensa-tdep.h | 24 ++------------------ - 7 files changed, 100 insertions(+), 22 deletions(-) - create mode 100644 gdb/arch/xtensa.h - -diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h -new file mode 100644 -index 0000000..fe96584 ---- /dev/null -+++ b/gdb/arch/xtensa.h -@@ -0,0 +1,46 @@ -+/* Common Target-dependent code for the Xtensa port of GDB, the GNU debugger. -+ -+ Copyright (C) 2003-2015 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef XTENSA_H -+#define XTENSA_H -+ -+/* Xtensa ELF core file register set representation ('.reg' section). -+ Copied from target-side ELF header . */ -+ -+typedef uint32_t xtensa_elf_greg_t; -+ -+typedef struct -+{ -+ xtensa_elf_greg_t pc; -+ xtensa_elf_greg_t ps; -+ xtensa_elf_greg_t lbeg; -+ xtensa_elf_greg_t lend; -+ xtensa_elf_greg_t lcount; -+ xtensa_elf_greg_t sar; -+ xtensa_elf_greg_t windowstart; -+ xtensa_elf_greg_t windowbase; -+ xtensa_elf_greg_t threadptr; -+ xtensa_elf_greg_t reserved[7+48]; -+ xtensa_elf_greg_t ar[64]; -+} xtensa_elf_gregset_t; -+ -+#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -+ / sizeof (xtensa_elf_greg_t)) -+ -+#endif -diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv -index 0b18d1d..320c26a 100644 ---- a/gdb/gdbserver/configure.srv -+++ b/gdb/gdbserver/configure.srv -@@ -352,6 +352,7 @@ case "${target}" in - xtensa*-*-linux*) srv_regobj=reg-xtensa.o - srv_tgtobj="$srv_linux_obj linux-xtensa-low.o" - srv_linux_regsets=yes -+ srv_linux_thread_db=yes - ;; - tilegx-*-linux*) srv_regobj=reg-tilegx.o - srv_regobj="${srv_regobj} reg-tilegx32.o" -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index 4daccee..debe467 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -26,6 +26,8 @@ extern const struct target_desc *tdesc_xtensa; - - #include - #include -+#include "arch/xtensa.h" -+#include "gdb_proc_service.h" - - #include "xtensa-xtregs.c" - -@@ -179,6 +181,25 @@ xtensa_breakpoint_at (CORE_ADDR where) - xtensa_breakpoint, xtensa_breakpoint_len) == 0; - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - static struct regsets_info xtensa_regsets_info = - { - xtensa_regsets, /* regsets */ -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index 77ad3e0..5538d5b 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -37,6 +37,9 @@ - #include "gregset.h" - #include "xtensa-tdep.h" - -+/* Defines ps_err_e, struct ps_prochandle. */ -+#include "gdb_proc_service.h" -+ - /* Extended register set depends on hardware configs. - Keeping these definitions separately allows to introduce - hardware-specific overlays. */ -@@ -280,6 +283,25 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, - store_xtregs (regcache, regnum); - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - void _initialize_xtensa_linux_nat (void); - - void -diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c -index 61ea9b0..99e0d3e 100644 ---- a/gdb/xtensa-linux-tdep.c -+++ b/gdb/xtensa-linux-tdep.c -@@ -106,6 +106,10 @@ xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) - xtensa_linux_gdb_signal_from_target); - set_gdbarch_gdb_signal_to_target (gdbarch, - xtensa_linux_gdb_signal_to_target); -+ -+ /* Enable TLS support. */ -+ set_gdbarch_fetch_tls_load_module_address (gdbarch, -+ svr4_fetch_objfile_link_map); - } - - /* Provide a prototype to silence -Wmissing-prototypes. */ -diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c -index 55e7d98..4b693ed 100644 ---- a/gdb/xtensa-tdep.c -+++ b/gdb/xtensa-tdep.c -@@ -28,6 +28,7 @@ - #include "value.h" - #include "dis-asm.h" - #include "inferior.h" -+#include "osabi.h" - #include "floatformat.h" - #include "regcache.h" - #include "reggroups.h" -@@ -3273,6 +3274,9 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - set_solib_svr4_fetch_link_map_offsets - (gdbarch, svr4_ilp32_fetch_link_map_offsets); - -+ /* Hook in the ABI-specific overrides, if they have been registered. */ -+ gdbarch_init_osabi (info, gdbarch); -+ - return gdbarch; - } - -diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h -index caa2988..5b28cab 100644 ---- a/gdb/xtensa-tdep.h -+++ b/gdb/xtensa-tdep.h -@@ -18,6 +18,8 @@ - along with this program. If not, see . */ - - -+#include "arch/xtensa.h" -+ - /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION - whenever the "tdep" structure changes in an incompatible way. */ - -@@ -81,28 +83,6 @@ typedef enum - } xtensa_target_flags_t; - - --/* Xtensa ELF core file register set representation ('.reg' section). -- Copied from target-side ELF header . */ -- --typedef uint32_t xtensa_elf_greg_t; -- --typedef struct --{ -- xtensa_elf_greg_t pc; -- xtensa_elf_greg_t ps; -- xtensa_elf_greg_t lbeg; -- xtensa_elf_greg_t lend; -- xtensa_elf_greg_t lcount; -- xtensa_elf_greg_t sar; -- xtensa_elf_greg_t windowstart; -- xtensa_elf_greg_t windowbase; -- xtensa_elf_greg_t reserved[8+48]; -- xtensa_elf_greg_t ar[64]; --} xtensa_elf_gregset_t; -- --#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -- / sizeof (xtensa_elf_greg_t)) -- - /* Mask. */ - - typedef struct --- -1.8.1.4 - diff --git a/package/gdb/7.10.1/0005-target.h-include-sys-types.h.patch b/package/gdb/7.10.1/0005-target.h-include-sys-types.h.patch deleted file mode 100644 index ba5419d244..0000000000 --- a/package/gdb/7.10.1/0005-target.h-include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cd68d0ebe7748a5448c86eb021b717df6fe83f35 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Sun, 22 Nov 2015 17:24:03 -0800 -Subject: [PATCH] target.h: #include . - -For musl. - -[Romain: - rebase on gdb 7.10.1 from upstream (7.11) - remove ChangeLog entry] -Signed-off-by: Romain Naour ---- - gdb/gdbserver/target.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h -index 9a40867..6af043c 100644 ---- a/gdb/gdbserver/target.h -+++ b/gdb/gdbserver/target.h -@@ -21,6 +21,7 @@ - #ifndef TARGET_H - #define TARGET_H - -+#include /* for mode_t */ - #include "target/target.h" - #include "target/resume.h" - #include "target/wait.h" --- -2.5.5 - diff --git a/package/gdb/7.10.1/0006-Sync-proc_service-definition-with-GLIBC.patch b/package/gdb/7.10.1/0006-Sync-proc_service-definition-with-GLIBC.patch deleted file mode 100644 index 2a53778770..0000000000 --- a/package/gdb/7.10.1/0006-Sync-proc_service-definition-with-GLIBC.patch +++ /dev/null @@ -1,287 +0,0 @@ -From ccc18e0b2dc77a6619df31fd4fadfb3a37401616 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sun, 26 Mar 2017 23:06:45 +0200 -Subject: [PATCH] Sync proc_service definition with GLIBC - -GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const' -attributes from ps_get_thread_area and comment #15 discuss why to remove -the const attribute (basically since it a callback with the struct -ps_prochandle owned by the client it should be able to modify it if -it the case). - -On default build this is not the issue and current g++ does not trigger -any issue with this mismatch declaration. However, on some bootstrap -build configuration where gdbserver is build with gcc instead this -triggers: - -error: conflicting types for 'ps_get_thread_area' - -This patch fixes it by syncing the declaration with GLIBC. - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311 - -gdb/ChangeLog: - -2016-08-25 Adhemerval Zanella - - * aarch64-linux-nat.c (ps_get_thread_area): Remove const from - struct ps_prochandle. - * amd64-linux-nat.c (ps_get_thread_area): Likewise. - * arm-linux-nat.c (ps_get_thread_area): Likewise. - * gdb_proc_service.h (ps_get_thread_area): Likewise. - * i386-linux-nat.c (ps_get_thread_area): Likewise. - * m68klinux-nat.c (ps_get_thread_area): Likewise. - * mips-linux-nat.c (ps_get_thread_area): Likewise. - * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise. - * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise. - * xtensa-linux-nat.c (ps_get_thread_area): Likewise. - -gdb/gdbserver/ChangeLog: - -2016-08-25 Adhemerval Zanella - - PR server/20491 - * gdb_proc_service.h (ps_get_thread_area): Remove const from struct - ps_prochandle. - * linux-aarch64-low.c (ps_get_thread_area): Likewise. - * linux-arm-low.c (ps_get_thread_area): Likewise. - * linux-crisv32-low.c (ps_get_thread_area): Likewise. - * linux-m68k-low.c (ps_get_thread_area): Likewise. - * linux-mips-low.c (ps_get_thread_area): Likewise. - * linux-nios2-low.c (ps_get_thread_area): Likewise. - * linux-tic6x-low.c (ps_get_thread_area): Likewise. - * linux-x86-low.c (ps_get_thread_area): Likewise. - * linux-xtensa-low.c (ps_get_thread_area): Likewise. - -(cherry picked from commit 140bf80050b34f0947b34dba93b830ea2bfc5040) -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/aarch64-linux-nat.c | 2 +- - gdb/amd64-linux-nat.c | 2 +- - gdb/arm-linux-nat.c | 2 +- - gdb/gdb_proc_service.h | 2 +- - gdb/gdbserver/gdb_proc_service.h | 2 +- - gdb/gdbserver/linux-aarch64-low.c | 2 +- - gdb/gdbserver/linux-arm-low.c | 2 +- - gdb/gdbserver/linux-crisv32-low.c | 2 +- - gdb/gdbserver/linux-m68k-low.c | 2 +- - gdb/gdbserver/linux-mips-low.c | 2 +- - gdb/gdbserver/linux-nios2-low.c | 2 +- - gdb/gdbserver/linux-tic6x-low.c | 2 +- - gdb/gdbserver/linux-x86-low.c | 2 +- - gdb/i386-linux-nat.c | 2 +- - gdb/m68klinux-nat.c | 2 +- - gdb/mips-linux-nat.c | 2 +- - 16 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c -index 9959b81a2d..aa0f8d76bd 100644 ---- a/gdb/aarch64-linux-nat.c -+++ b/gdb/aarch64-linux-nat.c -@@ -734,7 +734,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid) - storage (or its descriptor). */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - struct iovec iovec; -diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c -index 2e1b081b0f..7f076a9148 100644 ---- a/gdb/amd64-linux-nat.c -+++ b/gdb/amd64-linux-nat.c -@@ -244,7 +244,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, - a request for a thread's local storage address. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32) -diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c -index c167bce18b..8462655139 100644 ---- a/gdb/arm-linux-nat.c -+++ b/gdb/arm-linux-nat.c -@@ -778,7 +778,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h -index e7369911a1..91fbc29a76 100644 ---- a/gdb/gdb_proc_service.h -+++ b/gdb/gdb_proc_service.h -@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *); - /* Fetch the special per-thread address associated with the given LWP. - This call is only used on a few platforms (most use a normal register). - The meaning of the `int' parameter is machine-dependent. */ --extern ps_err_e ps_get_thread_area (const struct ps_prochandle *, -+extern ps_err_e ps_get_thread_area (struct ps_prochandle *, - lwpid_t, int, psaddr_t *); - - -diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h -index cbafbf3206..7f9b1e4de0 100644 ---- a/gdb/gdbserver/gdb_proc_service.h -+++ b/gdb/gdbserver/gdb_proc_service.h -@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *); - /* Fetch the special per-thread address associated with the given LWP. - This call is only used on a few platforms (most use a normal register). - The meaning of the `int' parameter is machine-dependent. */ --extern ps_err_e ps_get_thread_area (const struct ps_prochandle *, -+extern ps_err_e ps_get_thread_area (struct ps_prochandle *, - lwpid_t, int, psaddr_t *); - - -diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c -index 8a30b00029..a0ac35620d 100644 ---- a/gdb/gdbserver/linux-aarch64-low.c -+++ b/gdb/gdbserver/linux-aarch64-low.c -@@ -1089,7 +1089,7 @@ aarch64_stopped_by_watchpoint (void) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - struct iovec iovec; -diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c -index dd77b48ecd..560e7d8496 100644 ---- a/gdb/gdbserver/linux-arm-low.c -+++ b/gdb/gdbserver/linux-arm-low.c -@@ -334,7 +334,7 @@ arm_reinsert_addr (void) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c -index 65e6c09df2..fd5e627123 100644 ---- a/gdb/gdbserver/linux-crisv32-low.c -+++ b/gdb/gdbserver/linux-crisv32-low.c -@@ -336,7 +336,7 @@ cris_stopped_data_address (void) - } - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 4501904e39..7415930360 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -160,7 +160,7 @@ m68k_breakpoint_at (CORE_ADDR pc) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c -index 1695c4cf0d..acc2468bce 100644 ---- a/gdb/gdbserver/linux-mips-low.c -+++ b/gdb/gdbserver/linux-mips-low.c -@@ -640,7 +640,7 @@ mips_stopped_data_address (void) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c -index 7bd3c9795d..719883edef 100644 ---- a/gdb/gdbserver/linux-nios2-low.c -+++ b/gdb/gdbserver/linux-nios2-low.c -@@ -150,7 +150,7 @@ nios2_breakpoint_at (CORE_ADDR where) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c -index 0a0d220c34..26c4dee999 100644 ---- a/gdb/gdbserver/linux-tic6x-low.c -+++ b/gdb/gdbserver/linux-tic6x-low.c -@@ -266,7 +266,7 @@ tic6x_breakpoint_at (CORE_ADDR where) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c -index 484eadba05..15f25d71d5 100644 ---- a/gdb/gdbserver/linux-x86-low.c -+++ b/gdb/gdbserver/linux-x86-low.c -@@ -231,7 +231,7 @@ is_64bit_tdesc (void) - /* Called by libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - #ifdef __x86_64__ -diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c -index 349ce68f5c..80d6a516ea 100644 ---- a/gdb/i386-linux-nat.c -+++ b/gdb/i386-linux-nat.c -@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops, - storage (or its descriptor). */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - unsigned int base_addr; -diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c -index 8f89d7b87a..6e528b4e91 100644 ---- a/gdb/m68klinux-nat.c -+++ b/gdb/m68klinux-nat.c -@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops, - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0) -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index a36bb6356f..9f6d6975a0 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) --- -2.11.0 - diff --git a/package/gdb/7.10.1/0007-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/7.10.1/0007-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index c280831abc..0000000000 --- a/package/gdb/7.10.1/0007-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3964e15443c5cdfca6723987c8ef1ef6cf984d41 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2016 17:32:50 -0700 -Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 188fac0..f71d5ab 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "nat/ppc-linux.h" - -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 0ff2223..c978daa 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ --- -2.7.4 - diff --git a/package/gdb/7.10.1/0008-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/7.10.1/0008-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 50f9512bbc..0000000000 --- a/package/gdb/7.10.1/0008-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1662a42e980c3f605000b23fda86ab24ceb69d32 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC - systems - -Fixes a pt_{dsp,}regs redefinition when building with the musl C library -on SuperH. - -Inspired by -http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, -adapted for SuperH. - -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index 218d4d3..c4ada84 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; - #include - #endif - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+# define pt_dspregs uapi_pt_dspregs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+# undef pt_dspregs -+#endif - - #define sh_num_regs 41 - --- -2.7.4 - diff --git a/package/gdb/7.10.1/0009-Fix-gdbserver-build-on-uClibc-noMMU.patch b/package/gdb/7.10.1/0009-Fix-gdbserver-build-on-uClibc-noMMU.patch deleted file mode 100644 index 3f877b335f..0000000000 --- a/package/gdb/7.10.1/0009-Fix-gdbserver-build-on-uClibc-noMMU.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6de192acd4807d7fd57caf451567f09308bd8350 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 9 Jun 2017 10:19:32 +0200 -Subject: [PATCH] Fix gdbserver build on uClibc/noMMU - -The noMMU specific code requires including . - -Originally from -https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch. - -Signed-off-by: Thomas Petazzoni ---- - gdb/nat/linux-ptrace.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index be6c395..c9f85aa 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -23,7 +23,8 @@ struct buffer; - #include - - #ifdef __UCLIBC__ --#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) -+#include -+#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__)) - /* PTRACE_TEXT_ADDR and friends. */ - #include - #define HAS_NOMMU --- -2.7.4 - diff --git a/package/gdb/7.10.1/0010-use-asm-sgidefs.h.patch b/package/gdb/7.10.1/0010-use-asm-sgidefs.h.patch deleted file mode 100644 index fdc56793fb..0000000000 --- a/package/gdb/7.10.1/0010-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from https://sourceware.org/bugzilla/show_bug.cgi?id=21070 -Patch has been adapted to apply on 7.10.1.] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 9f6d697..8f57bb2 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include - #include - --- -2.13.1 - From bf19116c802118ec567e668e60de088b646f4fa3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 4 Jul 2018 20:45:42 +0200 Subject: [PATCH 2007/2640] package/gdb: remove gdb 7.11.1 patches gdb 7.11.x support was removed since commit bae35c80128fce6b5b4260186f9020308efbce4b Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...c-proc_service-definition-with-GLIBC.patch | 389 ------------------ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 53 --- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 41 -- ...-Fix-gdbserver-build-on-uClibc-noMMU.patch | 32 -- .../gdb/7.11.1/0005-use-asm-sgidefs.h.patch | 40 -- 5 files changed, 555 deletions(-) delete mode 100644 package/gdb/7.11.1/0001-Sync-proc_service-definition-with-GLIBC.patch delete mode 100644 package/gdb/7.11.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/7.11.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/7.11.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch delete mode 100644 package/gdb/7.11.1/0005-use-asm-sgidefs.h.patch diff --git a/package/gdb/7.11.1/0001-Sync-proc_service-definition-with-GLIBC.patch b/package/gdb/7.11.1/0001-Sync-proc_service-definition-with-GLIBC.patch deleted file mode 100644 index b3f723a8ef..0000000000 --- a/package/gdb/7.11.1/0001-Sync-proc_service-definition-with-GLIBC.patch +++ /dev/null @@ -1,389 +0,0 @@ -From 140bf80050b34f0947b34dba93b830ea2bfc5040 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella -Date: Thu, 25 Aug 2016 08:42:03 +0100 -Subject: [PATCH] Sync proc_service definition with GLIBC - -GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const' -attributes from ps_get_thread_area and comment #15 discuss why to remove -the const attribute (basically since it a callback with the struct -ps_prochandle owned by the client it should be able to modify it if -it the case). - -On default build this is not the issue and current g++ does not trigger -any issue with this mismatch declaration. However, on some bootstrap -build configuration where gdbserver is build with gcc instead this -triggers: - -error: conflicting types for 'ps_get_thread_area' - -This patch fixes it by syncing the declaration with GLIBC. - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311 - -gdb/ChangeLog: - -2016-08-25 Adhemerval Zanella - - * aarch64-linux-nat.c (ps_get_thread_area): Remove const from - struct ps_prochandle. - * amd64-linux-nat.c (ps_get_thread_area): Likewise. - * arm-linux-nat.c (ps_get_thread_area): Likewise. - * gdb_proc_service.h (ps_get_thread_area): Likewise. - * i386-linux-nat.c (ps_get_thread_area): Likewise. - * m68klinux-nat.c (ps_get_thread_area): Likewise. - * mips-linux-nat.c (ps_get_thread_area): Likewise. - * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise. - * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise. - * xtensa-linux-nat.c (ps_get_thread_area): Likewise. - -gdb/gdbserver/ChangeLog: - -2016-08-25 Adhemerval Zanella - - PR server/20491 - * gdb_proc_service.h (ps_get_thread_area): Remove const from struct - ps_prochandle. - * linux-aarch64-low.c (ps_get_thread_area): Likewise. - * linux-arm-low.c (ps_get_thread_area): Likewise. - * linux-crisv32-low.c (ps_get_thread_area): Likewise. - * linux-m68k-low.c (ps_get_thread_area): Likewise. - * linux-mips-low.c (ps_get_thread_area): Likewise. - * linux-nios2-low.c (ps_get_thread_area): Likewise. - * linux-tic6x-low.c (ps_get_thread_area): Likewise. - * linux-x86-low.c (ps_get_thread_area): Likewise. - * linux-xtensa-low.c (ps_get_thread_area): Likewise. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 14 ++++++++++++++ - gdb/aarch64-linux-nat.c | 2 +- - gdb/amd64-linux-nat.c | 2 +- - gdb/arm-linux-nat.c | 2 +- - gdb/gdb_proc_service.h | 2 +- - gdb/gdbserver/ChangeLog | 15 +++++++++++++++ - gdb/gdbserver/gdb_proc_service.h | 2 +- - gdb/gdbserver/linux-aarch64-low.c | 2 +- - gdb/gdbserver/linux-arm-low.c | 2 +- - gdb/gdbserver/linux-crisv32-low.c | 2 +- - gdb/gdbserver/linux-m68k-low.c | 2 +- - gdb/gdbserver/linux-mips-low.c | 2 +- - gdb/gdbserver/linux-nios2-low.c | 2 +- - gdb/gdbserver/linux-tic6x-low.c | 2 +- - gdb/gdbserver/linux-x86-low.c | 2 +- - gdb/gdbserver/linux-xtensa-low.c | 2 +- - gdb/i386-linux-nat.c | 2 +- - gdb/m68klinux-nat.c | 2 +- - gdb/mips-linux-nat.c | 2 +- - gdb/nat/aarch64-linux.c | 2 +- - gdb/nat/aarch64-linux.h | 2 +- - gdb/xtensa-linux-nat.c | 2 +- - 22 files changed, 49 insertions(+), 20 deletions(-) - -diff --git a/gdb/ChangeLog b/gdb/ChangeLog -index 9b6562502e..a03afdb82f 100644 ---- a/gdb/ChangeLog -+++ b/gdb/ChangeLog -@@ -1,3 +1,17 @@ -+2016-08-25 Adhemerval Zanella -+ -+ * aarch64-linux-nat.c (ps_get_thread_area): Remove const from -+ struct ps_prochandle. -+ * amd64-linux-nat.c (ps_get_thread_area): Likewise. -+ * arm-linux-nat.c (ps_get_thread_area): Likewise. -+ * gdb_proc_service.h (ps_get_thread_area): Likewise. -+ * i386-linux-nat.c (ps_get_thread_area): Likewise. -+ * m68klinux-nat.c (ps_get_thread_area): Likewise. -+ * mips-linux-nat.c (ps_get_thread_area): Likewise. -+ * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise. -+ * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise. -+ * xtensa-linux-nat.c (ps_get_thread_area): Likewise. -+ - 2016-06-01 Joel Brobecker - - * version.in: Set GDB version number to 7.11.1.DATE-git. -diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c -index fe1631dbbb..5166eebd33 100644 ---- a/gdb/aarch64-linux-nat.c -+++ b/gdb/aarch64-linux-nat.c -@@ -457,7 +457,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid) - storage (or its descriptor). */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - int is_64bit_p -diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c -index 391a646992..9da36fd1ba 100644 ---- a/gdb/amd64-linux-nat.c -+++ b/gdb/amd64-linux-nat.c -@@ -245,7 +245,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, - a request for a thread's local storage address. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32) -diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c -index d77ca93498..d11bdc6e22 100644 ---- a/gdb/arm-linux-nat.c -+++ b/gdb/arm-linux-nat.c -@@ -477,7 +477,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h -index 04d3c03884..a1a8eb5b2f 100644 ---- a/gdb/gdb_proc_service.h -+++ b/gdb/gdb_proc_service.h -@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *); - /* Fetch the special per-thread address associated with the given LWP. - This call is only used on a few platforms (most use a normal register). - The meaning of the `int' parameter is machine-dependent. */ --extern ps_err_e ps_get_thread_area (const struct ps_prochandle *, -+extern ps_err_e ps_get_thread_area (struct ps_prochandle *, - lwpid_t, int, psaddr_t *); - - -diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog -index 08fef5b06e..ea278b1250 100644 ---- a/gdb/gdbserver/ChangeLog -+++ b/gdb/gdbserver/ChangeLog -@@ -1,3 +1,18 @@ -+2016-08-25 Adhemerval Zanella -+ -+ PR server/20491 -+ * gdb_proc_service.h (ps_get_thread_area): Remove const from struct -+ ps_prochandle. -+ * linux-aarch64-low.c (ps_get_thread_area): Likewise. -+ * linux-arm-low.c (ps_get_thread_area): Likewise. -+ * linux-crisv32-low.c (ps_get_thread_area): Likewise. -+ * linux-m68k-low.c (ps_get_thread_area): Likewise. -+ * linux-mips-low.c (ps_get_thread_area): Likewise. -+ * linux-nios2-low.c (ps_get_thread_area): Likewise. -+ * linux-tic6x-low.c (ps_get_thread_area): Likewise. -+ * linux-x86-low.c (ps_get_thread_area): Likewise. -+ * linux-xtensa-low.c (ps_get_thread_area): Likewise. -+ - 2016-04-15 Pedro Alves - - * linux-low.c (check_stopped_by_breakpoint): Rename to ... -diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h -index 99bf226b01..cec9231ee5 100644 ---- a/gdb/gdbserver/gdb_proc_service.h -+++ b/gdb/gdbserver/gdb_proc_service.h -@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *); - /* Fetch the special per-thread address associated with the given LWP. - This call is only used on a few platforms (most use a normal register). - The meaning of the `int' parameter is machine-dependent. */ --extern ps_err_e ps_get_thread_area (const struct ps_prochandle *, -+extern ps_err_e ps_get_thread_area (struct ps_prochandle *, - lwpid_t, int, psaddr_t *); - - -diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c -index 806a76260f..b86f210390 100644 ---- a/gdb/gdbserver/linux-aarch64-low.c -+++ b/gdb/gdbserver/linux-aarch64-low.c -@@ -421,7 +421,7 @@ aarch64_stopped_by_watchpoint (void) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - return aarch64_ps_get_thread_area (ph, lwpid, idx, base, -diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c -index 0f627069e0..9f043878c7 100644 ---- a/gdb/gdbserver/linux-arm-low.c -+++ b/gdb/gdbserver/linux-arm-low.c -@@ -269,7 +269,7 @@ get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr, - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c -index 16c1f72015..fea6d5bf9b 100644 ---- a/gdb/gdbserver/linux-crisv32-low.c -+++ b/gdb/gdbserver/linux-crisv32-low.c -@@ -309,7 +309,7 @@ cris_stopped_data_address (void) - } - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index df3d7c6d9c..78a340fa8f 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -152,7 +152,7 @@ m68k_breakpoint_at (CORE_ADDR pc) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c -index 30a03d5f43..9356bb3d99 100644 ---- a/gdb/gdbserver/linux-mips-low.c -+++ b/gdb/gdbserver/linux-mips-low.c -@@ -637,7 +637,7 @@ mips_stopped_data_address (void) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c -index ea0ded1f1e..98a85ed8e3 100644 ---- a/gdb/gdbserver/linux-nios2-low.c -+++ b/gdb/gdbserver/linux-nios2-low.c -@@ -145,7 +145,7 @@ nios2_breakpoint_at (CORE_ADDR where) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c -index e40a3aff51..6b90560dc4 100644 ---- a/gdb/gdbserver/linux-tic6x-low.c -+++ b/gdb/gdbserver/linux-tic6x-low.c -@@ -274,7 +274,7 @@ tic6x_breakpoint_at (CORE_ADDR where) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c -index 0c4954a58d..8bac10a54b 100644 ---- a/gdb/gdbserver/linux-x86-low.c -+++ b/gdb/gdbserver/linux-x86-low.c -@@ -236,7 +236,7 @@ is_64bit_tdesc (void) - /* Called by libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - #ifdef __x86_64__ -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index 6e945eac17..431082c01f 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -177,7 +177,7 @@ xtensa_breakpoint_at (CORE_ADDR where) - /* Called by libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - xtensa_elf_gregset_t regs; -diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c -index a41ee21081..70d954fdc0 100644 ---- a/gdb/i386-linux-nat.c -+++ b/gdb/i386-linux-nat.c -@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops, - storage (or its descriptor). */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - unsigned int base_addr; -diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c -index 24b6242ba3..5b8684b719 100644 ---- a/gdb/m68klinux-nat.c -+++ b/gdb/m68klinux-nat.c -@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops, - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0) -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index bfe9fcbe68..0f20f16814 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) - /* Fetch the thread-local storage pointer for libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) -diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c -index 5ae5aa8602..1828977e28 100644 ---- a/gdb/nat/aarch64-linux.c -+++ b/gdb/nat/aarch64-linux.c -@@ -205,7 +205,7 @@ aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from) - storage (or its descriptor). */ - - ps_err_e --aarch64_ps_get_thread_area (const struct ps_prochandle *ph, -+aarch64_ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base, - int is_64bit_p) - { -diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h -index 7221982b78..aac7c68c06 100644 ---- a/gdb/nat/aarch64-linux.h -+++ b/gdb/nat/aarch64-linux.h -@@ -122,7 +122,7 @@ void aarch64_linux_prepare_to_resume (struct lwp_info *lwp); - - void aarch64_linux_new_thread (struct lwp_info *lwp); - --ps_err_e aarch64_ps_get_thread_area (const struct ps_prochandle *ph, -+ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base, - int is_64bit_p); - -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index 54da83791a..836d3f80ee 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -286,7 +286,7 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, - /* Called by libthread_db. */ - - ps_err_e --ps_get_thread_area (const struct ps_prochandle *ph, -+ps_get_thread_area (struct ps_prochandle *ph, - lwpid_t lwpid, int idx, void **base) - { - xtensa_elf_gregset_t regs; --- -2.11.0 - diff --git a/package/gdb/7.11.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/7.11.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index 1e7f6b6c9b..0000000000 --- a/package/gdb/7.11.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7438f3e5a41adf54cf82cd82d3d52244e77d7d05 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2016 17:32:50 -0700 -Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 2145c50..777905d 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "nat/ppc-linux.h" - -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 85fbcd8..cbec9c5 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ --- -2.7.4 - diff --git a/package/gdb/7.11.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/7.11.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index f8c9e59be6..0000000000 --- a/package/gdb/7.11.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b7cbde12595599768bf2831e311a8ab265322313 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC - systems - -Fixes a pt_{dsp,}regs redefinition when building with the musl C library -on SuperH. - -Inspired by -http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, -adapted for SuperH. - -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index 38612e2..3195d0d 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; - #include - #endif - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+# define pt_dspregs uapi_pt_dspregs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+# undef pt_dspregs -+#endif - - #define sh_num_regs 41 - --- -2.7.4 - diff --git a/package/gdb/7.11.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch b/package/gdb/7.11.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch deleted file mode 100644 index fc8b3ac607..0000000000 --- a/package/gdb/7.11.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d6bf0c57a6bf361ac53887653aa1878e60d56335 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 9 Jun 2017 10:19:32 +0200 -Subject: [PATCH] Fix gdbserver build on uClibc/noMMU - -The noMMU specific code requires including . - -Originally from -https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch. - -Signed-off-by: Thomas Petazzoni ---- - gdb/nat/linux-ptrace.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 0a23bcb..35b7cbb 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -23,7 +23,8 @@ struct buffer; - #include "nat/gdb_ptrace.h" - - #ifdef __UCLIBC__ --#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) -+#include -+#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__)) - /* PTRACE_TEXT_ADDR and friends. */ - #include - #define HAS_NOMMU --- -2.7.4 - diff --git a/package/gdb/7.11.1/0005-use-asm-sgidefs.h.patch b/package/gdb/7.11.1/0005-use-asm-sgidefs.h.patch deleted file mode 100644 index d30336904f..0000000000 --- a/package/gdb/7.11.1/0005-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index f2df1b9907..d24664cb56 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include "nat/gdb_ptrace.h" - #include - #include "inf-ptrace.h" --- -2.13.1 - From 72d4d098b0dbb10d3904868acc11c97acafa8d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= Date: Tue, 3 Jul 2018 09:48:10 +0200 Subject: [PATCH 2008/2640] dropbear: Disable legacy/insecure options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dropbear by default enables a number of algorithms that are now considered insecure and should only be used when legacy support is required: 3DES encryption Blowfish encryption SHA1-96 message integrity CBC encryption mode DSA public keys Diffie-Hellman Group1 key exchange So disable them by default, but add a config option for bringing them back. Furthermore the Blowfish legacy algorithm is unconditionally disabled Signed-off-by: Stefan Sørensen Reviewed-by: Baruch Siach Reviewed-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/dropbear/Config.in | 10 ++++++++++ package/dropbear/dropbear.mk | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 5d6b83b6d1..62f77bad9d 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -56,4 +56,14 @@ config BR2_PACKAGE_DROPBEAR_LASTLOG Enable logging of dropbear access to lastlog. Notice that Buildroot does not generate lastlog by default. +config BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO + bool "enable legacy crypto" + help + Enable legacy and possibly insecure algorithms: + 3DES encryption + SHA1-96 message integrity + CBC encryption mode + DSA public keys + Diffie-Hellman Group1 key exchange + endif diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index bb902bc7ce..7b1468cfb1 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -56,13 +56,23 @@ endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH endif +define DROPBEAR_DISABLE_LEGACY_CRYPTO + echo '#define DROPBEAR_3DES 0' >> $(@D)/localoptions.h + echo '#define DROPBEAR_ENABLE_CBC_MODE 0' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SHA1_96_HMAC 0' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h +endef +ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO +endif + define DROPBEAR_ENABLE_REVERSE_DNS echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h endef define DROPBEAR_BUILD_FEATURED echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h endef From 3f4df8cd162d6557d315360a78c3271f71d9a275 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 3 Jul 2018 23:07:08 +0200 Subject: [PATCH 2009/2640] package/exim: remove unused Local-Makefile When the exim package was added, it included a template for the build-time configuration file Local/Makefile in the package directory. In commit 8956779d5d2 (exim: use a more standard build-time configuration), this template file was replaced with the EDITME template file included in the exim sources. However, that commit did not remove Buildroot's Local-Makefile. Since this file is no longer used, remove it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Luca Ceresoli Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/exim/Local-Makefile | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 package/exim/Local-Makefile diff --git a/package/exim/Local-Makefile b/package/exim/Local-Makefile deleted file mode 100644 index 191f0e0da6..0000000000 --- a/package/exim/Local-Makefile +++ /dev/null @@ -1,15 +0,0 @@ -BIN_DIRECTORY=/usr/sbin -CONFIGURE_FILE=/etc/exim/configure -EXIM_USER=ref:exim -EXIM_GROUP=mail -SPOOL_DIRECTORY=/var/spool/exim -ROUTER_ACCEPT=yes -TRANSPORT_LMTP=yes -LOOKUP_DBM=yes -LOOKUP_LSEARCH=yes -PCRE_LIBS=-lpcre -FIXED_NEVER_USERS=root -HEADERS_CHARSET="ISO-8859-1" -HAVE_ICONV=no -SYSLOG_LOG_PID=yes -TMPDIR="/tmp" From 63d76c6f2f04c836af24098e26f2befe1e8e4cc4 Mon Sep 17 00:00:00 2001 From: Jan Heylen Date: Wed, 4 Jul 2018 09:07:35 +0200 Subject: [PATCH 2010/2640] linux: automatically set CONFIG_PERF_EVENTS when perf is enabled Perf profiling cannot be used if CONFIG_PERF_EVENTS is not enabled in the kernel configuration. Similar to other tools, like ktap, we can enable the right options automatically. Signed-off-by: Jan Heylen Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 2 ++ package/linux-tools/Config.in | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 6b5f5344ed..7f4c916671 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -292,6 +292,8 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config)) + $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF), + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config)) $(if $(BR2_PACKAGE_SYSTEMD), $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 2527c90257..349dc6bf0d 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -47,9 +47,11 @@ config BR2_PACKAGE_LINUX_TOOLS_PERF code), single CPU or severals threads. This will build and install the userspace 'perf' - command. It is up to the user to ensure that the kernel - configuration has all the suitable options enabled to allow a - proper operation of 'perf'. + command. + + Your kernel must have CONFIG_PERF_EVENTS enabled to use perf + profiling. Buildroot automatically enables this in the kernel + configuration. https://perf.wiki.kernel.org/ From c76380dd7c5d7c7a0827ea9619413664fd5c9773 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 4 Jul 2018 09:07:37 +0200 Subject: [PATCH 2011/2640] zstd: build program and add menuconfig entry for host variant The zstd (de)compression tool may be used in post-image scripts to compress certain elements of the final image. In order to allow that, make host-zstd selectable in the 'Host utilities' menu, and build the binary in addition to the library. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/zstd/Config.in.host | 8 ++++++++ package/zstd/zstd.mk | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 package/zstd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 38543e7390..7838ffc219 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -62,5 +62,6 @@ menu "Host utilities" source "package/vboot-utils/Config.in.host" source "package/xorriso/Config.in.host" source "package/zip/Config.in.host" + source "package/zstd/Config.in.host" endmenu diff --git a/package/zstd/Config.in.host b/package/zstd/Config.in.host new file mode 100644 index 0000000000..05751f8fbf --- /dev/null +++ b/package/zstd/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_ZSTD + bool "host zstd" + help + Zstandard, or zstd as short version, is a fast lossless + compression algorithm, targeting real-time compression + scenarios at zlib-level and better compression ratios + + https://facebook.github.io/zstd diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 4915cee07d..0b613a6da4 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -72,11 +72,15 @@ endef define HOST_ZSTD_BUILD_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ -C $(@D)/lib + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D) zstd endef define HOST_ZSTD_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/programs install endef $(eval $(generic-package)) From c31637b584a49a40e3a1f72d80002fd8fea0eeee Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Jul 2018 07:29:36 +0300 Subject: [PATCH 2012/2640] alsa-utils: make fftw an optional dependency for alsabat The BR2_PACKAGE_ALSA_UTILS_BAT option currently selects BR2_PACKAGE_FFTW. However, it turns out that fftw is not a mandatory dependency to build alsabat, just an optional dependency. This commit therefore turns this dependency into an optional one. However, it is not just FFTW that is necessary, but the simple precision version of FFTW, so the optional dependency takes this into account. We take this opportunity to extend the Config.in help text for BR2_PACKAGE_ALSA_UTILS_BAT. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/alsa-utils/Config.in | 8 +++++++- package/alsa-utils/alsa-utils.mk | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 1a48fc0315..edf5d39f26 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -76,7 +76,13 @@ config BR2_PACKAGE_ALSA_UTILS_ASEQNET config BR2_PACKAGE_ALSA_UTILS_BAT bool "bat" - select BR2_PACKAGE_FFTW + help + ALSABAT (ALSA Basic Audio Tester) is a simple command-line + utility intended to help automate audio driver and sound + server testing with little human interaction. + + Note that analysis support in alsabat requires fftw single + precision. config BR2_PACKAGE_ALSA_UTILS_IECSET bool "iecset" diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 9b2e64b1d3..e9a45c675f 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -40,7 +40,8 @@ endif ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y) ALSA_UTILS_CONF_OPTS += --enable-bat -ALSA_UTILS_DEPENDENCIES += fftw +# Analysis support requires fftw single precision +ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),fftw) else ALSA_UTILS_CONF_OPTS += --disable-bat endif From ec0ae23c45c790cfcdaac9012ed470063b2558f0 Mon Sep 17 00:00:00 2001 From: Alfredo Alvarez Fernandez Date: Wed, 4 Jul 2018 09:07:36 +0200 Subject: [PATCH 2013/2640] pigz: new package A parallel implementation of gzip for modern multi-processor, multi-core machines. Signed-off-by: Alfredo Alvarez Fernandez Signed-off-by: Thomas De Schampheleire [Thomas: add entry to DEVELOPERS file, add hash for license file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/pigz/Config.in | 14 ++++++++++++++ package/pigz/pigz.hash | 3 +++ package/pigz/pigz.mk | 21 +++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/pigz/Config.in create mode 100644 package/pigz/pigz.hash create mode 100644 package/pigz/pigz.mk diff --git a/DEVELOPERS b/DEVELOPERS index 803d248b4f..1fa0020dbb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1914,6 +1914,7 @@ F: package/civetweb/ N: Thomas De Schampheleire F: docs/manual/ F: package/opkg-utils/ +F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare F: toolchain/ diff --git a/package/Config.in b/package/Config.in index e94a6a8c12..20fe5ad8ff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -70,6 +70,7 @@ menu "Compressors and decompressors" source "package/lzip/Config.in" source "package/lzop/Config.in" source "package/p7zip/Config.in" + source "package/pigz/Config.in" source "package/pixz/Config.in" source "package/unrar/Config.in" source "package/unzip/Config.in" diff --git a/package/pigz/Config.in b/package/pigz/Config.in new file mode 100644 index 0000000000..af229060cf --- /dev/null +++ b/package/pigz/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PIGZ + bool "pigz" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ZLIB + help + pigz, which stands for parallel implementation of gzip, is a + fully functional replacement for gzip that exploits multiple + processors and multiple cores to the hilt when compressing + data. + + http://www.zlib.net/pigz/ + +comment "pigz needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pigz/pigz.hash b/package/pigz/pigz.hash new file mode 100644 index 0000000000..850e94f079 --- /dev/null +++ b/package/pigz/pigz.hash @@ -0,0 +1,3 @@ +# From https://zlib.net/pigz/ +sha256 a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73 pigz-2.4.tar.gz +sha256 dc8f78258cdb4478b5922f4c00eb63d3cbac06c171dc829648fd414bb0cf4493 README diff --git a/package/pigz/pigz.mk b/package/pigz/pigz.mk new file mode 100644 index 0000000000..82f3049519 --- /dev/null +++ b/package/pigz/pigz.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# pigz +# +################################################################################ + +PIGZ_VERSION = 2.4 +PIGZ_SITE = http://www.zlib.net/pigz +PIGZ_DEPENDENCIES = zlib +PIGZ_LICENSE = Zlib +PIGZ_LICENSE_FILES = README + +define PIGZ_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define PIGZ_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/pigz $(TARGET_DIR)/usr/bin/pigz +endef + +$(eval $(generic-package)) From d7c2cf8e199d5623f30ca8c847f105605ab6d9ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Jul 2018 00:22:35 +0200 Subject: [PATCH 2014/2640] boost: graph needs regex output/host/usr/bin/m68k-linux-readelf -d output/staging/usr/lib/libboost_graph.so Dynamic section at offset 0x47f00 contains 28 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_regex.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index d0c759a122..5ed2470b94 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -156,6 +156,7 @@ config BR2_PACKAGE_BOOST_FILESYSTEM config BR2_PACKAGE_BOOST_GRAPH bool "boost-graph" + select BR2_PACKAGE_BOOST_REGEX help The BGL graph interface and graph components are generic, in the same sense as the the Standard Template Library (STL). From 84e7b7c798bd38fc8afa2df70520dcd9115387d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Jul 2018 00:23:15 +0200 Subject: [PATCH 2015/2640] boost: thread needs system output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_thread.so Dynamic section at offset 0x21f00 contains 28 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 5ed2470b94..68b1128818 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -310,6 +310,7 @@ config BR2_PACKAGE_BOOST_TEST config BR2_PACKAGE_BOOST_THREAD bool "boost-thread" + select BR2_PACKAGE_BOOST_SYSTEM help Portable C++ multi-threading. C++11, C++14. From 892e006d7f069c55ea6fe447141e629456db645a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Jul 2018 00:23:54 +0200 Subject: [PATCH 2016/2640] boost: type_erasure needs chrono, system, thread output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_type_erasure.so Dynamic section at offset 0xcef0 contains 30 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_thread.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 68b1128818..5977bba63d 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -323,6 +323,9 @@ config BR2_PACKAGE_BOOST_TIMER config BR2_PACKAGE_BOOST_TYPE_ERASURE bool "boost-type_erasure" + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD help Runtime polymorphism based on concepts. From 36855f5ce1752588d1e75089e78a6f6abdb9dbbc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Jul 2018 00:24:30 +0200 Subject: [PATCH 2017/2640] boost: coroutine needs chrono, system, thread output/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-readelf -d output/staging/usr/lib/libboost_coroutine.so Dynamic section at offset 0xdee8 contains 31 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_context.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_thread.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 5977bba63d..510ed336e4 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -101,7 +101,10 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD help deprecated coroutine library, the non-depricated coroutine2 library is a header-only library and does not need to be From b99dbdfac946751deb05e6e0c1f4c44659e15524 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 8 Mar 2018 19:43:33 +0200 Subject: [PATCH 2018/2640] lm-sensors: fix static build Add -static to the link command line to have libgcc resolve libc symbols. This overrides the default -Wl,-rpath,/usr/lib, which is useless for static build anyway. Fixes: http://autobuild.buildroot.net/results/25d580bee6f609f6b28ebd6cc96d180179901b0e/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/lm-sensors/lm-sensors.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index f581b5cd8f..6fc7ce4981 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -26,7 +26,7 @@ LM_SENSORS_MAKE_OPTS = \ PREFIX=/usr ifeq ($(BR2_STATIC_LIBS),y) -LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0 +LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0 EXLDFLAGS=-static else LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1 endif From 2554caba8c827fd5d9bb2635c94b51bc8f2700d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Jul 2018 18:09:18 +0200 Subject: [PATCH 2019/2640] domoticz: remove DOMOTICZ_CXXFLAGS Since commit 6be346cec40dda8ab762e11471fa6ff951fdbfa0, DOMOTICZ_CXXFLAGS is not set anymore so remove it Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/domoticz/domoticz.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 6421fd0dd5..3d6cae4746 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -27,8 +27,7 @@ DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_LUA=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ - -DUSE_BUILTIN_MQTT=OFF \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(DOMOTICZ_CXXFLAGS)" + -DUSE_BUILTIN_MQTT=OFF ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb From db96fecd7d02f4e9dc95ac4b899ef2328e5fcb19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Jul 2018 17:35:46 +0200 Subject: [PATCH 2020/2640] wampcc: needs C++ Fixes: - http://autobuild.buildroot.net/results/b47daa2f7df44109b839b07d282d4f5b5123533c Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wampcc/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/wampcc/Config.in b/package/wampcc/Config.in index d9d82df3ef..9cf7d99dfe 100644 --- a/package/wampcc/Config.in +++ b/package/wampcc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WAMPCC bool "wampcc" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv @@ -14,10 +15,11 @@ config BR2_PACKAGE_WAMPCC https://github.com/darrenjs/wampcc -comment "wampcc needs a toolchain w/ NPTL, dynamic library" +comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS comment "wampcc needs a toolchain not affected by GCC bug 64735" depends on BR2_USE_MMU From d36a01273b4d6be2758682784c47ee4e2e610090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20T=C3=AAtu?= Date: Fri, 6 Jul 2018 17:27:09 -0400 Subject: [PATCH 2021/2640] package/automake: bump version to 1.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If Buildroot is run from a folder containing a '@' in the path, automake will fail since the aclocal Perl script will interpret what is after the '@' as an array in its system include paths. This was fixed in automake 1.16.1. Signed-off-by: Jean-François Têtu Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/automake/automake.hash | 2 +- package/automake/automake.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/automake/automake.hash b/package/automake/automake.hash index b194c3c2bc..9ff55a4bae 100644 --- a/package/automake/automake.hash +++ b/package/automake/automake.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf automake-1.15.1.tar.xz +sha256 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 automake-1.16.1.tar.xz # License files, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 270337712e..92e7d64666 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOMAKE_VERSION = 1.15.1 +AUTOMAKE_VERSION = 1.16.1 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake AUTOMAKE_LICENSE = GPL-2.0+ From 9d1d513c65a17003f695a8aeea9d686f28456a44 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 5 Jul 2018 23:22:39 -0300 Subject: [PATCH 2022/2640] liblogging: update project URL The original site www.liblogging.org has been taken down because of the new European data protection regulation (GDPR), to which it was not compliant. Signed-off-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liblogging/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/liblogging/Config.in b/package/liblogging/Config.in index 23c3c1ad2d..a39fdf8ddc 100644 --- a/package/liblogging/Config.in +++ b/package/liblogging/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBLOGGING logging. It offers an enhanced replacement for the syslog() call, but retains its ease of use. - http://www.liblogging.org/ + https://www.rsyslog.com/liblogging/ From 542891d6700e487ac89035a5b0e79ea1d31d8544 Mon Sep 17 00:00:00 2001 From: Alfredo Alvarez Fernandez Date: Thu, 5 Jul 2018 10:10:04 +0200 Subject: [PATCH 2023/2640] pigz: update to more stable download URL The pigz website seems to only host the latest release tarball. Chances are that the 2.4 tarball will disappear when 2.5 comes out. Instead, use the Github tarballs provided by the developer. Comparison between the 2.4 / v2.4 tarballs shows that only the .gitignore file is added. Suggested-by: Alfredo Alvarez Fernandez Signed-off-by: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pigz/pigz.hash | 4 ++-- package/pigz/pigz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pigz/pigz.hash b/package/pigz/pigz.hash index 850e94f079..843fd4fba8 100644 --- a/package/pigz/pigz.hash +++ b/package/pigz/pigz.hash @@ -1,3 +1,3 @@ -# From https://zlib.net/pigz/ -sha256 a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73 pigz-2.4.tar.gz +# Locally calculated +sha256 e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52 pigz-v2.4.tar.gz sha256 dc8f78258cdb4478b5922f4c00eb63d3cbac06c171dc829648fd414bb0cf4493 README diff --git a/package/pigz/pigz.mk b/package/pigz/pigz.mk index 82f3049519..ac4f94027c 100644 --- a/package/pigz/pigz.mk +++ b/package/pigz/pigz.mk @@ -4,8 +4,8 @@ # ################################################################################ -PIGZ_VERSION = 2.4 -PIGZ_SITE = http://www.zlib.net/pigz +PIGZ_VERSION = v2.4 +PIGZ_SITE = $(call github,madler,pigz,$(PIGZ_VERSION)) PIGZ_DEPENDENCIES = zlib PIGZ_LICENSE = Zlib PIGZ_LICENSE_FILES = README From 3193ac1d5426ad7202cfb262094f86f32f454212 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 5 Jul 2018 22:54:39 +0200 Subject: [PATCH 2024/2640] package/openpowerlink: bump to version 2.7.0 See http://openpowerlink.sourceforge.net/doc/2.7/2.7.0/page_revision_history.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/openpowerlink/openpowerlink.hash | 8 ++++---- package/openpowerlink/openpowerlink.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openpowerlink/openpowerlink.hash b/package/openpowerlink/openpowerlink.hash index f69950ddcf..da9bdd2a72 100644 --- a/package/openpowerlink/openpowerlink.hash +++ b/package/openpowerlink/openpowerlink.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.6.2/ -md5 bbb268e33e55424de563cb677703d8f7 openPOWERLINK_V2.6.2.tar.gz -sha1 bf6a8b202c1192b531ce6d6c4c6254e5689c65fe openPOWERLINK_V2.6.2.tar.gz +# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.0/ +md5 4843f857b8334c984827435fa9e1ab96 openPOWERLINK_V2.7.0.tar.gz +sha1 a256e05d187b334651764ab21a827b3a4fa64e2f openPOWERLINK_V2.7.0.tar.gz # sha256 locally computed -sha256 38d7a93c05cc0167be5c498e625d1efddeac2616ceb1bc8c3c6679552ae6da15 openPOWERLINK_V2.6.2.tar.gz +sha256 64c23ee42e3852bf2316fd99c59eae9cdd634219f92b3ea70ce747dad1e05354 openPOWERLINK_V2.7.0.tar.gz diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk index e2958b30b1..90088cef56 100644 --- a/package/openpowerlink/openpowerlink.mk +++ b/package/openpowerlink/openpowerlink.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWERLINK_VERSION = V2.6.2 +OPENPOWERLINK_VERSION = V2.7.0 OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION) OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0 From a777a426a0ba211eccaf70866537ef3ad08d2d86 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 5 Jul 2018 16:24:29 -0300 Subject: [PATCH 2025/2640] uboot: Introduce BR2_TARGET_UBOOT_FORMAT_DTB_IMX Some i.MX boards which use device tree to describe the hardware for U-Boot generate a u-boot-dtb.imx binary. Introduce the BR2_TARGET_UBOOT_FORMAT_DTB_IMX option to handle such case. Signed-off-by: Fabio Estevam Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/uboot/Config.in | 3 +++ boot/uboot/uboot.mk | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 482711ca64..7f8291abe8 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -190,6 +190,9 @@ config BR2_TARGET_UBOOT_FORMAT_DTB_BIN config BR2_TARGET_UBOOT_FORMAT_DTB_IMG bool "u-boot-dtb.img" +config BR2_TARGET_UBOOT_FORMAT_DTB_IMX + bool "u-boot-dtb.imx" + config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6ef275e842..bf227f2893 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -70,6 +70,11 @@ UBOOT_BINS += u-boot-dtb.img UBOOT_MAKE_TARGET += u-boot-dtb.img endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMX),y) +UBOOT_BINS += u-boot-dtb.imx +UBOOT_MAKE_TARGET += u-boot-dtb.imx +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_BIN),y) UBOOT_BINS += u-boot-dtb.bin UBOOT_MAKE_TARGET += u-boot-dtb.bin From 3b0aa9bc18903b7fb465e525046eb5ea3867869e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 5 Jul 2018 10:35:23 +0300 Subject: [PATCH 2026/2640] DEVELOPERS: fix alphabetic order Move Pierre's entry to its correct place. Cc: Pierre Ducroquet Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1fa0020dbb..cba1344d1d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1609,6 +1609,9 @@ F: package/lttng-tools/ F: package/python-ipython/ F: package/liburcu/ +N: Pierre Ducroquet +F: package/kf5/ + N: Pierre Floury F: package/trace-cmd/ @@ -2143,6 +2146,3 @@ F: package/qjson/ F: package/quazip/ F: package/shapelib/ F: package/tinc/ - -N: Pierre Ducroquet -F: package/kf5/ From 0fe0c50d3683be4975a4551ac183707692b11215 Mon Sep 17 00:00:00 2001 From: Asgeir Bjarni Ingvarsson Date: Wed, 4 Jul 2018 22:36:24 +0200 Subject: [PATCH 2027/2640] systemd: Fix polkit build order We need to install polkit before systemd if we want to enable polkit integration, because systemd will not install polkit policy files unless it finds polkit-gobject-1. Signed-off-by: Asgeir Bjarni Ingvarsson Acked-by: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 10e11a9277..04775ee778 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -283,6 +283,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y) SYSTEMD_CONF_OPTS += -Dpolkit=true +SYSTEMD_DEPENDENCIES += polkit else SYSTEMD_CONF_OPTS += -Dpolkit=false endif From e26a71d1a96aefcc6a63051207b26ea4282afb10 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Fri, 29 Jun 2018 12:23:10 +0300 Subject: [PATCH 2028/2640] configs/raspberrypi3_defconfig: increase filesystem size Increase the filesystem size for raspberrypi3 by setting BR2_TARGET_ROOTFS_EXT2_SIZE to "120M". The filesystem for raspberrypi3_64 has the same size. The size is so large because the kernel config enables many many modules. Fixes: Copying files into the device: __populate_fs: Could not allocate block in ext2 filesystem while writing file "services" mkfs.ext4: Could not allocate block in ext2 filesystem while populating file system This error is not reproducible, it seems to depend on e.g. directory ordering. Signed-off-by: Leon Anavi Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/raspberrypi3_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 856f321433..0ef9afeecf 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -28,6 +28,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" From ffb69cc9c8bd2c7e7085ac8050b685a1f8c7ffe6 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 8 Jul 2018 02:16:57 -0300 Subject: [PATCH 2029/2640] gconf: use $() to reference make variables instead of ${} Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gconf/gconf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk index 39df95fbd2..60ced95e18 100644 --- a/package/gconf/gconf.mk +++ b/package/gconf/gconf.mk @@ -5,7 +5,7 @@ ################################################################################ GCONF_VERSION = 3.2.6 -GCONF_SOURCE = GConf-${GCONF_VERSION}.tar.xz +GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2 GCONF_CONF_OPTS = --disable-orbit GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \ From de6968156cbc27526aa65b22d74fd9bf78342503 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 8 Jul 2018 02:16:58 -0300 Subject: [PATCH 2030/2640] json-for-modern-cpp: use $() to reference make variables instead of ${} Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 4bcfd46910..e547c07875 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -5,7 +5,7 @@ ################################################################################ JSON_FOR_MODERN_CPP_VERSION = v3.1.2 -JSON_FOR_MODERN_CPP_SOURCE = json-${JSON_FOR_MODERN_CPP_VERSION}.tar.gz +JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT From b492ab57855d1983fbf638580a074873ccbf96a6 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 8 Jul 2018 02:16:59 -0300 Subject: [PATCH 2031/2640] libpng: use $() to reference make variables instead of ${} Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libpng/libpng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index f8594c808f..ace62cd876 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -7,7 +7,7 @@ LIBPNG_VERSION = 1.6.34 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz -LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) +LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_LICENSE = Libpng LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES From dba254cdf006e559ed61e1a136677843a3b4a94e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 8 Jul 2018 02:17:00 -0300 Subject: [PATCH 2032/2640] php: use $() to reference make variables instead of ${} Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/php/php.mk b/package/php/php.mk index 4c3a87118e..028fa6fc55 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -137,7 +137,7 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) PHP_CONF_ENV += php_cv_libxml_build_works=yes -PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr +PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libxml2 endif From d1972e13ddeabe9287b82441554d40ade74bbc9e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jul 2018 09:36:45 +0200 Subject: [PATCH 2033/2640] libzip: bump to version 1.5.1 - Remove patch (already in version) - Update hash of license file: AES section has been removed: https://github.com/nih-at/libzip/commit/303fde909ffb1725f9926bed7be33b3abc87a107 The AES section was BSD-3-Clause as well, so nothing changes in LIBZIP_LICENSE. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...Use-cmake-E-tar-to-extract-test-data.patch | 40 ------------------- package/libzip/libzip.hash | 4 +- package/libzip/libzip.mk | 2 +- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch diff --git a/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch b/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch deleted file mode 100644 index 7d40111b1b..0000000000 --- a/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9244b207c0fc883ff84c1fc46602feb1e2b0347 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Wed, 3 Jan 2018 11:41:57 +0100 -Subject: [PATCH] Use 'cmake -E tar' to extract test data. - -For easier cross-compilation (Github issue #21). - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit e9244b207c0 - - regress/CMakeLists.txt | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt -index e2ce232c774a..3a0d4f77dcf6 100644 ---- a/regress/CMakeLists.txt -+++ b/regress/CMakeLists.txt -@@ -51,15 +51,9 @@ ADD_CUSTOM_TARGET(cleanup - ADD_CUSTOM_TARGET(testinput - ALL - VERBATIM -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 0 > manyfiles.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 1 > manyfiles-133000.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 2 > manyfiles-65536.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 3 > manyfiles-zip64-modulo.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 4 > manyfiles-zip64.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 5 > manyfiles-fewer.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 6 > manyfiles-more.zip -- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip cat 0 > bigzero.zip -- DEPENDS ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip -+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip -+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip - ) - - SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES --- -2.15.1 - diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index 0eeb3130c0..e9ed4717c5 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1 libzip-1.4.0.tar.xz -sha256 3c964a7eb1abeb6bd6f40035ed3a014728ff8c5437f107dcf24fbbfab16e227e LICENSE +sha256 04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372 libzip-1.5.1.tar.xz +sha256 04464e729973cf58189051e7a3e8bca2acce9a1058c735e9e2eb1fdbe0fbbf50 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 537aa1deeb..d46bc17977 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.4.0 +LIBZIP_VERSION = 1.5.1 LIBZIP_SITE = http://www.nih.at/libzip LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause From 975dedc753121607300ff059591522b21c4350bc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jul 2018 09:36:46 +0200 Subject: [PATCH 2034/2640] libzip: add optional openssl support openssl support has been added since version 1.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libzip/libzip.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index d46bc17977..0253a61cda 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -18,4 +18,11 @@ else LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBZIP_DEPENDENCIES += openssl +LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON +else +LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=OFF +endif + $(eval $(cmake-package)) From d5d1df1ba75f8acb97eb69d779b86bbeb472aa69 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jul 2018 09:36:47 +0200 Subject: [PATCH 2035/2640] libzip: add optional gnutls support gnutls support has been added since version 1.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libzip/libzip.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 0253a61cda..20c04122ec 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -18,6 +18,13 @@ else LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBZIP_DEPENDENCIES += gnutls +LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=ON +else +LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBZIP_DEPENDENCIES += openssl LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON From 50dc350c65f4b1662ba986d6eb25b24a70c43128 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:26 +0200 Subject: [PATCH 2036/2640] package/busybox: update to 1.29.0 The two patches are still needed, with the second needing a slight refresh around the edge. Since upstream has now full support to perform a noclobber install, drop our BUSYBOX_NOCLOBBER_INSTALL hook and use the new install rule. Signed-off-by: "Yann E. MORIN" Cc: Baruch Siach Cc: Matt Weber Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...flags-strip-non-l-arguments-returned-by-pkg.patch | 4 +++- package/busybox/busybox.hash | 10 +++------- package/busybox/busybox.mk | 12 ++++-------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index a5da3a251e..8375ae0531 100644 --- a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -4,6 +4,8 @@ Date: Mon, 25 Nov 2013 22:51:53 +0100 Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config Signed-off-by: Thomas Petazzoni +[yann.morin.1998@free.fr: refresh for 1.29.0] +Signed-off-by: "Yann E. MORIN" --- Makefile.flags | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) @@ -22,7 +24,7 @@ index 307afa7..885e323 100644 + $(SELINUX_PC_MODULES:lib%=%)) endif - ifeq ($(CONFIG_EFENCE),y) + ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) -- 1.8.1.2 diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 066817aefb..26194be3a9 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,7 +1,3 @@ -# From https://busybox.net/downloads/busybox-1.28.4.tar.bz2.sign -md5 5661d013c9ef7cc31a453640c320f56b busybox-1.28.4.tar.bz2 -sha1 acd0558a659b795da1dfbd7e0ed5353d6836fa37 busybox-1.28.4.tar.bz2 - -# Locally calculated -sha256 e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a busybox-1.28.4.tar.bz2 -sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE +# From https://busybox.net/downloads/busybox-1.29.0.tar.bz2.sha256 +sha256 c8115612f0be640644e7c35098766ddaac4a88b773c4c4f0e43564982f660c82 busybox-1.29.0.tar.bz2 +sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ba5a16b5b7..948a8313c3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.28.4 +BUSYBOX_VERSION = 1.29.0 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 @@ -253,12 +253,6 @@ define BUSYBOX_INSTALL_ADD_TO_SHELLS endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS -# Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any -# full-blown versions of apps installed by other packages with sym/hard links. -define BUSYBOX_NOCLOBBER_INSTALL - $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh -endef - define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_MMU) $(BUSYBOX_PREFER_STATIC) @@ -280,7 +274,9 @@ define BUSYBOX_BUILD_CMDS endef define BUSYBOX_INSTALL_TARGET_CMDS - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install + # Use the 'noclobber' install rule, to prevent BusyBox from overwriting + # any full-blown versions of apps installed by other packages. + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install-noclobber $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) From f13a12e2c90d2386263bb41eaa667c9daa0c7a8a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:27 +0200 Subject: [PATCH 2037/2640] package/busybox: invert dependency with whois Signed-off-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 4 ++++ package/whois/whois.mk | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 948a8313c3..47047d1a81 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -20,6 +20,10 @@ BUSYBOX_CFLAGS = \ BUSYBOX_LDFLAGS = \ $(TARGET_LDFLAGS) +# Packages that provide commands that may also be busybox applets: +BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_WHOIS),whois) + # Link against libtirpc if available so that we can leverage its RPC # support for NFS mounting with BusyBox ifeq ($(BR2_PACKAGE_LIBTIRPC),y) diff --git a/package/whois/whois.mk b/package/whois/whois.mk index c9203d8c0d..6b6069c51a 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -7,8 +7,7 @@ WHOIS_VERSION = 5.3.1 WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180522T155750Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz -# take precedence over busybox implementation -WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES) +WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV) WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LIBS="$(WHOIS_EXTRA_LIBS)" From 0e3240ddcc6e884fcda952c9a1b1d2da961c163a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:28 +0200 Subject: [PATCH 2038/2640] package/busybox: invert dependency with wget Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/wget/wget.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 47047d1a81..e5de1b7284 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WHOIS),whois) # Link against libtirpc if available so that we can leverage its RPC diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 36afea761a..28bd0a264f 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -11,11 +11,6 @@ WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING -# Prefer full-blown wget over busybox -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -WGET_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls From cd41a1bc220f3647ece5c141a9e0d1e8db3c9c52 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:29 +0200 Subject: [PATCH 2039/2640] package/busybox: invert dependency with vim Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/vim/vim.mk | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e5de1b7284..c42c4a470a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_VIM),vim) \ $(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WHOIS),whois) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 0c02ead7b5..dbf71c573f 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -6,10 +6,7 @@ VIM_VERSION = v8.1.0133 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) -# Win over busybox vi since vim is more feature-rich -VIM_DEPENDENCIES = \ - ncurses $(TARGET_NLS_DEPENDENCIES) \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) +VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src VIM_CONF_ENV = \ vim_cv_toupper_broken=no \ From f0bc0e94ab0d6cc4a0a30835f162987d5cd0614e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:30 +0200 Subject: [PATCH 2040/2640] package/busybox: invert dependency with util-linux Signed-off-by: Yann E. MORIN Reviewed-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/util-linux/util-linux.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index c42c4a470a..38f0246b4f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ $(if $(BR2_PACKAGE_VIM),vim) \ $(if $(BR2_PACKAGE_WGET),wget) \ $(if $(BR2_PACKAGE_WHOIS),whois) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 80a8a08051..76f4b97f5f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -31,12 +31,6 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency HOST_UTIL_LINUX_CONF_OPTS = --without-python -# If both util-linux and busybox are selected, make certain util-linux -# wins the fight over who gets to have their utils actually installed -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -UTIL_LINUX_DEPENDENCIES += busybox -endif - # Prevent the installation from attempting to move shared libraries from # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are # the same when merged usr is in use. From c4968938bb8ff60d219e0cea1920a2f1dd0e2760 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:31 +0200 Subject: [PATCH 2041/2640] package/busybox: invert dependency with usbutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/usbutils/usbutils.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 38f0246b4f..817f7a9c63 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ $(if $(BR2_PACKAGE_VIM),vim) \ $(if $(BR2_PACKAGE_WGET),wget) \ diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 43322e4a65..4bd12f34ff 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -11,11 +11,6 @@ USBUTILS_DEPENDENCIES = host-pkgconf libusb udev USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py) USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt -# Build after busybox since it's got a lightweight lsusb -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -USBUTILS_DEPENDENCIES += busybox -endif - # Nice lsusb.py script only if there's python 3.x ifeq ($(BR2_PACKAGE_PYTHON3),) define USBUTILS_REMOVE_PYTHON From faa21d4d22e1d8aac2313dcdc2f4bb9274ca59f5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:32 +0200 Subject: [PATCH 2042/2640] package/busybox: invert dependency with unzip Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/unzip/unzip.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 817f7a9c63..45153731af 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_UNZIP),unzip) \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ $(if $(BR2_PACKAGE_VIM),vim) \ diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 7d48d25309..cff5951ac0 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -7,8 +7,6 @@ UNZIP_VERSION = 60 UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src -# take precedence over busybox implementation -UNZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE From 0ed60ad5663ee544401d8dc5499c6b4468926aa9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:33 +0200 Subject: [PATCH 2043/2640] package/busybox: invert dependency with traceroute Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/traceroute/traceroute.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 45153731af..36527ce24e 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \ $(if $(BR2_PACKAGE_UNZIP),unzip) \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ diff --git a/package/traceroute/traceroute.mk b/package/traceroute/traceroute.mk index d01c62d5ea..192197498d 100644 --- a/package/traceroute/traceroute.mk +++ b/package/traceroute/traceroute.mk @@ -10,11 +10,6 @@ TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/tracero TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+ TRACEROUTE_LICENSE_FILES = COPYING COPYING.LIB -# Prefer full-featured traceroute over busybox's version -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -TRACEROUTE_DEPENDENCIES += busybox -endif - define TRACEROUTE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D) From 651a91bddec3465153a3c644605e6f6131977f14 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:34 +0200 Subject: [PATCH 2044/2640] package/busybox: invert dependency with tftpd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/tftpd/tftpd.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 36527ce24e..270dcc1416 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_TFTPD),tftpd) \ $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \ $(if $(BR2_PACKAGE_UNZIP),unzip) \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 78df835aa5..c42456afd1 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -9,11 +9,6 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa TFTPD_CONF_OPTS = --without-tcpwrappers -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -TFTPD_DEPENDENCIES += busybox -endif - define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp $(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd From f6d2c00d4311526bb627757baf790c2331c5c3a6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:35 +0200 Subject: [PATCH 2045/2640] package/busybox: invert dependency with tar Signed-off-by: Yann E. MORIN Cc: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/tar/tar.mk | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 270dcc1416..ff2e4c770c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_TAR),tar) \ $(if $(BR2_PACKAGE_TFTPD),tftpd) \ $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \ $(if $(BR2_PACKAGE_UNZIP),unzip) \ diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 9942e77737..6f609d7a02 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -8,16 +8,11 @@ TAR_VERSION = 1.29 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz TAR_SITE = $(BR2_GNU_MIRROR)/tar # busybox installs in /bin, so we need tar to install as well in /bin -# so that it overrides the Busybox symlinks. +# so that we don't end up with two different tar TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING -# Prefer full-blown tar over buybox's version -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -TAR_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl TAR_CONF_OPTS += --with-posix-acls From ad879202a1a535672d7ad81d3f61aa53a4dca4ff Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:36 +0200 Subject: [PATCH 2046/2640] package/busybox: invert dependency with sysvinit Signed-off-by: Yann E. MORIN Reviewed-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/sysvinit/sysvinit.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ff2e4c770c..e504924540 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \ $(if $(BR2_PACKAGE_TAR),tar) \ $(if $(BR2_PACKAGE_TFTPD),tftpd) \ $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \ diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index a606ddabf0..993e399e73 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -13,11 +13,6 @@ SYSVINIT_LICENSE_FILES = COPYING SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSVINIT_DEPENDENCIES = busybox -endif - ifeq ($(BR2_PACKAGE_LIBSELINUX),y) SYSVINIT_DEPENDENCIES += libselinux SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes" From a4b0e1801c860e18ae6eefc15aead9fc0ec431b6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:37 +0200 Subject: [PATCH 2047/2640] package/busybox: invert dependency with systemd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/systemd/systemd.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e504924540..9d3ea22d96 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_SYSTEMD),systemd) \ $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \ $(if $(BR2_PACKAGE_TAR),tar) \ $(if $(BR2_PACKAGE_TFTPD),tftpd) \ diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 04775ee778..d7031ed21d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -18,12 +18,6 @@ SYSTEMD_DEPENDENCIES = \ SYSTEMD_PROVIDES = udev -# Make sure that systemd will always be built after busybox so that we have -# a consistent init setup between two builds -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSTEMD_DEPENDENCIES += busybox -endif - SYSTEMD_CONF_OPTS += \ -Drootlibdir='/usr/lib' \ -Dblkid=true \ From 3fd118aac02c079fe7b5c4d273d879b337a2e15d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:38 +0200 Subject: [PATCH 2048/2640] package/busybox: invert dependency with syslog-ng In so doing, we must now ensure that busybox does not overwrite the startup script already installed by syslog-ng. Signed-off-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 6 +++++- package/syslog-ng/syslog-ng.mk | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 9d3ea22d96..c6c7b03ab3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) \ $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \ $(if $(BR2_PACKAGE_TAR),tar) \ @@ -208,8 +209,11 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES endef endif +# Only install our own if no other package already did. define BUSYBOX_INSTALL_LOGGING_SCRIPT - if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \ + if grep -q CONFIG_SYSLOGD=y $(@D)/.config && \ + [ ! -e $(TARGET_DIR)/etc/init.d/S01logging ]; \ + then \ $(INSTALL) -m 0755 -D package/busybox/S01logging \ $(TARGET_DIR)/etc/init.d/S01logging; \ fi diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 2b6f2c09e9..793fea0972 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -17,11 +17,6 @@ SYSLOG_NG_CONF_ENV = LIBS=-lrt SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ --disable-java --disable-java-modules --disable-mongodb -# We override busybox's S01logging init script -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSLOG_NG_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_GEOIP),y) SYSLOG_NG_DEPENDENCIES += geoip SYSLOG_NG_CONF_OPTS += --enable-geoip From 6d9e5980c38a9bb365ab2b0f674a770886271cfb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:39 +0200 Subject: [PATCH 2049/2640] package/busybox: invert dependency with sysklogd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/sysklogd/sysklogd.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index c6c7b03ab3..bbf3834e0d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \ $(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) \ $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \ diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 1c8259a9af..c4f064c10b 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -9,11 +9,6 @@ SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download SYSKLOGD_LICENSE = GPL-2.0+ SYSKLOGD_LICENSE_FILES = COPYING -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSKLOGD_DEPENDENCIES = busybox -endif - # Override SKFLAGS which is used as CFLAGS. define SYSKLOGD_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \ From 1e617aa1845c74fac79215cfb82a08f9ec92652f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:40 +0200 Subject: [PATCH 2050/2640] package/busybox: invert dependency with start-stop-daemon Signed-off-by: Yann E. MORIN Reviewed-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/start-stop-daemon/start-stop-daemon.mk | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index bbf3834e0d..00e17c4be6 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \ $(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \ $(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) \ diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk index 7071f5617e..01a6719762 100644 --- a/package/start-stop-daemon/start-stop-daemon.mk +++ b/package/start-stop-daemon/start-stop-daemon.mk @@ -19,8 +19,7 @@ START_STOP_DAEMON_CONF_ENV = \ dpkg_cv_va_copy=yes \ dpkg_cv_c99_snprintf=yes \ DPKG_DEVEL_MODE=1 -START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) +START_STOP_DAEMON_DEPENDENCIES = host-pkgconf # Patching m4/dpkg-arch.m4 START_STOP_DAEMON_AUTORECONF = YES START_STOP_DAEMON_LICENSE = GPL-2.0+ From 3ee4f78b36fb8d6ccb3b1e8b5d845ccbd86790e1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:41 +0200 Subject: [PATCH 2051/2640] package/busybox: invert dependency with rsyslog Signed-off-by: Yann E. MORIN Cc: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/rsyslog/rsyslog.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 00e17c4be6..22b798207a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \ $(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \ $(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \ $(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \ diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index e32505be22..61e08ba765 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -17,11 +17,6 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) -# Build after BusyBox -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -RSYSLOG_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls From d1a6280fe629896795b20b09013501cfa0094a1e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:42 +0200 Subject: [PATCH 2052/2640] package/busybox: invert dependency with psmisc Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/psmisc/psmisc.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 22b798207a..1a1ed792a2 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_PSMISC),psmisc) \ $(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \ $(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \ $(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \ diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3d9a80462d..3916e34b08 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -23,9 +23,4 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) PSMISC_CONF_OPTS = --disable-harden-flags endif -# build after busybox, we prefer fat versions while we're at it -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PSMISC_DEPENDENCIES += busybox -endif - $(eval $(autotools-package)) From bb47802facc682221bf169fa83b2676838503504 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:43 +0200 Subject: [PATCH 2053/2640] package/busybox: invert dependency with procps-ng Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/procps-ng/procps-ng.mk | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1a1ed792a2..df51f288c4 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \ $(if $(BR2_PACKAGE_PSMISC),psmisc) \ $(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \ $(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \ diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index e1fddea32c..03b74784d2 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -13,12 +13,6 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) -# If both procps-ng and busybox are selected, make certain procps-ng -# wins the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PROCPS_NG_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_CONF_OPTS += --with-systemd @@ -26,8 +20,8 @@ else PROCPS_NG_CONF_OPTS += --without-systemd endif -# Make sure binaries get installed in /bin, so that they overwrite -# their busybox counterparts. +# Make sure binaries get installed in /bin, as busybox does, so that we +# don't end up with two versions. # Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/ # otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking # pkg-config --libs libprocps. From 8e0b29022f11d869c59173f3713e31ddba0df7b1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:44 +0200 Subject: [PATCH 2054/2640] package/busybox: invert dependency with pciutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/pciutils/pciutils.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index df51f288c4..c87bcec0e4 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ $(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \ $(if $(BR2_PACKAGE_PSMISC),psmisc) \ $(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \ diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 2dd5771f21..30d429e75a 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -46,11 +46,6 @@ else PCIUTILS_MAKE_OPTS += SHARED=yes endif -# Build after busybox since it's got a lightweight lspci -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PCIUTILS_DEPENDENCIES += busybox -endif - define PCIUTILS_CONFIGURE_CMDS $(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh $(SED) 's/uname -s/echo Linux/' \ From 2319270de79e01ceb833baa909f2c5723d1926af Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:45 +0200 Subject: [PATCH 2055/2640] package/busybox: invert dependency with ntp Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/ntp/ntp.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index c87bcec0e4..1d3d202f53 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NTP),ntp) \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ $(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \ $(if $(BR2_PACKAGE_PSMISC),psmisc) \ diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 77bb33a42f..674c368395 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -7,7 +7,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION = $(NTP_VERSION_MAJOR).8p11 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) -NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox) +NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP NTP_LICENSE_FILES = COPYRIGHT NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no From 9f9235d35c7bce5cc7ca87b8cb1c6c92a0b2c15c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:46 +0200 Subject: [PATCH 2056/2640] package/busybox: invert dependency with nmap We only need that dependency when nmap's ncat is enabled. For consistency, we add a dependency on nmap, not a suboption of it, to have a dependency list in busybox that is only about packages, and directly associates the upper-case package variable to the lower-case package name, e.g. NMAP <-> nmap. Thus, if BR2_PACKAGE_NMAP_NCAT is selected, we have a redundant dependency. But that doesn't hurt and it really simplifies things. Signed-off-by: Yann E. MORIN Reviewed-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/nmap/nmap.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1d3d202f53..55c3d25b8e 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ $(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \ diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 1c89b5424e..420aec82d7 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -76,12 +76,6 @@ else NMAP_CONF_OPTS += --without-nping endif -# If we are going to install ncat, ensure Busybox gets built/installed -# before, so that this package overrides Busybox nc. -ifeq ($(BR2_PACKAGE_NMAP_NCAT)$(BR2_PACKAGE_BUSYBOX),yy) -NMAP_DEPENDENCIES += busybox -endif - # Add a symlink to "nc" if none of the competing netcats is selected ifeq ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:) define NMAP_INSTALL_NCAT_SYMLINK From f3da9ffff010d3b5fee984bb20a1f39df4b973f2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:47 +0200 Subject: [PATCH 2057/2640] package/busybox: invert dependency with netcat-openbsd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/netcat-openbsd/netcat-openbsd.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 55c3d25b8e..003909806a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index 5784e4d68e..e98b479c4f 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -10,12 +10,6 @@ NETCAT_OPENBSD_LICENSE = BSD-3-Clause NETCAT_OPENBSD_LICENSE_FILES = debian/copyright NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd -# Ensure Busybox gets built/installed before, so that this package -# overrides Busybox nc. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NETCAT_OPENBSD_DEPENDENCIES += busybox -endif - define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ From 355eadf4ab89049bb0a907faf6a1f13d75322808 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:48 +0200 Subject: [PATCH 2058/2640] package/busybox: invert dependency with netcat Since netcat would be installed before busybox, we don't need to remove a pre-installed 'nc' anymore. If another netcat implementation (e.g. netcat-openbsd) is also enabled, there is no way to tell which would win in the end, especially when we add TLPB, in which case that will be forbidden. So, we don't need to remove anything anymore. Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/netcat/netcat.mk | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 003909806a..eeb9dc5bac 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index d8b3c930b9..eb7ddcac27 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -9,17 +9,4 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -# Ensure Busybox gets built/installed before, so that this package -# overrides Busybox nc. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NETCAT_DEPENDENCIES += busybox -endif - -# Netcat doesn't overwrite a pre-existing 'nc' (e.g. from busybox) so -# force-remove it. -define NETCAT_RMOVE_NC_LINK - rm -f $(TARGET_DIR)/usr/bin/nc -endef -NETCAT_PRE_INSTALL_TARGET_HOOKS += NETCAT_RMOVE_NC_LINK - $(eval $(autotools-package)) From d0966cdd57302c84adc47d8504f3a568e247bdb0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:49 +0200 Subject: [PATCH 2059/2640] package/busybox: invert dependency with net-tools Signed-off-by: Yann E. MORIN Cc: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/net-tools/net-tools.mk | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eeb9dc5bac..451aae46a5 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \ $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index adab475b35..985fe2e35e 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -10,11 +10,6 @@ NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NET_TOOLS_DEPENDENCIES += busybox -endif - define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) endef @@ -40,7 +35,8 @@ define NET_TOOLS_BUILD_CMDS endef # install renames conflicting binaries, update does not -# ifconfig & route reside in /sbin for busybox +# ifconfig & route reside in /sbin for busybox, so ensure we don't end +# up with two versions of those. define NET_TOOLS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig From 14a16b3bc6730eefc433c1ad8f399967168dbe04 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:50 +0200 Subject: [PATCH 2060/2640] package/busybox: invert dependency with mtd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/mtd/mtd.mk | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 451aae46a5..efb463554c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_MTD),mtd) \ $(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \ $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 83bd6a6ae9..13e501fc33 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -31,10 +31,6 @@ else MTD_CONF_OPTS += --disable-tests --disable-install-tests endif -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -MTD_DEPENDENCIES += busybox -endif - # If extended attributes are required, the acl package must # also be enabled which will also include the attr package. ifeq ($(BR2_PACKAGE_ACL),y) From 00805d2fb97c524c19e163077fe36fc53d6e329a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:51 +0200 Subject: [PATCH 2061/2640] package/busybox: invert dependency with lsof Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/lsof/lsof.mk | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index efb463554c..cb629892cd 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LSOF),lsof) \ $(if $(BR2_PACKAGE_MTD),mtd) \ $(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \ $(if $(BR2_PACKAGE_NETCAT),netcat) \ diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 0dc8e2de2f..83a9b6c388 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -13,9 +13,6 @@ LSOF_LICENSE = lsof license # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h -# Make certain full-blown lsof gets built after the busybox version (1.20+) -LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) - ifeq ($(BR2_USE_WCHAR),) define LSOF_CONFIGURE_WCHAR_FIXUPS $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \ From ed231e7b8b4e418c531bcd485f39e749646b029b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:52 +0200 Subject: [PATCH 2062/2640] package/busybox: invert dependency with less Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/less/less.mk | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index cb629892cd..95fea18b50 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LESS),less) \ $(if $(BR2_PACKAGE_LSOF),lsof) \ $(if $(BR2_PACKAGE_MTD),mtd) \ $(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \ diff --git a/package/less/less.mk b/package/less/less.mk index bccc08b89f..ef3643c0aa 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -8,8 +8,7 @@ LESS_VERSION = 487 LESS_SITE = $(BR2_GNU_MIRROR)/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING -# Build after busybox, full-blown is better -LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox) +LESS_DEPENDENCIES = ncurses define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less From 273f23a452527859605be496992a65f28e3ee7c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:53 +0200 Subject: [PATCH 2063/2640] package/busybox: invert dependency with kmod Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/kmod/kmod.mk | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 95fea18b50..812de14ad0 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_KMOD),kmod) \ $(if $(BR2_PACKAGE_LESS),less) \ $(if $(BR2_PACKAGE_LSOF),lsof) \ $(if $(BR2_PACKAGE_MTD),mtd) \ diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index e1149b7b65..7c796ab19f 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -49,9 +49,6 @@ ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools) KMOD_LICENSE_FILES += COPYING -# take precedence over busybox implementation -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) - # /sbin is really /usr/sbin with merged /usr, so adjust relative symlink ifeq ($(BR2_ROOTFS_MERGED_USR),y) KMOD_BIN_PATH = ../bin/kmod From fcc3b9cec2f1babb2e0a545e3ffa232afead32c9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:54 +0200 Subject: [PATCH 2064/2640] package/busybox: invert dependency with iputils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/iputils/iputils.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 812de14ad0..399db06bb9 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_IPUTILS),iputils) \ $(if $(BR2_PACKAGE_KMOD),kmod) \ $(if $(BR2_PACKAGE_LESS),less) \ $(if $(BR2_PACKAGE_LSOF),lsof) \ diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 13e33898d6..713b0e4abf 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -17,12 +17,6 @@ IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING -# Build after busybox so target ends up with this package's full -# versions of the applications instead of busybox applets. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IPUTILS_DEPENDENCIES += busybox -endif - IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" From b83204d038b5f948c20235e677725f9312cfb2a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:55 +0200 Subject: [PATCH 2065/2640] package/busybox: invert dependency with iproute2 Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/iproute2/iproute2.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 399db06bb9..a7823d82ae 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ $(if $(BR2_PACKAGE_IPUTILS),iputils) \ $(if $(BR2_PACKAGE_KMOD),kmod) \ $(if $(BR2_PACKAGE_LESS),less) \ diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 1f276ac7ed..48413401cd 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -12,12 +12,6 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING -# If both iproute2 and busybox are selected, make certain we win -# the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IPROUTE2_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils endif From 996c4fb6d582eaf878a744b436b4535c948adfca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:56 +0200 Subject: [PATCH 2066/2640] package/busybox: invert dependency with ifupdown Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/ifupdown/ifupdown.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index a7823d82ae..b03945ad9c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ $(if $(BR2_PACKAGE_IPUTILS),iputils) \ $(if $(BR2_PACKAGE_KMOD),kmod) \ diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index dfc3f3cc11..84d24aedab 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -7,7 +7,6 @@ IFUPDOWN_VERSION = 0.8.16 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown -IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING From 01818153373c4b6e98af5fac564f9c546cfb8b79 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:57 +0200 Subject: [PATCH 2067/2640] package/busybox: invert dependency with ifplugd Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/ifplugd/ifplugd.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b03945ad9c..fb6e02336d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ $(if $(BR2_PACKAGE_IPUTILS),iputils) \ diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index b569320963..c7874b49e5 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -15,11 +15,6 @@ IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec IFPLUGD_CONF_OPTS = --disable-lynx --with-initdir=/etc/init.d/ IFPLUGD_DEPENDENCIES = libdaemon -# Prefer big ifplugd -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IFPLUGD_DEPENDENCIES += busybox -endif - define IFPLUGD_INSTALL_FIXUP $(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ From 456e68c871db5e45cbb06f29e9f6c0601aca9295 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:58 +0200 Subject: [PATCH 2068/2640] package/busybox: invert dependency with ifenslave Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/ifenslave/ifenslave.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index fb6e02336d..2d61927c21 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \ diff --git a/package/ifenslave/ifenslave.mk b/package/ifenslave/ifenslave.mk index 4030d22e82..b51aa72051 100644 --- a/package/ifenslave/ifenslave.mk +++ b/package/ifenslave/ifenslave.mk @@ -9,7 +9,6 @@ IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave IFENSLAVE_LICENSE = GPL-3.0+ IFENSLAVE_LICENSE_FILES = debian/copyright -IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) # shell script, so nothing to build From 8dd72efae2822d936ba8c076c6f9e2e453c98565 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:59 +0200 Subject: [PATCH 2069/2640] package/busybox: invert dependency with i2c-tools Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/i2c-tools/i2c-tools.mk | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 2d61927c21..8e32a58c2d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \ $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \ diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 9ddaa72786..db26647eb5 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -19,10 +19,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) I2C_TOOLS_DEPENDENCIES += python3 endif -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -I2C_TOOLS_DEPENDENCIES += busybox -endif - ifeq ($(BR2_STATIC_LIBS),y) I2C_TOOLS_MAKE_OPTS += BUILD_DYNAMIC_LIB=0 USE_STATIC_LIB=1 endif From c2cf255b6759bd6d286526a5027dd49334bf8965 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:00 +0200 Subject: [PATCH 2070/2640] package/busybox: invert dependency with gzip Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/gzip/gzip.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 8e32a58c2d..b00341c576 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_GZIP),gzip) \ $(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \ $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ $(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \ diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 26fc8ec347..d69215a850 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -9,8 +9,6 @@ GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz GZIP_SITE = $(BR2_GNU_MIRROR)/gzip # Some other tools expect it to be in /bin GZIP_CONF_OPTS = --exec-prefix=/ -# Prefer full gzip over potentially lightweight/slower from busybox -GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) GZIP_LICENSE = GPL-3.0+ GZIP_LICENSE_FILES = COPYING GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes From 3fa18f1a440ac484ef8ab84f1cf2417e2f6f02ba Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:01 +0200 Subject: [PATCH 2071/2640] package/busybox: invert dependency with grep Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/grep/grep.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b00341c576..f614576de7 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_GREP),grep) \ $(if $(BR2_PACKAGE_GZIP),gzip) \ $(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \ $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \ diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 6e44a189f0..730f36a344 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -25,9 +25,4 @@ else GREP_CONF_OPTS += --disable-perl-regexp endif -# Full grep preferred over busybox grep -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -GREP_DEPENDENCIES += busybox -endif - $(eval $(autotools-package)) From 5f9d14bb756bbda6445da69e2810e1b7d266ca79 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:02 +0200 Subject: [PATCH 2072/2640] package/busybox: invert dependency with gawk Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/gawk/gawk.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f614576de7..aac31fdba7 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GREP),grep) \ $(if $(BR2_PACKAGE_GZIP),gzip) \ $(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \ diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 0779736882..1315abb9ee 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -11,11 +11,6 @@ GAWK_DEPENDENCIES = host-gawk GAWK_LICENSE = GPL-3.0+ GAWK_LICENSE_FILES = COPYING -# Prefer full-blown gawk over busybox awk -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -GAWK_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_LIBSIGSEGV),y) GAWK_DEPENDENCIES += libsigsegv endif From ef265261cfbd6c737faa984a7234279d0df1365e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:03 +0200 Subject: [PATCH 2073/2640] package/busybox: invert dependency with fbset Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/fbset/fbset.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index aac31fdba7..a567f25231 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GREP),grep) \ $(if $(BR2_PACKAGE_GZIP),gzip) \ diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index d6ee104a22..787b4e1dca 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -9,11 +9,6 @@ FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev FBSET_DEPENDENCIES = host-bison host-flex FBSET_LICENSE = GPL-2.0 -# Make sure full fbset wins over busybox fbset -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -FBSET_DEPENDENCIES += busybox -endif - define FBSET_BUILD_CMDS $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef From 1561592231a086b3384ddc1ce2ad05eb3c29376c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:04 +0200 Subject: [PATCH 2074/2640] package/busybox: invert dependency with e2fsprogs Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/e2fsprogs/e2fsprogs.mk | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index a567f25231..166d187081 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \ $(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_GAWK),gawk) \ $(if $(BR2_PACKAGE_GREP),grep) \ diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 316546a8d7..efc10d0e99 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -17,12 +17,6 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux -# If both e2fsprogs and busybox are selected, make certain e2fsprogs -# wins the fight over who gets to have their utils actually installed -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -E2FSPROGS_DEPENDENCIES += busybox -endif - # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway. # Disable fuse2fs as well to avoid carrying over deps, and it's unused @@ -35,8 +29,8 @@ HOST_E2FSPROGS_CONF_OPTS = \ --enable-symlink-install \ --disable-testio-debug -# Set the binary directories to "/bin" and "/sbin" to override programs -# installed by busybox. +# Set the binary directories to "/bin" and "/sbin", as busybox does, +# so that we do not end up with two versions of e2fs tools. E2FSPROGS_CONF_OPTS = \ --bindir=/bin \ --sbindir=/sbin \ From ae39bfe24ee16bc01047fdf55aebb45d5bedc820 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:05 +0200 Subject: [PATCH 2075/2640] package/busybox: invert dependency with dos2unix Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/dos2unix/dos2unix.mk | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 166d187081..e50ca1447d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \ $(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \ $(if $(BR2_PACKAGE_FBSET),fbset) \ $(if $(BR2_PACKAGE_GAWK),gawk) \ diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 5001397f05..0522ad1671 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -8,9 +8,7 @@ DOS2UNIX_VERSION = 7.4.0 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -DOS2UNIX_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) \ - $(TARGET_NLS_DEPENDENCIES) +DOS2UNIX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) DOS2UNIX_MAKE_OPTS += ENABLE_NLS=1 From 78b42e9e55b99b2ac69036ea686effd87dca7664 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:06 +0200 Subject: [PATCH 2076/2640] package/busybox: invert dependency with diffutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/diffutils/diffutils.mk | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e50ca1447d..dbb4a9b93f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \ $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \ $(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \ $(if $(BR2_PACKAGE_FBSET),fbset) \ diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 79785d6f01..9a41c985df 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -17,8 +17,4 @@ ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes endif -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -DIFFUTILS_DEPENDENCIES += busybox -endif - $(eval $(autotools-package)) From 00d8894dfc9f4fb85b539b30aa6da2bfbc44339b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:07 +0200 Subject: [PATCH 2077/2640] package/busybox: invert dependency with debianutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/debianutils/debianutils.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index dbb4a9b93f..20459f123a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \ $(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \ $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \ $(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \ diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk index 86f201da1c..189d983732 100644 --- a/package/debianutils/debianutils.mk +++ b/package/debianutils/debianutils.mk @@ -8,8 +8,6 @@ DEBIANUTILS_VERSION = 4.8.1 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ -# Make sure we override the busybox tools, such as which -DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog) DEBIANUTILS_LICENSE_FILES = debian/copyright From 6d1792f57373473b10b129122c92baac6cf264bb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:08 +0200 Subject: [PATCH 2078/2640] package/busybox: invert dependency with dcron Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/dcron/dcron.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 20459f123a..fe36cb3918 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_DCRON),dcron) \ $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \ $(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \ $(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \ diff --git a/package/dcron/dcron.mk b/package/dcron/dcron.mk index 7e81b63803..2ee0709af5 100644 --- a/package/dcron/dcron.mk +++ b/package/dcron/dcron.mk @@ -9,11 +9,6 @@ DCRON_SITE = http://www.jimpryor.net/linux/releases # The source code does not specify the version of the GPL that is used. DCRON_LICENSE = GPL -# Overwrite cron-related Busybox commands if available -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -DCRON_DEPENDENCIES = busybox -endif - define DCRON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef From aec0e84de74fdd24da2ebb97f8418f34309f550a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:09 +0200 Subject: [PATCH 2079/2640] package/busybox: invert dependency with cpio Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/cpio/cpio.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index fe36cb3918..6351869330 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_CPIO),cpio) \ $(if $(BR2_PACKAGE_DCRON),dcron) \ $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \ $(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \ diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 7e8549dbd8..9a09279572 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -7,7 +7,6 @@ CPIO_VERSION = 2.12 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin -CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) CPIO_LICENSE = GPL-3.0+ CPIO_LICENSE_FILES = COPYING From 06d45770d1ca2e096ae23755170bb2dd713f9816 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:10 +0200 Subject: [PATCH 2080/2640] package/busybox: invert dependency with coreutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/coreutils/coreutils.mk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 6351869330..748f05aca3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_COREUTILS),coreutils) \ $(if $(BR2_PACKAGE_CPIO),cpio) \ $(if $(BR2_PACKAGE_DCRON),dcron) \ $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \ diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 4ef888829f..3cb96589f2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -59,12 +59,6 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \ kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \ vdir sleep stty sync touch true uname join -# If both coreutils and busybox are selected, make certain coreutils -# wins the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -COREUTILS_DEPENDENCIES = busybox -endif - ifeq ($(BR2_PACKAGE_ACL),y) COREUTILS_DEPENDENCIES += acl else From b3e4901d60f9f1f017aeb1ec209aab44f67ce8ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:11 +0200 Subject: [PATCH 2081/2640] package/busybox: invert dependency with binutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/binutils/binutils.mk | 5 ----- package/busybox/busybox.mk | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index cb6022f7fa..090065a3e4 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -72,11 +72,6 @@ ifeq ($(BR2_ARM_CPU_ARMV7M)$(BR2_OPTIMIZE_S),yy) BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O2" endif -# Install binutils after busybox to prefer full-blown utilities -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -BINUTILS_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) BINUTILS_DEPENDENCIES += zlib endif diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 748f05aca3..d920987d11 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_BINUTILS),binutils) \ $(if $(BR2_PACKAGE_COREUTILS),coreutils) \ $(if $(BR2_PACKAGE_CPIO),cpio) \ $(if $(BR2_PACKAGE_DCRON),dcron) \ From 942e801b3d1236c7fab068c51be07e4e76b7d4a1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:12 +0200 Subject: [PATCH 2082/2640] package/busybox: invert dependency with bc Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bc/bc.mk | 5 ----- package/busybox/busybox.mk | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/bc/bc.mk b/package/bc/bc.mk index a6446cef66..ee0e43848b 100644 --- a/package/bc/bc.mk +++ b/package/bc/bc.mk @@ -11,9 +11,4 @@ BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB -# Build after busybox so target ends up with bc's "dc" version -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -BC_DEPENDENCIES += busybox -endif - $(eval $(autotools-package)) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d920987d11..75a2dc4c6d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_BC),bc) \ $(if $(BR2_PACKAGE_BINUTILS),binutils) \ $(if $(BR2_PACKAGE_COREUTILS),coreutils) \ $(if $(BR2_PACKAGE_CPIO),cpio) \ From a40719477f4ddda9206333648662464f37bdda23 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:13 +0200 Subject: [PATCH 2083/2640] package/busybox: invert dependency with bash Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bash/bash.mk | 4 +--- package/busybox/busybox.mk | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index bb52bf3259..7fb7192e2c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -6,9 +6,7 @@ BASH_VERSION = 4.4.18 BASH_SITE = $(BR2_GNU_MIRROR)/bash -# Build after since bash is better than busybox shells -BASH_DEPENDENCIES = ncurses readline host-bison \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) +BASH_DEPENDENCIES = ncurses readline host-bison BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc BASH_LICENSE = GPL-3.0+ BASH_LICENSE_FILES = COPYING diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 75a2dc4c6d..0a9af9f17b 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_BASH),bash) \ $(if $(BR2_PACKAGE_BC),bc) \ $(if $(BR2_PACKAGE_BINUTILS),binutils) \ $(if $(BR2_PACKAGE_COREUTILS),coreutils) \ From 59234f1425e0b1c90d46a1b86bd93c2b0b8056a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:14 +0200 Subject: [PATCH 2084/2640] package/busybox: add dependency on attr attr and busybox may each install setfattr, so attr must be installed before busybox. Signed-off-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0a9af9f17b..5266f844b6 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_ATTR),attr) \ $(if $(BR2_PACKAGE_BASH),bash) \ $(if $(BR2_PACKAGE_BC),bc) \ $(if $(BR2_PACKAGE_BINUTILS),binutils) \ From c48ca9e49302719d60373ca846bfbcf70d1ed6e6 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Jul 2018 16:00:15 -0300 Subject: [PATCH 2085/2640] linux: bump default to version 4.17.5 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index d3ea3440da..9e53adb8bd 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From cf8aed9ff844e82fd939e0d137d25c5e7ca21d34 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Jul 2018 16:00:16 -0300 Subject: [PATCH 2086/2640] linux-headers: bump 4.{14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0c9b1022b5..8965ecf065 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -264,8 +264,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.53" if BR2_KERNEL_HEADERS_4_14 + default "4.14.54" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.4" if BR2_KERNEL_HEADERS_4_17 + default "4.17.5" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From ede1bc996aac8744a0d9bbd50cf7071323e638d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jul 2018 21:44:48 +0200 Subject: [PATCH 2087/2640] snappy: bump to version 1.1.7 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/snappy/snappy.hash | 3 ++- package/snappy/snappy.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index 71a2500f8f..e9ac4324c0 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e701cd80f1154d648c762c86140ad6873a5c9b09ed1d754e3157be8193d2c39e snappy-be6dc3db83c4701e3e79694dcbfd1c3da03b91dd.tar.gz +sha256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 snappy-1.1.7.tar.gz +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index a537ade57b..74d398de81 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPPY_VERSION = be6dc3db83c4701e3e79694dcbfd1c3da03b91dd +SNAPPY_VERSION = 1.1.7 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING From 3a66d0df644b8f3ad5c595e844015f7e65449366 Mon Sep 17 00:00:00 2001 From: Sefan Rommel <50ty-one@live.de> Date: Sun, 8 Jul 2018 16:14:33 +0000 Subject: [PATCH 2088/2640] genimage: bump to version 10 Adds cramfs and FIT image support. Signed-off-by: Rommel, Stefan <50ty-one@live.de> Signed-off-by: Peter Korsgaard --- package/genimage/genimage.hash | 2 +- package/genimage/genimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index 4be2fca873..095eb1413f 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 69f35af7edf6f4dbdac7a18ddc69dcf38c501e43d8b50c524555754c51479078 genimage-9.tar.xz +sha256 5a36b2c1387007c2d6535a722ee257a387d0913bddcf8a94d460e6acd4d01859 genimage-10.tar.xz diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 8d11c66a25..393c3e9b94 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 9 +GENIMAGE_VERSION = 10 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse From cfa2949b9f6bf82060ae2d34e05eb253ff7ae76e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 9 Jul 2018 22:53:33 +0300 Subject: [PATCH 2089/2640] DEVELOPERS: fix alphabetic order of entries Cc: Arnout Vandecappelle Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- DEVELOPERS | 144 ++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index cba1344d1d..82accbbc3d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,15 +158,15 @@ F: package/sysdig/ N: Anisse Astier F: package/go/ -N: Antony Pavlov -F: package/lsscsi/ - N: Anthony Viallard F: package/gnuplot/ N: Antoine Ténart F: package/wf111/ +N: Antony Pavlov +F: package/lsscsi/ + N: ARC Maintainers F: arch/Config.in.arc F: board/synopsys/ @@ -436,6 +436,9 @@ F: package/libdvbsi/ F: package/libsvg/ F: package/libsvg-cairo/ +N: Cédric Chépied +F: package/znc/ + N: Chakra Divi F: board/friendlyarm/nanopi-m1 F: board/friendlyarm/nanopi-m1-plus @@ -492,9 +495,6 @@ F: package/ustr/ N: Corentin Guillevic F: package/libloki/ -N: Cédric Chépied -F: package/znc/ - N: Cyril Bur F: arch/Config.in.powerpc F: package/kvm-unit-tests @@ -937,14 +937,14 @@ F: package/yad/ N: Jan Heylen F: package/opentracing-cpp/ -N: Jan Kundrát -F: configs/solidrun_clearfog_defconfig -F: board/solidrun/clearfog/ - N: Jan Kraval F: board/orangepi/orangepi-lite F: configs/orangepi_lite_defconfig +N: Jan Kundrát +F: configs/solidrun_clearfog_defconfig +F: board/solidrun/clearfog/ + N: Jan Pedersen F: package/zip/ @@ -968,6 +968,20 @@ F: package/batctl/ N: Jeremy Rosen F: package/fxload/ +N: Jérôme Oufella +F: package/libdri2/ +F: package/qt-webkit-kiosk/ + +N: Jérôme Pouiller +F: package/apitrace/ +F: package/freescale-imx/gpu-amd-bin-mx51/ +F: package/freescale-imx/libz160/ +F: package/lxc/ +F: package/strongswan/ +F: package/wmctrl/ +F: package/x11r7/xdriver_xf86-video-imx/ +F: package/x11r7/xdriver_xf86-video-imx-viv/ + N: Joel Carlson F: package/cmocka/ F: package/flatcc/ @@ -977,17 +991,6 @@ F: package/pdbg/ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig -N: Joseph Kogut -F: package/at-spi2-atk/ -F: package/at-spi2-core/ -F: package/gconf/ -F: package/libnss/ -F: package/python-cython/ -F: package/python-raven/ -F: package/python-schedule/ -F: package/python-websockets/ -F: package/python-xlib/ - N: Johan Derycke F: package/python-libconfig/ @@ -1026,6 +1029,24 @@ N: Jonathan Liu F: package/python-meld3/ F: package/supervisor/ +N: Jörg Krause +F: board/lemaker/bananapro/ +F: configs/bananapro_defconfig +F: package/augeas/ +F: package/bctoolbox/ +F: package/freescale-imx/imx-alsa-plugins/ +F: package/libopusenc/ +F: package/libshout/ +F: package/libupnpp/ +F: package/luv/ +F: package/luvi/ +F: package/mp4v2/ +F: package/mpd/ +F: package/shairport-sync/ +F: package/swupdate/ +F: package/upmpdcli/ +F: package/wavemon/ + N: Joris Lijssens F: package/emlog/ F: package/libcoap/ @@ -1034,6 +1055,17 @@ F: package/libuio/ F: package/netsniff-ng/ F: package/rabbitmq-c/ +N: Joseph Kogut +F: package/at-spi2-atk/ +F: package/at-spi2-core/ +F: package/gconf/ +F: package/libnss/ +F: package/python-cython/ +F: package/python-raven/ +F: package/python-schedule/ +F: package/python-websockets/ +F: package/python-xlib/ + N: Joshua Henderson F: package/qt5/qt5wayland/ @@ -1065,9 +1097,6 @@ F: package/qt5/ N: Julien Floret F: package/lldpd/ -N: Laurent Charpentier -F: package/open-lldp/ - N: Julien Viard de Galbert F: package/dieharder/ F: package/easy-rsa/ @@ -1075,38 +1104,6 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ -N: Jérôme Oufella -F: package/libdri2/ -F: package/qt-webkit-kiosk/ - -N: Jérôme Pouiller -F: package/apitrace/ -F: package/freescale-imx/gpu-amd-bin-mx51/ -F: package/freescale-imx/libz160/ -F: package/lxc/ -F: package/strongswan/ -F: package/wmctrl/ -F: package/x11r7/xdriver_xf86-video-imx/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ - -N: Jörg Krause -F: board/lemaker/bananapro/ -F: configs/bananapro_defconfig -F: package/augeas/ -F: package/bctoolbox/ -F: package/freescale-imx/imx-alsa-plugins/ -F: package/libopusenc/ -F: package/libshout/ -F: package/libupnpp/ -F: package/luv/ -F: package/luvi/ -F: package/mp4v2/ -F: package/mpd/ -F: package/shairport-sync/ -F: package/swupdate/ -F: package/upmpdcli/ -F: package/wavemon/ - N: Karoly Kasza F: package/irqbalance/ F: package/openvmtools/ @@ -1130,6 +1127,9 @@ F: package/nilfs-utils/ N: Laurent Cans F: package/aircrack-ng/ +N: Laurent Charpentier +F: package/open-lldp/ + N: Lee Jones F: boot/afboot-stm32/ @@ -1414,6 +1414,10 @@ N: Michał Łyszczek F: board/altera/socrates_cyclone5/ F: configs/socrates_cyclone5_defconfig +N: Mike Harmony +F: board/sinovoip/m2-plus/ +F: configs/bananapi_m2_plus_defconfig + N: Mikhail Boiko F: package/libfribidi/ @@ -1427,10 +1431,6 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ -N: Mike Harmony -F: board/sinovoip/m2-plus/ -F: configs/bananapi_m2_plus_defconfig - N: Mylène Josserand F: package/rtl8723bu/ @@ -1643,6 +1643,9 @@ N: Rahul Jain F: package/uhttpd/ F: package/ustream-ssl/ +N: Rémi Rérolle +F: package/libfreeimage/ + N: Renaud Aubin F: package/libhttpparser/ @@ -1673,9 +1676,6 @@ F: package/chocolate-doom/ F: package/irssi/ F: package/vnstat/ -N: Roman Gorbenkov -F: package/davfs2/ - N: Romain Naour F: package/aubio/ F: package/bullet/ @@ -1706,6 +1706,9 @@ F: package/tk/ F: package/upower/ F: package/xenomai/ +N: Roman Gorbenkov +F: package/davfs2/ + N: Ryan Barnett F: package/atftp/ F: package/miraclecast/ @@ -1724,9 +1727,6 @@ F: package/mariadb/ N: Ryan Wilkins F: package/biosdevname/ -N: Rémi Rérolle -F: package/libfreeimage/ - N: Sam Bobroff F: arch/Config.in.powerpc F: package/librtas/ @@ -1762,6 +1762,12 @@ F: package/kyua/ F: package/lutok/ F: package/yaml-cpp/ +N: Sébastien Szymanski +F: package/mmc-utils/ +F: package/python-flask-jsonrpc/ +F: package/python-flask-login/ +F: package/qt5/qt5charts/ + N: Semyon Kolganov F: package/fmt/ F: package/libbson/ @@ -1892,12 +1898,6 @@ F: package/libmms/ F: package/orc/ F: package/wampcc/ -N: Sébastien Szymanski -F: package/mmc-utils/ -F: package/python-flask-jsonrpc/ -F: package/python-flask-login/ -F: package/qt5/qt5charts/ - N: Theo Debrouwere F: package/pugixml/ From b7627223c9beccc19eda43ce7213305afbcec328 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Jul 2018 20:17:30 +0200 Subject: [PATCH 2090/2640] szip: bump to version 2.1.1 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/szip/szip.hash | 3 ++- package/szip/szip.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/szip/szip.hash b/package/szip/szip.hash index c6caf36481..3b582d901d 100644 --- a/package/szip/szip.hash +++ b/package/szip/szip.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a816d95d5662e8279625abdbea7d0e62157d7d1f028020b1075500bf483ed5ef szip-2.1.tar.gz +sha256 21ee958b4f2d4be2c9cabfa5e1a94877043609ce86fde5f286f105f7ff84d412 szip-2.1.1.tar.gz +sha256 98cc66747133b26563fefc4630ad4c8c7848c722c7b8a60ecd4afbc4c7d7eb01 COPYING diff --git a/package/szip/szip.mk b/package/szip/szip.mk index f3a47581bf..7a8a5a82e6 100644 --- a/package/szip/szip.mk +++ b/package/szip/szip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SZIP_VERSION = 2.1 -SZIP_SITE = http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src +SZIP_VERSION = 2.1.1 +SZIP_SITE = http://www.hdfgroup.org/ftp/lib-external/szip/2.1.1/src SZIP_LICENSE = szip license SZIP_LICENSE_FILES = COPYING SZIP_INSTALL_STAGING = YES From 1b5a8a44ea5e9f8976184041f97832dfa1653fed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:18:02 +0200 Subject: [PATCH 2091/2640] package/dovecot: bump version to 2.3.2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 46774e0d2e..857c976a8f 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 6e48f0fa60768427f03035b0a3e93d1ae29b972bb2bd9ca998ccc6a0f6dae393 dovecot-2.3.2.tar.gz +sha256 4a65118508dc7a562e5f90dd7c3f56219fff22367c496f17d77cd0c7e2724e34 dovecot-2.3.2.1.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 3923ee9e05..c93d4ff4a3 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).2 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).2.1 DOVECOT_SITE = https://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From ad8f4351ff1efe6539295bf4109d4bd45b5a627a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Jul 2018 09:05:33 +0300 Subject: [PATCH 2092/2640] iperf: bump to version 2.0.12 Drop patch #1; not needed anymore. Drop patch #2; fixed upstream in a slightly different way. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...01-util.h-add-missing-stdbool-header.patch | 54 ------------------- ...0002-fix-speed-display-in-csv-report.patch | 39 -------------- package/iperf/iperf.hash | 4 +- package/iperf/iperf.mk | 4 +- 4 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 package/iperf/0001-util.h-add-missing-stdbool-header.patch delete mode 100644 package/iperf/0002-fix-speed-display-in-csv-report.patch diff --git a/package/iperf/0001-util.h-add-missing-stdbool-header.patch b/package/iperf/0001-util.h-add-missing-stdbool-header.patch deleted file mode 100644 index 6eeed72a6c..0000000000 --- a/package/iperf/0001-util.h-add-missing-stdbool-header.patch +++ /dev/null @@ -1,54 +0,0 @@ -From babf9a5c2bbce4725963b21e47f413962e33ea88 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sat, 30 Jul 2016 14:24:33 +0200 -Subject: [PATCH] util.h: add missing stdbool header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -C requires the stdbool.h header for the 'bool' type. - -Fixes the following build failure under uClibc-ng C library: - -.../arm-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c delay.c -In file included from delay.c:55:0: -../include/util.h:73:1: error: unknown type name ‘bool’ - bool setsock_blocking(int fd, bool blocking); - ^ - -Signed-off-by: Baruch Siach -[Thomas: add AC_PROG_CC_C99, since C99 is needed for the bool type.] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 1 + - include/util.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d59107a..ba30cb7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,7 @@ dnl =================================================================== - AC_PROG_CXX - CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly - AC_PROG_CC -+AC_PROG_CC_C99 - CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly - AC_ISC_POSIX - AC_PROG_INSTALL -diff --git a/include/util.h b/include/util.h -index f4ae3d8..91540a9 100644 ---- a/include/util.h -+++ b/include/util.h -@@ -57,6 +57,8 @@ - #include "config.h" - #endif - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif --- -2.7.4 - diff --git a/package/iperf/0002-fix-speed-display-in-csv-report.patch b/package/iperf/0002-fix-speed-display-in-csv-report.patch deleted file mode 100644 index b06c7099e9..0000000000 --- a/package/iperf/0002-fix-speed-display-in-csv-report.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f035e70b72d4285dcdbd393e680777a927cb9da4 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 28 Jul 2016 19:04:01 -0500 -Subject: [PATCH] perf: fix "speed" display in csv report - -Some parameters displayed in the CSV reports are declared -as uint64_t, but the printf format doesn't reflect this. - -Submitted bug: https://sourceforge.net/p/iperf/bugs/66/ - -Signed-off-by: Matt Poduska -Signed-off-by: Atul Singh -Signed-off-by: Matthew Weber ---- - src/Locale.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Locale.c b/src/Locale.c -index b5d42b1..7b924fa 100644 ---- a/src/Locale.c -+++ b/src/Locale.c -@@ -260,11 +260,12 @@ const char reportCSV_bw_format[] = - const char reportCSV_bw_jitter_loss_format[] = - "%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n"; - #else -+#include "inttypes.h" - const char reportCSV_bw_format[] = --"%s,%s,%d,%.1f-%.1f,%d,%d\n"; -+"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 "\n"; - - const char reportCSV_bw_jitter_loss_format[] = --"%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n"; -+"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 ",%.3f,%d,%d,%.3f,%d\n"; - #endif //WIN32 - #endif //HAVE_QUAD_SUPPORT - /* ------------------------------------------------------------------- --- -1.9.1 - diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index 0752bfc356..3540c6e930 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/iperf2/files/ -sha1 8b44a23385044bb454e7891966c37339d3bb3711 iperf-2.0.10.tar.gz +sha1 909b469bbbc38508cd268e334a6ec319c3116f15 iperf-2.0.12.tar.gz # Locally computed: -sha256 7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 iperf-2.0.10.tar.gz +sha256 367f651fb1264b13f6518e41b8a7e08ce3e41b2a1c80e99ff0347561eed32646 iperf-2.0.12.tar.gz sha256 5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1 COPYING diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 644980754f..c712de61e0 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -4,12 +4,10 @@ # ################################################################################ -IPERF_VERSION = 2.0.10 +IPERF_VERSION = 2.0.12 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING -# patching configure.ac -IPERF_AUTORECONF = YES IPERF_CONF_OPTS = \ --disable-web100 From b80886388d7715478a41d0013fab558417af1946 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 10 Jul 2018 00:52:19 +0200 Subject: [PATCH 2093/2640] package/clamav: security bump to 0.100.1 Fixes CVE-2017-16932, CVE-2018-0360 & CVE-2018-0361: http://lists.clamav.net/pipermail/clamav-announce/2018/000032.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 4cf7e7a542..0cb8f51d87 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c5c5edaf75a3c53ac0f271148fd6447310bce53f448ec7e6205124a25918f65c clamav-0.100.0.tar.gz +sha256 84e026655152247de7237184ee13003701c40be030dd68e0316111049f58a59f clamav-0.100.1.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index c0138a8944..9db90bddea 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.100.0 +CLAMAV_VERSION = 0.100.1 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From 96b4568f596fb9337d2e099f6e33d5aecc2db4ac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 10 Jul 2018 00:59:36 +0200 Subject: [PATCH 2094/2640] package/tor: bump version to 0.3.3.8 Release notes: https://blog.torproject.org/tor-0338-released Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 554d5906b6..d56855f45e 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ea6bb512c4adfbc4e05b22e4c2d06bddff5b358a53de982273fec846b75bde0c tor-0.3.3.7.tar.gz +sha256 3cf5b4fea2491cbfefa1077bf1b2855e169052d381bd920cd57aa9bfaff6b3a5 tor-0.3.3.8.tar.gz sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fe22633bf6..6f977f8625 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.3.7 +TOR_VERSION = 0.3.3.8 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 5c1ae91a245e1d9bcec03852c7be8cbbdf858a6b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:47:44 +0200 Subject: [PATCH 2095/2640] package/ffmpeg: add optional support for libdrm Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 432e4cda09..82140e266e 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -231,6 +231,13 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) FFMPEG_DEPENDENCIES += libebur128 endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +FFMPEG_CONF_OPTS += --enable-libdrm +FFMPEG_DEPENDENCIES += libdrm +else +FFMPEG_CONF_OPTS += --disable-libdrm +endif + ifeq ($(BR2_PACKAGE_LIBOPENH264),y) FFMPEG_CONF_OPTS += --enable-libopenh264 FFMPEG_DEPENDENCIES += libopenh264 From 7eded10a33b5252b9769ebb8813bf9dadb2634ab Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Jul 2018 15:10:05 +0300 Subject: [PATCH 2096/2640] sed: bump to version 4.5 Add signature and key reference. Add license hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sed/sed.hash | 6 +++++- package/sed/sed.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/sed/sed.hash b/package/sed/sed.hash index 652c573615..470e5f2595 100644 --- a/package/sed/sed.hash +++ b/package/sed/sed.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b sed-4.4.tar.xz +# https://ftp.gnu.org/gnu/sed/sed-4.5.tar.xz.sig +# with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE +sha256 7aad73c8839c2bdadca9476f884d2953cdace9567ecd0d90f9959f229d146b40 sed-4.5.tar.xz +# Locally calculated +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 28df140d39..4b2ed0313f 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -4,7 +4,7 @@ # ################################################################################ -SED_VERSION = 4.4 +SED_VERSION = 4.5 SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 From 7cc269216dbb92d770717e5b909c5ac19bd6547c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Jul 2018 17:48:51 +0300 Subject: [PATCH 2097/2640] uemacs: bump to latest git commit Add license and license hash. Change git download site. The git download method does not work with BR2_KERNEL_MIRROR that is set to https://cdn.kernel.org/pub by default. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/uemacs/uemacs.hash | 3 ++- package/uemacs/uemacs.mk | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/uemacs/uemacs.hash b/package/uemacs/uemacs.hash index a88be88b56..33f50ca72d 100644 --- a/package/uemacs/uemacs.hash +++ b/package/uemacs/uemacs.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 c6772ccb519f89731ac927c6bd229617fa4a488b966251e9147a03f998c39960 uemacs-8841922689769960fa074fbb053cb8507f2f3ed9.tar.gz +sha256 d28aa611e377c178808b5fe9dcb4285391070d2b2b96931b7d5fa0e5f99ed30e uemacs-31a16c0ccab9a4b69c79920244b9c623bee7bffe.tar.gz +sha256 6e2a4cf41ec8d4379c154923349733bc0d3935c6fa72c4337cf1bc137b98b90a README diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk index 19fda12467..845d610760 100644 --- a/package/uemacs/uemacs.mk +++ b/package/uemacs/uemacs.mk @@ -4,10 +4,12 @@ # ################################################################################ -UEMACS_VERSION = 8841922689769960fa074fbb053cb8507f2f3ed9 -UEMACS_SITE = $(BR2_KERNEL_MIRROR)/scm/editors/uemacs/uemacs.git +UEMACS_VERSION = 31a16c0ccab9a4b69c79920244b9c623bee7bffe +UEMACS_SITE = https://git.kernel.org/pub/scm/editors/uemacs/uemacs.git UEMACS_SITE_METHOD = git UEMACS_DEPENDENCIES = ncurses +UEMACS_LICENSE = MicroEMACS copyright notice +UEMACS_LICENSE_FILES = README define UEMACS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ From e8ea239d6d32c9018d8fa060519253d0e161c63c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 10 Jul 2018 18:45:06 +0300 Subject: [PATCH 2098/2640] zstd: bump to version 1.3.5 Drop upstream patches. Cc: Andrey Smirnov Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...stall-target-into-pc-static-shared-a.patch | 51 ------------------- ...ate-include-directory-before-headers.patch | 45 ---------------- package/zstd/zstd.hash | 2 +- package/zstd/zstd.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 package/zstd/0001-Split-library-install-target-into-pc-static-shared-a.patch delete mode 100644 package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch diff --git a/package/zstd/0001-Split-library-install-target-into-pc-static-shared-a.patch b/package/zstd/0001-Split-library-install-target-into-pc-static-shared-a.patch deleted file mode 100644 index af9b2bf3f9..0000000000 --- a/package/zstd/0001-Split-library-install-target-into-pc-static-shared-a.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2623a12bff19049b6ad5bc066e3ef9c6259d415c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 16 Apr 2018 20:44:49 +0200 -Subject: [PATCH] Split library install target into pc, static, shared and - include only target - -Signed-off-by: Peter Seiderer ---- - lib/Makefile | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/lib/Makefile b/lib/Makefile -index cdfdc5c..b592aa6 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -159,20 +159,29 @@ libzstd.pc: libzstd.pc.in - -e 's|@VERSION@|$(VERSION)|' \ - $< >$@ - --install: libzstd.a libzstd libzstd.pc -+install: install-pc install-static install-shared install-includes -+ @echo zstd static and shared library installed -+ -+install-pc: libzstd.pc - @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ - @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ -- @echo Installing libraries -+ -+install-static: libzstd.a -+ @echo Installing static library - @$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR) -+ -+install-shared: libzstd -+ @echo Installing shared library - @$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR) - @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) - @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT) -+ -+install-includes: - @echo Installing includes - @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) - @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) - @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings - @$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR) -- @echo zstd static and shared library installed - - uninstall: - @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a --- -2.16.3 - diff --git a/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch b/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch deleted file mode 100644 index e95f8c0be4..0000000000 --- a/package/zstd/0002-lib-Makefile-create-include-directory-before-headers.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9a0643b633c00e86db059e3790bdea7155fb6dc9 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 8 May 2018 20:43:28 +0300 -Subject: [PATCH] lib/Makefile: create include directory before headers - installation - -Make sure that $(INCLUDEDIR) exists before copying the headers there. -Otherwise, the contest of header files is copied over -$(DESTDIR)$(INCLUDEDIR), making it a regular file. - -While at it, remove $(DESTDIR)$(INCLUDEDIR) from the list of directories -to create in the install-pc target. The install-pc target does not need -this directory. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/facebook/zstd/pull/1123 - - lib/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/Makefile b/lib/Makefile -index f64f192d4724..d8178c7a58a0 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -163,7 +163,7 @@ install: install-pc install-static install-shared install-includes - @echo zstd static and shared library installed - - install-pc: libzstd.pc -- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ -+ @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ - @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/ - - install-static: libzstd.a -@@ -178,6 +178,7 @@ install-shared: libzstd - - install-includes: - @echo Installing includes -+ @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/ - @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR) - @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR) - @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings --- -2.17.0 - diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index f7aadfb5db..95b2270981 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9 zstd-v1.3.4.tar.gz +sha256 d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea zstd-v1.3.5.tar.gz # License files (locally computed as well) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 0b613a6da4..a1a11f9ab2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = v1.3.4 +ZSTD_VERSION = v1.3.5 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From 8d91fc17cdbdd9b531ab177a4ad23321e217f379 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Jul 2018 20:22:26 +0200 Subject: [PATCH 2099/2640] brltty: add optional at-spi2-core dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/brltty/brltty.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index eb91ef8ff7..df3e9c7888 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -11,7 +11,8 @@ BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL -BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf +BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \ + $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) BRLTTY_CONF_OPTS = \ --disable-java-bindings \ From 150fa57ed0765e20a7199fa9743e56689d44d5d6 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 10 Jul 2018 21:35:54 +0200 Subject: [PATCH 2100/2640] wireguard: bump to 0.0.20180708 * chacha20poly1305: use slow crypto on -rt kernels on arm too Leftover from the last commit of the previous snapshot that we forgot to handle. * tools: getentropy requires macOS 10.12 Small build time fixup for old versions of macOS. * queueing: remove useless spinlocks on sc * queueing: re-enable preemption periodically to lower latency * simd: encapsulate fpu amortization into nice functions * simd: no need to restore fpu state when no preemption This will improve general system latency on preempt-enabled systems, like desktops. * dns-hatchet: apply resolv.conf's selinux context to new resolv.conf Fixes wg-quick's dns hatchet on CentOS. * qemu: bump default kernel By bumping to 4.17.2, we actually uncovered a bug in the SLUB allocator, which upstream is now fixing: https://lkml.org/lkml/2018/6/18/1407 * noise: take locks for ss precomputation * netlink: maintain static_identity lock over entire private key update Minor locking correctness fixes and optimizations. * noise: wait for crng before taking locks We now make sure that an outgoing packet which needs a potentially unseeded rng won't block a call to wg(8), which takes similar locks for retrieving data. * receive: drop handshake packets if rng is not initialized If the rng is unseeded, we drop incoming handshake packets, so that it's not possible for an attacker to fill the handshake queue thereby provoking cookies. * ratelimiter: mitigate reference underflow * ratelimiter: do not allow concurrent init and uninit Minor correctness and hardening fixes, which don't fix anything particular in WireGuard, but might be useful if our ratelimiter is ever used elsewhere. * compat: use stabler lkml links * poly1305: add missing string.h header Minor fixups. * receive: don't toggle bh The last snapshot caused a big performance regression, which we partially revert here. This general matter, though, will be revisited in the future, perhaps by switching to NAPI. * main: test poly1305 before chacha20poly1305 * poly1305: give linker the correct constant data section size While the default bfd linker did the right thing, gold would sometimes merge section incorrectly because of an incorrect section length field, resulting in wrong calculations. * simd: add missing header Fixes a compile error on a few odd kernels. * global: fix a few typos * manpages: eliminate whitespace at the end of the line * tools: fix misspelling of strchrnul in comment Cosmetic fixups. * global: use ktime boottime instead of jiffies * global: use fast boottime instead of normal boottime * compat: more robust ktime backport We now use the equivalent of clock_gettime(CLOCK_BOOTTIME) for doing age checks on time-limited objects, such as ephemeral keys, so that on systems where we don't clear before sleep (like Android), we make sure to invalidate the objects after the proper amount of time, taking into account time spent asleep. * wg-quick: android: prevent outgoing handshake packets from being dropped Recent android phones block outgoing packets using iptables while the system is asleep. This makes sense for most services, but not for a tunnel device itself, so we work around this by inserting our own iptables rule. * device: print daddr not saddr in missing peer error * receive: style Debug messages now make sense again. * wg-quick: android: support excluding applications Android now supports excluding certain apps (uids) from the tunnel. * selftest: ratelimiter: improve chance of success via retry * qemu: bump default kernel version * qemu: decide debug kernel based on KERNEL_VERSION Some improvements to our testing infrastructure. * receive: use NAPI on the receive path This is a big change that should both improve preemption latency (by not disabling it unconditionally) and vastly improve rx performance on most systems by using NAPI. The main purpose of this snapshot is to test out this technique. Signed-off-by: Jason A. Donenfeld Signed-off-by: Peter Korsgaard --- ...poly1305-add-missing-string.h-header.patch | 26 ------------------- package/wireguard/wireguard.hash | 4 +-- package/wireguard/wireguard.mk | 2 +- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 package/wireguard/0001-poly1305-add-missing-string.h-header.patch diff --git a/package/wireguard/0001-poly1305-add-missing-string.h-header.patch b/package/wireguard/0001-poly1305-add-missing-string.h-header.patch deleted file mode 100644 index 8f1bfecb5c..0000000000 --- a/package/wireguard/0001-poly1305-add-missing-string.h-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ed04799b1868f45e05d788e614b9b8cfa4fcab46 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Wed, 20 Jun 2018 14:55:24 +0200 -Subject: [PATCH] poly1305: add missing string.h header - -Reported-by: Peter Korsgaard -Signed-off-by: Peter Korsgaard ---- - src/crypto/poly1305.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/crypto/poly1305.c b/src/crypto/poly1305.c -index 26af4ad..65a37d9 100644 ---- a/src/crypto/poly1305.c -+++ b/src/crypto/poly1305.c -@@ -7,6 +7,7 @@ - #include "poly1305.h" - - #include -+#include - - #if defined(CONFIG_X86_64) - #include --- -2.11.0 - diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index f7c5e65475..d0cd65ad4f 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2018-June/002984.html -sha256 c120cdedc3967dcb4ad5c1c7eadd2a1b04ef5dbf2fe60cc8e7c0db337bcda7dc WireGuard-0.0.20180613.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2018-July/003112.html +sha256 5e38d554f7d1e3a64e3a5319ca1a3b790c84ed89c896586c490a93ac1f953a91 WireGuard-0.0.20180708.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index e1c43beea7..cc8ad7c4cc 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20180613 +WIREGUARD_VERSION = 0.0.20180708 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 From cef82cccf3c3aacd8726850499f3c9b407c24c04 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 10 Jul 2018 18:36:37 +0200 Subject: [PATCH 2101/2640] lua: bump to version 5.3.5 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lua/{5.3.4 => 5.3.5}/0001-root-path.patch | 0 package/lua/{5.3.4 => 5.3.5}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.3.4 => 5.3.5}/0011-linenoise.patch | 0 package/lua/lua.hash | 4 ++-- package/lua/lua.mk | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename package/lua/{5.3.4 => 5.3.5}/0001-root-path.patch (100%) rename package/lua/{5.3.4 => 5.3.5}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.3.4 => 5.3.5}/0011-linenoise.patch (100%) diff --git a/package/lua/5.3.4/0001-root-path.patch b/package/lua/5.3.5/0001-root-path.patch similarity index 100% rename from package/lua/5.3.4/0001-root-path.patch rename to package/lua/5.3.5/0001-root-path.patch diff --git a/package/lua/5.3.4/0002-shared-libs-for-lua.patch b/package/lua/5.3.5/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.3.4/0002-shared-libs-for-lua.patch rename to package/lua/5.3.5/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.3.4/0011-linenoise.patch b/package/lua/5.3.5/0011-linenoise.patch similarity index 100% rename from package/lua/5.3.4/0011-linenoise.patch rename to package/lua/5.3.5/0011-linenoise.patch diff --git a/package/lua/lua.hash b/package/lua/lua.hash index 32e7472c38..43f5be275e 100644 --- a/package/lua/lua.hash +++ b/package/lua/lua.hash @@ -1,6 +1,6 @@ # Hashes from: http://www.lua.org/ftp/ -md5 53a9c68bcc0eda58bdc2095ad5cdfc63 lua-5.3.4.tar.gz -sha1 79790cfd40e09ba796b01a571d4d63b52b1cd950 lua-5.3.4.tar.gz +md5 4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz +sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447 lua-5.3.5.tar.gz md5 913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf lua-5.2.4.tar.gz diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 851dc8f734..22643c4c8c 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_VERSION = 5.3.4 +LUA_VERSION = 5.3.5 else ifeq ($(BR2_PACKAGE_LUA_5_2),y) LUA_VERSION = 5.2.4 From a1a152684e6370ec7592539a596f2f1b5e32574e Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Mon, 9 Jul 2018 16:46:25 +0300 Subject: [PATCH 2102/2640] configs/olimex_a10_olinuxino_lime_defconfig: new board Add a defconfig for the Olimex A10-OLinuXino-LIME, reusing most of the A20-OLinuXino-Lime and A13-OLinuXino files (sym links). The configurations for Olimex A10-OLinuXino-LIME feature: - U-Boot 2018.03 - Mainline Linux kernel 4.14.26 Signed-off-by: Leon Anavi [Arnout: remove commented-out BR2_ARM_EABIHF=y (which is default)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 4 ++ board/olimex/a10_olinuxino/boot.cmd | 1 + board/olimex/a10_olinuxino/genimage.cfg | 1 + board/olimex/a10_olinuxino/post-build.sh | 1 + board/olimex/a10_olinuxino/readme.txt | 57 +++++++++++++++++++++ configs/olimex_a10_olinuxino_lime_defconfig | 47 +++++++++++++++++ 6 files changed, 111 insertions(+) create mode 120000 board/olimex/a10_olinuxino/boot.cmd create mode 120000 board/olimex/a10_olinuxino/genimage.cfg create mode 120000 board/olimex/a10_olinuxino/post-build.sh create mode 100644 board/olimex/a10_olinuxino/readme.txt create mode 100644 configs/olimex_a10_olinuxino_lime_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 82accbbc3d..48ab0d9048 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1133,6 +1133,10 @@ F: package/open-lldp/ N: Lee Jones F: boot/afboot-stm32/ +N: Leon Anavi +F: board/olimex/a10_olinuxino +F: configs/olimex_a10_olinuxino_lime_defconfig + N: Lionel Flandrin F: package/python-babel/ F: package/python-daemonize/ diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd new file mode 120000 index 0000000000..612c745500 --- /dev/null +++ b/board/olimex/a10_olinuxino/boot.cmd @@ -0,0 +1 @@ +../a20_olinuxino/boot.cmd \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/genimage.cfg b/board/olimex/a10_olinuxino/genimage.cfg new file mode 120000 index 0000000000..c21932feec --- /dev/null +++ b/board/olimex/a10_olinuxino/genimage.cfg @@ -0,0 +1 @@ +../a20_olinuxino/genimage.cfg \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh new file mode 120000 index 0000000000..b346896024 --- /dev/null +++ b/board/olimex/a10_olinuxino/post-build.sh @@ -0,0 +1 @@ +../a20_olinuxino/post-build.sh \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/readme.txt b/board/olimex/a10_olinuxino/readme.txt new file mode 100644 index 0000000000..ba4bf69126 --- /dev/null +++ b/board/olimex/a10_olinuxino/readme.txt @@ -0,0 +1,57 @@ +A10-OLinuXino-LIME + +Intro +===== + +These are open hardware boards, all based on the Allwinner A10 SoC. + +for more details about the boards see the following pages: + - https://www.olimex.com/Products/OLinuXino/open-source-hardware + - https://www.olimex.com/Products/OLinuXino/A10/A10-OLinuXino-LIME/ + +The following defconfigs are available: + - olimex_a10_olinuxino_lime_defconfig + for the A10-OLinuXino-LIME board using mainline kernel + +(see http://linux-sunxi.org/Linux_Kernel for more details) + +How to build it +=============== + +Configure Buildroot: + + $ make _defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- boot.scr + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- sun4i-a10-olinuxino-lime.dtb (lime, mainline) + +-- u-boot.bin + +-- u-boot-sunxi-with-spl.bin + `-- zImage + + +How to write the SD card +======================== + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to a uSD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the uSD. + +Eject the SD card, insert it in the A10-OLinuXino board, and power it up. + diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig new file mode 100644 index 0000000000..8248daf92c --- /dev/null +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -0,0 +1,47 @@ +# Architecture +BR2_arm=y +BR2_cortex_a8=y + +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" +BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a10_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.26" +BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-olinuxino-lime" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" + +# Additional tools +BR2_PACKAGE_HOST_GENIMAGE=y From 2664022787eb396125b5696a2d42c460ef54d359 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 12:26:59 +0200 Subject: [PATCH 2103/2640] utils/test-pkg: log the output of merge-config Currently, the stdout is consigned to oblivion, while the stderr is not redirected at all. So, when the configuration under test redefines a symbol, like is the case when testing busybox for example, there is an ugly warning. So, just redirect both stdout and stderr to the logfile. Signed-off-by: "Yann E. MORIN" Tested-by: Matt Weber Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 54951276fa..aa91ee02cf 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -131,7 +131,7 @@ build_one() { support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ - > /dev/null + >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set # or not set) in the actual .config; if one of them is not, it means # some dependency from the toolchain or arch is not available, in From 5230ecfde7fea60f3938e2a3daca56a4d79f83d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Jul 2018 14:49:40 +0200 Subject: [PATCH 2104/2640] boost: detect missing selects As suggested by Arnout during the review of http://patchwork.ozlabs.org/patch/934589, add a mechanism to detect a missing boost select by checking that we do not install a boost library which hasn't been selected by the user. To manage a change of boost configuration by the user between two builds, add a BOOST_PRE_INSTALL_TARGET_HOOKS to remove all boost libraries before installing them. Also, use ls with a wildcard instead of test to avoid trying to guess library names if boost layout is set to tagged or versionned (the wildcard will also help us to manage shared or static library) Signed-off-by: Fabrice Fontaine Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boost/boost.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index cf0cea7edd..b2605a70b7 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -159,6 +159,24 @@ define BOOST_INSTALL_STAGING_CMDS --layout=$(BOOST_LAYOUT) install) endef +# These hooks will help us to detect missing select in Config.in +# Indeed boost buildsystem can select a library even if the user has +# disable it +define BOOST_REMOVE_TARGET_LIBRARIES + rm -rf $(TARGET_DIR)/usr/lib/libboost_* +endef + +BOOST_PRE_INSTALL_TARGET_HOOKS += BOOST_REMOVE_TARGET_LIBRARIES + +define BOOST_CHECK_TARGET_LIBRARIES + @$(foreach disabled,$(BOOST_WITHOUT_FLAGS),\ + ! ls $(TARGET_DIR)/usr/lib/libboost_$(disabled)* 1>/dev/null 2>&1 || \ + ! echo "libboost_$(disabled) shouldn't have been installed: missing select in boost/Config.in" || \ + exit 1;) +endef + +BOOST_POST_INSTALL_TARGET_HOOKS += BOOST_CHECK_TARGET_LIBRARIES + define HOST_BOOST_CONFIGURE_CMDS (cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS)) echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : \"$(HOST_CXXFLAGS)\" \"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam From a37657f44eaa8ece0cc3538bc9a7eaa8ca23c4f3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 16:21:26 +0200 Subject: [PATCH 2105/2640] package/acl: bump version Of most interest is the build system overhaul, and the drop of the dependency on attr-provided in favour of the system-provided . That last bit meaning that we will be able to bump attr. We can drop our patches: static is now natively supported thanks to the use of libtool, and the internal symbols patch was a backport, and finally, our install patch is superseded by the use of autotools. The option to disable NLS has changed, so update accordingly. Signed-off-by: "Yann E. MORIN" Cc: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-support-static-installation.patch | 29 -- ...-__acl_-prefixes-to-internal-symbols.patch | 292 ------------------ ...use-install-1-to-install-executables.patch | 67 ---- package/acl/acl.hash | 2 +- package/acl/acl.mk | 50 +-- 5 files changed, 8 insertions(+), 432 deletions(-) delete mode 100644 package/acl/0001-support-static-installation.patch delete mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch delete mode 100644 package/acl/0003-all-use-install-1-to-install-executables.patch diff --git a/package/acl/0001-support-static-installation.patch b/package/acl/0001-support-static-installation.patch deleted file mode 100644 index 4cb473ffc2..0000000000 --- a/package/acl/0001-support-static-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -Support installation of .a file when doing static linking - -When doing static linking (i.e ENABLE_SHARED != yes), the acl build -logic wasn't installing any library at all, not even the .a file which -is needed for static linking. This patch fixes that. - -Signed-off-by: Thomas Petazzoni - -Index: b/include/buildmacros -=================================================================== ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -97,7 +97,15 @@ - - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ -+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ -+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -+ fi - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ diff --git a/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch b/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch deleted file mode 100644 index f9a5d9bd1e..0000000000 --- a/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch +++ /dev/null @@ -1,292 +0,0 @@ -From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 12 Aug 2014 08:37:25 -0400 -Subject: [PATCH] add __acl_ prefixes to internal symbols - -When static linking libacl, people sometimes run into symbol collisions -because their own code defines symbols like "quote". So for acl internal -symbols, use an __acl_ prefix. - -[Rahul Bedarkar: backported from upstream - http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ] -Signed-off-by: Rahul Bedarkar ---- - exports | 12 ++---------- - getfacl/getfacl.c | 4 ++-- - include/misc.h | 8 ++++---- - libacl/__acl_to_any_text.c | 4 ++-- - libacl/acl_from_text.c | 4 ++-- - libmisc/high_water_alloc.c | 2 +- - libmisc/next_line.c | 6 +++--- - libmisc/quote.c | 4 ++-- - libmisc/unquote.c | 2 +- - setfacl/parse.c | 10 +++++----- - setfacl/setfacl.c | 4 ++-- - 11 files changed, 26 insertions(+), 34 deletions(-) - -diff --git a/exports b/exports -index 7d8e69e..bf15d84 100644 ---- a/exports -+++ b/exports -@@ -59,22 +59,14 @@ ACL_1.0 { - acl_to_any_text; - - local: -- # Library internal stuff -+ # Library internal stuff - __new_var_obj_p; - __new_obj_p_here; - __free_obj_p; - __check_obj_p; - __ext2int_and_check; -- __acl_reorder_entry_obj_p; -- __acl_reorder_obj_p; -- __acl_init_obj; -- __acl_create_entry_obj; -- __acl_free_acl_obj; -- __acl_to_any_text; -+ __acl_*; - __apply_mask_to_mode; -- -- quote; -- unquote; - }; - - ACL_1.1 { -diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c -index f8eaf25..af9e225 100644 ---- a/getfacl/getfacl.c -+++ b/getfacl/getfacl.c -@@ -90,7 +90,7 @@ int opt_numeric; /* don't convert id's to symbolic names */ - - static const char *xquote(const char *str, const char *quote_chars) - { -- const char *q = quote(str, quote_chars); -+ const char *q = __acl_quote(str, quote_chars); - if (q == NULL) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - exit(1); -@@ -718,7 +718,7 @@ int main(int argc, char *argv[]) - do { - if (optind == argc || - strcmp(argv[optind], "-") == 0) { -- while ((line = next_line(stdin)) != NULL) { -+ while ((line = __acl_next_line(stdin)) != NULL) { - if (*line == '\0') - continue; - -diff --git a/include/misc.h b/include/misc.h -index 0c5fdcc..c25accf 100644 ---- a/include/misc.h -+++ b/include/misc.h -@@ -15,9 +15,9 @@ - along with this program. If not, see . - */ - --extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize); -+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize); - --extern const char *quote(const char *str, const char *quote_chars); --extern char *unquote(char *str); -+extern const char *__acl_quote(const char *str, const char *quote_chars); -+extern char *__acl_unquote(char *str); - --extern char *next_line(FILE *file); -+extern char *__acl_next_line(FILE *file); -diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c -index a4f9c34..19f1ccc 100644 ---- a/libacl/__acl_to_any_text.c -+++ b/libacl/__acl_to_any_text.c -@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, - if (options & TEXT_NUMERIC_IDS) - str = NULL; - else -- str = quote(user_name( -+ str = __acl_quote(user_name( - entry_obj_p->eid.qid), ":, \t\n\r"); - if (str != NULL) { - strncpy(text_p, str, size); -@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, - if (options & TEXT_NUMERIC_IDS) - str = NULL; - else -- str = quote(group_name( -+ str = __acl_quote(group_name( - entry_obj_p->eid.qid), ":, \t\n\r"); - if (str != NULL) { - strncpy(text_p, str, size); -diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c -index 1e05322..f6165be 100644 ---- a/libacl/acl_from_text.c -+++ b/libacl/acl_from_text.c -@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) - str = get_token(text_p); - if (str) { - entry_obj.etag = ACL_USER; -- error = get_uid(unquote(str), -+ error = get_uid(__acl_unquote(str), - &entry_obj.eid.qid); - free(str); - if (error) { -@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) - str = get_token(text_p); - if (str) { - entry_obj.etag = ACL_GROUP; -- error = get_gid(unquote(str), -+ error = get_gid(__acl_unquote(str), - &entry_obj.eid.qid); - free(str); - if (error) { -diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c -index c127dc1..951f4bb 100644 ---- a/libmisc/high_water_alloc.c -+++ b/libmisc/high_water_alloc.c -@@ -21,7 +21,7 @@ - #include - #include "misc.h" - --int high_water_alloc(void **buf, size_t *bufsize, size_t newsize) -+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize) - { - #define CHUNK_SIZE 256 - /* -diff --git a/libmisc/next_line.c b/libmisc/next_line.c -index 0566d7a..126a364 100644 ---- a/libmisc/next_line.c -+++ b/libmisc/next_line.c -@@ -23,7 +23,7 @@ - - #define LINE_SIZE getpagesize() - --char *next_line(FILE *file) -+char *__acl_next_line(FILE *file) - { - static char *line; - static size_t line_size; -@@ -31,7 +31,7 @@ char *next_line(FILE *file) - int eol = 0; - - if (!line) { -- if (high_water_alloc((void **)&line, &line_size, LINE_SIZE)) -+ if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE)) - return NULL; - } - c = line; -@@ -47,7 +47,7 @@ char *next_line(FILE *file) - if (feof(file)) - break; - if (!eol) { -- if (high_water_alloc((void **)&line, &line_size, -+ if (__acl_high_water_alloc((void **)&line, &line_size, - 2 * line_size)) - return NULL; - c = strrchr(line, '\0'); -diff --git a/libmisc/quote.c b/libmisc/quote.c -index bf8f9eb..a28800c 100644 ---- a/libmisc/quote.c -+++ b/libmisc/quote.c -@@ -23,7 +23,7 @@ - #include - #include "misc.h" - --const char *quote(const char *str, const char *quote_chars) -+const char *__acl_quote(const char *str, const char *quote_chars) - { - static char *quoted_str; - static size_t quoted_str_len; -@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars) - if (nonpr == 0) - return str; - -- if (high_water_alloc((void **)"ed_str, "ed_str_len, -+ if (__acl_high_water_alloc((void **)"ed_str, "ed_str_len, - (s - (unsigned char *)str) + nonpr * 3 + 1)) - return NULL; - for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) { -diff --git a/libmisc/unquote.c b/libmisc/unquote.c -index bffebf9..4f4ce7c 100644 ---- a/libmisc/unquote.c -+++ b/libmisc/unquote.c -@@ -22,7 +22,7 @@ - #include - #include "misc.h" - --char *unquote(char *str) -+char *__acl_unquote(char *str) - { - unsigned char *s, *t; - -diff --git a/setfacl/parse.c b/setfacl/parse.c -index e7e6add..7433459 100644 ---- a/setfacl/parse.c -+++ b/setfacl/parse.c -@@ -226,7 +226,7 @@ user_entry: - str = get_token(text_p); - if (str) { - cmd->c_tag = ACL_USER; -- error = get_uid(unquote(str), &cmd->c_id); -+ error = get_uid(__acl_unquote(str), &cmd->c_id); - free(str); - if (error) { - *text_p = backup; -@@ -245,7 +245,7 @@ user_entry: - str = get_token(text_p); - if (str) { - cmd->c_tag = ACL_GROUP; -- error = get_gid(unquote(str), &cmd->c_id); -+ error = get_gid(__acl_unquote(str), &cmd->c_id); - free(str); - if (error) { - *text_p = backup; -@@ -466,7 +466,7 @@ read_acl_comments( - if (strncmp(cp, "file:", 5) == 0) { - cp += 5; - SKIP_WS(cp); -- cp = unquote(cp); -+ cp = __acl_unquote(cp); - - if (path_p) { - if (*path_p) -@@ -483,7 +483,7 @@ read_acl_comments( - if (uid_p) { - if (*uid_p != ACL_UNDEFINED_ID) - goto fail; -- if (get_uid(unquote(cp), uid_p) != 0) -+ if (get_uid(__acl_unquote(cp), uid_p) != 0) - continue; - } - } else if (strncmp(cp, "group:", 6) == 0) { -@@ -493,7 +493,7 @@ read_acl_comments( - if (gid_p) { - if (*gid_p != ACL_UNDEFINED_ID) - goto fail; -- if (get_gid(unquote(cp), gid_p) != 0) -+ if (get_gid(__acl_unquote(cp), gid_p) != 0) - continue; - } - } else if (strncmp(cp, "flags:", 6) == 0) { -diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c -index 81062a6..fb2d172 100644 ---- a/setfacl/setfacl.c -+++ b/setfacl/setfacl.c -@@ -92,7 +92,7 @@ int promote_warning; - - static const char *xquote(const char *str, const char *quote_chars) - { -- const char *q = quote(str, quote_chars); -+ const char *q = __acl_quote(str, quote_chars); - if (q == NULL) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - exit(1); -@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq) - args.seq = seq; - - if (strcmp(arg, "-") == 0) { -- while ((line = next_line(stdin))) -+ while ((line = __acl_next_line(stdin))) - errors = walk_tree(line, walk_flags, 0, do_set, &args); - if (!feof(stdin)) { - fprintf(stderr, _("%s: Standard input: %s\n"), --- -2.6.2 - diff --git a/package/acl/0003-all-use-install-1-to-install-executables.patch b/package/acl/0003-all-use-install-1-to-install-executables.patch deleted file mode 100644 index 9640dd866d..0000000000 --- a/package/acl/0003-all-use-install-1-to-install-executables.patch +++ /dev/null @@ -1,67 +0,0 @@ -From d3bd7b29b79147b4155e78a8ea06ded98b91f92a Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 8 May 2018 15:23:57 +0200 -Subject: [PATCH] all: use install(1) to install executables - -When the destination file already exists, the current install script -will overwrite it with the new executable. - -However, when the existing executable is a symlink or hardlink to -something else, like busybox, this effectively overwrites that something -with the new executable, and thus replaces busybox and all its applets -with the code for either of the three commands. - -We fix that by simply calling install(1). install(1) is sufficiently -widespread that we don't bother checking for it, as tis is just a -workaround while waiting for the version bump that will eventually fix -it for good. - -Signed-off-by: "Yann E. MORIN" ---- - chacl/Makefile | 4 ++-- - getfacl/Makefile | 4 ++-- - setfacl/Makefile | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/chacl/Makefile b/chacl/Makefile -index 33858d6..c857329 100644 ---- a/chacl/Makefile -+++ b/chacl/Makefile -@@ -30,6 +30,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: -diff --git a/getfacl/Makefile b/getfacl/Makefile -index 7fbafda..8ac63e0 100644 ---- a/getfacl/Makefile -+++ b/getfacl/Makefile -@@ -31,6 +31,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: -diff --git a/setfacl/Makefile b/setfacl/Makefile -index c44e7c0..eea2ede 100644 ---- a/setfacl/Makefile -+++ b/setfacl/Makefile -@@ -31,6 +31,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: --- -2.14.1 - diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 3f9d7900d3..091092a1c5 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 acl-2.2.52.src.tar.gz +sha256 06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 acl-2.2.53.tar.gz diff --git a/package/acl/acl.mk b/package/acl/acl.mk index 4d30059390..038bc7a050 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,54 +4,18 @@ # ################################################################################ -ACL_VERSION = 2.2.52 -ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz +ACL_VERSION = 2.2.53 ACL_SITE = http://download.savannah.gnu.org/releases/acl -ACL_INSTALL_STAGING = YES -ACL_DEPENDENCIES = attr -ACL_CONF_OPTS = --enable-gettext=no ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -# While the configuration system uses autoconf, the Makefiles are -# hand-written and do not use automake. Therefore, we have to hack -# around their deficiencies by: -# - explicitly passing CFLAGS (LDFLAGS are passed on from configure, -# CFLAGS are not). -# - explicitly passing the installation prefix, not using DESTDIR. - -ACL_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)" - -ACL_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ - install-dev install-lib - -ACL_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ - install install-lib - -# The libdir variable in libacl.la is empty, so let's fix it. This is -# probably due to acl not using automake, and not doing fully the -# right thing with libtool. -define ACL_FIX_LIBTOOL_LA_LIBDIR - $(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \ - $(STAGING_DIR)/usr/lib/libacl.la -endef - -ACL_POST_INSTALL_STAGING_HOOKS += ACL_FIX_LIBTOOL_LA_LIBDIR - +ACL_DEPENDENCIES = attr HOST_ACL_DEPENDENCIES = host-attr -HOST_ACL_CONF_OPTS = --enable-gettext=no -HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)" -HOST_ACL_INSTALL_OPTS = \ - prefix=$(HOST_DIR) \ - exec_prefix=$(HOST_DIR) \ - PKG_DEVLIB_DIR=$(HOST_DIR)/lib \ - install-dev install-lib -# For the host, libacl.la is correct, no fixup needed. + +ACL_INSTALL_STAGING = YES + +ACL_CONF_OPTS = --disable-nls +HOST_ACL_CONF_OPTS = --disable-nls $(eval $(autotools-package)) $(eval $(host-autotools-package)) From b02616cff44258f0386d6572adb9a12dece49509 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Jun 2018 16:21:27 +0200 Subject: [PATCH 2106/2640] package/attr: bump version The current version of attr uses a canned custom buildsystem, that is borked in quite a few ways (no support for static, overwrites destination files without unlinking...) There has been a release recently-ish, with a complete overhaul of the buildsystem. We can now drop all our patches. The option to disable NLS has changed, so update accordingly. Fixes: #10986 Signed-off-by: "Yann E. MORIN" Cc: Yegor Yefremov [Arnout: use the original SITE instead of a specific mirror] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-support-static-installation.patch | 29 -------- ...2-avoid-glibc-specific-decls-defines.patch | 37 ---------- package/attr/0003-portability-fixes.patch | 37 ---------- ...use-install-1-to-install-executables.patch | 67 ------------------- package/attr/attr.hash | 2 +- package/attr/attr.mk | 36 ++-------- 6 files changed, 5 insertions(+), 203 deletions(-) delete mode 100644 package/attr/0001-support-static-installation.patch delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch delete mode 100644 package/attr/0003-portability-fixes.patch delete mode 100644 package/attr/0004-all-use-install-1-to-install-executables.patch diff --git a/package/attr/0001-support-static-installation.patch b/package/attr/0001-support-static-installation.patch deleted file mode 100644 index 87858ac75e..0000000000 --- a/package/attr/0001-support-static-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -Support installation of .a file when doing static linking - -When doing static linking (i.e ENABLE_SHARED != yes), the attr build -logic wasn't installing any library at all, not even the .a file which -is needed for static linking. This patch fixes that. - -Signed-off-by: Thomas Petazzoni - -Index: b/include/buildmacros -=================================================================== ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -97,7 +97,15 @@ - - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ -+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ -+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -+ fi - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ diff --git a/package/attr/0002-avoid-glibc-specific-decls-defines.patch b/package/attr/0002-avoid-glibc-specific-decls-defines.patch deleted file mode 100644 index 8c71678cf4..0000000000 --- a/package/attr/0002-avoid-glibc-specific-decls-defines.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 10 Jan 2014 13:56:37 +0000 -Subject: avoid glibc-specific DECLS defines - -This matches what we do in all the other headers. - -Signed-off-by: Thomas Petazzoni ---- -diff --git a/include/xattr.h b/include/xattr.h -index 70a84be..070d7c5 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -30,8 +30,9 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW; - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ --- -cgit v0.9.0.2 diff --git a/package/attr/0003-portability-fixes.patch b/package/attr/0003-portability-fixes.patch deleted file mode 100644 index c5dc8c865b..0000000000 --- a/package/attr/0003-portability-fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus -Date: Mon, 30 Jun 2014 13:06:05 +0000 -Subject: Portability fixes - -- is Linux specific -- Define __THROW for non glibc based systems - -Signed-off-by: Thomas Petazzoni ---- -(limited to 'include/xattr.h') - -diff --git a/include/xattr.h b/include/xattr.h -index 070d7c5..fd1f268 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -20,7 +20,18 @@ - #ifndef __XATTR_H__ - #define __XATTR_H__ - -+#if defined(linux) - #include -+#endif -+ -+/* Portability non glibc c++ build systems */ -+#ifndef __THROW -+# if defined __cplusplus -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif - - #include - #ifndef ENOATTR --- -cgit v0.9.0.2 diff --git a/package/attr/0004-all-use-install-1-to-install-executables.patch b/package/attr/0004-all-use-install-1-to-install-executables.patch deleted file mode 100644 index ef59bb797c..0000000000 --- a/package/attr/0004-all-use-install-1-to-install-executables.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4187e60ab52cac3ed36036a354977310dab68dcb Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 8 May 2018 15:16:10 +0200 -Subject: [PATCH] all: use install(1) to install executables - -When the destination file already exists, the current install script -will overwrite it with the new executable. - -However, when the existing executable is a symlink or hardlink to -something else, like busybox, this effectively overwrites that something -with the new executable, and thus replaces busybox and all its applets -with the code for either of the three commands. - -We fix that by simply calling install(1). install(1) is sufficiently -widespread that we don't bother checking for it, as this is just a -workaround while waiting for the version bump that will eventually fix -it for good. - -Signed-off-by: "Yann E. MORIN" ---- - attr/Makefile | 4 ++-- - getfattr/Makefile | 4 ++-- - setfattr/Makefile | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/attr/Makefile b/attr/Makefile -index 1c467e8..326dd7e 100644 ---- a/attr/Makefile -+++ b/attr/Makefile -@@ -29,6 +29,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: -diff --git a/getfattr/Makefile b/getfattr/Makefile -index 91d3df2..f913172 100644 ---- a/getfattr/Makefile -+++ b/getfattr/Makefile -@@ -30,6 +30,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: -diff --git a/setfattr/Makefile b/setfattr/Makefile -index d55461b..26dc5d8 100644 ---- a/setfattr/Makefile -+++ b/setfattr/Makefile -@@ -30,6 +30,6 @@ default: $(LTCOMMAND) - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) -+ - install-dev install-lib: --- -2.14.1 - diff --git a/package/attr/attr.hash b/package/attr/attr.hash index d2d1c2ed50..88adf44e6a 100644 --- a/package/attr/attr.hash +++ b/package/attr/attr.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 attr-2.4.47.src.tar.gz +sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 8d250608b7..348dcd2f87 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -4,43 +4,15 @@ # ################################################################################ -ATTR_VERSION = 2.4.47 -ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz +ATTR_VERSION = 2.4.48 ATTR_SITE = http://download.savannah.gnu.org/releases/attr -ATTR_INSTALL_STAGING = YES -ATTR_CONF_OPTS = --enable-gettext=no -HOST_ATTR_CONF_OPTS = --enable-gettext=no ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -# While the configuration system uses autoconf, the Makefiles are -# hand-written and do not use automake. Therefore, we have to hack -# around their deficiencies by passing installation paths. -ATTR_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ - install-dev install-lib +ATTR_INSTALL_STAGING = YES -ATTR_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ - install install-lib - -HOST_ATTR_INSTALL_OPTS = \ - prefix=$(HOST_DIR) \ - exec_prefix=$(HOST_DIR) \ - install-dev install-lib - -# The libdir variable in libattr.la is empty, so let's fix it. This is -# probably due to attr not using automake, and not doing fully the -# right thing with libtool. -define ATTR_FIX_LIBTOOL_LA_LIBDIR - $(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \ - $(STAGING_DIR)/usr/lib/libattr.la -endef - -ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR +ATTR_CONF_OPTS = --disable-nls +HOST_ATTR_CONF_OPTS = --disable-nls $(eval $(autotools-package)) $(eval $(host-autotools-package)) From c4bf4fbebe7725669e86db604945322a8f2a94b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:43 +0200 Subject: [PATCH 2107/2640] package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-mach64.hash | 9 +++++++-- .../xdriver_xf86-video-mach64.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash index 43a7fa707e..55acd74652 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002599.html -sha256 3e98985b6e044189efd42342862208f472881c25debf22230a1d54a96d71b41f xf86-video-mach64-6.9.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-May/002896.html +md5 0e12f9a3b5659e1e27e03adc42b04d99 xf86-video-mach64-6.9.6.tar.bz2 +sha1 1fdf0c3488ab88cb46b563efee166a5d54a01932 xf86-video-mach64-6.9.6.tar.bz2 +sha256 7a0707c71bb522430f83bb5e9d9ee697e661e35534a3a2d10834f86b327a3c9c xf86-video-mach64-6.9.6.tar.bz2 +sha512 687f6ac60491b704d5c4788463763d2f4bf725611e10bd2163156963fe0a8fdbffe0a1b7c737eff131f01759e43b5ec3544a7dabe66a67e85b286dcb969da2f1 xf86-video-mach64-6.9.6.tar.bz2 +# Locally computed +sha256 a7d68021893bced0d709338a59a137c74b11e624880e110e4a2f14ccef475120 COPYING diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index 599036033d..ca24d39e43 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.5 +XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.6 XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT From d8fda20618642a08c9dafbd155cfa299118c27a8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:44 +0200 Subject: [PATCH 2108/2640] package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-vmware.hash | 9 +++++++-- .../xdriver_xf86-video-vmware.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash index 8d948a7d4c..f07e061478 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002743.html -sha256 e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b xf86-video-vmware-13.2.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-May/002895.html +md5 08d66d062055080ff699ab4869726ea2 xf86-video-vmware-13.3.0.tar.bz2 +sha1 f01335fe6bdb507e749571bfcd69163aed97312a xf86-video-vmware-13.3.0.tar.bz2 +sha256 47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c xf86-video-vmware-13.3.0.tar.bz2 +sha512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca xf86-video-vmware-13.3.0.tar.bz2 +# Locally computed +sha256 7e59b8ca2a161855a60561f27ada8dfdbb678733eacdb23423fff6d21f9ad43b COPYING diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index 1b2066d277..63a27a26dd 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.2.1 +XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.3.0 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT From 8a0e39330d08ebf67034ad0bd7f53214cbec6573 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:45 +0200 Subject: [PATCH 2109/2640] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-input-mouse.hash | 9 +++++++-- .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index caba427b22..551ff9d844 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002740.html -sha256 f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f xf86-input-mouse-1.9.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-June/002903.html +md5 a2104693bbcfe1413397f7905eecd3dc xf86-input-mouse-1.9.3.tar.bz2 +sha1 b3982998808ba43117fc066c4ecc94ce67c5818e xf86-input-mouse-1.9.3.tar.bz2 +sha256 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5 xf86-input-mouse-1.9.3.tar.bz2 +sha512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2 +# Locally computed +sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 5bcbeb70fd..97ee452f9c 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.2 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.3 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT From 47fb4c5de5508d94c871e7fe91047c6b3df53f5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:46 +0200 Subject: [PATCH 2110/2640] package/x11r7/xdriver_xf86-video-intel: bump version This version bump includes https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=359477215092ac1b602ad1e2f17a28963d9224c2 which is needed for compatibility with upcoming xserver_xorg-server 1.20.0. Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash | 2 +- .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index 1852540cb3..469649ec30 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3a107fadcdeef35830a12a305b09dfa793a33a54930a0ecd5e84a6156f546eb xdriver_xf86-video-intel-84eaaba2737b2765f3fe843a138002ad0056a52b.tar.gz +sha256 8a008db80964700c57db407fe9fab78884d6919bd5343a269f681625132b4687 xdriver_xf86-video-intel-3d395062ce73f85e8340218df01c2ebf4bc25023.tar.gz sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index fa0f650dbe..db96c9f6f8 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 84eaaba2737b2765f3fe843a138002ad0056a52b +XDRIVER_XF86_VIDEO_INTEL_VERSION = 3d395062ce73f85e8340218df01c2ebf4bc25023 XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING From df6e784f105e170029d17266168e6ac668c6c7a9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:47 +0200 Subject: [PATCH 2111/2640] package/x11r7/xlib_libXScrnSaver: bump version to 1.2.3 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash | 9 +++++++-- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash index d5340baf1e..266840114f 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2012-March/054015.html -sha256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d libXScrnSaver-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-July/002906.html +md5 eeea9d5af3e6c143d0ea1721d27a5e49 libXScrnSaver-1.2.3.tar.bz2 +sha1 70c791c5755a298ecf1a0823e239a24fa4b2b42f libXScrnSaver-1.2.3.tar.bz2 +sha256 f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8 libXScrnSaver-1.2.3.tar.bz2 +sha512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a libXScrnSaver-1.2.3.tar.bz2 +# Locally computed +sha256 5cf3e16f5dd753a4c0853e8227134ab65f5562d9ef89b1a2d7681f5c8ac9feb5 COPYING diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk index f22ee983c0..4c3d36d007 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXSCRNSAVER_VERSION = 1.2.2 +XLIB_LIBXSCRNSAVER_VERSION = 1.2.3 XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSCRNSAVER_LICENSE = MIT From 72f28b266a9caff8f630e9add108256c2df889d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:48 +0200 Subject: [PATCH 2112/2640] package/x11r7/xlib_libXinerama: bump version to 1.1.4 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xlib_libXinerama/xlib_libXinerama.hash | 9 +++++++-- package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash index 6dfd7770d2..995181dd16 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002231.html -sha256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 libXinerama-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-July/002905.html +md5 0d5f826a197dae74da67af4a9ef35885 libXinerama-1.1.4.tar.bz2 +sha1 34a1d9908ffbd46805d2357c6b05f5e341a8dc7c libXinerama-1.1.4.tar.bz2 +sha256 0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720 libXinerama-1.1.4.tar.bz2 +sha512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14 libXinerama-1.1.4.tar.bz2 +# Locally computed +sha256 f661fd883b6e980b3b118e0fbe230fbf10eef8d4d4a35931355f29ed647ddbe3 COPYING diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index ee8bf55602..3c2a505bc8 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXINERAMA_VERSION = 1.1.3 +XLIB_LIBXINERAMA_VERSION = 1.1.4 XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT From 0ce56fbdf6469cf9bbda168ffe75480ae811acaa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 9 Jul 2018 19:45:49 +0200 Subject: [PATCH 2113/2640] package/x11r7/xlib_libdmx: bump version to 1.1.4 Added license hash and all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xlib_libdmx/xlib_libdmx.hash | 9 +++++++-- package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.hash b/package/x11r7/xlib_libdmx/xlib_libdmx.hash index 9f715359be..1090e3c2d5 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.hash +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg-announce/2013-May/002225.html -sha256 c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 libdmx-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-May/002894.html +md5 d2f1f0ec68ac3932dd7f1d9aa0a7a11c libdmx-1.1.4.tar.bz2 +sha1 499e2540ca0e94ca858037865243c3c60908fd94 libdmx-1.1.4.tar.bz2 +sha256 253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243 libdmx-1.1.4.tar.bz2 +sha512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9 libdmx-1.1.4.tar.bz2 +# Locally computed +sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk index fbe3067fe1..01ff493201 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBDMX_VERSION = 1.1.3 +XLIB_LIBDMX_VERSION = 1.1.4 XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBDMX_LICENSE = MIT From 5af4748de4ab45752d8cb77b8fc497ca4d52b208 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 11 Jul 2018 13:03:50 -0300 Subject: [PATCH 2114/2640] linux: bump default to version 4.17.6 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 9e53adb8bd..9b166eded6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 572c7af8dbcc9539ea54724e88b0850ae47d98ee Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 11 Jul 2018 13:03:51 -0300 Subject: [PATCH 2115/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8965ecf065..bb3ca5e2eb 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.139" if BR2_KERNEL_HEADERS_4_4 - default "4.9.111" if BR2_KERNEL_HEADERS_4_9 + default "4.4.140" if BR2_KERNEL_HEADERS_4_4 + default "4.9.112" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.54" if BR2_KERNEL_HEADERS_4_14 + default "4.14.55" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.5" if BR2_KERNEL_HEADERS_4_17 + default "4.17.6" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From bf79731153d2739580954161547225acb60f65e8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 12 Jul 2018 21:15:57 +0300 Subject: [PATCH 2116/2640] libcurl: security bump to version 7.61.0 Fixes CVE-2018-0500: curl might overflow a heap based memory buffer when sending data over SMTP and using a reduced read buffer. Drop upstream patch. Add reference to tarball signature key. Drop CRYPTO_lock seed. Removed from configure script since 7.45. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ith-ssh2-built-with-a-static-mbedtls.patch | 40 ------------------- package/libcurl/libcurl.hash | 5 ++- package/libcurl/libcurl.mk | 5 +-- 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch diff --git a/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch b/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch deleted file mode 100644 index 9107fa7c8c..0000000000 --- a/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b5fbc486e805805efb8400373ccec2a3dee1c81b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 21 May 2018 12:07:00 +0200 -Subject: [PATCH 1/1] Fix link with ssh2 built with a static mbedtls - -The ssh2 pkg-config file could contain the following lines when build -with a static version of mbedtls: - Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a - Libs.private: /xxx/libmbedcrypto.a - -This static mbedtls library must be used to correctly detect ssh2 -support and this library must be copied in libcurl.pc otherwise -compilation of any application (such as upmpdcli) with libcurl will fail -when trying to found mbedtls functions included in libssh2. -So, replace pkg-config --libs-only-l by pkg-config --libs. - -Fixes: - - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5569a26b4..9e2606885 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -2766,7 +2766,7 @@ if test X"$OPT_LIBSSH2" != Xno; then - CURL_CHECK_PKGCONFIG(libssh2) - - if test "$PKGCONFIG" != "no" ; then -- LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2` -+ LIB_SSH2=`$PKGCONFIG --libs libssh2` - LD_SSH2=`$PKGCONFIG --libs-only-L libssh2` - CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2` - version=`$PKGCONFIG --modversion libssh2` --- -2.14.1 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index cb1e6e72f2..9a57153d2b 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.60.0.tar.xz.asc -sha256 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 curl-7.60.0.tar.xz +# https://curl.haxx.se/download/curl-7.61.0.tar.xz.asc +# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 +sha256 ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720 curl-7.61.0.tar.xz sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 00a213cc3c..c9b325c672 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.60.0 +LIBCURL_VERSION = 7.61.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -13,8 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES -# We're patching configure.ac -LIBCURL_AUTORECONF = YES # We disable NTLM support because it uses fork(), which doesn't work # on non-MMU platforms. Moreover, this authentication method is @@ -39,7 +37,6 @@ LIBCURL_CONFIG_SCRIPTS = curl-config ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes # configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up # native stuff during the rest of configure when target == host. # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs From c69af82ba0e3b46c2a5b823757fae2cfce7b60d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Jul 2018 17:54:25 +0200 Subject: [PATCH 2117/2640] package/x265: fix arm build Fixes http://autobuild.buildroot.net/results/048/048e1914d89d7893f12b90b66a7aa1dbf41b820c/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x265/0003-arm-asm-primitives.patch | 354 +++++++++++++++++++++ 1 file changed, 354 insertions(+) create mode 100644 package/x265/0003-arm-asm-primitives.patch diff --git a/package/x265/0003-arm-asm-primitives.patch b/package/x265/0003-arm-asm-primitives.patch new file mode 100644 index 0000000000..e500443429 --- /dev/null +++ b/package/x265/0003-arm-asm-primitives.patch @@ -0,0 +1,354 @@ +Fixes "arm assembly fail to compile on 1.8" + +Downloaded from upstream bug report: +https://bitbucket.org/multicoreware/x265/issues/406 + +Signed-off-by: Bernd Kuhls + +--- ./source/common/arm/asm-primitives.cpp.orig 2018-05-21 02:33:10.000000000 -0600 ++++ ./source/common/arm/asm-primitives.cpp 2018-05-28 20:38:37.302378303 -0600 +@@ -48,77 +48,77 @@ void setupAssemblyPrimitives(EncoderPrim + p.ssim_4x4x2_core = PFX(ssim_4x4x2_core_neon); + + // addAvg +- p.pu[LUMA_4x4].addAvg = PFX(addAvg_4x4_neon); +- p.pu[LUMA_4x8].addAvg = PFX(addAvg_4x8_neon); +- p.pu[LUMA_4x16].addAvg = PFX(addAvg_4x16_neon); +- p.pu[LUMA_8x4].addAvg = PFX(addAvg_8x4_neon); +- p.pu[LUMA_8x8].addAvg = PFX(addAvg_8x8_neon); +- p.pu[LUMA_8x16].addAvg = PFX(addAvg_8x16_neon); +- p.pu[LUMA_8x32].addAvg = PFX(addAvg_8x32_neon); +- p.pu[LUMA_12x16].addAvg = PFX(addAvg_12x16_neon); +- p.pu[LUMA_16x4].addAvg = PFX(addAvg_16x4_neon); +- p.pu[LUMA_16x8].addAvg = PFX(addAvg_16x8_neon); +- p.pu[LUMA_16x12].addAvg = PFX(addAvg_16x12_neon); +- p.pu[LUMA_16x16].addAvg = PFX(addAvg_16x16_neon); +- p.pu[LUMA_16x32].addAvg = PFX(addAvg_16x32_neon); +- p.pu[LUMA_16x64].addAvg = PFX(addAvg_16x64_neon); +- p.pu[LUMA_24x32].addAvg = PFX(addAvg_24x32_neon); +- p.pu[LUMA_32x8].addAvg = PFX(addAvg_32x8_neon); +- p.pu[LUMA_32x16].addAvg = PFX(addAvg_32x16_neon); +- p.pu[LUMA_32x24].addAvg = PFX(addAvg_32x24_neon); +- p.pu[LUMA_32x32].addAvg = PFX(addAvg_32x32_neon); +- p.pu[LUMA_32x64].addAvg = PFX(addAvg_32x64_neon); +- p.pu[LUMA_48x64].addAvg = PFX(addAvg_48x64_neon); +- p.pu[LUMA_64x16].addAvg = PFX(addAvg_64x16_neon); +- p.pu[LUMA_64x32].addAvg = PFX(addAvg_64x32_neon); +- p.pu[LUMA_64x48].addAvg = PFX(addAvg_64x48_neon); +- p.pu[LUMA_64x64].addAvg = PFX(addAvg_64x64_neon); ++ p.pu[LUMA_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); ++ p.pu[LUMA_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); ++ p.pu[LUMA_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); ++ p.pu[LUMA_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); ++ p.pu[LUMA_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); ++ p.pu[LUMA_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); ++ p.pu[LUMA_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); ++ p.pu[LUMA_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); ++ p.pu[LUMA_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); ++ p.pu[LUMA_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); ++ p.pu[LUMA_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); ++ p.pu[LUMA_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); ++ p.pu[LUMA_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); ++ p.pu[LUMA_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); ++ p.pu[LUMA_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); ++ p.pu[LUMA_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); ++ p.pu[LUMA_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); ++ p.pu[LUMA_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); ++ p.pu[LUMA_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); ++ p.pu[LUMA_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); ++ p.pu[LUMA_48x64].addAvg[ALIGNED] = PFX(addAvg_48x64_neon); ++ p.pu[LUMA_64x16].addAvg[ALIGNED] = PFX(addAvg_64x16_neon); ++ p.pu[LUMA_64x32].addAvg[ALIGNED] = PFX(addAvg_64x32_neon); ++ p.pu[LUMA_64x48].addAvg[ALIGNED] = PFX(addAvg_64x48_neon); ++ p.pu[LUMA_64x64].addAvg[ALIGNED] = PFX(addAvg_64x64_neon); + + // chroma addAvg +- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg = PFX(addAvg_4x2_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg = PFX(addAvg_4x4_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg = PFX(addAvg_4x8_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg = PFX(addAvg_4x16_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg = PFX(addAvg_6x8_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg = PFX(addAvg_8x2_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg = PFX(addAvg_8x4_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg = PFX(addAvg_8x6_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg = PFX(addAvg_8x8_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg = PFX(addAvg_8x16_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg = PFX(addAvg_8x32_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg = PFX(addAvg_12x16_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg = PFX(addAvg_16x4_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg = PFX(addAvg_16x8_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg = PFX(addAvg_16x12_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg = PFX(addAvg_16x16_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg = PFX(addAvg_16x32_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg = PFX(addAvg_24x32_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg = PFX(addAvg_32x8_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg = PFX(addAvg_32x16_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg = PFX(addAvg_32x24_neon); +- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg = PFX(addAvg_32x32_neon); +- +- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg = PFX(addAvg_4x8_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg = PFX(addAvg_4x16_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg = PFX(addAvg_4x32_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg = PFX(addAvg_6x16_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg = PFX(addAvg_8x4_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg = PFX(addAvg_8x8_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg = PFX(addAvg_8x12_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg = PFX(addAvg_8x16_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg = PFX(addAvg_8x32_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg = PFX(addAvg_8x64_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg = PFX(addAvg_12x32_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg = PFX(addAvg_16x8_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg = PFX(addAvg_16x16_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg = PFX(addAvg_16x24_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg = PFX(addAvg_16x32_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg = PFX(addAvg_16x64_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg = PFX(addAvg_24x64_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg = PFX(addAvg_32x16_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg = PFX(addAvg_32x32_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg = PFX(addAvg_32x48_neon); +- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg = PFX(addAvg_32x64_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg[ALIGNED] = PFX(addAvg_4x2_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg[ALIGNED] = PFX(addAvg_6x8_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg[ALIGNED] = PFX(addAvg_8x2_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg[ALIGNED] = PFX(addAvg_8x6_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); ++ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); ++ ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg[ALIGNED] = PFX(addAvg_4x32_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg[ALIGNED] = PFX(addAvg_6x16_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg[ALIGNED] = PFX(addAvg_8x12_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg[ALIGNED] = PFX(addAvg_8x64_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg[ALIGNED] = PFX(addAvg_12x32_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg[ALIGNED] = PFX(addAvg_16x24_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg[ALIGNED] = PFX(addAvg_24x64_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg[ALIGNED] = PFX(addAvg_32x48_neon); ++ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); + + // quant + p.quant = PFX(quant_neon); +@@ -402,7 +402,7 @@ void setupAssemblyPrimitives(EncoderPrim + p.scale2D_64to32 = PFX(scale2D_64to32_neon); + + // scale1D_128to64 +- p.scale1D_128to64 = PFX(scale1D_128to64_neon); ++ p.scale1D_128to64[ALIGNED] = PFX(scale1D_128to64_neon); + + // copy_count + p.cu[BLOCK_4x4].copy_cnt = PFX(copy_cnt_4_neon); +@@ -411,37 +411,37 @@ void setupAssemblyPrimitives(EncoderPrim + p.cu[BLOCK_32x32].copy_cnt = PFX(copy_cnt_32_neon); + + // filterPixelToShort +- p.pu[LUMA_4x4].convert_p2s = PFX(filterPixelToShort_4x4_neon); +- p.pu[LUMA_4x8].convert_p2s = PFX(filterPixelToShort_4x8_neon); +- p.pu[LUMA_4x16].convert_p2s = PFX(filterPixelToShort_4x16_neon); +- p.pu[LUMA_8x4].convert_p2s = PFX(filterPixelToShort_8x4_neon); +- p.pu[LUMA_8x8].convert_p2s = PFX(filterPixelToShort_8x8_neon); +- p.pu[LUMA_8x16].convert_p2s = PFX(filterPixelToShort_8x16_neon); +- p.pu[LUMA_8x32].convert_p2s = PFX(filterPixelToShort_8x32_neon); +- p.pu[LUMA_12x16].convert_p2s = PFX(filterPixelToShort_12x16_neon); +- p.pu[LUMA_16x4].convert_p2s = PFX(filterPixelToShort_16x4_neon); +- p.pu[LUMA_16x8].convert_p2s = PFX(filterPixelToShort_16x8_neon); +- p.pu[LUMA_16x12].convert_p2s = PFX(filterPixelToShort_16x12_neon); +- p.pu[LUMA_16x16].convert_p2s = PFX(filterPixelToShort_16x16_neon); +- p.pu[LUMA_16x32].convert_p2s = PFX(filterPixelToShort_16x32_neon); +- p.pu[LUMA_16x64].convert_p2s = PFX(filterPixelToShort_16x64_neon); +- p.pu[LUMA_24x32].convert_p2s = PFX(filterPixelToShort_24x32_neon); +- p.pu[LUMA_32x8].convert_p2s = PFX(filterPixelToShort_32x8_neon); +- p.pu[LUMA_32x16].convert_p2s = PFX(filterPixelToShort_32x16_neon); +- p.pu[LUMA_32x24].convert_p2s = PFX(filterPixelToShort_32x24_neon); +- p.pu[LUMA_32x32].convert_p2s = PFX(filterPixelToShort_32x32_neon); +- p.pu[LUMA_32x64].convert_p2s = PFX(filterPixelToShort_32x64_neon); +- p.pu[LUMA_48x64].convert_p2s = PFX(filterPixelToShort_48x64_neon); +- p.pu[LUMA_64x16].convert_p2s = PFX(filterPixelToShort_64x16_neon); +- p.pu[LUMA_64x32].convert_p2s = PFX(filterPixelToShort_64x32_neon); +- p.pu[LUMA_64x48].convert_p2s = PFX(filterPixelToShort_64x48_neon); +- p.pu[LUMA_64x64].convert_p2s = PFX(filterPixelToShort_64x64_neon); ++ p.pu[LUMA_4x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x4_neon); ++ p.pu[LUMA_4x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x8_neon); ++ p.pu[LUMA_4x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x16_neon); ++ p.pu[LUMA_8x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x4_neon); ++ p.pu[LUMA_8x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x8_neon); ++ p.pu[LUMA_8x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x16_neon); ++ p.pu[LUMA_8x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x32_neon); ++ p.pu[LUMA_12x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_12x16_neon); ++ p.pu[LUMA_16x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x4_neon); ++ p.pu[LUMA_16x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x8_neon); ++ p.pu[LUMA_16x12].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x12_neon); ++ p.pu[LUMA_16x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x16_neon); ++ p.pu[LUMA_16x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x32_neon); ++ p.pu[LUMA_16x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x64_neon); ++ p.pu[LUMA_24x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_24x32_neon); ++ p.pu[LUMA_32x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x8_neon); ++ p.pu[LUMA_32x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x16_neon); ++ p.pu[LUMA_32x24].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x24_neon); ++ p.pu[LUMA_32x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x32_neon); ++ p.pu[LUMA_32x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x64_neon); ++ p.pu[LUMA_48x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_48x64_neon); ++ p.pu[LUMA_64x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x16_neon); ++ p.pu[LUMA_64x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x32_neon); ++ p.pu[LUMA_64x48].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x48_neon); ++ p.pu[LUMA_64x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x64_neon); + + // Block_fill +- p.cu[BLOCK_4x4].blockfill_s = PFX(blockfill_s_4x4_neon); +- p.cu[BLOCK_8x8].blockfill_s = PFX(blockfill_s_8x8_neon); +- p.cu[BLOCK_16x16].blockfill_s = PFX(blockfill_s_16x16_neon); +- p.cu[BLOCK_32x32].blockfill_s = PFX(blockfill_s_32x32_neon); ++ p.cu[BLOCK_4x4].blockfill_s[ALIGNED] = PFX(blockfill_s_4x4_neon); ++ p.cu[BLOCK_8x8].blockfill_s[ALIGNED] = PFX(blockfill_s_8x8_neon); ++ p.cu[BLOCK_16x16].blockfill_s[ALIGNED] = PFX(blockfill_s_16x16_neon); ++ p.cu[BLOCK_32x32].blockfill_s[ALIGNED] = PFX(blockfill_s_32x32_neon); + + // Blockcopy_ss + p.cu[BLOCK_4x4].copy_ss = PFX(blockcopy_ss_4x4_neon); +@@ -495,21 +495,21 @@ void setupAssemblyPrimitives(EncoderPrim + p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].copy_sp = PFX(blockcopy_sp_32x64_neon); + + // pixel_add_ps +- p.cu[BLOCK_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); +- p.cu[BLOCK_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); +- p.cu[BLOCK_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); +- p.cu[BLOCK_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); +- p.cu[BLOCK_64x64].add_ps = PFX(pixel_add_ps_64x64_neon); ++ p.cu[BLOCK_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); ++ p.cu[BLOCK_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); ++ p.cu[BLOCK_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); ++ p.cu[BLOCK_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); ++ p.cu[BLOCK_64x64].add_ps[ALIGNED] = PFX(pixel_add_ps_64x64_neon); + + // chroma add_ps +- p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); +- p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); +- p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); +- p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); +- p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps = PFX(pixel_add_ps_4x8_neon); +- p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps = PFX(pixel_add_ps_8x16_neon); +- p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps = PFX(pixel_add_ps_16x32_neon); +- p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps = PFX(pixel_add_ps_32x64_neon); ++ p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); ++ p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); ++ p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); ++ p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); ++ p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps[ALIGNED] = PFX(pixel_add_ps_4x8_neon); ++ p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps[ALIGNED] = PFX(pixel_add_ps_8x16_neon); ++ p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps[ALIGNED] = PFX(pixel_add_ps_16x32_neon); ++ p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps[ALIGNED] = PFX(pixel_add_ps_32x64_neon); + + // cpy2Dto1D_shr + p.cu[BLOCK_4x4].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_4x4_neon); +@@ -518,10 +518,10 @@ void setupAssemblyPrimitives(EncoderPrim + p.cu[BLOCK_32x32].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_32x32_neon); + + // ssd_s +- p.cu[BLOCK_4x4].ssd_s = PFX(pixel_ssd_s_4x4_neon); +- p.cu[BLOCK_8x8].ssd_s = PFX(pixel_ssd_s_8x8_neon); +- p.cu[BLOCK_16x16].ssd_s = PFX(pixel_ssd_s_16x16_neon); +- p.cu[BLOCK_32x32].ssd_s = PFX(pixel_ssd_s_32x32_neon); ++ p.cu[BLOCK_4x4].ssd_s[ALIGNED] = PFX(pixel_ssd_s_4x4_neon); ++ p.cu[BLOCK_8x8].ssd_s[ALIGNED] = PFX(pixel_ssd_s_8x8_neon); ++ p.cu[BLOCK_16x16].ssd_s[ALIGNED] = PFX(pixel_ssd_s_16x16_neon); ++ p.cu[BLOCK_32x32].ssd_s[ALIGNED] = PFX(pixel_ssd_s_32x32_neon); + + // sse_ss + p.cu[BLOCK_4x4].sse_ss = PFX(pixel_sse_ss_4x4_neon); +@@ -548,10 +548,10 @@ void setupAssemblyPrimitives(EncoderPrim + p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].sub_ps = PFX(pixel_sub_ps_32x64_neon); + + // calc_Residual +- p.cu[BLOCK_4x4].calcresidual = PFX(getResidual4_neon); +- p.cu[BLOCK_8x8].calcresidual = PFX(getResidual8_neon); +- p.cu[BLOCK_16x16].calcresidual = PFX(getResidual16_neon); +- p.cu[BLOCK_32x32].calcresidual = PFX(getResidual32_neon); ++ p.cu[BLOCK_4x4].calcresidual[ALIGNED] = PFX(getResidual4_neon); ++ p.cu[BLOCK_8x8].calcresidual[ALIGNED] = PFX(getResidual8_neon); ++ p.cu[BLOCK_16x16].calcresidual[ALIGNED] = PFX(getResidual16_neon); ++ p.cu[BLOCK_32x32].calcresidual[ALIGNED] = PFX(getResidual32_neon); + + // sse_pp + p.cu[BLOCK_4x4].sse_pp = PFX(pixel_sse_pp_4x4_neon); +@@ -722,31 +722,31 @@ void setupAssemblyPrimitives(EncoderPrim + p.pu[LUMA_64x64].sad_x4 = PFX(sad_x4_64x64_neon); + + // pixel_avg_pp +- p.pu[LUMA_4x4].pixelavg_pp = PFX(pixel_avg_pp_4x4_neon); +- p.pu[LUMA_4x8].pixelavg_pp = PFX(pixel_avg_pp_4x8_neon); +- p.pu[LUMA_4x16].pixelavg_pp = PFX(pixel_avg_pp_4x16_neon); +- p.pu[LUMA_8x4].pixelavg_pp = PFX(pixel_avg_pp_8x4_neon); +- p.pu[LUMA_8x8].pixelavg_pp = PFX(pixel_avg_pp_8x8_neon); +- p.pu[LUMA_8x16].pixelavg_pp = PFX(pixel_avg_pp_8x16_neon); +- p.pu[LUMA_8x32].pixelavg_pp = PFX(pixel_avg_pp_8x32_neon); +- p.pu[LUMA_12x16].pixelavg_pp = PFX(pixel_avg_pp_12x16_neon); +- p.pu[LUMA_16x4].pixelavg_pp = PFX(pixel_avg_pp_16x4_neon); +- p.pu[LUMA_16x8].pixelavg_pp = PFX(pixel_avg_pp_16x8_neon); +- p.pu[LUMA_16x12].pixelavg_pp = PFX(pixel_avg_pp_16x12_neon); +- p.pu[LUMA_16x16].pixelavg_pp = PFX(pixel_avg_pp_16x16_neon); +- p.pu[LUMA_16x32].pixelavg_pp = PFX(pixel_avg_pp_16x32_neon); +- p.pu[LUMA_16x64].pixelavg_pp = PFX(pixel_avg_pp_16x64_neon); +- p.pu[LUMA_24x32].pixelavg_pp = PFX(pixel_avg_pp_24x32_neon); +- p.pu[LUMA_32x8].pixelavg_pp = PFX(pixel_avg_pp_32x8_neon); +- p.pu[LUMA_32x16].pixelavg_pp = PFX(pixel_avg_pp_32x16_neon); +- p.pu[LUMA_32x24].pixelavg_pp = PFX(pixel_avg_pp_32x24_neon); +- p.pu[LUMA_32x32].pixelavg_pp = PFX(pixel_avg_pp_32x32_neon); +- p.pu[LUMA_32x64].pixelavg_pp = PFX(pixel_avg_pp_32x64_neon); +- p.pu[LUMA_48x64].pixelavg_pp = PFX(pixel_avg_pp_48x64_neon); +- p.pu[LUMA_64x16].pixelavg_pp = PFX(pixel_avg_pp_64x16_neon); +- p.pu[LUMA_64x32].pixelavg_pp = PFX(pixel_avg_pp_64x32_neon); +- p.pu[LUMA_64x48].pixelavg_pp = PFX(pixel_avg_pp_64x48_neon); +- p.pu[LUMA_64x64].pixelavg_pp = PFX(pixel_avg_pp_64x64_neon); ++ p.pu[LUMA_4x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x4_neon); ++ p.pu[LUMA_4x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x8_neon); ++ p.pu[LUMA_4x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x16_neon); ++ p.pu[LUMA_8x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x4_neon); ++ p.pu[LUMA_8x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x8_neon); ++ p.pu[LUMA_8x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x16_neon); ++ p.pu[LUMA_8x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x32_neon); ++ p.pu[LUMA_12x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_12x16_neon); ++ p.pu[LUMA_16x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x4_neon); ++ p.pu[LUMA_16x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x8_neon); ++ p.pu[LUMA_16x12].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x12_neon); ++ p.pu[LUMA_16x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x16_neon); ++ p.pu[LUMA_16x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x32_neon); ++ p.pu[LUMA_16x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x64_neon); ++ p.pu[LUMA_24x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_24x32_neon); ++ p.pu[LUMA_32x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x8_neon); ++ p.pu[LUMA_32x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x16_neon); ++ p.pu[LUMA_32x24].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x24_neon); ++ p.pu[LUMA_32x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x32_neon); ++ p.pu[LUMA_32x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x64_neon); ++ p.pu[LUMA_48x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_48x64_neon); ++ p.pu[LUMA_64x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x16_neon); ++ p.pu[LUMA_64x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x32_neon); ++ p.pu[LUMA_64x48].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x48_neon); ++ p.pu[LUMA_64x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x64_neon); + + // planecopy + p.planecopy_cp = PFX(pixel_planecopy_cp_neon); From 5b88e60abaca1b21f6c67890c1e632d73e9b419b Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 12 Jul 2018 07:55:15 +0200 Subject: [PATCH 2118/2640] libostree: add upstream patch to fix linking errors Support for Avahi in libostree depends on some support functions from libsoup. Use its own support functions in case of libsoup is not provided. Fixes: http://autobuild.buildroot.net/results/5e5441822e2a94f8de51bfa0470aced84720ce31 [Peter: enable AUTORECONF as .am file is touched] Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- ...-soup-to-build-process-when-configur.patch | 45 +++++++++++++++++++ package/libostree/libostree.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch diff --git a/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch b/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch new file mode 100644 index 0000000000..b89bd743a1 --- /dev/null +++ b/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch @@ -0,0 +1,45 @@ +From 1cd86d4978ad32405b41f864e11ac21a2474c2f3 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 3 Jul 2018 10:02:46 +0200 +Subject: [PATCH] build: add ostree-soup-* to build process when configured + with avahi + +Avoid getting these link errors: + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_path' + ./.libs/libostree-1.so: undefined reference to `soup_uri_new' + ./.libs/libostree-1.so: undefined reference to `soup_uri_free' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme' + ./.libs/libostree-1.so: undefined reference to `soup_uri_to_string' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_host' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_port' + collect2: error: ld returned 1 exit status + +Reproduce with: + ./configure --with-avahi --without-soup + +Signed-off-by: Marcus Folkesson +--- + Makefile-libostree.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Makefile-libostree.am b/Makefile-libostree.am +index 01a209d1..dbc9ebb8 100644 +--- a/Makefile-libostree.am ++++ b/Makefile-libostree.am +@@ -238,6 +238,13 @@ if USE_LIBSOUP + libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c + libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) + libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS) ++else ++if USE_AVAHI ++libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \ ++ src/libostree/ostree-soup-uri.c \ ++ src/libostree/ostree-soup-form.c \ ++ $(NULL) ++endif + endif + endif + +-- +2.18.0 + diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index d9739b7901..69e84343e9 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -12,6 +12,8 @@ LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz LIBOSTREE_INSTALL_STAGING = YES +# For 0002-build-add-ostree-soup-to-build-process-when-configur.patch +LIBOSTREE_AUTORECONF = YES LIBOSTREE_CONF_OPTS += \ --with-gpgme-prefix=$(STAGING_DIR)/usr \ From 49fc9ab9b337c372b84e82c37a791608881b7345 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 13 Jul 2018 22:29:31 +0200 Subject: [PATCH 2119/2640] package/tor: bump version to 0.3.3.9 Changelog: https://gitweb.torproject.org/tor.git/commit/ChangeLog?h=tor-0.3.3.9&id=5521729da9fc5ca732db4f9ccd2e217f4231e1b6 o Directory authority changes: - The "Bifroest" bridge authority has been retired; the new bridge authority is "Serge", and it is operated by George from the TorBSD project. Closes ticket 26771. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index d56855f45e..35659eca6e 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3cf5b4fea2491cbfefa1077bf1b2855e169052d381bd920cd57aa9bfaff6b3a5 tor-0.3.3.8.tar.gz +sha256 85346b4d026e6a041c8e326d2cc64b5f5361b032075c89c5854f16dbc02fce6f tor-0.3.3.9.tar.gz sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 6f977f8625..2ee25c873f 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.3.8 +TOR_VERSION = 0.3.3.9 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 02b7fbf8fc4321d5d7aab4bdc85f759060e016d7 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Sat, 14 Jul 2018 14:15:14 -0500 Subject: [PATCH 2120/2640] board/minnowboard: add CONFIG_IGB in Linux kernel config The 2017 MinnowBoard Turbot skews no longer use the Realtek 8169 Ethernet chip. The Turbot D0 uses The Intel I211, the Turbot Dual Ethernet has an I210 (quad-core) or I211 (dual-core). Add CONFIG_IGB to the Linux config but keep the Realtek 8169 support to avoid breaking older boards Tested on Turbot D0, lspci -k shows the igb driver is used: 03:00.0 Class 0200: 8086:1539 igb Signed-off-by: Pierre-Louis Bossart Signed-off-by: Thomas Petazzoni --- board/minnowboard/linux.config | 1 + 1 file changed, 1 insertion(+) diff --git a/board/minnowboard/linux.config b/board/minnowboard/linux.config index 03ffc5e371..27077dbcda 100644 --- a/board/minnowboard/linux.config +++ b/board/minnowboard/linux.config @@ -21,6 +21,7 @@ CONFIG_SATA_AHCI=y CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_R8169=y +CONFIG_IGB=y CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y From c8fe0341420286e587f4d7e41f5c69988cbc98a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Jul 2018 10:28:35 +0200 Subject: [PATCH 2121/2640] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.28.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-libinput.hash | 10 +++++----- .../xdriver_xf86-input-libinput.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 1c260d0b43..cb41765f4f 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-April/002889.html -md5 bdad198a7a9f2ce2c1f90d5e6760462b xf86-input-libinput-0.27.1.tar.bz2 -sha1 70ba045975b6484f16d11b32fbbb7e7194d2e0fd xf86-input-libinput-0.27.1.tar.bz2 -sha256 d4ad8dc5ad6f962a3f15f61ba9e9f8e37fa0b57eee9f484e2bd721d60ca72ee6 xf86-input-libinput-0.27.1.tar.bz2 -sha512 01379f5d71bf39214c4dff428173512df57fd12e782f3fcde757be923aa0dbf4e010a0395a81bd8e4fb518edc7e05ca1ee64b1e313eb4df5d4990315580609a1 xf86-input-libinput-0.27.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-July/002908.html +md5 2d7519ac0e39d4c88f3be32e81a637aa xf86-input-libinput-0.28.0.tar.bz2 +sha1 07f5559bcf0363d4ecaf0b2cecb88ee7d2b16fc6 xf86-input-libinput-0.28.0.tar.bz2 +sha256 21994d065fc26e85d1c3fc87d8479b9c22699ed5a0119df98fbe0000e84630a1 xf86-input-libinput-0.28.0.tar.bz2 +sha512 4276b6aea87ddc83fa1f5e8d8949e34ad117186a6b5b599549231cb90424cd0fa69f3a4701ce529739c676665bb5c936eb447817c9420511d23bc048f6be92a4 xf86-input-libinput-0.28.0.tar.bz2 # Locally computed sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 1723b3fcf8..89d0e5e3e7 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.27.1 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.28.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT From 34ba18cbc47996a4eb9513c6355ef23330bcec97 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 14 Jul 2018 09:21:49 +0300 Subject: [PATCH 2122/2640] libuv: bump to version 1.22.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 612f45b6ad..c9f6565ef3 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c6f53e4a75d2601db8efe0e837839969de7667d36569110429a0bc8f8229bf59 libuv-v1.21.0.tar.gz +sha256 c72f0401e1298f948daf310abafce38373a926fb9438464d1bf7fe90784544e0 libuv-v1.22.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 591eaeb7c4..85e8dccb63 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.21.0 +LIBUV_VERSION = v1.22.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 565a2b8f4ba5e182fce10a430ee52475e91fd872 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Jul 2018 09:14:41 +0200 Subject: [PATCH 2123/2640] package/{mesa3d, mesa3d-headers}: bump version to 18.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c598444b5f..8c317916e5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.1.3 +MESA3D_HEADERS_VERSION = 18.1.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f4564d0da7..7279e8d9f3 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2018-June/000439.html -md5 b34273403a605f6f98ead00f0bdf8e0b mesa-18.1.3.tar.xz -sha1 0a5fb3096108a95f913411267b8a374f9ff547b2 mesa-18.1.3.tar.xz -sha256 54f08deeda0cd2f818e8d40140040ed013de7852573002453b7f50da9ea738ce mesa-18.1.3.tar.xz -sha512 f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887 mesa-18.1.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2018-July/000442.html +md5 7abc628e2e34b2f478d906b6d233ade3 mesa-18.1.4.tar.xz +sha1 b5af29aff8b7abe070103ea2cc625d38b4eb1611 mesa-18.1.4.tar.xz +sha256 3061488b5d85504092cf4343816cfb2d96f2ad9bc2edec31fc96933d184cf58b mesa-18.1.4.tar.xz +sha512 04b8e5bbfa640f2303c388ab701fc2aca7f6d5d127ca5a9f9409975556813ba8e94305d27c9cea236a0e6d44a38b97e2877509268a96d9ed2a6762ab385aa3dc mesa-18.1.4.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html sha256 3a0cf6c7835f98f86d5579b2cc517f84254da7411f764fb0095a383fb0759771 docs/patents.txt diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 79e8e25a34..324e0a1e7b 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.1.3 +MESA3D_VERSION = 18.1.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 9987955106b838913f3960a992a868e8e185739a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Jul 2018 10:27:10 +0200 Subject: [PATCH 2124/2640] package/ffmpeg: bump version to 3.4.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index a8092616a9..d9f1dda1e7 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 ffmpeg-3.4.2.tar.xz +sha256 6b341b7d49e74c4bbdaa8dd166107008c4138ce0d5af73aa04fbbc7ae0d0855c ffmpeg-3.4.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 82140e266e..6932390e40 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.4.2 +FFMPEG_VERSION = 3.4.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From f99659d314d535f35e21f2d1003b8c813a7adfc0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 13 Jul 2018 21:51:36 +0200 Subject: [PATCH 2125/2640] package/x11r7/xapp_mkfontscale: select dependencies xapp_mkfontscale depends on xproto_xproto & zlib but did not select them. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_mkfontscale/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in index 540dd455ff..0cfee6ad05 100644 --- a/package/x11r7/xapp_mkfontscale/Config.in +++ b/package/x11r7/xapp_mkfontscale/Config.in @@ -3,5 +3,7 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBFONTENC + select BR2_PACKAGE_XPROTO_XPROTO + select BR2_PACKAGE_ZLIB help create an index of scalable font files for X From b115ecd122d6a9738d89b5e6efc5f7f6df7872e9 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Thu, 28 Jun 2018 22:42:46 -0300 Subject: [PATCH 2126/2640] pkg-generic: fix no-check-hash for inferred site method Currently, when the site method is explicitly set to a SCM other than git, the main download is correctly excluded from being hash-checked. But when the site method is inferred from the site uri, the download from a SCM other than git is wrongly being hash-checked. Fix this by moving the code that excludes SCM methods from hash-check below the code that infers the site method. Currently there is no package in the tree that uses inferred site method, and that is why the autobuilder didn't caught this. We had packages using inferred site method in the past, the last one was 'expect', but since they didn't have a hash file (for a license or extra-download for example) the build didn't error out. Signed-off-by: Ricardo Martincoski Cc: Luca Ceresoli Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Cc: Yann E. MORIN Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 501dd3de39..91b61c6de0 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -489,10 +489,6 @@ ifndef $(2)_PATCH endif endif -ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),) -BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) -endif - $(2)_ALL_DOWNLOADS = \ $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \ $$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\ @@ -514,6 +510,10 @@ ifndef $(2)_SITE_METHOD endif endif +ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),) +BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) +endif + # Do not accept to download git submodule if not using the git method ifneq ($$($(2)_GIT_SUBMODULES),) ifneq ($$($(2)_SITE_METHOD),git) From 112f7314ac9b7aaa33ee3d11e998371b992be165 Mon Sep 17 00:00:00 2001 From: Yannis Damigos Date: Wed, 11 Jul 2018 15:38:29 +0300 Subject: [PATCH 2127/2640] configs/asus_tinker_rk3288: use uboot 2018.07 Using uboot version 2017.11 creates an sd card image which fails to boot with the following error: Missing DTB ### ERROR ### Please RESET the board ### Updating tinkerboard default configuration to use latest uboot release 2018.07 creates a sd card image which boot fine. Signed-off-by: Yannis Damigos Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 22e9bcd817..a0df3de8a1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 80db2f4205da12ce31169c24e8f730c36cc29149 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 15 Jul 2018 10:25:37 +0200 Subject: [PATCH 2128/2640] package/pulseaudio: bump version to 12.1 Release notes: https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030259.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pulseaudio/pulseaudio.hash | 8 ++++---- package/pulseaudio/pulseaudio.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index f10ed82e90..948f3aa684 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-June/030091.html -md5 efe7683310080e80bc42707285df8c36 pulseaudio-12.0.tar.xz -sha1 9b0dcd62ae4c24542e13644e5fac3de5b13d6db7 pulseaudio-12.0.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030259.html +md5 2511b7ce7193eecf029c91de96eee547 pulseaudio-12.1.tar.xz +sha1 3d8ecff70b7b47d82fd8a262755ce24dd956bef1 pulseaudio-12.1.tar.xz # Locally computed -sha256 6e422dbdc9fd11c0cb6af869e5eda73dc24a8be3c14725440edd51ce6b464444 pulseaudio/pulseaudio-12.0.tar.xz +sha256 5f5dfb5e2c376e8c974b80f93b983ed77088ade7fb8b9325a575c45aa35977f3 pulseaudio-12.1.tar.xz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 55f9def639..2b8f5724bc 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 12.0 +PULSEAUDIO_VERSION = 12.1 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From c699f5ab5a9d86d4416647a3ba9405476bf6bb9b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 16 Jul 2018 13:09:30 +0200 Subject: [PATCH 2129/2640] Revert "package/automake: bump version to 1.16.1" This reverts commit d36a01273b4d6be2758682784c47ee4e2e610090, which causes several build breakage. The squid build breakage has a proposed fix, but it has some comments from Arnout. In order to reduce the build failure noise in the autobuilders, let's revert back to the previous version of automake. Fixes (or rather avoids): http://autobuild.buildroot.net/results/2f6ac1663681b702538a2163a02e030880075eda/ Signed-off-by: Thomas Petazzoni --- package/automake/automake.hash | 2 +- package/automake/automake.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/automake/automake.hash b/package/automake/automake.hash index 9ff55a4bae..b194c3c2bc 100644 --- a/package/automake/automake.hash +++ b/package/automake/automake.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 automake-1.16.1.tar.xz +sha256 af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf automake-1.15.1.tar.xz # License files, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 92e7d64666..270337712e 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOMAKE_VERSION = 1.16.1 +AUTOMAKE_VERSION = 1.15.1 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake AUTOMAKE_LICENSE = GPL-2.0+ From 4182346f4bbe03c6fa1dababeeaeae2dc5e8223f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 16 Jul 2018 13:12:14 +0200 Subject: [PATCH 2130/2640] Revert "librsvg: bump to version 2.42.5" This reverts commit 1ec1f865515223426518e0709d4ca8b57dded6fc, which causes numerous build failures due to Rust handling problems. See the thread at http://lists.busybox.net/pipermail/buildroot/2018-June/223642.html for details. Fixes (or rather avoids): http://autobuild.buildroot.net/results/26102d0ec258d5ef3af36ac32371fba1c996965b/ Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 1 - package/enlightenment/Config.in | 2 - package/gstreamer/gst-plugins-bad/Config.in | 2 - package/gstreamer1/gst1-plugins-bad/Config.in | 2 - .../0001-Add-RUST_TARGET-variable.patch | 57 ------------------- package/librsvg/Config.in | 3 - package/librsvg/librsvg.hash | 7 +-- package/librsvg/librsvg.mk | 12 ++-- 8 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 package/librsvg/0001-Add-RUST_TARGET-variable.patch diff --git a/package/efl/Config.in b/package/efl/Config.in index b9b285d8da..cfb803c6df 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -289,7 +289,6 @@ config BR2_PACKAGE_EFL_LIBRAW config BR2_PACKAGE_EFL_SVG bool "SVG loader" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 892da79b4d..d1dee25f86 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_ENLIGHTENMENT bool "enlightenment" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # efl svg -> librsvg # libevas-generic-loaders-svg -> librsvg -> glib2 / pango depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP @@ -30,7 +29,6 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_PACKAGE_HAS_UDEV diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in index 3f2392afdb..7bbd56a602 100644 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ b/package/gstreamer/gst-plugins-bad/Config.in @@ -297,13 +297,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG comment "rsvg plugin needs a toolchain w/ C++" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 3ce6daf544..a2ceeb9035 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -510,7 +510,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG @@ -518,7 +517,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG RSVG plugin library comment "rsvg plugin needs a toolchain w/ C++" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/librsvg/0001-Add-RUST_TARGET-variable.patch b/package/librsvg/0001-Add-RUST_TARGET-variable.patch deleted file mode 100644 index 2807c2423f..0000000000 --- a/package/librsvg/0001-Add-RUST_TARGET-variable.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2bef718d1ade8dd20f431ac2eef9fdf58d96842f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 1 Jun 2018 20:58:25 +0200 -Subject: [PATCH] Add RUST_TARGET variable - -Add RUST_TARGET environment variable through AC_ARG_VAR to allow the -user to override the rust target name. Indeed, using $host when -cross-compiling is not always the good option especially when vendor -part of target is not set to unknown but to another value such as -buildroot. -Indeed, in this case aarch64-buildroot-linux-gnu won't be recognised as -a valid target by rust/cargo. - -[Upstream status: merged (https://github.com/GNOME/librsvg/commit/f0b76ab6f003b8e05d4caab2b6d844e97b97796f)] - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 2 +- - configure.ac | 7 ++++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index f21b58e2..0b5b906f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -136,7 +136,7 @@ CARGO_RELEASE_ARGS=--release - endif - - if CROSS_COMPILING --CARGO_TARGET_ARGS=--target=$(host) -+CARGO_TARGET_ARGS=--target=$(RUST_TARGET) - endif - - CARGO_VERBOSE = $(cargo_verbose_$(V)) -diff --git a/configure.ac b/configure.ac -index c9666757..50ca9f0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -286,9 +286,14 @@ else - fi - AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) - -+AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) -+if test "x$RUST_TARGET" == x; then -+ RUST_TARGET=$host -+fi -+ - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) - if test "x$cross_compiling" = "xyes" ; then -- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR" -+ RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" - fi - AC_SUBST([RUST_TARGET_SUBDIR]) - --- -2.14.1 - diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 45919c7d51..ffb0287dbd 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBRSVG bool "librsvg" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -9,7 +8,6 @@ config BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_HOST_CARGO select BR2_PACKAGE_LIBCROCO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 @@ -21,7 +19,6 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg comment "librsvg needs a toolchain w/ wchar, threads, C++" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index dce918d0ce..6f4b07423a 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,5 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.42/librsvg-2.42.5.sha256sum -sha256 d4dd51a492a2022c07dec385e22947190fe70410928c471934ff3399f20935ec librsvg-2.42.5.tar.xz - -# Hash for license file: -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB +# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum +sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index 037e1fbc14..4f563ce6db 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -4,22 +4,18 @@ # ################################################################################ -LIBRSVG_VERSION_MAJOR = 2.42 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).5 +LIBRSVG_VERSION_MAJOR = 2.40 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).20 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no -LIBRSVG_DEPENDENCIES = cairo host-cargo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ +LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) -HOST_LIBRSVG_DEPENDENCIES = host-cairo host-cargo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango +HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango LIBRSVG_LICENSE = LGPL-2.0+ LIBRSVG_LICENSE_FILES = COPYING.LIB -# We're patching configure.ac -LIBRSVG_AUTORECONF = YES -LIBRSVG_CONF_ENV = RUST_TARGET=$(RUSTC_TARGET_NAME) - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From f7daf3c9becacf127f62afd17489d1607841ffe8 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:45 +0200 Subject: [PATCH 2131/2640] perl-convert-asn1: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-convert-asn1/Config.in | 6 ++++++ package/perl-convert-asn1/perl-convert-asn1.hash | 6 ++++++ package/perl-convert-asn1/perl-convert-asn1.mk | 13 +++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/perl-convert-asn1/Config.in create mode 100644 package/perl-convert-asn1/perl-convert-asn1.hash create mode 100644 package/perl-convert-asn1/perl-convert-asn1.mk diff --git a/DEVELOPERS b/DEVELOPERS index 48ab0d9048..932b01d327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1921,6 +1921,7 @@ F: package/civetweb/ N: Thomas De Schampheleire F: docs/manual/ F: package/opkg-utils/ +F: package/perl-convert-asn1/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 20fe5ad8ff..86563a1cee 100644 --- a/package/Config.in +++ b/package/Config.in @@ -664,6 +664,7 @@ endif source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules" + source "package/perl-convert-asn1/Config.in" source "package/perl-crypt-openssl-random/Config.in" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-datetime-tiny/Config.in" diff --git a/package/perl-convert-asn1/Config.in b/package/perl-convert-asn1/Config.in new file mode 100644 index 0000000000..a3e988c888 --- /dev/null +++ b/package/perl-convert-asn1/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_CONVERT_ASN1 + bool "perl-convert-asn1" + help + Convert between perl data structures and ASN.1 encoded packets + + https://metacpan.org/release/Convert-ASN1 diff --git a/package/perl-convert-asn1/perl-convert-asn1.hash b/package/perl-convert-asn1/perl-convert-asn1.hash new file mode 100644 index 0000000000..4fd7d3eb61 --- /dev/null +++ b/package/perl-convert-asn1/perl-convert-asn1.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 68723e96be0b258a9e20480276e8a62c Convert-ASN1-0.27.tar.gz +sha256 74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814d3d58a Convert-ASN1-0.27.tar.gz + +# computed by scancpan +sha256 4ef46cc39d9e2b4c767503457a1f8fda5bcf9c0c164923e2a54a3863209cf237 LICENSE diff --git a/package/perl-convert-asn1/perl-convert-asn1.mk b/package/perl-convert-asn1/perl-convert-asn1.mk new file mode 100644 index 0000000000..74482010f9 --- /dev/null +++ b/package/perl-convert-asn1/perl-convert-asn1.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# perl-convert-asn1 +# +################################################################################ + +PERL_CONVERT_ASN1_VERSION = 0.27 +PERL_CONVERT_ASN1_SOURCE = Convert-ASN1-$(PERL_CONVERT_ASN1_VERSION).tar.gz +PERL_CONVERT_ASN1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR +PERL_CONVERT_ASN1_LICENSE = Artistic or GPL-1.0+ +PERL_CONVERT_ASN1_LICENSE_FILES = LICENSE + +$(eval $(perl-package)) From 34424bf095c4008c290d80101bd0e31e06969507 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:46 +0200 Subject: [PATCH 2132/2640] perl-crypt-blowfish: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-crypt-blowfish/Config.in | 10 ++++++++++ package/perl-crypt-blowfish/perl-crypt-blowfish.hash | 6 ++++++ package/perl-crypt-blowfish/perl-crypt-blowfish.mk | 12 ++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/perl-crypt-blowfish/Config.in create mode 100644 package/perl-crypt-blowfish/perl-crypt-blowfish.hash create mode 100644 package/perl-crypt-blowfish/perl-crypt-blowfish.mk diff --git a/DEVELOPERS b/DEVELOPERS index 932b01d327..f437401818 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1922,6 +1922,7 @@ N: Thomas De Schampheleire F: docs/manual/ F: package/opkg-utils/ F: package/perl-convert-asn1/ +F: package/perl-crypt-blowfish/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 86563a1cee..5bd229eab0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -665,6 +665,7 @@ endif if BR2_PACKAGE_PERL menu "Perl libraries/modules" source "package/perl-convert-asn1/Config.in" + source "package/perl-crypt-blowfish/Config.in" source "package/perl-crypt-openssl-random/Config.in" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-datetime-tiny/Config.in" diff --git a/package/perl-crypt-blowfish/Config.in b/package/perl-crypt-blowfish/Config.in new file mode 100644 index 0000000000..093f11d95b --- /dev/null +++ b/package/perl-crypt-blowfish/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_CRYPT_BLOWFISH + bool "perl-crypt-blowfish" + depends on !BR2_STATIC_LIBS + help + Perl Blowfish encryption module + + https://metacpan.org/release/Crypt-Blowfish + +comment "perl-crypt-blowfish needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-crypt-blowfish/perl-crypt-blowfish.hash b/package/perl-crypt-blowfish/perl-crypt-blowfish.hash new file mode 100644 index 0000000000..f814cb9bd5 --- /dev/null +++ b/package/perl-crypt-blowfish/perl-crypt-blowfish.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 792b43cd4e49d2c2cf4a9f6990ff7d1b Crypt-Blowfish-2.14.tar.gz +sha256 46b3431ffb6bf5b9cb359f79565d48407e652ad2b04fdf5ca62a69e7197a67b1 Crypt-Blowfish-2.14.tar.gz + +# computed by scancpan +sha256 d61437443e6912d03677874c7baef242f28119c2c5d8b92b0f3f3660200f98d4 COPYRIGHT diff --git a/package/perl-crypt-blowfish/perl-crypt-blowfish.mk b/package/perl-crypt-blowfish/perl-crypt-blowfish.mk new file mode 100644 index 0000000000..f6644eb151 --- /dev/null +++ b/package/perl-crypt-blowfish/perl-crypt-blowfish.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# perl-crypt-blowfish +# +################################################################################ + +PERL_CRYPT_BLOWFISH_VERSION = 2.14 +PERL_CRYPT_BLOWFISH_SOURCE = Crypt-Blowfish-$(PERL_CRYPT_BLOWFISH_VERSION).tar.gz +PERL_CRYPT_BLOWFISH_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DP/DPARIS +PERL_CRYPT_BLOWFISH_LICENSE_FILES = COPYRIGHT + +$(eval $(perl-package)) From 13d5c37ebe7797e9e8d3e6811b7e0e2cf64b7ef0 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:47 +0200 Subject: [PATCH 2133/2640] perl-crypt-cbc: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-crypt-cbc/Config.in | 6 ++++++ package/perl-crypt-cbc/perl-crypt-cbc.hash | 6 ++++++ package/perl-crypt-cbc/perl-crypt-cbc.mk | 12 ++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/perl-crypt-cbc/Config.in create mode 100644 package/perl-crypt-cbc/perl-crypt-cbc.hash create mode 100644 package/perl-crypt-cbc/perl-crypt-cbc.mk diff --git a/DEVELOPERS b/DEVELOPERS index f437401818..ca7e1efd7e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1923,6 +1923,7 @@ F: docs/manual/ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ +F: package/perl-crypt-cbc/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 5bd229eab0..981c84c350 100644 --- a/package/Config.in +++ b/package/Config.in @@ -666,6 +666,7 @@ if BR2_PACKAGE_PERL menu "Perl libraries/modules" source "package/perl-convert-asn1/Config.in" source "package/perl-crypt-blowfish/Config.in" + source "package/perl-crypt-cbc/Config.in" source "package/perl-crypt-openssl-random/Config.in" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-datetime-tiny/Config.in" diff --git a/package/perl-crypt-cbc/Config.in b/package/perl-crypt-cbc/Config.in new file mode 100644 index 0000000000..7ecfa70552 --- /dev/null +++ b/package/perl-crypt-cbc/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_CRYPT_CBC + bool "perl-crypt-cbc" + help + Encrypt Data with Cipher Block Chaining Mode + + https://metacpan.org/release/Crypt-CBC diff --git a/package/perl-crypt-cbc/perl-crypt-cbc.hash b/package/perl-crypt-cbc/perl-crypt-cbc.hash new file mode 100644 index 0000000000..f3d5e03c31 --- /dev/null +++ b/package/perl-crypt-cbc/perl-crypt-cbc.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 3db5117d60df67e3b400fe367e716be0 Crypt-CBC-2.33.tar.gz +sha256 6a70de21b6cc7f2b100067e8e188db966e9a8001b5db6fa976e7cb5b294ae645 Crypt-CBC-2.33.tar.gz + +# computed by scancpan +sha256 a98da8a2eef02a8823cf2f58111e981796c4aaf38e8d446acd338a559af42bfc README diff --git a/package/perl-crypt-cbc/perl-crypt-cbc.mk b/package/perl-crypt-cbc/perl-crypt-cbc.mk new file mode 100644 index 0000000000..3da0561096 --- /dev/null +++ b/package/perl-crypt-cbc/perl-crypt-cbc.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# perl-crypt-cbc +# +################################################################################ + +PERL_CRYPT_CBC_VERSION = 2.33 +PERL_CRYPT_CBC_SOURCE = Crypt-CBC-$(PERL_CRYPT_CBC_VERSION).tar.gz +PERL_CRYPT_CBC_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS +PERL_CRYPT_CBC_LICENSE_FILES = README + +$(eval $(perl-package)) From ab4f62bbbb528b903557e58a546c754b1eb4d4fa Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:48 +0200 Subject: [PATCH 2134/2640] perl-digest-md5: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-digest-md5/Config.in | 10 ++++++++++ package/perl-digest-md5/perl-digest-md5.hash | 6 ++++++ package/perl-digest-md5/perl-digest-md5.mk | 13 +++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/perl-digest-md5/Config.in create mode 100644 package/perl-digest-md5/perl-digest-md5.hash create mode 100644 package/perl-digest-md5/perl-digest-md5.mk diff --git a/DEVELOPERS b/DEVELOPERS index ca7e1efd7e..6208e2b6b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1924,6 +1924,7 @@ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ +F: package/perl-digest-md5/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 981c84c350..1408b46bb7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -671,6 +671,7 @@ menu "Perl libraries/modules" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-datetime-tiny/Config.in" source "package/perl-digest-hmac/Config.in" + source "package/perl-digest-md5/Config.in" source "package/perl-digest-sha1/Config.in" source "package/perl-encode-detect/Config.in" source "package/perl-encode-locale/Config.in" diff --git a/package/perl-digest-md5/Config.in b/package/perl-digest-md5/Config.in new file mode 100644 index 0000000000..e8bb3fd8e7 --- /dev/null +++ b/package/perl-digest-md5/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_DIGEST_MD5 + bool "perl-digest-md5" + depends on !BR2_STATIC_LIBS + help + Perl interface to the MD-5 algorithm + + https://metacpan.org/release/Digest-MD5 + +comment "perl-digest-md5 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-digest-md5/perl-digest-md5.hash b/package/perl-digest-md5/perl-digest-md5.hash new file mode 100644 index 0000000000..3876f3aca3 --- /dev/null +++ b/package/perl-digest-md5/perl-digest-md5.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 601519b826ca14c233f13a4578b967ef Digest-MD5-2.55.tar.gz +sha256 03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c Digest-MD5-2.55.tar.gz + +# computed by scancpan +sha256 f92f16702159fc57cd29c23f29b7f2420bff578ed72365d0225d2945a501cd5a README diff --git a/package/perl-digest-md5/perl-digest-md5.mk b/package/perl-digest-md5/perl-digest-md5.mk new file mode 100644 index 0000000000..f39f4b2323 --- /dev/null +++ b/package/perl-digest-md5/perl-digest-md5.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# perl-digest-md5 +# +################################################################################ + +PERL_DIGEST_MD5_VERSION = 2.55 +PERL_DIGEST_MD5_SOURCE = Digest-MD5-$(PERL_DIGEST_MD5_VERSION).tar.gz +PERL_DIGEST_MD5_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_DIGEST_MD5_LICENSE = Artistic or GPL-1.0+ +PERL_DIGEST_MD5_LICENSE_FILES = README + +$(eval $(perl-package)) From 512cedea05bb8004bd00c98cefc2e57f52788245 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:49 +0200 Subject: [PATCH 2135/2640] perl-mime-base64-urlsafe: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-mime-base64-urlsafe/Config.in | 6 ++++++ .../perl-mime-base64-urlsafe.hash | 6 ++++++ .../perl-mime-base64-urlsafe.mk | 12 ++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/perl-mime-base64-urlsafe/Config.in create mode 100644 package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash create mode 100644 package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6208e2b6b2..88b4ad0a65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1925,6 +1925,7 @@ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ F: package/perl-digest-md5/ +F: package/perl-mime-base64-urlsafe/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 1408b46bb7..e67bcc7f25 100644 --- a/package/Config.in +++ b/package/Config.in @@ -694,6 +694,7 @@ menu "Perl libraries/modules" source "package/perl-lwp-mediatypes/Config.in" source "package/perl-mail-dkim/Config.in" source "package/perl-mailtools/Config.in" + source "package/perl-mime-base64-urlsafe/Config.in" source "package/perl-mime-base64/Config.in" source "package/perl-mojolicious/Config.in" source "package/perl-net-dns/Config.in" diff --git a/package/perl-mime-base64-urlsafe/Config.in b/package/perl-mime-base64-urlsafe/Config.in new file mode 100644 index 0000000000..8abfdc25ab --- /dev/null +++ b/package/perl-mime-base64-urlsafe/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_MIME_BASE64_URLSAFE + bool "perl-mime-base64-urlsafe" + help + Perl version of Python's URL-safe base64 codec + + https://metacpan.org/release/MIME-Base64-URLSafe diff --git a/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash new file mode 100644 index 0000000000..c6d01afe38 --- /dev/null +++ b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 eccf42cc7e9576dd23b9f39ad59c9b62 MIME-Base64-URLSafe-0.01.tar.gz +sha256 cb9966c50538bb676ab67bc40a7c841019b23ba2243d0ffcc2ccf084e5c33798 MIME-Base64-URLSafe-0.01.tar.gz + +# computed by scancpan +sha256 2fffac76f75709b6d94111a37f6cd8cab21e8f2b2de73b0b4fa53a5bed4efc15 README diff --git a/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk new file mode 100644 index 0000000000..d72b36fb04 --- /dev/null +++ b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# perl-mime-base64-urlsafe +# +################################################################################ + +PERL_MIME_BASE64_URLSAFE_VERSION = 0.01 +PERL_MIME_BASE64_URLSAFE_SOURCE = MIME-Base64-URLSafe-$(PERL_MIME_BASE64_URLSAFE_VERSION).tar.gz +PERL_MIME_BASE64_URLSAFE_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZUHO +PERL_MIME_BASE64_URLSAFE_LICENSE_FILES = README + +$(eval $(perl-package)) From 1c6f4985a8fb1a6f737f5ea25e2e2d411656b7f6 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:50 +0200 Subject: [PATCH 2136/2640] perl-mojolicious-plugin-authentication: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + .../Config.in | 7 +++++++ .../perl-mojolicious-plugin-authentication.hash | 6 ++++++ .../perl-mojolicious-plugin-authentication.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/perl-mojolicious-plugin-authentication/Config.in create mode 100644 package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash create mode 100644 package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk diff --git a/DEVELOPERS b/DEVELOPERS index 88b4ad0a65..0cd6b6d03a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1926,6 +1926,7 @@ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ F: package/perl-digest-md5/ F: package/perl-mime-base64-urlsafe/ +F: package/perl-mojolicious-plugin-authentication/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index e67bcc7f25..fe9175b42b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -696,6 +696,7 @@ menu "Perl libraries/modules" source "package/perl-mailtools/Config.in" source "package/perl-mime-base64-urlsafe/Config.in" source "package/perl-mime-base64/Config.in" + source "package/perl-mojolicious-plugin-authentication/Config.in" source "package/perl-mojolicious/Config.in" source "package/perl-net-dns/Config.in" source "package/perl-net-http/Config.in" diff --git a/package/perl-mojolicious-plugin-authentication/Config.in b/package/perl-mojolicious-plugin-authentication/Config.in new file mode 100644 index 0000000000..26c3cde5d4 --- /dev/null +++ b/package/perl-mojolicious-plugin-authentication/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION + bool "perl-mojolicious-plugin-authentication" + select BR2_PACKAGE_PERL_MOJOLICIOUS + help + A plugin to make authentication a bit easier + + https://metacpan.org/release/Mojolicious-Plugin-Authentication diff --git a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash new file mode 100644 index 0000000000..f225ff486b --- /dev/null +++ b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 b318be1e1e50e7595baee639b2964565 Mojolicious-Plugin-Authentication-1.33.tar.gz +sha256 1c32dffc88a683ba3b2719f34bc52fb9c5c5fb2f1276bbd30136bfad0ac262bc Mojolicious-Plugin-Authentication-1.33.tar.gz + +# computed by scancpan +sha256 59727ac57166e9891175d8247a8ea47d4aeb24a0dc1e24011b773d139481b135 LICENSE diff --git a/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk new file mode 100644 index 0000000000..2748965944 --- /dev/null +++ b/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-mojolicious-plugin-authentication +# +################################################################################ + +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_VERSION = 1.33 +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_SOURCE = Mojolicious-Plugin-Authentication-$(PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_VERSION).tar.gz +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JJ/JJATRIA +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_DEPENDENCIES = perl-mojolicious +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_LICENSE = Artistic or GPL-1.0+ +PERL_MOJOLICIOUS_PLUGIN_AUTHENTICATION_LICENSE_FILES = LICENSE + +$(eval $(perl-package)) From 4837ab94908164c7c0f8d5f1bfe0513c5f41c79e Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:51 +0200 Subject: [PATCH 2137/2640] perl-net-ping: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-net-ping/Config.in | 6 ++++++ package/perl-net-ping/perl-net-ping.hash | 6 ++++++ package/perl-net-ping/perl-net-ping.mk | 12 ++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/perl-net-ping/Config.in create mode 100644 package/perl-net-ping/perl-net-ping.hash create mode 100644 package/perl-net-ping/perl-net-ping.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0cd6b6d03a..4c6eaffb09 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1927,6 +1927,7 @@ F: package/perl-crypt-cbc/ F: package/perl-digest-md5/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ +F: package/perl-net-ping/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index fe9175b42b..ace997cdb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -700,6 +700,7 @@ menu "Perl libraries/modules" source "package/perl-mojolicious/Config.in" source "package/perl-net-dns/Config.in" source "package/perl-net-http/Config.in" + source "package/perl-net-ping/Config.in" source "package/perl-net-ssleay/Config.in" source "package/perl-netaddr-ip/Config.in" source "package/perl-path-tiny/Config.in" diff --git a/package/perl-net-ping/Config.in b/package/perl-net-ping/Config.in new file mode 100644 index 0000000000..a0ba7b0de1 --- /dev/null +++ b/package/perl-net-ping/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_NET_PING + bool "perl-net-ping" + help + check a remote host for reachability + + https://metacpan.org/release/Net-Ping diff --git a/package/perl-net-ping/perl-net-ping.hash b/package/perl-net-ping/perl-net-ping.hash new file mode 100644 index 0000000000..363d095386 --- /dev/null +++ b/package/perl-net-ping/perl-net-ping.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 0b01ada2bc588330456924393d47ed11 Net-Ping-2.68.tar.gz +sha256 d01ac2fcdf684c4a23a07104fbb147cfbdbda47fd5b660912124258f29afd7e3 Net-Ping-2.68.tar.gz + +# computed by scancpan +sha256 eb4ad254a468a977f29849efda0183f69b7f4ede0f7123e0dd5768207ee73c58 README diff --git a/package/perl-net-ping/perl-net-ping.mk b/package/perl-net-ping/perl-net-ping.mk new file mode 100644 index 0000000000..3cd4cd0b47 --- /dev/null +++ b/package/perl-net-ping/perl-net-ping.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# perl-net-ping +# +################################################################################ + +PERL_NET_PING_VERSION = 2.68 +PERL_NET_PING_SOURCE = Net-Ping-$(PERL_NET_PING_VERSION).tar.gz +PERL_NET_PING_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN +PERL_NET_PING_LICENSE_FILES = README + +$(eval $(perl-package)) From 0b78743d1513858489daaa72e169869675208351 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:52 +0200 Subject: [PATCH 2138/2640] perl-net-snmp: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-net-snmp/Config.in | 6 ++++++ package/perl-net-snmp/perl-net-snmp.hash | 6 ++++++ package/perl-net-snmp/perl-net-snmp.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/perl-net-snmp/Config.in create mode 100644 package/perl-net-snmp/perl-net-snmp.hash create mode 100644 package/perl-net-snmp/perl-net-snmp.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4c6eaffb09..df88e516db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1928,6 +1928,7 @@ F: package/perl-digest-md5/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ F: package/perl-net-ping/ +F: package/perl-net-snmp/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index ace997cdb8..302a01c0e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -701,6 +701,7 @@ menu "Perl libraries/modules" source "package/perl-net-dns/Config.in" source "package/perl-net-http/Config.in" source "package/perl-net-ping/Config.in" + source "package/perl-net-snmp/Config.in" source "package/perl-net-ssleay/Config.in" source "package/perl-netaddr-ip/Config.in" source "package/perl-path-tiny/Config.in" diff --git a/package/perl-net-snmp/Config.in b/package/perl-net-snmp/Config.in new file mode 100644 index 0000000000..e509292cd8 --- /dev/null +++ b/package/perl-net-snmp/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_NET_SNMP + bool "perl-net-snmp" + help + Object oriented interface to SNMP + + https://metacpan.org/release/Net-SNMP diff --git a/package/perl-net-snmp/perl-net-snmp.hash b/package/perl-net-snmp/perl-net-snmp.hash new file mode 100644 index 0000000000..0b162e6dcc --- /dev/null +++ b/package/perl-net-snmp/perl-net-snmp.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 6137f04f9942d703f66179f890e3d096 Net-SNMP-v6.0.1.tar.gz +sha256 14c37bc1cbb3f3cdc7d6c13e0f27a859f14cdcfd5ea54a0467a88bc259b0b741 Net-SNMP-v6.0.1.tar.gz + +# computed by scancpan +sha256 a038159be54a2807dc48e2b946514d59fceab6737d5461d93d55297a98e6e24e LICENSE diff --git a/package/perl-net-snmp/perl-net-snmp.mk b/package/perl-net-snmp/perl-net-snmp.mk new file mode 100644 index 0000000000..a9daa13d7f --- /dev/null +++ b/package/perl-net-snmp/perl-net-snmp.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-net-snmp +# +################################################################################ + +PERL_NET_SNMP_VERSION = v6.0.1 +PERL_NET_SNMP_SOURCE = Net-SNMP-$(PERL_NET_SNMP_VERSION).tar.gz +PERL_NET_SNMP_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DT/DTOWN +PERL_NET_SNMP_DEPENDENCIES = host-perl-module-build +PERL_NET_SNMP_LICENSE = Artistic or GPL-1.0+ +PERL_NET_SNMP_LICENSE_FILES = LICENSE + +$(eval $(perl-package)) From 352ca28d2dcbb5d4c1fc4fbbbffc69aa1861f2f5 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:53 +0200 Subject: [PATCH 2139/2640] perl-net-ssh2: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-net-ssh2/Config.in | 11 +++++++++++ package/perl-net-ssh2/perl-net-ssh2.hash | 6 ++++++ package/perl-net-ssh2/perl-net-ssh2.mk | 14 ++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/perl-net-ssh2/Config.in create mode 100644 package/perl-net-ssh2/perl-net-ssh2.hash create mode 100644 package/perl-net-ssh2/perl-net-ssh2.mk diff --git a/DEVELOPERS b/DEVELOPERS index df88e516db..f509041441 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1929,6 +1929,7 @@ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ F: package/perl-net-ping/ F: package/perl-net-snmp/ +F: package/perl-net-ssh2/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 302a01c0e7..40547760fc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -702,6 +702,7 @@ menu "Perl libraries/modules" source "package/perl-net-http/Config.in" source "package/perl-net-ping/Config.in" source "package/perl-net-snmp/Config.in" + source "package/perl-net-ssh2/Config.in" source "package/perl-net-ssleay/Config.in" source "package/perl-netaddr-ip/Config.in" source "package/perl-path-tiny/Config.in" diff --git a/package/perl-net-ssh2/Config.in b/package/perl-net-ssh2/Config.in new file mode 100644 index 0000000000..07c42ee5b1 --- /dev/null +++ b/package/perl-net-ssh2/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PERL_NET_SSH2 + bool "perl-net-ssh2" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBSSH2 + help + Support for the SSH 2 protocol via libssh2. + + https://metacpan.org/release/Net-SSH2 + +comment "perl-net-ssh2 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-net-ssh2/perl-net-ssh2.hash b/package/perl-net-ssh2/perl-net-ssh2.hash new file mode 100644 index 0000000000..7a84949a6e --- /dev/null +++ b/package/perl-net-ssh2/perl-net-ssh2.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 94ed21d4557a6bbc3cb6bfd7c3479ef0 Net-SSH2-0.69.tar.gz +sha256 2fc85e1434b8a6e77142d85e3cea5a081ca71da5d02c4212b9970d3a3924baa6 Net-SSH2-0.69.tar.gz + +# computed by scancpan +sha256 6db904d7c8127a33df4666961088c97586c24644a4980dc50d0676ef4c0509f7 README diff --git a/package/perl-net-ssh2/perl-net-ssh2.mk b/package/perl-net-ssh2/perl-net-ssh2.mk new file mode 100644 index 0000000000..6d84deb284 --- /dev/null +++ b/package/perl-net-ssh2/perl-net-ssh2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-net-ssh2 +# +################################################################################ + +PERL_NET_SSH2_VERSION = 0.69 +PERL_NET_SSH2_SOURCE = Net-SSH2-$(PERL_NET_SSH2_VERSION).tar.gz +PERL_NET_SSH2_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SA/SALVA +PERL_NET_SSH2_LICENSE = Artistic or GPL-1.0+ +PERL_NET_SSH2_LICENSE_FILES = README +PERL_NET_SSH2_DEPENDENCIES = libssh2 + +$(eval $(perl-package)) From 2e3799c31d848a8647a1cff637fb593466424a6a Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 12 Jul 2018 23:00:54 +0200 Subject: [PATCH 2140/2640] perl-net-telnet: new package Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/perl-net-telnet/Config.in | 6 ++++++ package/perl-net-telnet/perl-net-telnet.hash | 6 ++++++ package/perl-net-telnet/perl-net-telnet.mk | 12 ++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 package/perl-net-telnet/Config.in create mode 100644 package/perl-net-telnet/perl-net-telnet.hash create mode 100644 package/perl-net-telnet/perl-net-telnet.mk diff --git a/DEVELOPERS b/DEVELOPERS index f509041441..f37efa457a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1930,6 +1930,7 @@ F: package/perl-mojolicious-plugin-authentication/ F: package/perl-net-ping/ F: package/perl-net-snmp/ F: package/perl-net-ssh2/ +F: package/perl-net-telnet/ F: package/pigz/ F: support/scripts/size-stats F: utils/size-stats-compare diff --git a/package/Config.in b/package/Config.in index 40547760fc..c980e81003 100644 --- a/package/Config.in +++ b/package/Config.in @@ -704,6 +704,7 @@ menu "Perl libraries/modules" source "package/perl-net-snmp/Config.in" source "package/perl-net-ssh2/Config.in" source "package/perl-net-ssleay/Config.in" + source "package/perl-net-telnet/Config.in" source "package/perl-netaddr-ip/Config.in" source "package/perl-path-tiny/Config.in" source "package/perl-time-hires/Config.in" diff --git a/package/perl-net-telnet/Config.in b/package/perl-net-telnet/Config.in new file mode 100644 index 0000000000..6d7993c608 --- /dev/null +++ b/package/perl-net-telnet/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_NET_TELNET + bool "perl-net-telnet" + help + Interact with TELNET port or other TCP ports + + https://metacpan.org/release/Net-Telnet diff --git a/package/perl-net-telnet/perl-net-telnet.hash b/package/perl-net-telnet/perl-net-telnet.hash new file mode 100644 index 0000000000..cf1def6a57 --- /dev/null +++ b/package/perl-net-telnet/perl-net-telnet.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 d2514080116c1b0fa5f96295c84538e3 Net-Telnet-3.04.tar.gz +sha256 e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a Net-Telnet-3.04.tar.gz + +# computed by scancpan +sha256 05beca683093827706ef45a4958bf23bcd91990e0beeb0b098f97c661478c90d README diff --git a/package/perl-net-telnet/perl-net-telnet.mk b/package/perl-net-telnet/perl-net-telnet.mk new file mode 100644 index 0000000000..04d170d10a --- /dev/null +++ b/package/perl-net-telnet/perl-net-telnet.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# perl-net-telnet +# +################################################################################ + +PERL_NET_TELNET_VERSION = 3.04 +PERL_NET_TELNET_SOURCE = Net-Telnet-$(PERL_NET_TELNET_VERSION).tar.gz +PERL_NET_TELNET_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JR/JROGERS +PERL_NET_TELNET_LICENSE_FILES = README + +$(eval $(perl-package)) From cf2f764b3ffe1a1988342c0c53d3f2841f482bcb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 6 Jul 2018 00:11:07 +0200 Subject: [PATCH 2141/2640] package/minetest: bump to version 4.17.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/minetest/minetest.hash | 2 +- package/minetest/minetest.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index 5e6aeffa43..e8b8bf2fce 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0ef3793de9f569746ea78af7a66fe96ef65400019e5e64a04a5c3fa26a707655 minetest-0.4.16.tar.gz +sha256 cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59 minetest-0.4.17.1.tar.gz sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0 README.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index a813a0db4e..8b573a0f4f 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 0.4.16 +MINETEST_VERSION = 0.4.17.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) MINETEST_LICENSE_FILES = README.txt From 9919549ad0d8a2428450d55fe8c5e9cd4c569456 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 6 Jul 2018 00:11:08 +0200 Subject: [PATCH 2142/2640] package/minetest-game: bump to version 4.17 Remove upstream patch. Update license hash for mods/default/license.txt (Book textures updated) Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...vert-Default-Shorter-and-better-ABMs.patch | 54 ------------------- package/minetest-game/minetest-game.hash | 4 +- package/minetest-game/minetest-game.mk | 2 +- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch diff --git a/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch b/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch deleted file mode 100644 index e484e50a01..0000000000 --- a/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 626cd8e9c7c2a5d5c907a12abbaa6066b6d5f2ff Mon Sep 17 00:00:00 2001 -From: "vorunbekannt75@web.de" -Date: Tue, 6 Jun 2017 19:20:58 +0200 -Subject: [PATCH] Default: Revert "Default: Shorter and better ABMs" - -This reverts commit e523c3a2965afe76b9102b67992e15fafba1594a to re-enable -the overriding and redefinition of these global functions. - -[Romain backport from upstream] -Signed-off-by: Romain Naour ---- - mods/default/functions.lua | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/mods/default/functions.lua b/mods/default/functions.lua -index 5dc22ca..327e0c8 100644 ---- a/mods/default/functions.lua -+++ b/mods/default/functions.lua -@@ -139,7 +139,9 @@ if minetest.settings:get_bool("enable_lavacooling") ~= false then - interval = 1, - chance = 2, - catch_up = false, -- action = default.cool_lava, -+ action = function(...) -+ default.cool_lava(...) -+ end, - }) - end - -@@ -222,7 +224,9 @@ minetest.register_abm({ - neighbors = {"group:sand"}, - interval = 12, - chance = 83, -- action = default.grow_cactus -+ action = function(...) -+ default.grow_cactus(...) -+ end - }) - - minetest.register_abm({ -@@ -231,7 +235,9 @@ minetest.register_abm({ - neighbors = {"default:dirt", "default:dirt_with_grass"}, - interval = 14, - chance = 71, -- action = default.grow_papyrus -+ action = function(...) -+ default.grow_papyrus(...) -+ end - }) - - --- -2.9.4 - diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 1a2fe78a96..52aa10d58f 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ea914555949b4faccda5e13143cb021d2f9a5fa19abd1f5e4b7b65004cbd2b5a minetest-game-0.4.16.tar.gz +sha256 f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d minetest-game-0.4.17.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt @@ -8,7 +8,7 @@ sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bon sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt -sha256 0542a1ff8212197bf350b6135fb4d29f8a2341d9ddc1407ec812d7fb609a5c0f mods/default/license.txt +sha256 6972a14d2cea9362cda1293284c5a472b1912056e2da215ce43e9c54c80da334 mods/default/license.txt sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index 2386944a02..bef7a63bb1 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 0.4.16 +MINETEST_GAME_VERSION = 0.4.17 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) From 0fbc50d46a52555b7fc199ba319d011c0c7fd1c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Jul 2018 20:27:40 +0200 Subject: [PATCH 2143/2640] wampcc: needs atomic Fixes: - http://autobuild.buildroot.net/results/2f994762d4e01a904c50cf2728a4103e6e79da2a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wampcc/Config.in | 3 +++ package/wampcc/wampcc.mk | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/package/wampcc/Config.in b/package/wampcc/Config.in index 9cf7d99dfe..92abc9cb25 100644 --- a/package/wampcc/Config.in +++ b/package/wampcc/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_WAMPCC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LIBUV @@ -17,11 +18,13 @@ config BR2_PACKAGE_WAMPCC comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS comment "wampcc needs a toolchain not affected by GCC bug 64735" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/wampcc/wampcc.mk b/package/wampcc/wampcc.mk index d8e093f679..dcd65f49d5 100644 --- a/package/wampcc/wampcc.mk +++ b/package/wampcc/wampcc.mk @@ -11,4 +11,9 @@ WAMPCC_INSTALL_STAGING = YES WAMPCC_LICENSE = MIT WAMPCC_LICENSE_FILES = LICENSE +# Uses __atomic_fetch_add_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +WAMPCC_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +endif + $(eval $(cmake-package)) From c5dec11d71ac7436892749b40394daead5752524 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 11 Jul 2018 22:51:18 +0300 Subject: [PATCH 2144/2640] coreutils: fix chroot installation Since commit 256bb383fb7 (coreutils: use single binary in symlink method) the chroot move command creates a dangling symlink, because the symlink target is 'coreutils' which is not in the /usr/sbin/ directory. Instead of moving, remove the coreutils installed symlink, and create a new one in $(TARGET_DIR)/usr/sbin with the correct target. Should also fix (busybox): http://autobuild.buildroot.net/results/6b3/6b39648b466738162516aa50ab328d839ec85448/ Cc: Carlos Santos Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 3cb96589f2..2fb4a32c79 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -114,7 +114,8 @@ define COREUTILS_CLEANUP # link for archaic shells ln -fs test $(TARGET_DIR)/usr/bin/[ # gnu thinks chroot is in bin, debian thinks it's in sbin - mv -f $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot + rm -f $(TARGET_DIR)/usr/bin/chroot + ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot endef COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP From efa6946d4b43b8a07a7d0e4dcbfe1bd31503e1d9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 11 Jul 2018 22:51:19 +0300 Subject: [PATCH 2145/2640] coreutils: optimize the '[' symlink Link '[' directly to the coreutils binary instead of going through 'test'. Suggested-by: Arnout Vandecappelle Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 2fb4a32c79..7e7251ff73 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -112,7 +112,7 @@ endif define COREUTILS_CLEANUP # link for archaic shells - ln -fs test $(TARGET_DIR)/usr/bin/[ + ln -fs coreutils $(TARGET_DIR)/usr/bin/[ # gnu thinks chroot is in bin, debian thinks it's in sbin rm -f $(TARGET_DIR)/usr/bin/chroot ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot From 21fc68228945c04fbaf57d88d1062d266648649a Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Tue, 10 Jul 2018 16:31:25 -0600 Subject: [PATCH 2146/2640] capnproto: new package Adds the capnproto package. This also builds a host variant to generate the capnp compiler that can be used to compile message definitions into C++ code. Includes a patch from upstream to fix an issue with uclibc. Signed-off-by: Koen Martens Signed-off-by: Joel Carlson [Thomas: only link with -latomic when BR2_TOOLCHAIN_HAS_LIBATOMIC=y.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + ...01-Do-not-use-execinfo-h-with-uclibc.patch | 30 +++++++++++++++++++ package/capnproto/Config.in | 24 +++++++++++++++ package/capnproto/capnproto.hash | 3 ++ package/capnproto/capnproto.mk | 25 ++++++++++++++++ 6 files changed, 85 insertions(+) create mode 100644 package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch create mode 100644 package/capnproto/Config.in create mode 100644 package/capnproto/capnproto.hash create mode 100644 package/capnproto/capnproto.mk diff --git a/DEVELOPERS b/DEVELOPERS index f37efa457a..de09979999 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -983,6 +983,7 @@ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Joel Carlson +F: package/capnproto/ F: package/cmocka/ F: package/flatcc/ @@ -1117,6 +1118,7 @@ N: Kevin Joly F: package/libgphoto2/ N: Koen Martens +F: package/capnproto/ F: package/linuxconsoletools/ N: Kurt Van Dijck diff --git a/package/Config.in b/package/Config.in index c980e81003..eedce83616 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1514,6 +1514,7 @@ menu "Other" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" source "package/boost/Config.in" + source "package/capnproto/Config.in" source "package/clang/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in" diff --git a/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch b/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch new file mode 100644 index 0000000000..6bb7702a58 --- /dev/null +++ b/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch @@ -0,0 +1,30 @@ +From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001 +From: Koen Martens +Date: Wed, 12 Jul 2017 18:49:32 +0200 +Subject: [PATCH] Do not use execinfo.h with uclibc (#511) + +Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2 + +Signed-off-by: Koen Martens +Signed-off-by: Joel Carlson + +--- + c++/src/kj/exception.c++ | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++ +index 218f1db..339601a 100644 +--- a/c++/src/kj/exception.c++ ++++ b/c++/src/kj/exception.c++ +@@ -33,7 +33,7 @@ + #endif + #include "io.h" + +-#if (__linux__ && __GLIBC__) || __APPLE__ ++#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__ + #define KJ_HAS_BACKTRACE 1 + #include + #endif +-- +2.7.4 + diff --git a/package/capnproto/Config.in b/package/capnproto/Config.in new file mode 100644 index 0000000000..00328fa6ce --- /dev/null +++ b/package/capnproto/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_CAPNPROTO + bool "capnproto" + depends on BR2_USE_MMU + depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + help + Cap'n Proto is an insanely fast data interchange format + and capability-based RPC system. Think JSON, except + binary. Or think Protocol Buffers, except faster. In + fact, in benchmarks, Cap’n Proto is INFINITY TIMES + faster than Protocol Buffers. + + https://capnproto.org/index.html + +comment "capnproto needs host and target gcc >= 4.8 w/ C++, threads, atomic" + depends on BR2_USE_MMU + depends on !BR2_HOST_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash new file mode 100644 index 0000000000..1a65cdd401 --- /dev/null +++ b/package/capnproto/capnproto.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d capnproto-v0.6.1.tar.gz +sha256 16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk new file mode 100644 index 0000000000..ff7a5bc15b --- /dev/null +++ b/package/capnproto/capnproto.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# capnproto +# +################################################################################ + +CAPNPROTO_VERSION = v0.6.1 +CAPNPROTO_SITE = $(call github,capnproto,capnproto,$(CAPNPROTO_VERSION)) +CAPNPROTO_LICENSE = MIT +CAPNPROTO_LICENSE_FILES = LICENSE +CAPNPROTO_INSTALL_STAGING = YES +# Fetched from Github with no configure script +CAPNPROTO_AUTORECONF = YES +CAPNPROTO_CONF_OPTS = --with-external-capnp +# Needs the capnproto compiler on the host to generate C++ code from message +# definitions +CAPNPROTO_DEPENDENCIES = host-autoconf host-capnproto +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +CAPNPROTO_CONF_ENV += LIBS=-latomic +endif +# The actual source to be compiled is within a 'c++' subdirectory +CAPNPROTO_SUBDIR = c++ + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 8c7eec1d00360ad8ad966413540be2b8f3568e43 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 16 Jul 2018 20:35:52 +0200 Subject: [PATCH 2147/2640] package/pulseaudio: bump version to 12.2 Release notes: https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030280.html Removed md5 and sha1 hashes, not provided by upstream anymore. Added sha256 hash provided by upstream, removed locally computed sha256 hash. Fixes http://autobuild.buildroot.net/results/c8d/c8d3822ee34d0bbcba14eecc8524c8c865c85c1b/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pulseaudio/pulseaudio.hash | 6 ++---- package/pulseaudio/pulseaudio.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index 948f3aa684..7e1ea1606e 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030259.html -md5 2511b7ce7193eecf029c91de96eee547 pulseaudio-12.1.tar.xz -sha1 3d8ecff70b7b47d82fd8a262755ce24dd956bef1 pulseaudio-12.1.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030280.html +sha256 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 pulseaudio-12.2.tar.xz # Locally computed -sha256 5f5dfb5e2c376e8c974b80f93b983ed77088ade7fb8b9325a575c45aa35977f3 pulseaudio-12.1.tar.xz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 2b8f5724bc..d1c35654cf 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 12.1 +PULSEAUDIO_VERSION = 12.2 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From 8ef1aaa08478a2d84c17e8bd12e33b0802433ac1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 16 Jul 2018 21:34:57 +0200 Subject: [PATCH 2148/2640] package/apache: bump version to 2.4.34 Changelog: http://www.apache.org/dist/httpd/CHANGES_2.4.34 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 5 +++-- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 76c7c766cb..74a48ae914 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,3 +1,4 @@ -# From http://archive.apache.org/dist/httpd/httpd-2.4.33.tar.bz2.sha256 -sha256 de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 httpd-2.4.33.tar.bz2 +# From http://archive.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.sha256 +sha256 fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0 httpd-2.4.34.tar.bz2 +# Locally computed sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 6ebd30ca40..d50e3774ff 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.33 +APACHE_VERSION = 2.4.34 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From 51932c48aa63d1c69421d8e0829545939d605e3c Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Tue, 17 Jul 2018 11:31:09 +0200 Subject: [PATCH 2149/2640] DEVELOPERS: update email for llvm and clang Signed-off-by: Valentin Korenblit Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index de09979999..67d0748360 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2003,7 +2003,7 @@ N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ -N: Valentin Korenblit +N: Valentin Korenblit F: package/clang/ F: package/llvm/ From dc195622cf99f3886ffcc96fd90f3a28d28fb518 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 16 Jul 2018 10:21:41 -0700 Subject: [PATCH 2150/2640] DEVELOPERS: add myself for clang and llvm Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 67d0748360..4c2d1f291f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1059,8 +1059,10 @@ F: package/rabbitmq-c/ N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ +F: package/clang/ F: package/gconf/ F: package/libnss/ +F: package/llvm/ F: package/python-cython/ F: package/python-raven/ F: package/python-schedule/ From 6912c6aa14a260065e0ab074690fa5a4bd367fb6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 16 Jul 2018 23:30:10 +0200 Subject: [PATCH 2151/2640] package/binutils: add binutils version 2.31 https://sourceware.org/ml/binutils/2018-07/msg00213.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/2.31/0001-sh-conf.patch | 48 +++ package/binutils/2.31/0002-ld-makefile.patch | 41 +++ .../2.31/0003-check-ldrunpath-length.patch | 36 +++ .../0004-add-sysroot-fix-from-bug-3049.patch | 51 +++ .../2.31/0005-poison-system-directories.patch | 306 ++++++++++++++++++ ...ion-where-GOT-information-is-collect.patch | 198 ++++++++++++ ...ess.-Return-FALSE-in-case-of-NULL-po.patch | 35 ++ ...-symbol-is-not-an-indirect-or-warnin.patch | 43 +++ ...was-still-being-generated-when-symbo.patch | 37 +++ package/binutils/Config.in.host | 4 + package/binutils/binutils.hash | 1 + 11 files changed, 800 insertions(+) create mode 100644 package/binutils/2.31/0001-sh-conf.patch create mode 100644 package/binutils/2.31/0002-ld-makefile.patch create mode 100644 package/binutils/2.31/0003-check-ldrunpath-length.patch create mode 100644 package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch create mode 100644 package/binutils/2.31/0005-poison-system-directories.patch create mode 100644 package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch create mode 100644 package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch create mode 100644 package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch create mode 100644 package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch diff --git a/package/binutils/2.31/0001-sh-conf.patch b/package/binutils/2.31/0001-sh-conf.patch new file mode 100644 index 0000000000..9e77c12b68 --- /dev/null +++ b/package/binutils/2.31/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From ac36af7d97d7920512068316fac6159aead97a01 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 462ad053066..27cb5571d0d 100755 +--- a/configure ++++ b/configure +@@ -3855,7 +3855,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index a638f694134..2fd7bce1576 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1152,7 +1152,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.14.4 + diff --git a/package/binutils/2.31/0002-ld-makefile.patch b/package/binutils/2.31/0002-ld-makefile.patch new file mode 100644 index 0000000000..6893d65aa0 --- /dev/null +++ b/package/binutils/2.31/0002-ld-makefile.patch @@ -0,0 +1,41 @@ +From ae435bc27e1eb59e4ad571a37a144bf99dc68f55 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:40:53 +0100 +Subject: [PATCH] ld-makefile + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/Makefile.am | 2 +- + ld/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index d86ad0940c9..c95b0ef0252 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -57,7 +57,7 @@ endif + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 4792b2b013c..789df2d01b9 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include +-- +2.14.4 + diff --git a/package/binutils/2.31/0003-check-ldrunpath-length.patch b/package/binutils/2.31/0003-check-ldrunpath-length.patch new file mode 100644 index 0000000000..6cdf085422 --- /dev/null +++ b/package/binutils/2.31/0003-check-ldrunpath-length.patch @@ -0,0 +1,36 @@ +From a216bfcd91363a8e8c14db320a2870fff2985d78 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:41:47 +0100 +Subject: [PATCH] check-ldrunpath-length + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/emultempl/elf32.em | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 1ad9d6b6fa8..637a5d5d585 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1471,6 +1471,8 @@ fragment <link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.14.4 + diff --git a/package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch new file mode 100644 index 0000000000..1ef1385062 --- /dev/null +++ b/package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch @@ -0,0 +1,51 @@ +From 73ecf6f6a1f327c9fa3af1fc924d152321aac801 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:42:48 +0100 +Subject: [PATCH] add sysroot fix from bug #3049 + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +Signed-off-by: Sven Rebhan +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/ldfile.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/ld/ldfile.c b/ld/ldfile.c +index a72ff135264..b3d166cbd60 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch, + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = TRUE; + return TRUE; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return TRUE; + + if (IS_ABSOLUTE_PATH (entry->filename)) +-- +2.14.4 + diff --git a/package/binutils/2.31/0005-poison-system-directories.patch b/package/binutils/2.31/0005-poison-system-directories.patch new file mode 100644 index 0000000000..90c7ac760a --- /dev/null +++ b/package/binutils/2.31/0005-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index d93c9b0..5da2742 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -31,6 +31,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 300a272..d68890f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -822,6 +822,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1486,6 +1487,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15803,7 +15806,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index d10c553..9f1b57b 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index ba914b9..9df17da 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -180,6 +180,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 40d79dd..137d46c 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index b3d166c..3dcbf66 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 04d6fd5..d7df005 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -148,6 +148,8 @@ enum option_values + OPTION_REQUIRE_DEFINED_SYMBOL, + OPTION_ORPHAN_HANDLING, + OPTION_FORCE_GROUP_ALLOCATION, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index f31eeb2..25f8497 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -268,6 +268,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 86a033a..f07f095 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = + { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, + '\0', N_("=MODE"), N_("Control how orphan sections are handled."), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + lang_leave_group (); +-- +2.7.4 + diff --git a/package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch b/package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch new file mode 100644 index 0000000000..306c65fdff --- /dev/null +++ b/package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch @@ -0,0 +1,198 @@ +From d930affa2d475d1cc6792f1e6d56bef3d6c617db Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:16:21 +0100 +Subject: [PATCH] Refactored location where GOT information is collected. + +Change location where GOT information is collected for ARC target, avoiding +posible use conflicts of the previous .got field in the symbols hash_entry. + +bfd/ +2018-03-01 Cupertino Miranda + + * arc-got.h (get_got_entry_list_for_symbol): Changed. + * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed. + (elf_arc_link_hash_newfunc): Changed. + (arc_elf_link_hash_table_create): Removed old initializations. + (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed. + +Signed-off-by: Alexey Brodkin +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour +--- + bfd/arc-got.h | 6 +++-- + bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++++++-------------------------- + 2 files changed, 46 insertions(+), 37 deletions(-) + +diff --git a/bfd/arc-got.h b/bfd/arc-got.h +index a86061bcb38..81ce88fe21a 100644 +--- a/bfd/arc-got.h ++++ b/bfd/arc-got.h +@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd, + unsigned long r_symndx, + struct elf_link_hash_entry *h) + { +- if (h != NULL) ++ struct elf_arc_link_hash_entry *h1 = ++ ((struct elf_arc_link_hash_entry *) h); ++ if (h1 != NULL) + { +- return &h->got.glist; ++ return &h1->got_ents; + } + else + { +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index a48ef0ca15f..ab84de43815 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -160,6 +160,18 @@ struct arc_relocation_data + const char * symbol_name; + }; + ++/* ARC ELF linker hash entry. */ ++struct elf_arc_link_hash_entry ++{ ++ struct elf_link_hash_entry root; ++ ++ /* Track dynamic relocs copied for this symbol. */ ++ struct elf_dyn_relocs *dyn_relocs; ++ ++ struct got_entry *got_ents; ++}; ++ ++ + /* Should be included at this location due to static declarations + defined before this point. */ + #include "arc-got.h" +@@ -281,15 +293,6 @@ struct arc_reloc_map + unsigned char elf_reloc_val; + }; + +-/* ARC ELF linker hash entry. */ +-struct elf_arc_link_hash_entry +-{ +- struct elf_link_hash_entry root; +- +- /* Track dynamic relocs copied for this symbol. */ +- struct elf_dyn_relocs *dyn_relocs; +-}; +- + /* ARC ELF linker hash table. */ + struct elf_arc_link_hash_table + { +@@ -301,28 +304,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) + { ++ struct elf_arc_link_hash_entry * ret = ++ (struct elf_arc_link_hash_entry *) entry; ++ + /* Allocate the structure if it has not already been allocated by a + subclass. */ +- if (entry == NULL) +- { +- entry = (struct bfd_hash_entry *) +- bfd_hash_allocate (table, +- sizeof (struct elf_arc_link_hash_entry)); +- if (entry == NULL) +- return entry; +- } ++ if (ret == NULL) ++ ret = (struct elf_arc_link_hash_entry *) ++ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry)); ++ if (ret == NULL) ++ return (struct bfd_hash_entry *) ret; + + /* Call the allocation method of the superclass. */ +- entry = _bfd_elf_link_hash_newfunc (entry, table, string); +- if (entry != NULL) ++ ret = ((struct elf_arc_link_hash_entry *) ++ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, ++ table, string)); ++ if (ret != NULL) + { +- struct elf_arc_link_hash_entry *eh; +- +- eh = (struct elf_arc_link_hash_entry *) entry; +- eh->dyn_relocs = NULL; ++ ret->dyn_relocs = NULL; ++ ret->got_ents = NULL; + } + +- return entry; ++ return (struct bfd_hash_entry *) ret; + } + + /* Destroy an ARC ELF linker hash table. */ +@@ -352,11 +355,6 @@ arc_elf_link_hash_table_create (bfd *abfd) + return NULL; + } + +- ret->elf.init_got_refcount.refcount = 0; +- ret->elf.init_got_refcount.glist = NULL; +- ret->elf.init_got_offset.offset = 0; +- ret->elf.init_got_offset.glist = NULL; +- + ret->elf.root.hash_table_free = elf_arc_link_hash_table_free; + + return &ret->elf.root; +@@ -1615,10 +1613,14 @@ elf_arc_relocate_section (bfd * output_bfd, + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + { +- struct elf_link_hash_entry *h_old = h; ++ struct elf_arc_link_hash_entry *ah_old = ++ (struct elf_arc_link_hash_entry *) h; + h = (struct elf_link_hash_entry *) h->root.u.i.link; +- if (h->got.glist == 0 && h_old->got.glist != h->got.glist) +- h->got.glist = h_old->got.glist; ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ ++ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents) ++ ah->got_ents = ah_old->got_ents; + } + + /* TODO: Need to validate what was the intention. */ +@@ -1636,6 +1638,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + if (is_reloc_for_GOT (howto) && !bfd_link_pic (info)) + { ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; + /* TODO: Change it to use arc_do_relocation with + ARC_32 reloc. Try to use ADD_RELA macro. */ + bfd_vma relocation = +@@ -1645,8 +1649,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + reloc_data.sym_section->output_section->vma) + : 0); + +- BFD_ASSERT (h->got.glist); +- bfd_vma got_offset = h->got.glist->offset; ++ BFD_ASSERT (ah->got_ents); ++ bfd_vma got_offset = ah->got_ents->offset; + bfd_put_32 (output_bfd, relocation, + htab->sgot->contents + got_offset); + } +@@ -1958,6 +1962,7 @@ elf_arc_check_relocs (bfd * abfd, + else /* Global one. */ + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + ++ + switch (r_type) + { + case R_ARC_32: +@@ -2404,7 +2409,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + create respective dynamic relocs. */ + /* TODO: Make function to get list and not access the list directly. */ + /* TODO: Move function to relocate_section create this relocs eagerly. */ +- create_got_dynrelocs_for_got_info (&h->got.glist, ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ create_got_dynrelocs_for_got_info (&ah->got_ents, + output_bfd, + info, + h); +-- +2.14.4 + diff --git a/package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch new file mode 100644 index 0000000000..b6e6d202ec --- /dev/null +++ b/package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch @@ -0,0 +1,35 @@ +From 955176bd999fe80c5b937ab8786665079e35c387 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:33:48 +0100 +Subject: [PATCH] Improved robustness. Return FALSE in case of NULL pointer. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case + arc_htab is NULL. + +Signed-off-by: Alexey Brodkin +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour +--- + bfd/elf32-arc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index ab84de43815..33fc72cff6e 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2420,6 +2420,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + { + struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info); + ++ if(arc_htab == NULL) ++ return FALSE; ++ + if (h->dynindx == -1 + || (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) +-- +2.14.4 + diff --git a/package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch new file mode 100644 index 0000000000..c3558fe081 --- /dev/null +++ b/package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch @@ -0,0 +1,43 @@ +From 9d09ce14b4eef2b56f24660fd69a44acd45128b2 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:38:14 +0100 +Subject: [PATCH] Make sure global symbol is not an indirect or warning. + +Problem identified in the context of glibc with latest upstream binutils. +Dynamic symbol space was being reserved but, no actual information for the +symbol was being set. Data for the symbol was kept initialized with -1. +No easy test case was possible to be created. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Alexey Brodkin +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour +--- + bfd/elf32-arc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 33fc72cff6e..9b72c5b4f4f 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -1960,7 +1960,12 @@ elf_arc_check_relocs (bfd * abfd, + if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ + h = NULL; + else /* Global one. */ +- h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ { ++ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ while (h->root.type == bfd_link_hash_indirect ++ || h->root.type == bfd_link_hash_warning) ++ h = (struct elf_link_hash_entry *) h->root.u.i.link; ++ } + + + switch (r_type) +-- +2.14.4 + diff --git a/package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch b/package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch new file mode 100644 index 0000000000..60bb522e12 --- /dev/null +++ b/package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch @@ -0,0 +1,37 @@ +From e4861c68067cb2166b4c2bb9c052abeb6ad9aaa1 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda +Date: Fri, 2 Mar 2018 17:44:29 +0100 +Subject: [PATCH] PLT information was still being generated when symbol was + forced_local. + +A change upstream reveiled this issue, triggering an assert when linking glibc. + +bfd/ +2018-03-01 Cupertino Miranda + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Alexey Brodkin +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour +--- + bfd/elf32-arc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 9b72c5b4f4f..b40b463d34d 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2041,7 +2041,8 @@ elf_arc_check_relocs (bfd * abfd, + if (h == NULL) + continue; + else +- h->needs_plt = 1; ++ if(h->forced_local == 0) ++ h->needs_plt = 1; + } + + /* Add info to the symbol got_entry_list. */ +-- +2.14.4 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ed4475ade9..982456332a 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -19,6 +19,9 @@ config BR2_BINUTILS_VERSION_2_29_X config BR2_BINUTILS_VERSION_2_30_X bool "binutils 2.30" +config BR2_BINUTILS_VERSION_2_31_X + bool "binutils 2.31" + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.29)" depends on BR2_arc @@ -30,6 +33,7 @@ config BR2_BINUTILS_VERSION default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X + default "2.31" if BR2_BINUTILS_VERSION_2_31_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index cc13686cc8..67f2a99a68 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d binutils-2.28.1.tar.xz sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz +sha512 3448a71c42d790569c1159c1042aa520b2d8ac8af7506fb1f2a4199dfb13b39f1c2271a5cb3a643d10c7d8a388a73f190e90503d4793a016da7893473aa1c635 binutils-2.31.tar.xz # Locally calculated (fetched from Github) sha512 bea88164ed48733bad63393fe702e12e651efd113aa4f3fe2e253e05c4c1e5da20b5a99333f0b5528df6d32ce806f799211c568e1916845a87999901dde28817 binutils-arc-2018.03.tar.gz From ab196e4c91711dc96b7279c7d5efa301baa1a2ee Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 12 Jul 2018 14:13:49 +0300 Subject: [PATCH 2152/2640] package/gcc: Backport code generation fix for ARC700 Fixes assembler failure when compiling for ARC700 only: ------------------------>8--------------------- {standard input}: Assembler messages: {standard input}:213: Error: operand out of range (128 is not between -128 and 127) make[2]: *** [scripts/Makefile.build:317: net/ipv4/xfrm4_mode_tunnel.o] Error 1 ------------------------>8--------------------- This is an upstream fix scheduled for the next release, see https://github.com/gcc-mirror/gcc/commit/5afc07eeb18fb7dd351ac981367bce721ca22af3 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- ...-return-padding-operation-for-ARC700.patch | 355 ++++++++++++++++++ 1 file changed, 355 insertions(+) create mode 100644 package/gcc/8.1.0/0006-ARC-Reimplement-return-padding-operation-for-ARC700.patch diff --git a/package/gcc/8.1.0/0006-ARC-Reimplement-return-padding-operation-for-ARC700.patch b/package/gcc/8.1.0/0006-ARC-Reimplement-return-padding-operation-for-ARC700.patch new file mode 100644 index 0000000000..2c7f50ea6f --- /dev/null +++ b/package/gcc/8.1.0/0006-ARC-Reimplement-return-padding-operation-for-ARC700.patch @@ -0,0 +1,355 @@ +From d8d716f49c0057e239f2b64e7d902046b92d244f Mon Sep 17 00:00:00 2001 +From: Claudiu Zissulescu +Date: Fri, 24 Mar 2017 11:55:54 +0100 +Subject: [PATCH] [ARC] Reimplement return padding operation for ARC700. + +For ARC700, adding padding if necessary to avoid a mispredict. A +return could happen immediately after the function start. A +call/return and return/return must be 6 bytes apart to avoid +mispredict. + +The old implementation was doing this operation very late in the +compilation process, and the additional nop instructions and/or +forcing some other instruction to take their long form was not taken +into account when generating brcc instructions. Thus, wrong code could +be generated. + +gcc/ +2017-03-24 Claudiu Zissulescu + + * config/arc/arc-protos.h (arc_pad_return): Remove. + * config/arc/arc.c (machine_function): Remove force_short_suffix + and size_reason. + (arc_print_operand): Adjust printing of '&'. + (arc_verify_short): Remove conditional printing of short suffix. + (arc_final_prescan_insn): Remove reference to size_reason. + (pad_return): New function. + (arc_reorg): Call pad_return. + (arc_pad_return): Remove. + (arc_init_machine_status): Remove reference to force_short_suffix. + * config/arc/arc.md (vunspec): Add VUNSPEC_ARC_BLOCKAGE. + (attr length): When attribute iscompact is true force to 2 + regardless; in the case of maybe check if we want to force the + instruction to have 4 bytes length. + (nopv): Change it to generate 4 byte long nop as well. + (blockage): New pattern. + (simple_return): Remove call to arc_pad_return. + (p_return_i): Likewise. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261542 138bc75d-0d04-0410-961f-82ee72b054a4 +Upstream-Status: Backport (trunk) +Signed-off-by: Alexey Brodkin +--- + gcc/config/arc/arc-protos.h | 1 - + gcc/config/arc/arc.c | 156 +++++++++----------- + gcc/config/arc/arc.md | 26 +++- + 4 files changed, 128 insertions(+), 93 deletions(-) + +diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h +index 67f3b4e3226b..ce4b6f84749e 100644 +--- a/gcc/config/arc/arc-protos.h ++++ b/gcc/config/arc/arc-protos.h +@@ -89,7 +89,6 @@ extern void arc_clear_unalign (void); + extern void arc_toggle_unalign (void); + extern void split_addsi (rtx *); + extern void split_subsi (rtx *); +-extern void arc_pad_return (void); + extern void arc_split_move (rtx *); + extern const char *arc_short_long (rtx_insn *insn, const char *, const char *); + extern rtx arc_regno_use_in (unsigned int, rtx); +diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c +index b1a09d82b72e..22f1442a027c 100644 +--- a/gcc/config/arc/arc.c ++++ b/gcc/config/arc/arc.c +@@ -2648,8 +2648,6 @@ typedef struct GTY (()) machine_function + struct arc_frame_info frame_info; + /* To keep track of unalignment caused by short insns. */ + int unalign; +- int force_short_suffix; /* Used when disgorging return delay slot insns. */ +- const char *size_reason; + struct arc_ccfsm ccfsm_current; + /* Map from uid to ccfsm state during branch shortening. */ + rtx ccfsm_current_insn; +@@ -4307,7 +4305,7 @@ arc_print_operand (FILE *file, rtx x, int code) + } + break; + case '&': +- if (TARGET_ANNOTATE_ALIGN && cfun->machine->size_reason) ++ if (TARGET_ANNOTATE_ALIGN) + fprintf (file, "; unalign: %d", cfun->machine->unalign); + return; + case '+': +@@ -4980,7 +4978,6 @@ static int + arc_verify_short (rtx_insn *insn, int, int check_attr) + { + enum attr_iscompact iscompact; +- struct machine_function *machine; + + if (check_attr > 0) + { +@@ -4988,10 +4985,6 @@ arc_verify_short (rtx_insn *insn, int, int check_attr) + if (iscompact == ISCOMPACT_FALSE) + return 0; + } +- machine = cfun->machine; +- +- if (machine->force_short_suffix >= 0) +- return machine->force_short_suffix; + + return (get_attr_length (insn) & 2) != 0; + } +@@ -5030,8 +5023,6 @@ arc_final_prescan_insn (rtx_insn *insn, rtx *opvec ATTRIBUTE_UNUSED, + cfun->machine->prescan_initialized = 1; + } + arc_ccfsm_advance (insn, &arc_ccfsm_current); +- +- cfun->machine->size_reason = 0; + } + + /* Given FROM and TO register numbers, say whether this elimination is allowed. +@@ -7673,6 +7664,76 @@ jli_call_scan (void) + } + } + ++/* Add padding if necessary to avoid a mispredict. A return could ++ happen immediately after the function start. A call/return and ++ return/return must be 6 bytes apart to avoid mispredict. */ ++ ++static void ++pad_return (void) ++{ ++ rtx_insn *insn; ++ long offset; ++ ++ if (!TARGET_PAD_RETURN) ++ return; ++ ++ for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) ++ { ++ rtx_insn *prev0 = prev_active_insn (insn); ++ bool wantlong = false; ++ ++ if (!INSN_P (insn) || GET_CODE (PATTERN (insn)) != SIMPLE_RETURN) ++ continue; ++ ++ if (!prev0) ++ { ++ prev0 = emit_insn_before (gen_nopv (), insn); ++ /* REG_SAVE_NOTE is used by Haifa scheduler, we are in reorg ++ so it is safe to reuse it for forcing a particular length ++ for an instruction. */ ++ add_reg_note (prev0, REG_SAVE_NOTE, GEN_INT (1)); ++ emit_insn_before (gen_nopv (), insn); ++ continue; ++ } ++ offset = get_attr_length (prev0); ++ ++ if (get_attr_length (prev0) == 2 ++ && get_attr_iscompact (prev0) != ISCOMPACT_TRUE) ++ { ++ /* Force long version of the insn. */ ++ wantlong = true; ++ offset += 2; ++ } ++ ++ rtx_insn *prev = prev_active_insn (prev0); ++ if (prev) ++ offset += get_attr_length (prev); ++ ++ prev = prev_active_insn (prev); ++ if (prev) ++ offset += get_attr_length (prev); ++ ++ switch (offset) ++ { ++ case 2: ++ prev = emit_insn_before (gen_nopv (), insn); ++ add_reg_note (prev, REG_SAVE_NOTE, GEN_INT (1)); ++ break; ++ case 4: ++ emit_insn_before (gen_nopv (), insn); ++ break; ++ default: ++ continue; ++ } ++ ++ if (wantlong) ++ add_reg_note (prev0, REG_SAVE_NOTE, GEN_INT (1)); ++ ++ /* Emit a blockage to avoid delay slot scheduling. */ ++ emit_insn_before (gen_blockage(), insn); ++ } ++} ++ + static int arc_reorg_in_progress = 0; + + /* ARC's machince specific reorg function. */ +@@ -7698,6 +7759,7 @@ arc_reorg (void) + + workaround_arc_anomaly (); + jli_call_scan (); ++ pad_return (); + + /* FIXME: should anticipate ccfsm action, generate special patterns for + to-be-deleted branches that have no delay slot and have at least the +@@ -9256,79 +9318,6 @@ arc_branch_size_unknown_p (void) + return !optimize_size && arc_reorg_in_progress; + } + +-/* We are about to output a return insn. Add padding if necessary to avoid +- a mispredict. A return could happen immediately after the function +- start, but after a call we know that there will be at least a blink +- restore. */ +- +-void +-arc_pad_return (void) +-{ +- rtx_insn *insn = current_output_insn; +- rtx_insn *prev = prev_active_insn (insn); +- int want_long; +- +- if (!prev) +- { +- fputs ("\tnop_s\n", asm_out_file); +- cfun->machine->unalign ^= 2; +- want_long = 1; +- } +- /* If PREV is a sequence, we know it must be a branch / jump or a tailcall, +- because after a call, we'd have to restore blink first. */ +- else if (GET_CODE (PATTERN (prev)) == SEQUENCE) +- return; +- else +- { +- want_long = (get_attr_length (prev) == 2); +- prev = prev_active_insn (prev); +- } +- if (!prev +- || ((NONJUMP_INSN_P (prev) && GET_CODE (PATTERN (prev)) == SEQUENCE) +- ? CALL_ATTR (as_a (PATTERN (prev))->insn (0), +- NON_SIBCALL) +- : CALL_ATTR (prev, NON_SIBCALL))) +- { +- if (want_long) +- cfun->machine->size_reason +- = "call/return and return/return must be 6 bytes apart to avoid mispredict"; +- else if (TARGET_UNALIGN_BRANCH && cfun->machine->unalign) +- { +- cfun->machine->size_reason +- = "Long unaligned jump avoids non-delay slot penalty"; +- want_long = 1; +- } +- /* Disgorge delay insn, if there is any, and it may be moved. */ +- if (final_sequence +- /* ??? Annulled would be OK if we can and do conditionalize +- the delay slot insn accordingly. */ +- && !INSN_ANNULLED_BRANCH_P (insn) +- && (get_attr_cond (insn) != COND_USE +- || !reg_set_p (gen_rtx_REG (CCmode, CC_REG), +- XVECEXP (final_sequence, 0, 1)))) +- { +- prev = as_a (XVECEXP (final_sequence, 0, 1)); +- gcc_assert (!prev_real_insn (insn) +- || !arc_hazard (prev_real_insn (insn), prev)); +- cfun->machine->force_short_suffix = !want_long; +- rtx save_pred = current_insn_predicate; +- final_scan_insn (prev, asm_out_file, optimize, 1, NULL); +- cfun->machine->force_short_suffix = -1; +- prev->set_deleted (); +- current_output_insn = insn; +- current_insn_predicate = save_pred; +- } +- else if (want_long) +- fputs ("\tnop\n", asm_out_file); +- else +- { +- fputs ("\tnop_s\n", asm_out_file); +- cfun->machine->unalign ^= 2; +- } +- } +- return; +-} +- + /* The usual; we set up our machine_function data. */ + + static struct machine_function * +@@ -9337,7 +9326,6 @@ arc_init_machine_status (void) + struct machine_function *machine; + machine = ggc_cleared_alloc (); + machine->fn_type = ARC_FUNCTION_UNKNOWN; +- machine->force_short_suffix = -1; + + return machine; + } +diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md +index 5610bab694c6..2401926f08df 100644 +--- a/gcc/config/arc/arc.md ++++ b/gcc/config/arc/arc.md +@@ -162,6 +162,7 @@ + VUNSPEC_ARC_CAS + VUNSPEC_ARC_SC + VUNSPEC_ARC_LL ++ VUNSPEC_ARC_BLOCKAGE + ]) + + (define_constants +@@ -385,13 +386,18 @@ + ;; and insn lengths: insns with shimm values cannot be conditionally executed. + (define_attr "length" "" + (cond +- [(eq_attr "iscompact" "true,maybe") ++ [(eq_attr "iscompact" "true") ++ (const_int 2) ++ ++ (eq_attr "iscompact" "maybe") + (cond + [(eq_attr "type" "sfunc") + (cond [(match_test "GET_CODE (PATTERN (insn)) == COND_EXEC") + (const_int 12)] + (const_int 10)) +- (match_test "GET_CODE (PATTERN (insn)) == COND_EXEC") (const_int 4)] ++ (match_test "GET_CODE (PATTERN (insn)) == COND_EXEC") (const_int 4) ++ (match_test "find_reg_note (insn, REG_SAVE_NOTE, GEN_INT (1))") ++ (const_int 4)] + (const_int 2)) + + (eq_attr "iscompact" "true_limm") +@@ -4447,8 +4453,16 @@ archs4x, archs4xd, archs4xd_slow" + "" + "nop%?" + [(set_attr "type" "misc") +- (set_attr "iscompact" "true") +- (set_attr "length" "2")]) ++ (set_attr "iscompact" "maybe") ++ (set_attr "length" "*")]) ++ ++(define_insn "blockage" ++ [(unspec_volatile [(const_int 0)] VUNSPEC_ARC_BLOCKAGE)] ++ "" ++ "" ++ [(set_attr "length" "0") ++ (set_attr "type" "block")] ++) + + ;; Split up troublesome insns for better scheduling. + +@@ -4993,8 +5007,6 @@ archs4x, archs4xd, archs4xd_slow" + { + return \"rtie\"; + } +- if (TARGET_PAD_RETURN) +- arc_pad_return (); + output_asm_insn (\"j%!%* [%0]%&\", ®); + return \"\"; + } +@@ -5038,8 +5050,6 @@ archs4x, archs4xd, archs4xd_slow" + arc_return_address_register (arc_compute_function_type + (cfun))); + +- if (TARGET_PAD_RETURN) +- arc_pad_return (); + output_asm_insn (\"j%d0%!%# [%1]%&\", xop); + /* record the condition in case there is a delay insn. */ + arc_ccfsm_record_condition (xop[0], false, insn, 0); +-- +2.17.1 + From b35ad5d0b45e5288f4019aeaa06b87ef0f2ef016 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Tue, 10 Jul 2018 09:46:03 -0700 Subject: [PATCH 2153/2640] ncurses: make host-ncurses use host terminfo Host GDB suffers a serious problem: pressing backspace (or ^W ^U or any other "delete" key) results in a plain space being printed instead, making the command prompt almost completely unusable. That's because it's using host-ncurses, which embeds a path for the terminfo database into the library itself. That path ends up being something like /home/hollisb/buildroot.git/output/host/share/terminfo, which obviously doesn't generally exist other hosts. ('relocate-sdk.sh' cannot and does not edit binaries like libncurses.so.6, so doesn't resolve this problem.) /usr/share/terminfo is a far better path to use, since it almost certainly exists on the host. Theoretically, it could be from a different ncurses version with incompatible terminfo database format, but this doesn't seem to be a problem in practice. (Future patches could address the theoretical problem if it actually appears in real life.) This change allows buildroot's host gdb, which uses ncurses 6.x, to work on RHEL5, RHEL6, and RHEL7, which all provide terminfo from ncurses 5.x. Signed-off-by: Hollis Blanchard Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ncurses/ncurses.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 90cf4a4dc5..5b36df564c 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -153,6 +153,7 @@ HOST_NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ --without-ada \ + --with-default-terminfo-dir=/usr/share/terminfo \ --without-normal $(eval $(autotools-package)) From b36577a2669310c1b1a6722e012a1049e3793d1d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 17 Jul 2018 14:32:54 +0300 Subject: [PATCH 2154/2640] bind: security bump to 9.11.4 Fixes CVE-2018-5738: When recursion is enabled but the allow-recursion and allow-query-cache ACLs are not specified, they should be limited to local networks, but they were inadvertently set to match the default allow-query, thus allowing remote queries. Update license file hash; copyright year update. Add reference to tarball signature key. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 7 ++++--- package/bind/bind.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 199db704fe..78f8015521 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,3 +1,4 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.2-P1/bind-9.11.2-P1.tar.gz.sha256.asc -sha256 cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 bind-9.11.2-P1.tar.gz -sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT +# Verified from https://ftp.isc.org/isc/bind9/9.11.4/bind-9.11.4.tar.gz.asc +# with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57 +sha256 595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617 bind-9.11.4.tar.gz +sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 392ef321c2..c4429ef6cc 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.2-P1 +BIND_VERSION = 9.11.4 BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From c6054f20cc2ab5da9d08107186ab137287c0541f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 17 Jul 2018 09:50:18 -0300 Subject: [PATCH 2155/2640] linux: bump default to version 4.17.7 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 9b166eded6..b5f1577654 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.7" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From e02883632e411362915c1513f9810f9765c1dfbf Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 17 Jul 2018 09:50:19 -0300 Subject: [PATCH 2156/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bb3ca5e2eb..909e74d49e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.140" if BR2_KERNEL_HEADERS_4_4 - default "4.9.112" if BR2_KERNEL_HEADERS_4_9 + default "4.4.141" if BR2_KERNEL_HEADERS_4_4 + default "4.9.113" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.55" if BR2_KERNEL_HEADERS_4_14 + default "4.14.56" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.6" if BR2_KERNEL_HEADERS_4_17 + default "4.17.7" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 9ea4636ad5af52863c805b628f80b6b7032988bd Mon Sep 17 00:00:00 2001 From: Laurent Cans Date: Tue, 17 Jul 2018 17:29:06 +0200 Subject: [PATCH 2157/2640] aircrack-ng: bump to version 1.3 - Remove patches (already in version) - Add optional dependency to jemalloc Signed-off-by: Laurent Cans Signed-off-by: Peter Korsgaard --- ...01-Fix-compilation-without-getauxval.patch | 81 ------------------- ...hout-opt-should-skip-stack-protector.patch | 52 ------------ ...utoconf-Added-NEON-intrinsic-support.patch | 64 --------------- ...lation-with-gcrypt-on-some-platforms.patch | 53 ------------ package/aircrack-ng/aircrack-ng.hash | 4 +- package/aircrack-ng/aircrack-ng.mk | 9 ++- 6 files changed, 10 insertions(+), 253 deletions(-) delete mode 100644 package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch delete mode 100644 package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch delete mode 100644 package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch delete mode 100644 package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch diff --git a/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch b/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch deleted file mode 100644 index 8a291356ca..0000000000 --- a/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0017bae95dbcf336495e36ac83c868ca1d7f2846 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 May 2018 22:52:30 +0200 -Subject: [PATCH] Fix compilation without getauxval - -Protect getauxval call and sys/auxv.h include by #ifdef HAS_AUXV in -trampoline_arm.c and trampoline_ppc.c. -Indeed, auxv is not available on some toolchains such as uclibc - -Signed-off-by: Fabrice Fontaine -[Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1896)] ---- - src/trampoline_arm.c | 4 ++++ - src/trampoline_ppc.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/trampoline_arm.c b/src/trampoline_arm.c -index 45db82db..e653109a 100644 ---- a/src/trampoline_arm.c -+++ b/src/trampoline_arm.c -@@ -17,8 +17,10 @@ - */ - - #if defined(__arm__) || defined(__aarch64__) -+#ifdef HAS_AUXV - #include - #include -+#endif - #else - #error "The wrong CPU architecture file has been included." - #endif -@@ -39,6 +41,7 @@ int - simd_get_supported_features (void) - { - int result = 0; -+#ifdef HAS_AUXV - long hwcaps = getauxval (AT_HWCAP); - - #if defined(HWCAP_ASIMD) -@@ -53,6 +56,7 @@ simd_get_supported_features (void) - { - result |= SIMD_SUPPORTS_NEON; - } -+#endif - #endif - - return (result); -diff --git a/src/trampoline_ppc.c b/src/trampoline_ppc.c -index 0d439776..b5c0cb2b 100644 ---- a/src/trampoline_ppc.c -+++ b/src/trampoline_ppc.c -@@ -17,8 +17,10 @@ - */ - - #if defined(__ppc__) || defined(__PPC__) -+#ifdef HAS_AUXV - #include - #include -+#endif - #else - #error "The wrong CPU architecture file has been included." - #endif -@@ -39,6 +41,7 @@ int - simd_get_supported_features (void) - { - int result = 0; -+#ifdef HAS_AUXV - long hwcaps = getauxval (AT_HWCAP2); - - #if defined(PPC_FEATURE2_ARCH_2_07) -@@ -46,6 +49,7 @@ simd_get_supported_features (void) - { - result |= SIMD_SUPPORTS_POWER8; - } -+#endif - #endif - - return (result); --- -2.14.1 - diff --git a/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch b/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch deleted file mode 100644 index 8563c78d33..0000000000 --- a/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Mon, 16 Apr 2018 11:26:23 -0700 -Subject: [PATCH] autotools: The flag --without-opt should skip stack protector - flags. (#1864) - -Signed-off-by: Fabrice Fontaine -[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/58fe40daf3e082d9e63d689d795a3bbecf72fedb] ---- - build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4 -index 0fb19726..8a973dbf 100644 ---- a/build/m4/aircrack_ng_compiler.m4 -+++ b/build/m4/aircrack_ng_compiler.m4 -@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in - CYGWIN*|MSYS*|cygwin*|msys*) - ;; - *) -- AS_IF([test "x$gcc_over49" = "xno"], [ -- AS_IF([test "x$gcc_over41" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -- AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -- ], []) -+ case $with_opt in -+ yes | "") -+ AS_IF([test "x$gcc_over49" = "xno"], [ -+ AS_IF([test "x$gcc_over41" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -+ AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ], []) - -- AS_IF([test "x$gcc_over49" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -- AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -+ AS_IF([test "x$gcc_over49" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -+ AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ;; -+ esac - ;; - esac - ;; diff --git a/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch b/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch deleted file mode 100644 index 59c7ade4e9..0000000000 --- a/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 149929109eab1f79c4b90aa423f6d6eb4ee0e882 Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Tue, 8 May 2018 11:49:22 -0700 -Subject: [PATCH] Autoconf: Added NEON intrinsic support. (#1879, #1872) - -Perform NEON intrinsic support using Autoconf, instead of failing to build on older ARM processors without NEON features. - -Signed-off-by: Fabrice Fontaine -[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/149929109eab1f79c4b90aa423f6d6eb4ee0e882] ---- - build/m4/aircrack_ng_simd.m4 | 16 ++++++++++++++++ - src/Makefile.am | 2 ++ - 2 files changed, 18 insertions(+) - -diff --git a/build/m4/aircrack_ng_simd.m4 b/build/m4/aircrack_ng_simd.m4 -index 9d13031e..74135f32 100644 ---- a/build/m4/aircrack_ng_simd.m4 -+++ b/build/m4/aircrack_ng_simd.m4 -@@ -95,6 +95,21 @@ then - AX_APPEND_FLAG(-mfpu=neon, [arm_neon_[]_AC_LANG_ABBREV[]flags]) - AC_SUBST(arm_neon_[]_AC_LANG_ABBREV[]flags) - ]) -+ -+ AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_neon_[]_AC_LANG_ABBREV[]flags]) -+ AC_CACHE_CHECK([whether _AC_LANG compiler supports NEON instructions], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $arm_neon_[]_AC_LANG_ABBREV[]flags" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+#if !defined(__ARM_NEON) && !defined(__ARM_NEON__) && !defined(__aarch64) && !defined(__aarch64__) -+#error macro not defined -+#endif -+ ]])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags -+ ]) -+ AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [NEON_FOUND=1], [NEON_FOUND=0]) -+ AS_VAR_POPDEF([CACHEVAR]) - fi - - if test $IS_PPC -eq 1 -@@ -185,6 +200,7 @@ fi - AM_CONDITIONAL([X86], [test "$IS_X86" = 1]) - AM_CONDITIONAL([ARM], [test "$IS_ARM" = 1]) - AM_CONDITIONAL([PPC], [test "$IS_PPC" = 1]) -+AM_CONDITIONAL([NEON], [test "$NEON_FOUND" = 1]) - ]) - - AC_DEFUN([AIRCRACK_NG_SIMD_C], [ -diff --git a/src/Makefile.am b/src/Makefile.am -index 3cc8ebdc..beac9dce 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -116,9 +116,11 @@ endif - pkglibexec_PROGRAMS = aircrack-ng--generic - - if ARM -+if NEON - pkglibexec_PROGRAMS += aircrack-ng--neon \ - aircrack-ng--asimd - endif -+endif - - if PPC - pkglibexec_PROGRAMS += aircrack-ng--altivec \ diff --git a/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch b/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch deleted file mode 100644 index b32f29f800..0000000000 --- a/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 208c0d4810f24e03b4def637ebe130f8777ef3e1 Mon Sep 17 00:00:00 2001 -From: Mister X <3520734+Mister-X-@users.noreply.github.com> -Date: Sat, 5 May 2018 00:28:30 +0000 -Subject: [PATCH] Fixed compilation with gcrypt on some platforms. - -Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/208c0d4810f24e03b4def637ebe130f8777ef3e1 - -Signed-off-by: Fabrice Fontaine ---- - src/gcrypt-openssl-wrapper.h | 13 +++++++++++++ - src/md5.h | 6 +++++- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/gcrypt-openssl-wrapper.h b/src/gcrypt-openssl-wrapper.h -index 79a0376e..db3e0462 100644 ---- a/src/gcrypt-openssl-wrapper.h -+++ b/src/gcrypt-openssl-wrapper.h -@@ -82,5 +82,18 @@ - gcry_md_get_algo_dlen (algo)); \ - gcry_md_close(mdh); \ - } while (0) -+// MD5 -+#define MD5_CTX gcry_md_hd_t -+#define MD5_Init(ctx) gcry_md_open(ctx, GCRY_MD_MD5, 0) -+#define MD5_Update(ctx, data, len) gcry_md_write(*ctx, data, len) -+ // HMAC_Update(ctx, data, len) -+#define MD5_Final(ctx, md) do { \ -+ memcpy( md, \ -+ gcry_md_read(*(gcry_md_hd_t*)ctx, GCRY_MD_MD5), \ -+ gcry_md_get_algo_dlen(gcry_md_get_algo(*(gcry_md_hd_t*)ctx)) \ -+ ); \ -+ gcry_md_close(*(gcry_md_hd_t*)ctx); \ -+ } while (0) -+ - // http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros - #endif // _GCRYPT_OPENSSL_WRAPPER_H -diff --git a/src/md5.h b/src/md5.h -index e9edeb81..d8d3d6b3 100644 ---- a/src/md5.h -+++ b/src/md5.h -@@ -61,7 +61,11 @@ typedef unsigned int MD5_u32plus; - - #include "arch.h" - #ifdef SIMD_PARA_MD5 --#include -+ #ifndef USE_GCRYPT -+ #include -+ #else -+ #include "gcrypt-openssl-wrapper.h" -+ #endif - #endif - - #endif /* _MD5_H */ diff --git a/package/aircrack-ng/aircrack-ng.hash b/package/aircrack-ng/aircrack-ng.hash index a5fbbcfd31..7c5fe9f0de 100644 --- a/package/aircrack-ng/aircrack-ng.hash +++ b/package/aircrack-ng/aircrack-ng.hash @@ -1,6 +1,6 @@ # From http://www.aircrack-ng.org/downloads.html -sha1 ccc7a44ad2243c66b9a45fe133514485a72d674f aircrack-ng-1.2.tar.gz -md5 bb11ec14e1fe505d8d0d51cee0c54df9 aircrack-ng-1.2.tar.gz +sha1 245464585dfd24622807a8f868d62d9d00f6a22c aircrack-ng-1.3.tar.gz +md5 c7c5b076dee0c25ee580b0f56f455623 aircrack-ng-1.3.tar.gz # Hash for license file: sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index fe0f504ed1..f338121a48 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -AIRCRACK_NG_VERSION = 1.2 +AIRCRACK_NG_VERSION = 1.3 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE @@ -31,6 +31,13 @@ else AIRCRACK_NG_CONF_OPTS += --without-duma endif +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +AIRCRACK_NG_DEPENDENCIES += jemalloc +AIRCRACK_NG_CONF_OPTS += --with-jemalloc +else +AIRCRACK_NG_CONF_OPTS += --without-jemalloc +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) AIRCRACK_NG_DEPENDENCIES += libgcrypt AIRCRACK_NG_CONF_OPTS += \ From 846c6a3b385e78be419ca27caeb88014e0324f56 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 17 Jul 2018 18:31:42 +0200 Subject: [PATCH 2158/2640] package/elf2flt: fix build with Binutils >= 2.31 Binutils added diagnostics.h to bfd.h [1], so elf2flt must create a symlink for this header. Fixes: https://gitlab.com/free-electrons/toolchains-builder/-/jobs/82284139 [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=95da9854466ada2572b42f5528711a06a2d42db1 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...akefile-fix-build-with-Binutils-2.31.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch diff --git a/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch b/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch new file mode 100644 index 0000000000..825582550b --- /dev/null +++ b/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch @@ -0,0 +1,34 @@ +From faf1a1646093fbc5ed279bae1c7250c7dfea56f8 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 17 Jul 2018 16:36:16 +0200 +Subject: [PATCH] Makefile: fix build with Binutils 2.31 + +Binutils added diagnostics.h to bfd.h [1], so elf2flt must create a symlink +for this header. + +Fixes: +https://gitlab.com/free-electrons/toolchains-builder/-/jobs/82284139 + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=95da9854466ada2572b42f5528711a06a2d42db1 + +Signed-off-by: Romain Naour +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index cfad06c..164e306 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -127,7 +127,7 @@ bfd-headers/.stamp: + rm -rf bfd-headers + mkdir bfd-headers + ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h +- for f in ansidecl filenames hashtab libiberty symcat; do \ ++ for f in ansidecl diagnostics filenames hashtab libiberty symcat; do \ + ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \ + done + ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf +-- +2.7.4 + From f9ad75b4c13925bfa8586601d2ae31b2df87eb47 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 17 Jul 2018 22:48:54 +0200 Subject: [PATCH 2159/2640] rust-bin: bump version to 1.27.1 Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 60 +++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d09654307f..a83dea911d 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,33 +1,33 @@ -# From https://static.rust-lang.org/dist/rustc-1.25.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 2b9b7d1df84a2a591c7f02faf082045eb5520cec70162249f941d8da006e97ec rustc-1.25.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.25.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 f61766a970e067614037f2c788e3800d84b1bbc0c00c283ca0c6ecbc38559776 rustc-1.25.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 a9257edc85e9159b5953a9d68a3c1fbfe1306e2a5b752284ee4e4410deb96d73 rust-std-1.25.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -sha256 73ad54b1da0d100dc49e2a1ec425aecb6f38ffda334eb91fc6bb99fc30c301f5 rust-std-1.25.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 73bf215c2a5cc8068676f8d881a7464352e66f00946a0df81ac271fed16ebcfb rust-std-1.25.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 ebfb2a21b54d610c5454445380628854fc880c8f4f6add4ffac27db6aa65a1a6 rust-std-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 6a6dba618372029f640d8a76342d957676cd9324084a1246ab6d5a89283e1d50 rust-std-1.25.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-mips-unknown-linux-gnu.tar.xz.sha256 -sha256 85774d422307499b120841c78de7e920f7d1bdb2b8a9aca29607be467c5de9a0 rust-std-1.25.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -sha256 51347ff3c2cf1a1c55c22a3fecba6b155841e2e5a86ff5a077a7e96de096ff19 rust-std-1.25.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -sha256 e18a7259e58798bcbd6ad68ade35ea46201b9f370f3d2ead2e3d293cb2938d60 rust-std-1.25.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -sha256 9e60e356bd755aa3525f3fc4327e5ef64103e1198b9fbba9ad874e49a66877d7 rust-std-1.25.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 6908b1819e6b64ce3a2cbc33cccca10afda686efa60d6d91d4ce19213912f87e rust-std-1.25.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 1ebe2c241514b41b492772eded30d6c601f41cd68e493cb31ebbdd39ffc5c2e9 rust-std-1.25.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 28a6200b05b6ab870c0700eb371201f0790ca24e9b3b8982db62fd21c1e846e2 rust-std-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.25.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 30c724d3fa01eb7dd448ef4a1fe63f6caa59f70c250b7d2ec3ede6be29c2505f rust-std-1.25.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.27.1-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 739acc03d50c5fb2ce43037b0b54c37ac99bd1bef9ea61ee969b49a63d11315d rustc-1.27.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.27.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 d4c45e15d4ffb150f3eeef1fa2945a5ae541ab791f9464e9a4dcccba77bdf9c7 rustc-1.27.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 1f9565cac16e600c68ebfb4fe50b1658462698b8d4a1e8392f8182c4e813d99d rust-std-1.27.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +sha256 a58026c1b441c45d21acc9b054232831fceb12f1906995754ef6aa9b20376d6a rust-std-1.27.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 dc3ee826617487777bd70f52743baa499396c58cbdd3934cf57fa84624b84f05 rust-std-1.27.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 d846df9113718e3faaf77c7b29690a4f9a9f1432e7d001e2a1fee95514d92c79 rust-std-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 68f028911a1606e93eb71bdf95fe7d91e2b4cbd247663f3ab1e59d291dcd61b7 rust-std-1.27.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips-unknown-linux-gnu.tar.xz.sha256 +sha256 e15358613566b4a7721cfbebf424f850c771cf2acfc67ea170154447e81a7d5d rust-std-1.27.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +sha256 a2c8a030964515328cf1cff5d72a53e2d8df30048382318378904df6bd019395 rust-std-1.27.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +sha256 27444c6892c978d294d24e26409bf924b6644822d18ef1d3e0d4fa3370e7d4da rust-std-1.27.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +sha256 ac0c03e7d53439821c2d9eaf1311716b92fe347d83c1009bc031907b4ddef0f2 rust-std-1.27.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 d2f2b88adb85af25699dd5e866d8e989660ef1a94561a9b73e4b7080e75ef6ee rust-std-1.27.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 80b6070996f297f4e9f802b014e88285914de03c1af7b087064035c9ece500bf rust-std-1.27.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 a3c1843a583af8a38d49a403ea4e3013c8e1e0092a37353e62e69957fa1e9dbd rust-std-1.27.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.27.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 d3b0d00357cfaecf85651bea6f1d72793a5a859b6b07e9613ba21285922d5d58 rust-std-1.27.1-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index e10dbcebd0..cebca11133 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.25.0 +RUST_BIN_VERSION = 1.27.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From f09c6907cf770ff927bacc50842abd8bd6e64baf Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 17 Jul 2018 22:48:55 +0200 Subject: [PATCH 2160/2640] rust: bump version to 1.27.1 Bump version to 1.27.1 and backport some patches to fix build of rust-installer. Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- ...warnings-in-library-from-error-chain.patch | 25 +++++++++++++++++++ ...arnings-inside-error-chain-expansion.patch | 25 +++++++++++++++++++ package/rust/rust.hash | 4 +-- package/rust/rust.mk | 2 +- 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 package/rust/0001-Fix-warnings-in-library-from-error-chain.patch create mode 100644 package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch diff --git a/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch b/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch new file mode 100644 index 0000000000..be9d2a87c7 --- /dev/null +++ b/package/rust/0001-Fix-warnings-in-library-from-error-chain.patch @@ -0,0 +1,25 @@ +From ac3ffd15e1cf16059b4ccd90b7c816b078a621a5 Mon Sep 17 00:00:00 2001 +From: Mark Simulacrum +Date: Wed, 20 Jun 2018 19:47:00 -0600 +Subject: [PATCH] Fix warnings in library from error-chain + +Signed-off-by: Eric Le Bihan +--- + src/lib.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git rust-1.27.1.orig/src/tools/rust-installer/src/lib.rs rust-1.27.1/src/tools/rust-installer/src/lib.rs +index ff0495b..cc5e740 100644 +--- rust-1.27.1.orig/src/tools/rust-installer/src/lib.rs ++++ rust-1.27.1/src/tools/rust-installer/src/lib.rs +@@ -22,6 +22,7 @@ extern crate winapi; + #[macro_use] + extern crate lazy_static; + ++#[allow(warnings)] + mod errors { + error_chain!{ + foreign_links { +-- +2.11.0 + diff --git a/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch b/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch new file mode 100644 index 0000000000..6c332bc0ba --- /dev/null +++ b/package/rust/0001-Permit-warnings-inside-error-chain-expansion.patch @@ -0,0 +1,25 @@ +From d90cef58439bcd14426d64b16599e060cd6464f9 Mon Sep 17 00:00:00 2001 +From: Mark Simulacrum +Date: Wed, 20 Jun 2018 16:54:40 -0600 +Subject: [PATCH] Permit warnings inside error-chain expansion + +Signed-off-by: Eric Le Bihan +--- + src/main.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git rust-1.27.1.orig/src/tools/rust-installer/src/main.rs rust-1.27.1/src/tools/rust-installer/src/main.rs +index cabffb8..007ed71 100644 +--- rust-1.27.1.orig/src/tools/rust-installer/src/main.rs ++++ rust-1.27.1/src/tools/rust-installer/src/main.rs +@@ -7,6 +7,7 @@ extern crate installer; + use errors::*; + use clap::{App, ArgMatches}; + ++#[allow(warnings)] + mod errors { + error_chain!{ + links { +-- +2.11.0 + diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 495722e355..6e6b0d9b6f 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,5 +1,5 @@ -# From https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.xz.sha256 -sha256 14fcb82d5959df758aaf422539359300917217fa8420e34bd596e3fb6ed2de87 rustc-1.25.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.27.1-src.tar.xz.sha256 +sha256 948e2645057960ee1c03d9f0e8f78133a5f73d9ca9a24bc56126e395a212d25c rustc-1.27.1-src.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index af5c366495..74df7d234a 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.25.0 +RUST_VERSION = 1.27.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From d0e8f4a50d9cdd1818b8a0acea24905a43d7ca17 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 17 Jul 2018 22:48:56 +0200 Subject: [PATCH 2161/2640] cargo-bin: bump version to 0.27.0 Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/cargo-bin/cargo-bin.hash | 12 ++++++------ package/cargo-bin/cargo-bin.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash index 2dfea7c868..ad2da2bc00 100644 --- a/package/cargo-bin/cargo-bin.hash +++ b/package/cargo-bin/cargo-bin.hash @@ -1,9 +1,9 @@ -# From https://static.rust-lang.org/dist/cargo-0.26.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 bc5f5aa32d2f4ba26abf79a900231d06eecc7f1f2e125ed51bf71766550d1879 cargo-0.26.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 b14b47f59b436d07e57c5eab5bdd7378842b8ef4873d5836e08f0391e743f516 cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 aeaa5813aa6615dd7fdde6d870ca257c5b2e9da5e308f8242a08b231605bce0e cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 64c2262c0577ef1824d3d885753362d68c04f36ea85a195894894c37e2445ef5 cargo-0.27.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 3688bea3d971615d9c4b33612c20783bd9a385539aa7f754e6543c196e1bcec2 cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 d09c061daaafd735742e0b18a4da6eb656f61d4c57504d100a6ca9f766b38c71 cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 0c017bdb43..82b020a43a 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CARGO_BIN_VERSION = 0.26.0 +CARGO_BIN_VERSION = 0.27.0 CARGO_BIN_SITE = https://static.rust-lang.org/dist CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz CARGO_BIN_LICENSE = Apache-2.0 or MIT From 52344e556fa03d632f2b32276c2701218010b12f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Jul 2018 18:16:18 -0300 Subject: [PATCH 2162/2640] imx/post-image: Allow flashing u-boot-dtb.imx in the SD card Add support for flashing the u-boot-dtb.imx binary in the SD card when a target selects BR2_TARGET_UBOOT_FORMAT_DTB_IMX. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/common/imx/genimage.cfg.template | 2 +- board/freescale/common/imx/post-image.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/imx/genimage.cfg.template b/board/freescale/common/imx/genimage.cfg.template index acce058b2a..2a7036a7df 100644 --- a/board/freescale/common/imx/genimage.cfg.template +++ b/board/freescale/common/imx/genimage.cfg.template @@ -22,7 +22,7 @@ image sdcard.img { partition u-boot { in-partition-table = "no" - image = "u-boot.imx" + image = "%UBOOTBIN%" offset = 1024 } diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 264c8a4bcb..6590beda3e 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -41,13 +41,24 @@ genimage_type() fi } +uboot_image() +{ + if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then + echo "u-boot-dtb.imx" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then + echo "u-boot.imx" + fi +} + main() { local FILES="$(dtb_list) $(linux_image)" + local UBOOTBIN="$(uboot_image)" local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ + -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} rm -rf "${GENIMAGE_TMP}" From 376e7f4ee782c3308b039be33bf015bdb368c31e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Jul 2018 18:16:19 -0300 Subject: [PATCH 2163/2640] configs/imx7d-sdb: Add new defconfig Introduce imx7d-sdb_defconfig that allows booting imx7d-sdb board using U-Boot and kernel mainline instead of the vendor provided versions. Signed-off-by: Fabio Estevam [Thomas: add DEVELOPERS entry, regenerate .gitlab-ci.yml] Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + configs/imx7d-sdb_defconfig | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 configs/imx7d-sdb_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e80491cdde..de2abdd4ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,6 +147,7 @@ imx6slevk_defconfig: *defconfig imx6sx-sdb_defconfig: *defconfig imx6ulevk_defconfig: *defconfig imx6ulpico_defconfig: *defconfig +imx7d-sdb_defconfig: *defconfig imx7dpico_defconfig: *defconfig lego_ev3_defconfig: *defconfig linksprite_pcduino_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 4c2d1f291f..25c3ebe970 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -660,6 +660,7 @@ F: configs/imx6slevk_defconfig F: configs/imx6sx-sdb_defconfig F: configs/imx6ulevk_defconfig F: configs/imx6ulpico_defconfig +F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig new file mode 100644 index 0000000000..b1cc5f8523 --- /dev/null +++ b/configs/imx7d-sdb_defconfig @@ -0,0 +1,36 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 4.17 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y + +# system +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# U-Boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y + +# Filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# required tools to create the eMMC image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 8d5e0e088241382ca9554caa85555fbc3a28022b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 18 Jul 2018 11:57:42 +0200 Subject: [PATCH 2164/2640] .gitlab-ci.yml: update with the addition of olimex_a10_olinuxino_lime_defconfig Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de2abdd4ce..6385fffc70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,6 +167,7 @@ nitrogen6sx_defconfig: *defconfig nitrogen6x_defconfig: *defconfig nitrogen7_defconfig: *defconfig odroidc2_defconfig: *defconfig +olimex_a10_olinuxino_lime_defconfig: *defconfig olimex_a13_olinuxino_defconfig: *defconfig olimex_a20_olinuxino_lime2_defconfig: *defconfig olimex_a20_olinuxino_lime_defconfig: *defconfig From d5eed34f4497343669b83513a0b6075295597ee3 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Tue, 17 Jul 2018 17:46:13 -0300 Subject: [PATCH 2165/2640] cutelyst: new package A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework. Signed-off-by: Daniel Nicoletti [Thomas: add entry in DEVELOPERS file, move cmake-package invocation to the end of .mk file, select BR2_PACKAGE_OPENSSL.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/cutelyst/Config.in | 10 ++++++++++ package/cutelyst/cutelyst.hash | 3 +++ package/cutelyst/cutelyst.mk | 36 ++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 package/cutelyst/Config.in create mode 100644 package/cutelyst/cutelyst.hash create mode 100644 package/cutelyst/cutelyst.mk diff --git a/DEVELOPERS b/DEVELOPERS index 25c3ebe970..257f6ff89e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -510,6 +510,9 @@ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ +N: Daniel Nicoletti +F: package/cutelyst/ + N: Daniel Nyström F: package/e2tools/ diff --git a/package/Config.in b/package/Config.in index eedce83616..08a3eac48a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Other GUIs" source "package/kf5/Config.in" if BR2_PACKAGE_QT || BR2_PACKAGE_QT5 comment "QT libraries and helper libraries" + source "package/cutelyst/Config.in" source "package/grantlee/Config.in" source "package/qextserialport/Config.in" source "package/qjson/Config.in" diff --git a/package/cutelyst/Config.in b/package/cutelyst/Config.in new file mode 100644 index 0000000000..5a3974a454 --- /dev/null +++ b/package/cutelyst/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_CUTELYST + bool "cutelyst" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_QT5BASE_GUI + help + A C++ Web Framework built on top of Qt, using + the simple approach of Catalyst (Perl) framework. + + https://cutelyst.org diff --git a/package/cutelyst/cutelyst.hash b/package/cutelyst/cutelyst.hash new file mode 100644 index 0000000000..58645e50c2 --- /dev/null +++ b/package/cutelyst/cutelyst.hash @@ -0,0 +1,3 @@ +# Locally calculated after checking pgp signature +sha256 a5d40c5e0027982181529449ffa807492f5759c2c604cdc467e748445721ff28 cutelyst-2.5.1.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk new file mode 100644 index 0000000000..438ac091c6 --- /dev/null +++ b/package/cutelyst/cutelyst.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# cutelyst +# +################################################################################ + +CUTELYST_VERSION = 2.5.1 +CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) +CUTELYST_INSTALL_STAGING = YES +CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO +CUTELYST_LICENSE = LGPL-2.1+ +CUTELYST_LICENSE_FILES = COPYING +CUTELYST_DEPENDENCIES = qt5base + +CUTELYST_CONF_OPTS += \ + -DPLUGIN_CSRFPROTECTION=ON + +ifeq ($(BR2_PACKAGE_GRANTLEE),y) +CUTELYST_CONF_OPTS += -DPLUGIN_VIEW_GRANTLEE=ON +else +CUTELYST_CONF_OPTS += -DPLUGIN_VIEW_GRANTLEE=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBPWQUALITY),y) +CUTELYST_CONF_OPTS += -DPLUGIN_VALIDATOR_PWQUALITY=ON +else +CUTELYST_CONF_OPTS += -DPLUGIN_VALIDATOR_PWQUALITY=OFF +endif + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +CUTELYST_CONF_OPTS += -DUSE_JEMALLOC=ON +else +CUTELYST_CONF_OPTS += -DUSE_JEMALLOC=OFF +endif + +$(eval $(cmake-package)) From 39e4b467487084b866c1ae35a3e2f74867ba2404 Mon Sep 17 00:00:00 2001 From: Christoph Engelbert Date: Mon, 16 Jul 2018 18:13:03 +0300 Subject: [PATCH 2166/2640] wireless-regdb: add regulatory.db[.p7s] to /lib/firmware Starting from kernel version 4.15, Linux supports loading regulatory.db and regulatory.db.p7s files directly from /lib/firmware, without the need of crda. If the kernel can't load those files it'll fallback to using crda, but the direct way is preferred. This patch copies those those files under /lib/firmware. The use of crda shouldn't be necessary with kernels of 4.15 or later. Signed-off-by: Christoph Engelbert Signed-off-by: Thomas Petazzoni --- package/wireless-regdb/wireless-regdb.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9283a00e2..829374edcf 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -15,6 +15,10 @@ define WIRELESS_REGDB_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/lib/crda/regulatory.bin $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ $(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem + $(INSTALL) -m 644 -D -T $(@D)/regulatory.db \ + $(TARGET_DIR)/lib/firmware/regulatory.db + $(INSTALL) -m 644 -D -T $(@D)/regulatory.db.p7s \ + $(TARGET_DIR)/lib/firmware/regulatory.db.p7s endef $(eval $(generic-package)) From f57b8b5b4dd44c02b89d7525db255ba34a3037f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 18 Jul 2018 12:30:20 +0200 Subject: [PATCH 2167/2640] shairport-sync: bump to version 3.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/shairport-sync/shairport-sync.hash | 2 +- package/shairport-sync/shairport-sync.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index e0eea4c42f..076f0a2132 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 90555f1a5e05bd777741147d5c0104543d0f26d4f95b9bfd44143c818a6f50f1 shairport-sync-3.1.6.tar.gz +sha256 1fe16856ec828704b086c571038a3b2eb907a3cf0a3847ed1b721b517554659d shairport-sync-3.2.1.tar.gz diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 53ebcc581e..f1857b0dae 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.1.6 +SHAIRPORT_SYNC_VERSION = 3.2.1 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause From 157f76cc3bb051adf3aff7b6b756fe26d7683a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 18 Jul 2018 12:39:59 +0200 Subject: [PATCH 2168/2640] =?UTF-8?q?DEVELOPERS:=20remove=20some=20package?= =?UTF-8?q?s=20from=20J=C3=B6rg=20Krause?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the following packages from myself: * bctoolbox * libshout * mp4v2 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 257f6ff89e..d458c82c3e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1038,14 +1038,11 @@ N: Jörg Krause F: board/lemaker/bananapro/ F: configs/bananapro_defconfig F: package/augeas/ -F: package/bctoolbox/ F: package/freescale-imx/imx-alsa-plugins/ F: package/libopusenc/ -F: package/libshout/ F: package/libupnpp/ F: package/luv/ F: package/luvi/ -F: package/mp4v2/ F: package/mpd/ F: package/shairport-sync/ F: package/swupdate/ From 080d3f793f3f5273a882de1334508e0c1668caf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 18 Jul 2018 12:40:00 +0200 Subject: [PATCH 2169/2640] =?UTF-8?q?DEVELOPERS:=20add=20bluez-alsa=20to?= =?UTF-8?q?=20J=C3=B6rg=20Krause?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d458c82c3e..3f92cab4fd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1038,6 +1038,7 @@ N: Jörg Krause F: board/lemaker/bananapro/ F: configs/bananapro_defconfig F: package/augeas/ +F: package/bluez-alsa/ F: package/freescale-imx/imx-alsa-plugins/ F: package/libopusenc/ F: package/libupnpp/ From 3ab5dfb548a840debe6e4e767ea2ea10e9c6e93a Mon Sep 17 00:00:00 2001 From: David Owens Date: Thu, 12 Jul 2018 11:37:34 -0500 Subject: [PATCH 2170/2640] libglib2: Avoid absolute path to python in shebang When the output directory is nested under a long path name, calling the gdbus-codegen, glib-genmarshal, or glib-mkenums scripts throws the error: > '/usr/bin/env: /...: No such file or directory' This is because libglib2 uses the absolute path to the python interpreter for its shebang statements, and shebangs have a max length of 127 chars[1]. A long absolute path will be cut off and appear as a missing file. Since the host Python is present in the $PATH passed to all packages, we can copy the workaround from Yocto and just use the python interpreter in $PATH[2]. However, 'python' is used instead of 'python3' as the scripts are compatible with both. [1] https://linux.die.net/man/2/execve [2] http://cgit.openembedded.org/openembedded-core/commit/?id=eef7883587acc933d6f34b559ec03ff84d18573b Signed-off-by: Brandon Maier Signed-off-by: David Owens Signed-off-by: Thomas Petazzoni --- ...dcode-python-path-into-various-tools.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch diff --git a/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch b/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch new file mode 100644 index 0000000000..fa558e6dbf --- /dev/null +++ b/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch @@ -0,0 +1,48 @@ +From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 3 Oct 2017 10:45:55 +0300 +Subject: [PATCH] Do not hardcode python path into various tools + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +Fetch from: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch?id=eef7883587acc933d6f34b559ec03ff84d18573b +Signed-off-by: David Owens +--- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- + gobject/glib-genmarshal.in | 2 +- + gobject/glib-mkenums.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in +index 8050981..e693ef3 100644 +--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in ++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python + + # GDBus - GLib D-Bus Library + # +diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in +index 09e8408..b2f9d99 100755 +--- a/gobject/glib-genmarshal.in ++++ b/gobject/glib-genmarshal.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python + + # pylint: disable=too-many-lines, missing-docstring, invalid-name + +diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in +index d4bfd11..051fce4 100755 +--- a/gobject/glib-mkenums.in ++++ b/gobject/glib-mkenums.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!/usr/bin/env python + + # If the code below looks horrible and unpythonic, do not panic. + # +-- +2.14.1 + From ec4ca0ddf974aafa60acc00a89ce0b962bd701d4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 18 Jul 2018 14:07:54 +0200 Subject: [PATCH 2171/2640] package/binutils: bump to version 2.31.1 >From the release note: This is a point release over the previous 2.31 version, which was necessary as a source file was accidentally omitted from that release. This release also contains a fix for PR gold/23409 where the gold linker could end up creating duplicate copies of some symbols. https://sourceware.org/ml/binutils/2018-07/msg00286.html Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/binutils/{2.31 => 2.31.1}/0001-sh-conf.patch | 0 package/binutils/{2.31 => 2.31.1}/0002-ld-makefile.patch | 0 .../{2.31 => 2.31.1}/0003-check-ldrunpath-length.patch | 0 .../{2.31 => 2.31.1}/0004-add-sysroot-fix-from-bug-3049.patch | 0 .../{2.31 => 2.31.1}/0005-poison-system-directories.patch | 0 ...Refactored-location-where-GOT-information-is-collect.patch | 0 ...Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch | 0 ...Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch | 0 ...PLT-information-was-still-being-generated-when-symbo.patch | 0 package/binutils/Config.in.host | 4 ++-- package/binutils/binutils.hash | 2 +- 11 files changed, 3 insertions(+), 3 deletions(-) rename package/binutils/{2.31 => 2.31.1}/0001-sh-conf.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0002-ld-makefile.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0003-check-ldrunpath-length.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0004-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0005-poison-system-directories.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0006-Refactored-location-where-GOT-information-is-collect.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch (100%) rename package/binutils/{2.31 => 2.31.1}/0009-PLT-information-was-still-being-generated-when-symbo.patch (100%) diff --git a/package/binutils/2.31/0001-sh-conf.patch b/package/binutils/2.31.1/0001-sh-conf.patch similarity index 100% rename from package/binutils/2.31/0001-sh-conf.patch rename to package/binutils/2.31.1/0001-sh-conf.patch diff --git a/package/binutils/2.31/0002-ld-makefile.patch b/package/binutils/2.31.1/0002-ld-makefile.patch similarity index 100% rename from package/binutils/2.31/0002-ld-makefile.patch rename to package/binutils/2.31.1/0002-ld-makefile.patch diff --git a/package/binutils/2.31/0003-check-ldrunpath-length.patch b/package/binutils/2.31.1/0003-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/2.31/0003-check-ldrunpath-length.patch rename to package/binutils/2.31.1/0003-check-ldrunpath-length.patch diff --git a/package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/2.31/0004-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/2.31/0005-poison-system-directories.patch b/package/binutils/2.31.1/0005-poison-system-directories.patch similarity index 100% rename from package/binutils/2.31/0005-poison-system-directories.patch rename to package/binutils/2.31.1/0005-poison-system-directories.patch diff --git a/package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch b/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch similarity index 100% rename from package/binutils/2.31/0006-Refactored-location-where-GOT-information-is-collect.patch rename to package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch diff --git a/package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch similarity index 100% rename from package/binutils/2.31/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch rename to package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch diff --git a/package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch similarity index 100% rename from package/binutils/2.31/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch rename to package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch diff --git a/package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch b/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch similarity index 100% rename from package/binutils/2.31/0009-PLT-information-was-still-being-generated-when-symbo.patch rename to package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 982456332a..21dc84e498 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -20,7 +20,7 @@ config BR2_BINUTILS_VERSION_2_30_X bool "binutils 2.30" config BR2_BINUTILS_VERSION_2_31_X - bool "binutils 2.31" + bool "binutils 2.31.1" config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.29)" @@ -33,7 +33,7 @@ config BR2_BINUTILS_VERSION default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X - default "2.31" if BR2_BINUTILS_VERSION_2_31_X + default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 67f2a99a68..d97f55da8a 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,7 +2,7 @@ sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d binutils-2.28.1.tar.xz sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz -sha512 3448a71c42d790569c1159c1042aa520b2d8ac8af7506fb1f2a4199dfb13b39f1c2271a5cb3a643d10c7d8a388a73f190e90503d4793a016da7893473aa1c635 binutils-2.31.tar.xz +sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz # Locally calculated (fetched from Github) sha512 bea88164ed48733bad63393fe702e12e651efd113aa4f3fe2e253e05c4c1e5da20b5a99333f0b5528df6d32ce806f799211c568e1916845a87999901dde28817 binutils-arc-2018.03.tar.gz From 5a92bb63bf0657f24694b8c8c24dff04f6e96dca Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 18 Jul 2018 21:53:03 +0300 Subject: [PATCH 2172/2640] bind: fix build with openssl The bind configure.in uses AC_TRY_RUN that is not compatible with cross compile. Disable eddsa unconditionally since it requires a newer OpenSSL version than we currently have. Enable aes; this is always supported in current OpenSSL versions. Fixes: http://autobuild.buildroot.net/results/3ed/3edb1659954b00401b68ffc7e1c8b3c29581c0e4/ http://autobuild.buildroot.net/results/025/025e377b51b39ba34647636ad0d0661a3cb95572/ http://autobuild.buildroot.net/results/725/7250564e780e43e793ae6c8c526985e5519681f4/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/bind/bind.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index c4429ef6cc..e71eddcd7f 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -61,7 +61,9 @@ BIND_CONF_ENV += \ ac_cv_func_EVP_sha512=yes BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \ - --with-ecdsa=yes + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes From ba3c7e806d3ebeb1fa66fe7ba0ee9a70447b49b0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 18 Jul 2018 21:53:04 +0300 Subject: [PATCH 2173/2640] bind: fix build with zlib The bind configure.in now checks for "${with_zlib}/include/zlib.h". Remove the redundant "include/". Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e71eddcd7f..d478a7f6e1 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -33,7 +33,7 @@ BIND_CONF_OPTS = \ --enable-filter-aaaa ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr/include +BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr BIND_DEPENDENCIES += zlib else BIND_CONF_OPTS += --without-zlib From d8c0faa980df32622d5f1964892ba84fa4f17a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Th=C3=A9bault?= Date: Thu, 12 Jul 2018 06:52:13 +0000 Subject: [PATCH 2174/2640] support/misc/toolchainfile.cmake.in: use TARGET_LDFLAGS for shared and module libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With cmake packages, we are only using TARGET_LDFLAGS for executables and not for shared libraries. This patch adds CMAKE_SHARED_LINKER_FLAGS and CMAKE_MODULE_LINKER_FLAGS to the cmake toolchain file so that buildroot TARGET_LDFLAGS are used for shared and module libraries. Signed-off-by: Damien Thébault Signed-off-by: Thomas Petazzoni --- support/misc/toolchainfile.cmake.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 1f5d2371ed..6f3c8ca971 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -45,6 +45,8 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") +set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") +set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") set(CMAKE_INSTALL_SO_NO_EXE 0) From a534676dc334879f69a9834aaf47ed440e80a381 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:04 +0200 Subject: [PATCH 2175/2640] board/freescale/common/imx: make imx8-bootloader-prepare more generic Allow user to override the hardcoded dtb name by using BR2_ROOTFS_POST_SCRIPT_ARGS. The only user of this script, configs/freescale_imx8mqevk, is updated accordingly. Cc: Fabio Estevam Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 8 ++++++-- configs/freescale_imx8mqevk_defconfig | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index 2648147ab0..cc12666ae6 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -2,9 +2,13 @@ main () { - # Currently we support imx8mqevk. + UBOOT_DTB=$2 + if [ ! -e "$UBOOT_DTB" ]; then + echo "ERROR: couldn't find dtb: $UBOOT_DTB" + exit 1 + fi cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${BINARIES_DIR}/fsl-imx8mq-evk.dtb > ${BINARIES_DIR}/u-boot.its + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index f48e4f78e4..a6e9b940b5 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -3,6 +3,7 @@ BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" From 3ef69d824547caabc51b1bfa92948427419a4803 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:05 +0200 Subject: [PATCH 2176/2640] board/boundarydevices/common/post-build.sh: fix U-Boot naming The upgrade.cmd script expects the binary to be named u-boot.. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/boundarydevices/common/post-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/board/boundarydevices/common/post-build.sh b/board/boundarydevices/common/post-build.sh index b8abb26540..d97c8d7b6a 100755 --- a/board/boundarydevices/common/post-build.sh +++ b/board/boundarydevices/common/post-build.sh @@ -6,6 +6,7 @@ # BOARD_DIR="$(dirname $0)" +UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/.*\"\(.*\)\"/\1/')" # bd u-boot looks for standard bootscript install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/ @@ -14,9 +15,9 @@ $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command -if [ -e $BINARIES_DIR/u-boot.imx ]; -then - install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx +if [ -e $BINARIES_DIR/u-boot.imx ]; then + install -D -m 0644 $BINARIES_DIR/u-boot.imx \ + $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr # legacy 6x_upgrade script From c1f914fd43aba992e96ee2bcd65604ffaace1e7e Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:06 +0200 Subject: [PATCH 2177/2640] board/boundarydevices: remove obsolete u-boot scripts 6x_bootscript/6x_upgrade have been deprecated for more than a year. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .../boundarydevices/common/6x_bootscript.txt | 131 ------------------ board/boundarydevices/common/6x_upgrade.txt | 69 --------- board/boundarydevices/common/post-build.sh | 6 - 3 files changed, 206 deletions(-) delete mode 100644 board/boundarydevices/common/6x_bootscript.txt delete mode 100644 board/boundarydevices/common/6x_upgrade.txt diff --git a/board/boundarydevices/common/6x_bootscript.txt b/board/boundarydevices/common/6x_bootscript.txt deleted file mode 100644 index af5822a88b..0000000000 --- a/board/boundarydevices/common/6x_bootscript.txt +++ /dev/null @@ -1,131 +0,0 @@ -setenv bootargs '' - -if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then - a_script=0x80800000 - a_zImage=0x80800000 - a_fdt=0x83000000 - m4='' - if itest.s "x1" == "x$m4enabled" ; then - run m4boot; - m4='-m4'; - fi -else - a_script=0x10800000 - a_zImage=0x10800000 - a_fdt=0x13000000 -fi - -setenv initrd_high 0xffffffff -if itest.s "x" == "x${dtbname}" ; then - if itest.s x6SOLO == "x${cpu}" ; then - dtbname=imx6dl-${board}.dtb; - elif itest.s x6DL == "x${cpu}" ; then - dtbname=imx6dl-${board}.dtb; - elif itest.s x6QP == "x${cpu}" ; then - dtbname=imx6qp-${board}.dtb; - elif itest.s x6SX == "x${cpu}" ; then - dtbname=imx6sx-${board}${m4}.dtb; - elif itest.s x7D == "x${cpu}" ; then - dtbname=imx7d-${board}${m4}.dtb; - else - dtbname=imx6q-${board}.dtb; - fi -fi - -if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then - env import -t ${a_script} ${filesize} -fi - -if itest.s x == x${bootdir} ; then - bootdir=/boot/ -fi - -if itest.s x${bootpart} == x ; then - bootpart=1 -fi - -if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then - fdt addr ${a_fdt} - setenv fdt_high 0xffffffff -else - echo "!!!! Error loading ${bootdir}${dtbname}"; - exit; -fi - -cmd_xxx_present= -fdt resize -if itest.s "x" != "x${cmd_custom}" ; then - run cmd_custom - cmd_xxx_present=1; -fi - -if itest.s "x" != "x${cmd_hdmi}" ; then - run cmd_hdmi - cmd_xxx_present=1; - if itest.s x == x${allow_noncea} ; then - setenv bootargs ${bootargs} mxc_hdmi.only_cea=1; - echo "only CEA modes allowed on HDMI port"; - else - setenv bootargs ${bootargs} mxc_hdmi.only_cea=0; - echo "non-CEA modes allowed on HDMI, audio may be affected"; - fi -fi - -if itest.s "x" != "x${cmd_lcd}" ; then - run cmd_lcd - cmd_xxx_present=1; -fi -if itest.s "x" != "x${cmd_lvds}" ; then - run cmd_lvds - cmd_xxx_present=1; -fi -if itest.s "x" != "x${cmd_lvds2}" ; then - run cmd_lvds2 - cmd_xxx_present=1; -fi - -if itest.s "x" == "x${cmd_xxx_present}" ; then - echo "!!!!!!!!!!!!!!!!" - echo "warning: your u-boot may be outdated, please upgrade" - echo "!!!!!!!!!!!!!!!!" -fi - -setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc" - -if test "sata" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; -elif test "usb" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; -else - setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bootpart}" -fi - -if itest.s "x" != "x${disable_giga}" ; then - setenv bootargs ${bootargs} fec.disable_giga=1 -fi - -if itest.s "x" != "x${wlmac}" ; then - setenv bootargs ${bootargs} wlcore.mac=${wlmac} - setenv bootargs ${bootargs} wlan.mac=${wlmac} -fi - -if itest.s "x" != "x${gpumem}" ; then - setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem} -fi - -if itest.s "x" != "x${cma}" ; then - setenv bootargs ${bootargs} cma=${cma} -fi - -if itest.s "x" != "x${show_fdt}" ; then - fdt print / -fi - -if itest.s "x" != "x${show_env}" ; then - printenv -fi - -if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then - bootz ${a_zImage} - ${a_fdt} -fi -echo "Error loading kernel image" diff --git a/board/boundarydevices/common/6x_upgrade.txt b/board/boundarydevices/common/6x_upgrade.txt deleted file mode 100644 index e012ff97ac..0000000000 --- a/board/boundarydevices/common/6x_upgrade.txt +++ /dev/null @@ -1,69 +0,0 @@ -if itest.s a$uboot_defconfig == a; then - echo "Please set uboot_defconfig to the appropriate value" - exit -fi - -offset=0x400 -a_uImage1=0x12000000 -a_uImage2=0x12400000 - -if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then - a_uImage1=0x82000000 - a_uImage2=0x82400000 -fi - -setenv stdout serial,vga -echo "check U-Boot" ; - -if load ${dtype} ${disk}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then -else - echo "No U-Boot image found on SD card" ; - exit -fi -echo "read $filesize bytes from SD card" ; -if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then - echo "probed SPI ROM" ; -else - echo "Error initializing EEPROM" ; - exit -fi ; -if sf read ${a_uImage2} $offset $filesize ; then -else - echo "Error reading boot loader from EEPROM" ; - exit -fi -if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then - echo "------- U-Boot versions match" ; - exit -fi -echo "Need U-Boot upgrade" ; -echo "Program in 5 seconds" ; -for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; -done -echo "erasing" ; -sf erase 0 0xC0000 ; - -# two steps to prevent bricking -echo "programming" ; -setexpr a1 ${a_uImage1} + 0x400 -setexpr o1 ${offset} + 0x400 -setexpr s1 ${filesize} - 0x400 -sf write ${a1} ${o1} ${s1} ; -sf write ${a_uImage1} $offset 0x400 ; - -echo "verifying" ; -if sf read ${a_uImage2} $offset $filesize ; then -else - echo "Error re-reading EEPROM" ; - exit -fi -if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then -else - echo "Read verification error" ; - exit -fi -while echo "---- U-Boot upgraded. reset" ; do - sleep 120 -done diff --git a/board/boundarydevices/common/post-build.sh b/board/boundarydevices/common/post-build.sh index d97c8d7b6a..e30efe8b88 100755 --- a/board/boundarydevices/common/post-build.sh +++ b/board/boundarydevices/common/post-build.sh @@ -10,9 +10,6 @@ UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/ # bd u-boot looks for standard bootscript install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/ -# legacy 6x_bootscript script -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ --n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command if [ -e $BINARIES_DIR/u-boot.imx ]; then @@ -20,7 +17,4 @@ if [ -e $BINARIES_DIR/u-boot.imx ]; then $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr - # legacy 6x_upgrade script - $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "upgrade script" -d $BOARD_DIR/6x_upgrade.txt $TARGET_DIR/6x_upgrade fi From 3d34f36806398a5d469f440eaf897b40f1336206 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:07 +0200 Subject: [PATCH 2178/2640] board/boundarydevices: add i.MX8MQ support to post-build.sh - Use proper ARCH for mkimage command - Use different U-Boot binary name depending on ARCH Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/boundarydevices/common/post-build.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/board/boundarydevices/common/post-build.sh b/board/boundarydevices/common/post-build.sh index e30efe8b88..161ec0643f 100755 --- a/board/boundarydevices/common/post-build.sh +++ b/board/boundarydevices/common/post-build.sh @@ -8,13 +8,22 @@ BOARD_DIR="$(dirname $0)" UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/.*\"\(.*\)\"/\1/')" +if grep -Eq "^BR2_aarch64=y$" ${BR2_CONFIG}; then + MKIMAGE_ARCH=arm64 + UBOOT_BINARY=imx8-boot-sd.bin +else + MKIMAGE_ARCH=arm + UBOOT_BINARY=u-boot.imx +fi + # bd u-boot looks for standard bootscript -install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/ +$HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \ + -n "boot script" -d $BOARD_DIR/boot.cmd $TARGET_DIR/boot/boot.scr # u-boot / update script for bd upgradeu command -if [ -e $BINARIES_DIR/u-boot.imx ]; then - install -D -m 0644 $BINARIES_DIR/u-boot.imx \ +if [ -e $BINARIES_DIR/$UBOOT_BINARY ]; then + install -D -m 0644 $BINARIES_DIR/$UBOOT_BINARY \ $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG - $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr + $HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \ + -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr fi From bdc2246149bdddc96aa93cd43fcf14412353cf3e Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:08 +0200 Subject: [PATCH 2179/2640] board/boundarydevices: add i.MX8MQ support to u-boot scripts - Update RAM address - Update kernel image name for ARM64 - Update U-Boot boot command for ARM64 - Remove obsolete cmd_xxx_present check - Remove obsolete wlan.mac parameter - Add cmd_mipi command for MIPI-DSI interface Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/boundarydevices/common/boot.cmd | 40 +++++++------- board/boundarydevices/common/upgrade.cmd | 69 +++++++++++++++++++++--- 2 files changed, 81 insertions(+), 28 deletions(-) diff --git a/board/boundarydevices/common/boot.cmd b/board/boundarydevices/common/boot.cmd index 7602b0139e..760363da9b 100644 --- a/board/boundarydevices/common/boot.cmd +++ b/board/boundarydevices/common/boot.cmd @@ -2,6 +2,8 @@ setenv bootargs '' setenv initrd_high 0xffffffff m4='' +kernelimage=zImage +bootcommand=bootz a_base=0x10000000 if itest.s x51 == "x${imx_cpu}" ; then a_base=0x90000000 @@ -9,10 +11,14 @@ elif itest.s x53 == "x${imx_cpu}"; then a_base=0x70000000 elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x80000000 - if itest.s "x1" == "x$m4enabled" ; then - run m4boot; - m4='-m4'; - fi +elif itest.s x8MQ == "x${imx_cpu}"; then + a_base=0x40000000 + kernelimage=Image + bootcommand=booti +fi +if itest.s "x1" == "x${m4enabled}" ; then + run m4boot; + m4='-m4'; fi setexpr a_script ${a_base} + 0x00800000 @@ -39,10 +45,12 @@ if itest.s "x" == "x${fdt_file}" ; then fdt_file=imx6sx-${board}${m4}.dtb; elif itest.s x7D == "x${imx_cpu}" ; then fdt_file=imx7d-${board}${m4}.dtb; + elif itest.s x8MQ == "x${imx_cpu}" ; then + fdt_file=imx8mq-${board}${m4}.dtb; elif itest.s x51 == "x${imx_cpu}" ; then - fdt_file=imx51-${board}${m4}.dtb; + fdt_file=imx51-${board}.dtb; elif itest.s x53 == "x${imx_cpu}" ; then - fdt_file=imx53-${board}${m4}.dtb; + fdt_file=imx53-${board}.dtb; else fdt_file=imx6q-${board}.dtb; fi @@ -66,16 +74,12 @@ else exit; fi -cmd_xxx_present= fdt resize if itest.s "x" != "x${cmd_custom}" ; then run cmd_custom - cmd_xxx_present=1; fi - if itest.s "x" != "x${cmd_hdmi}" ; then run cmd_hdmi - cmd_xxx_present=1; if itest.s x == x${allow_noncea} ; then setenv bootargs ${bootargs} mxc_hdmi.only_cea=1; echo "only CEA modes allowed on HDMI port"; @@ -87,25 +91,18 @@ fi if itest.s "x" != "x${cmd_lcd}" ; then run cmd_lcd - cmd_xxx_present=1; fi if itest.s "x" != "x${cmd_lcd2}" ; then run cmd_lcd2 - cmd_xxx_present=1; fi if itest.s "x" != "x${cmd_lvds}" ; then run cmd_lvds - cmd_xxx_present=1; fi if itest.s "x" != "x${cmd_lvds2}" ; then run cmd_lvds2 - cmd_xxx_present=1; fi - -if itest.s "x" == "x${cmd_xxx_present}" ; then - echo "!!!!!!!!!!!!!!!!" - echo "warning: your u-boot may be outdated, please upgrade" - echo "!!!!!!!!!!!!!!!!" +if itest.s "x" != "x${cmd_mipi}" ; then + run cmd_mipi fi if test "sata" = "${devtype}" ; then @@ -126,7 +123,6 @@ fi if itest.s "x" != "x${wlmac}" ; then setenv bootargs ${bootargs} wlcore.mac=${wlmac} - setenv bootargs ${bootargs} wlan.mac=${wlmac} fi if itest.s "x" != "x${gpumem}" ; then @@ -149,7 +145,7 @@ if itest.s "x" != "x${show_env}" ; then printenv fi -if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}zImage ; then - bootz ${a_zImage} - ${a_fdt} +if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}${kernelimage} ; then + ${bootcommand} ${a_zImage} - ${a_fdt} fi echo "Error loading kernel image" diff --git a/board/boundarydevices/common/upgrade.cmd b/board/boundarydevices/common/upgrade.cmd index 249185dba4..24b705eb76 100644 --- a/board/boundarydevices/common/upgrade.cmd +++ b/board/boundarydevices/common/upgrade.cmd @@ -7,6 +7,7 @@ offset=0x400 erase_size=0xC0000 qspi_offset=0x0 a_base=0x12000000 +block_size=0x200 if itest.s x51 == "x${imx_cpu}"; then a_base=0x92000000 @@ -14,6 +15,9 @@ elif itest.s x53 == "x${imx_cpu}"; then a_base=0x72000000 elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x82000000 +elif itest.s x8MQ == "x${imx_cpu}"; then + a_base=0x42000000 + offset=0x8400 fi qspi_match=1 @@ -25,6 +29,54 @@ setexpr a_script ${a_base} setenv stdout serial,vga +if itest.s "x${sfname}" == "x" ; then +# U-Boot resides in (e)MMC +if itest.s "x${env_dev}" == "x" || itest.s "x${env_part}" == "x"; then + echo "Please set env_dev/part to the appropriate values" + exit +fi + +# Load bootloader binary for this board +if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then +else + echo "File u-boot.$uboot_defconfig not found on SD card" ; + exit +fi + +# Compute block count for filesize and offset +setexpr cntoffset ${offset} / ${block_size} +setexpr cntfile ${filesize} / ${block_size} +# Add 1 in case the $filesize is not a multiple of $block_size +setexpr cntfile ${cntfile} + 1 + +# Select media partition (if different from main partition) +mmc dev ${env_dev} ${env_part} + +# Read and compare current U-Boot +mmc read ${a_uImage2} ${cntoffset} ${cntfile} +if cmp.b ${a_uImage1} ${a_uImage2} ${filesize} ; then + echo "------- U-Boot versions match" ; + exit ; +fi + +echo "Need U-Boot upgrade" ; +echo "Program in 5 seconds" ; +for n in 5 4 3 2 1 ; do + echo $n ; + sleep 1 ; +done +mmc write ${a_uImage1} ${cntoffset} ${cntfile} + +# Make sure to boot from the proper partition +if itest ${env_part} != 0 ; then + mmc partconf ${env_dev} 1 ${env_part} 0 +fi + +# Switch back to main eMMC partition (to avoid confusion) +mmc dev ${env_dev} + +else +# U-Boot resides in NOR flash if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then echo "probed SPI ROM" ; else @@ -32,9 +84,13 @@ else exit fi +if itest.s "x${sfname}" == "xat45db041d" ; then + erase_size=0x7e000 +fi + if itest.s x7D == "x${imx_cpu}"; then echo "check qspi parameter block" ; - if ${fs}load ${devtype} ${devnum}:1 ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then + if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then else echo "parameter file qspi-${sfname}.${uboot_defconfig} not found on SD card" exit @@ -63,7 +119,7 @@ fi echo "check U-Boot" ; -if ${fs}load ${devtype} ${devnum}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then +if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then else echo "File u-boot.$uboot_defconfig not found on SD card" ; exit @@ -80,7 +136,7 @@ if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then if itest.s "${qspi_match}" == "1" ; then echo "------- upgrade not needed" ; if itest.s "x" != "x${next}" ; then - if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then + if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then source ${a_script} else echo "${next} not found on SD card" @@ -142,13 +198,14 @@ if itest.s x7D == "x${imx_cpu}"; then fi if itest.s "x" != "x${next}" ; then - if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then + if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then source ${a_script} else - echo "${next} not found on ${devtype} ${devnum}" + echo "${next} not found on ${devtype} ${devnum}:${distro_bootpart}" fi fi +fi -while echo "---- U-Boot upgraded. reset" ; do +while echo "---- U-Boot upgraded. Please reset the board" ; do sleep 120 done From 69fa9372977221243da3f1133ec30a4e3b9ff568 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 19 Jul 2018 12:31:09 +0200 Subject: [PATCH 2180/2640] configs/nitrogen8m: Add new defconfig NXP i.MX8MQ based SBC with 2GB of LPDDR4 and 8GB eMMC. More details on the platform here: https://boundarydevices.com/product/nitrogen8m Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + configs/nitrogen8m_defconfig | 54 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 configs/nitrogen8m_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6385fffc70..ab22a1921c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,6 +166,7 @@ nexbox_a95x_defconfig: *defconfig nitrogen6sx_defconfig: *defconfig nitrogen6x_defconfig: *defconfig nitrogen7_defconfig: *defconfig +nitrogen8m_defconfig: *defconfig odroidc2_defconfig: *defconfig olimex_a10_olinuxino_lime_defconfig: *defconfig olimex_a13_olinuxino_defconfig: *defconfig diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig new file mode 100644 index 0000000000..9b758f0b97 --- /dev/null +++ b/configs/nitrogen8m_defconfig @@ -0,0 +1,54 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y + +# System +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-nitrogen8m.dtb" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# DDR training binaries +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# ARM Trusted Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_4.9.51_imx8m_ga +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/67c68675.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_v2017.03_4.9.51_imx8m_ga +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/b661d854.tar.gz" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_SPL=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +# Latest revision of branch boundary-imx_4.9.x_2.0.0_ga +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/7777e14d.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4" From cfe63dcd632fed002543f51cb0ff44b6a1eaa63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Burtin?= Date: Thu, 19 Jul 2018 15:54:08 +0200 Subject: [PATCH 2181/2640] nghttp2: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nghttp2 is an implementation of HTTP/2 and its header compression algorithm HPACK in C. Signed-off-by: Michaël Burtin Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/nghttp2/Config.in | 7 +++++++ package/nghttp2/nghttp2.hash | 3 +++ package/nghttp2/nghttp2.mk | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/nghttp2/Config.in create mode 100644 package/nghttp2/nghttp2.hash create mode 100644 package/nghttp2/nghttp2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3f92cab4fd..3605032da3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -157,6 +157,7 @@ F: package/sysdig/ N: Anisse Astier F: package/go/ +F: package/nghttp2/ N: Anthony Viallard F: package/gnuplot/ diff --git a/package/Config.in b/package/Config.in index 08a3eac48a..f5a17492c7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1481,6 +1481,7 @@ menu "Networking" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" source "package/neon/Config.in" + source "package/nghttp2/Config.in" source "package/norm/Config.in" source "package/nss-mdns/Config.in" source "package/nss-pam-ldapd/Config.in" diff --git a/package/nghttp2/Config.in b/package/nghttp2/Config.in new file mode 100644 index 0000000000..03fe71d097 --- /dev/null +++ b/package/nghttp2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_NGHTTP2 + bool "nghttp2" + help + nghttp2 is an implementation of HTTP/2 and its header + compression algorithm HPACK in C. + + https://nghttp2.org/ diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash new file mode 100644 index 0000000000..d000fd56c5 --- /dev/null +++ b/package/nghttp2/nghttp2.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f75e8f228217f23aa5eabfbab140e061cda00b7c21e34c891ecfb248d663303f nghttp2-1.32.0.tar.gz +sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk new file mode 100644 index 0000000000..20bfee75a3 --- /dev/null +++ b/package/nghttp2/nghttp2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# nghttp2 +# +################################################################################ + +NGHTTP2_VERSION = 1.32.0 +NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) +NGHTTP2_LICENSE = MIT +NGHTTP2_LICENSE_FILES = COPYING +NGHTTP2_INSTALL_STAGING = YES +NGHTTP2_DEPENDENCIES = host-pkgconf +NGHTTP2_CONF_OPTS = --enable-lib-only + +define NGHTTP2_INSTALL_CLEAN_HOOK + # Remove fetch-ocsp-response script unused by library + $(Q)$(RM) -rf $(TARGET_DIR)/usr/share/nghttp2 +endef + +NGHTTP2_POST_INSTALL_TARGET_HOOKS += NGHTTP2_INSTALL_CLEAN_HOOK + +$(eval $(autotools-package)) From 9b733d45f4b1b3b8244cfc7513b3d680da3d163d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Burtin?= Date: Thu, 19 Jul 2018 15:54:09 +0200 Subject: [PATCH 2182/2640] libcurl: add nghttp2 optional dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The nghttp2 package has recently been added to buildroot. When enabled, this adds support for HTTP2 to libcurl. By default, libcurl configure script will enable HTTP2 if the library is found using pkg-config. Adding this option makes the build consistent. Signed-off-by: Michaël Burtin Signed-off-by: Anisse Astier Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index c9b325c672..e0ecb081b7 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -88,6 +88,13 @@ else LIBCURL_CONF_OPTS += --without-brotli endif +ifeq ($(BR2_PACKAGE_NGHTTP2),y) +LIBCURL_DEPENDENCIES += nghttp2 +LIBCURL_CONF_OPTS += --with-nghttp2 +else +LIBCURL_CONF_OPTS += --without-nghttp2 +endif + define LIBCURL_FIX_DOT_PC printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in endef From 9f803332a722c369987c60da06871d100d106e82 Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Thu, 19 Jul 2018 13:12:36 +1000 Subject: [PATCH 2183/2640] busybox: Update to 1.29.1 Includes fixes to sendmail and wget. Signed-off-by: Samuel Mendoza-Jonas Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 26194be3a9..11b9565df9 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,3 +1,3 @@ -# From https://busybox.net/downloads/busybox-1.29.0.tar.bz2.sha256 -sha256 c8115612f0be640644e7c35098766ddaac4a88b773c4c4f0e43564982f660c82 busybox-1.29.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.29.1.tar.bz2.sha256 +sha256 fc250730ea16d28839bfecda3c431683fa6bd4273ffca6b632cbeb3556c914c3 busybox-1.29.1.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 5266f844b6..3be6cbc7b1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.29.0 +BUSYBOX_VERSION = 1.29.1 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From 717cda6e281c46c7a406de4c0692fe9b05665584 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 19 Jul 2018 14:33:34 -0300 Subject: [PATCH 2184/2640] linux: bump default to version 4.17.8 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index b5f1577654..8ca77c0209 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 612db70febc2c2c0b175c803d6160ffdf7cd2e90 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 19 Jul 2018 14:33:35 -0300 Subject: [PATCH 2185/2640] linux-headers: bump 4.{4, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 909e74d49e..56fde5f456 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,7 +258,7 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.141" if BR2_KERNEL_HEADERS_4_4 + default "4.4.142" if BR2_KERNEL_HEADERS_4_4 default "4.9.113" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 @@ -267,5 +267,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.56" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.17" if BR2_KERNEL_HEADERS_4_16 - default "4.17.7" if BR2_KERNEL_HEADERS_4_17 + default "4.17.8" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 335be08fcf4d8e54d124e19c944bc181b2e7b8ee Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 19 Jul 2018 13:59:21 -0300 Subject: [PATCH 2186/2640] util-linux: bump to version 2.32.1 Small improvements and bug fixes. See change log at http://www.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32.1-ChangeLog Change-Id: Ia337a51bb72fc25ca7867eeb88d8ed86bcfe7be8 Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 8f93d793c8..1b7d6db45a 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.32/sha256sums.asc -sha256 6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734 util-linux-2.32.tar.xz +sha256 86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2 util-linux-2.32.1.tar.xz # License files, locally calculated sha256 1e4b65802b0df8115395c697029d03339f983d451a473a08643309c684410d9a README.licensing sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPLv2 diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 76f4b97f5f..d6b3c33b26 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -5,7 +5,7 @@ ################################################################################ UTIL_LINUX_VERSION_MAJOR = 2.32 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From 3b502b90f040cf9e62015e3dce7f92a6fb56e69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 20 Jul 2018 08:40:49 +0200 Subject: [PATCH 2187/2640] wavemon: bump to version 0.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add hash for license file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/wavemon/wavemon.hash | 3 ++- package/wavemon/wavemon.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/wavemon/wavemon.hash b/package/wavemon/wavemon.hash index 69bd2b4bf1..99d7382450 100644 --- a/package/wavemon/wavemon.hash +++ b/package/wavemon/wavemon.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c9ea57da4f8161401bcaaca17b37bcdf16ffb88baad2370afed2e15a7f71af73 wavemon-v0.8.1.tar.gz +sha256 4199e2ad11a036f4289f5ad42a8b0fe518f2b5ff77447f4c366dbcf3f23e91d5 wavemon-v0.8.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/wavemon/wavemon.mk b/package/wavemon/wavemon.mk index e87ab7a368..0639c3450e 100644 --- a/package/wavemon/wavemon.mk +++ b/package/wavemon/wavemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVEMON_VERSION = v0.8.1 +WAVEMON_VERSION = v0.8.2 WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION)) WAVEMON_LICENSE = GPL-3.0+ WAVEMON_LICENSE_FILES = COPYING From e40cdee9ccfaf279465826af8f68f611fd6afcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 20 Jul 2018 09:04:18 +0200 Subject: [PATCH 2188/2640] bluez-alsa: bump to version 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add optional build of rfcomm which requires readline. Update license hash as authorship has been updated in the license file. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/bluez-alsa/Config.in | 6 ++++++ package/bluez-alsa/bluez-alsa.hash | 4 ++-- package/bluez-alsa/bluez-alsa.mk | 9 ++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package/bluez-alsa/Config.in b/package/bluez-alsa/Config.in index 1753da48f9..e52933f07c 100644 --- a/package/bluez-alsa/Config.in +++ b/package/bluez-alsa/Config.in @@ -26,6 +26,12 @@ config BR2_PACKAGE_BLUEZ_ALSA_HCITOP help Enable top-like monitoring tool for HCI. +config BR2_PACKAGE_BLUEZ_ALSA_RFCOMM + bool "rfcomm" + select BR2_PACKAGE_READLINE + help + Simple tool for sending RFCOMM commands. + endif comment "bluez-alsa needs a toolchain w/ wchar, NPTL, headers >= 3.4, dynamic library" diff --git a/package/bluez-alsa/bluez-alsa.hash b/package/bluez-alsa/bluez-alsa.hash index b96c37cc46..5036f82eaa 100644 --- a/package/bluez-alsa/bluez-alsa.hash +++ b/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 dfa48e991a6bbb194a9161deb949371155150dabd5cfc1453a8df754b7cbdc84 bluez-alsa-9045edb436ea755f395a2e09e4525b5defad286a.tar.gz -sha256 c90a0081b0526834f700d084e48819b18d11453ecb030c9b7de0d2cc3e3711a5 LICENSE.txt +sha256 20005c4a153346ea7941973e9b7bd0b228417351f2e8ce88d1c02cc62bca188e bluez-alsa-v1.3.0.tar.gz +sha256 4738489ada14818fe4c53ce86223d7b2f4c1f57cb1f93d62c973c94a89080e83 LICENSE.txt diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 3ba237a6b7..fdf7e464a7 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = 9045edb436ea755f395a2e09e4525b5defad286a +BLUEZ_ALSA_VERSION = v1.3.0 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT BLUEZ_ALSA_LICENSE_FILES = LICENSE.txt @@ -40,4 +40,11 @@ else BLUEZ_ALSA_CONF_OPTS += --disable-hcitop endif +ifeq ($(BR2_PACKAGE_BLUEZ_ALSA_RFCOMM),y) +BLUEZ_ALSA_DEPENDENCIES += readline +BLUEZ_ALSA_CONF_OPTS += --enable-rfcomm +else +BLUEZ_ALSA_CONF_OPTS += --disable-rfcomm +endif + $(eval $(autotools-package)) From 9a50447b5d4b2ab0162e3235395ab9a4c8a647d5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 2 Jun 2018 16:34:07 +0200 Subject: [PATCH 2189/2640] linux: disable attribute alias with gcc >= 8.1 gcc-8 started warning about function aliases that have a non-matching prototype. This seems rather useful in general, but it causes tons of warnings in the Linux kernel, where we rely on abusing those aliases for system call entry points, in order to sanitze the arguments passed from user space in registers. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435 Disable the attribute-alias warning introduced by gcc-8 by adding -Wno-attribute-alias to KCFLAGS. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7f4c916671..7527b11673 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -121,6 +121,16 @@ LINUX_MAKE_ENV += \ KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif +# gcc-8 started warning about function aliases that have a +# non-matching prototype. This seems rather useful in general, but it +# causes tons of warnings in the Linux kernel, where we rely on +# abusing those aliases for system call entry points, in order to +# sanitize the arguments passed from user space in registers. +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +LINUX_MAKE_ENV += KCFLAGS=-Wno-attribute-alias +endif + # Get the real Linux version, which tells us where kernel modules are # going to be installed in the target filesystem. LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` From 3134d94ed1f68dec95d39e4a8638fed67f893cc5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Jul 2018 00:38:47 +0200 Subject: [PATCH 2190/2640] Update for 2018.05.1 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit ef26ffddded912570ca3893271e2900aa8b27866) Signed-off-by: Peter Korsgaard --- CHANGES | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGES b/CHANGES index 44484ee80e..ef5aec274c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,35 @@ +2018.05.1, Released July 20th, 2018 + + Important / security related fixes. + + U-Boot: Ensure host version of ncurses is picked up and not + host-ncurses built by buildroot, as that otherwise causes + widechar/non-widechar conflicts and corrupted menuconfig + menus. + + Linux: Enable CONFIG_PERF_EVENTS when perf is enabled. + + Toolchain: ARC tools updated to arc-2018.03. + + pkg-stats: Fix python 3.x compatibility. + + dl-wrapper: Fix support for URIs containing '+', fix + no-check-hash for inferred site method. + + Defconfigs: Raspberrypi3: Bump rootfs size, Minnowboard-max: + Support ethernet on Turbot variant. + + Updated/fixed packages: audit, bind, btrfs-progs, cifs-utils, + clamav, collectd, coreutils, docker-containerd, dos2unix, + edid-decode, file, gcc, gdb, gnupg, gnupg2, heimdal, hidapi, + imagemagick, libcurl, libgcrypt, libglib2, liblogging, + libostree, libressl, libsoup, libv4l, libvncserver, libvorbis, + libwebsockets, libxslt, lm-sensors, mariadb, mpg123, ncurses, + network-manager, nodejs, patchelf, perl, php-amqp, pinentry, + pixiewps, qpdf, qt53d, qt5base, qt5charts, qt5script, redis, + systemd, triggerhappy, uboot, wireguard, wireless-regdb, + wireshark + 2018.05, Released June 1st, 2018 Minor fixes. From 73722908f2ec6104a6e52ca79b0e23e2bf1ebf9e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Jul 2018 10:43:03 +0200 Subject: [PATCH 2191/2640] docs/website: update for 2018.05.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 660d1d42f9..6f48b99f6a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
            -

            Latest stable release: 2018.05

            +

            Latest stable release: 2018.05.1

            - +
            - +
            -

            buildroot-2018.05.tar.gz

            -

            PGP signature

            +

            buildroot-2018.05.1.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2018.05.tar.bz2

            -

            PGP signature

            +

            buildroot-2018.05.1.tar.bz2

            +

            PGP signature

            +
            Source code
            diff --git a/docs/website/news.html b/docs/website/news.html index dfc937cfb0..cf95fb52d5 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,29 @@

            News

              +
            • +
              +
              +
              +

              2018.08-rc1 released

              +

              5 August 2018

              +
              +
              +

              We have a new release candidate! Lots of changes all over the + tree, see the + CHANGES + file for details. +

              + +

              Head to the downloads page to pick up the + 2018.08-rc1 + release candidate, and report any problems found to the + mailing list or + bug tracker.

              +
              +
              +
              • +
            • From 4094342e2a14e92544575435a576df4f6ddde7b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 5 Aug 2018 16:09:43 +0200 Subject: [PATCH 2320/2640] docs/website: update news.html with 2018.08-rc1 announcement link Signed-off-by: Thomas Petazzoni --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index cf95fb52d5..0535f96497 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

              We have a new release candidate! Lots of changes all over the tree, see the CHANGES - file for details. + file for details and/or read + the announcement.

              Head to the downloads page to pick up the From 0f96073561badde3c7abdf338abca7d00dba56dd Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 5 Aug 2018 16:05:03 +0200 Subject: [PATCH 2321/2640] package/mono: remove target mips architecture Current version of mono doesn't compile on mips due to a bug, so disabling the mips target architecture until the bug is fixed upstream. Fixes: http://autobuild.buildroot.net/results/b402af8cb7f00dc2e69c219926b474a8e0c8d372 and many others. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mono/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mono/Config.in b/package/mono/Config.in index 63208fef49..a375a98448 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -5,8 +5,8 @@ config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO_ARCH_SUPPORTS bool - default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_powerpc || BR2_x86_64) + default y if (BR2_arm || BR2_armeb || BR2_i386 || \ + BR2_powerpc || BR2_x86_64) depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO From d7dcc6c0196e0d7b68a1da56a5a2a39616a3fcbe Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Aug 2018 16:17:52 +0200 Subject: [PATCH 2322/2640] CHANGES: add 2018.08-rc1 release date Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1372fc8978..351f6f80ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -2018.08-rc1, To be released +2018.08-rc1, Released August 5th, 2018 Toolchain: From 760fbe789c77571b2baf1ddbb3b10207ece7fd7a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Aug 2018 17:55:22 +0300 Subject: [PATCH 2323/2640] libarchive: add upstream security patches Add patches for the following security issues: CVE-2017-14501 - An out-of-bounds read flaw exists in parse_file_info in archive_read_support_format_iso9660.c when extracting a specially crafted iso9660 iso file. CVE-2017-14502 - Off-by-one error for UTF-16 names in RAR archives, leading to an out-of-bounds read in archive_read_format_rar_read_header. CVE-2017-14503 - Out-of-bounds read within lha_read_data_none() in archive_read_support_format_lha.c when extracting a specially crafted lha archive. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...660-validate-directory-record-length.patch | 78 +++++++++++++++++++ ...-by-one-error-for-UTF16-names-in-RAR.patch | 34 ++++++++ ...A-archive-entries-with-negative-size.patch | 32 ++++++++ 3 files changed, 144 insertions(+) create mode 100644 package/libarchive/0002-iso9660-validate-directory-record-length.patch create mode 100644 package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch create mode 100644 package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch diff --git a/package/libarchive/0002-iso9660-validate-directory-record-length.patch b/package/libarchive/0002-iso9660-validate-directory-record-length.patch new file mode 100644 index 0000000000..8a0c34f257 --- /dev/null +++ b/package/libarchive/0002-iso9660-validate-directory-record-length.patch @@ -0,0 +1,78 @@ +From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001 +From: John Starks +Date: Wed, 25 Jul 2018 12:16:34 -0700 +Subject: [PATCH] iso9660: validate directory record length + +Signed-off-by: Baruch Siach +--- +Upstream status: commit f9569c086ff + + .../archive_read_support_format_iso9660.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index f01d37bf682e..089bb7236cd1 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -409,7 +409,8 @@ static int next_entry_seek(struct archive_read *, struct iso9660 *, + struct file_info **); + static struct file_info * + parse_file_info(struct archive_read *a, +- struct file_info *parent, const unsigned char *isodirrec); ++ struct file_info *parent, const unsigned char *isodirrec, ++ size_t reclen); + static int parse_rockridge(struct archive_read *a, + struct file_info *file, const unsigned char *start, + const unsigned char *end); +@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent) + if (*(p + DR_name_len_offset) == 1 + && *(p + DR_name_offset) == '\001') + continue; +- child = parse_file_info(a, parent, p); ++ child = parse_file_info(a, parent, p, b - p); + if (child == NULL) { + __archive_read_consume(a, skip_size); + return (ARCHIVE_FATAL); +@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660) + */ + seenJoliet = iso9660->seenJoliet;/* Save flag. */ + iso9660->seenJoliet = 0; +- file = parse_file_info(a, NULL, block); ++ file = parse_file_info(a, NULL, block, vd->size); + if (file == NULL) + return (ARCHIVE_FATAL); + iso9660->seenJoliet = seenJoliet; +@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660) + return (ARCHIVE_FATAL); + } + iso9660->seenJoliet = 0; +- file = parse_file_info(a, NULL, block); ++ file = parse_file_info(a, NULL, block, vd->size); + if (file == NULL) + return (ARCHIVE_FATAL); + iso9660->seenJoliet = seenJoliet; +@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a) + */ + static struct file_info * + parse_file_info(struct archive_read *a, struct file_info *parent, +- const unsigned char *isodirrec) ++ const unsigned char *isodirrec, size_t reclen) + { + struct iso9660 *iso9660; + struct file_info *file, *filep; +@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + + iso9660 = (struct iso9660 *)(a->format->data); + +- dr_len = (size_t)isodirrec[DR_length_offset]; ++ if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Invalid directory record length"); ++ return (NULL); ++ } + name_len = (size_t)isodirrec[DR_name_len_offset]; + location = archive_le32dec(isodirrec + DR_extent_offset); + fsize = toi(isodirrec + DR_size_offset, DR_size_size); +-- +2.18.0 + diff --git a/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch b/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch new file mode 100644 index 0000000000..13a80d1fb3 --- /dev/null +++ b/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch @@ -0,0 +1,34 @@ +From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Sat, 9 Sep 2017 17:47:32 +0200 +Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR + archives. + +Reported-By: OSS-Fuzz issue 573 +Signed-off-by: Baruch Siach +--- +Upstream status: commit 5562545b5562 + + libarchive/archive_read_support_format_rar.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index cbb14c32dc3b..751de6979ba5 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, + return (ARCHIVE_FATAL); + } + filename[filename_size++] = '\0'; +- filename[filename_size++] = '\0'; ++ /* ++ * Do not increment filename_size here as the computations below ++ * add the space for the terminating NUL explicitly. ++ */ ++ filename[filename_size] = '\0'; + + /* Decoded unicode form is UTF-16BE, so we have to update a string + * conversion object for it. */ +-- +2.18.0 + diff --git a/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch b/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch new file mode 100644 index 0000000000..628e74aed4 --- /dev/null +++ b/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch @@ -0,0 +1,32 @@ +From 2c8c83b9731ff822fad6cc8c670ea5519c366a14 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Thu, 19 Jul 2018 21:14:53 +0200 +Subject: [PATCH] Reject LHA archive entries with negative size. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit 2c8c83b9731 + + libarchive/archive_read_support_format_lha.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c +index b8ef4ae10ece..95c99bb1f31e 100644 +--- a/libarchive/archive_read_support_format_lha.c ++++ b/libarchive/archive_read_support_format_lha.c +@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_read *a, + * Prepare variables used to read a file content. + */ + lha->entry_bytes_remaining = lha->compsize; ++ if (lha->entry_bytes_remaining < 0) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Invalid LHa entry size"); ++ return (ARCHIVE_FATAL); ++ } + lha->entry_offset = 0; + lha->entry_crc_calculated = 0; + +-- +2.18.0 + From fffc281e6ecd7c460869e6098b30928334eb8b10 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Aug 2018 08:33:20 +0300 Subject: [PATCH 2324/2640] libgit2: security bump to version 0.27.4 Fixes CVE-2018-10887 and CVE-2018-10888: out-of-bounds reads when reading objects from a packfile. Also fixes out-of-bounds reads when processing smart-protocol "ng" packets (no known CVE yet). Drop upstream patch. Cc: Nicolas Cavallari Signed-off-by: Baruch Siach Reviewed-By: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-with-LibreSSL-2.7.patch | 45 ------------------- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch diff --git a/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch b/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch deleted file mode 100644 index f0be0f0d2f..0000000000 --- a/package/libgit2/0001-Fix-build-with-LibreSSL-2.7.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7490d449b518115a1ae86b01397e95c38e39cff1 Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Mon, 2 Apr 2018 20:00:07 +0200 -Subject: [PATCH] Fix build with LibreSSL 2.7 - -LibreSSL 2.7 adds OpenSSL 1.1 API - -Signed-off-by: Bernard Spil -Signed-off-by: Nicolas Cavallari ---- - src/streams/openssl.c | 3 ++- - src/streams/openssl.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/streams/openssl.c b/src/streams/openssl.c -index 9cbb2746f..adcb7f14e 100644 ---- a/src/streams/openssl.c -+++ b/src/streams/openssl.c -@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void) - ssl_opts |= SSL_OP_NO_COMPRESSION; - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - SSL_load_error_strings(); - OpenSSL_add_ssl_algorithms(); - #else -diff --git a/src/streams/openssl.h b/src/streams/openssl.h -index 2bbad7c68..44329ec90 100644 ---- a/src/streams/openssl.h -+++ b/src/streams/openssl.h -@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *file, const char *path); - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { --- -2.17.0 - diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 43d8f9930e..41ab87bf4d 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 837b11927bc5f64e7f9ab0376f57cfe3ca5aa52ffd2007ac41184b21124fb086 libgit2-v0.27.1.tar.gz +sha256 0b7ca31cb959ff1b22afa0da8621782afe61f99242bf716c403802ffbdb21d51 libgit2-v0.27.4.tar.gz sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 8b7b9f6d77..551e3dea62 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = v0.27.1 +LIBGIT2_VERSION = v0.27.4 LIBGIT2_SITE = $(call github,libgit2,libgit2,$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception LIBGIT2_LICENSE_FILES = COPYING From ce1af4db2a9d927479d980bca654dad926c08f34 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 7 Aug 2018 08:03:57 +0200 Subject: [PATCH 2325/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4383466af1..36c1ddcdb8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.145" if BR2_KERNEL_HEADERS_4_4 - default "4.9.116" if BR2_KERNEL_HEADERS_4_9 + default "4.4.146" if BR2_KERNEL_HEADERS_4_4 + default "4.9.118" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.59" if BR2_KERNEL_HEADERS_4_14 + default "4.14.61" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.11" if BR2_KERNEL_HEADERS_4_17 + default "4.17.13" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From b8cb17253098bbbd22fbffefb0a522a2c665331d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 7 Aug 2018 08:03:58 +0200 Subject: [PATCH 2326/2640] linux: bump default to version 4.17.13 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index d30489e254..623a3cee6f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From f2e3e3712485ace7a964505a517ed92fdbcc4517 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 7 Aug 2018 08:53:53 +0200 Subject: [PATCH 2327/2640] linux: bump CIP to version v4.4.138-cip25 This patch bumps the CIP Linux kernel to version v4.4.138-cip25 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 623a3cee6f..4f31850ac0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -33,7 +33,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (4.17)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.130-cip23)" + bool "Latest CIP SLTS version (v4.4.138-cip25)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -121,7 +121,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "4.17.13" if BR2_LINUX_KERNEL_LATEST_VERSION - default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From f2d748e13be6ca119271af8487adda5856d43da4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 Aug 2018 10:12:28 +0200 Subject: [PATCH 2328/2640] boot-wrapper-aarch64: use SPDX identifier for 3 clause BSD Use the correct SPDX identifier for the 3 clause BSD license, like we do elsewhere. Signed-off-by: Peter Korsgaard --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 601cfab314..cd6e1b7b77 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -6,7 +6,7 @@ BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git -BOOT_WRAPPER_AARCH64_LICENSE = BSD3c +BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES From bef1786475a743bd2cf76484b5d6a3158c0d7bc5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Aug 2018 14:04:48 +0300 Subject: [PATCH 2329/2640] cryptsetup: fix build with old host kernel headers By default cryptsetup configure fails when the if_alg.h kernel header is not available. Kernels older than 2.6.38, like the one in RHEL 6 hosts, do not provide this header. Since we don't need the kernel crypto feature for host tools, just disable this feature to allow successful completion of the configure script. While at it, fix a typo in the --with-crypto_backend option (hyphen -> underscore). Should fix: http://autobuild.buildroot.net/results/ffd/ffda2579b215b53161025b7bc703091cb30ef95d/ http://autobuild.buildroot.net/results/c48/c48015f76b13fec38f650f66824e7b986eb28572/ http://autobuild.buildroot.net/results/be6/be621f71bf9da8719bf7fc943eccc9b4dc2cc43e/ Cc: Martin Hicks Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d5ab022b77..d81aa7b341 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -36,7 +36,8 @@ HOST_CRYPTSETUP_DEPENDENCIES = \ host-json-c \ host-openssl -HOST_CRYPTSETUP_CONF_OPTS = --with-crypto-backend=openssl +HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \ + --disable-kernel_crypto $(eval $(autotools-package)) $(eval $(host-autotools-package)) From d9c3f93f3f9e416930b3e72c6e22bd7f3f7f1c50 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Tue, 7 Aug 2018 20:33:59 +0300 Subject: [PATCH 2330/2640] uclibc: ldso/arc: fix LD_DEBUG segv when printing R_ARC_NONE Dynamic linker used to segfault on attempt to print info about R_ARC_NONE reloaction. The fix is already in upstream master [1], should be removed on uClibc version bump. [1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=269a2a2a0f863e1b43dc02f2f4f0f3c50299456e Signed-off-by: Alexey Brodkin Signed-off-by: Peter Korsgaard --- ..._DEBUG-segv-when-printing-R_ARC_NONE.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch diff --git a/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch b/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch new file mode 100644 index 0000000000..ad87698f53 --- /dev/null +++ b/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch @@ -0,0 +1,45 @@ +From 269a2a2a0f863e1b43dc02f2f4f0f3c50299456e Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Tue, 26 Jun 2018 18:26:24 -0700 +Subject: [PATCH] ldso/arc: fix LD_DEBUG segv when printing R_ARC_NONE + +Signed-off-by: Vineet Gupta +Signed-off-by: Alexey Brodkin +--- + ldso/ldso/arc/elfinterp.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ldso/ldso/arc/elfinterp.c b/ldso/ldso/arc/elfinterp.c +index 5a02bc234..a30c19bcb 100644 +--- a/ldso/ldso/arc/elfinterp.c ++++ b/ldso/ldso/arc/elfinterp.c +@@ -64,7 +64,7 @@ _dl_linux_resolver(struct elf_resolve *tpnt, unsigned int plt_pc) + if (_dl_debug_bindings) { + _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname); + if (_dl_debug_detail) +- _dl_dprintf(_dl_debug_file, "\n\tpatched %x ==> %pc @ %pl\n", ++ _dl_dprintf(_dl_debug_file, "\n\tpatched %x ==> %pc @ %p\n", + *got_addr, new_addr, got_addr); + } + +@@ -178,7 +178,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope, + + log_entry: + #if defined __SUPPORT_LD_DEBUG__ +- if (_dl_debug_detail) ++ if (_dl_debug_detail && (reloc_type != R_ARC_NONE)) + _dl_dprintf(_dl_debug_file,"\tpatched: %x ==> %x @ %x", + old_val, *reloc_addr, reloc_addr); + #endif +@@ -214,7 +214,7 @@ _dl_do_lazy_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope, + } + + #if defined __SUPPORT_LD_DEBUG__ +- if (_dl_debug_reloc && _dl_debug_detail) ++ if (_dl_debug_reloc && _dl_debug_detail && (reloc_type != R_ARC_NONE)) + _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n", + old_val, *reloc_addr, reloc_addr); + #endif +-- +2.16.2 + From 90b26f87640c0ebff53a304b15d168b1aca738dd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 Aug 2018 10:05:38 +0200 Subject: [PATCH 2331/2640] package/samba4: reformat patch 0002 as Git-formatted patch This commit reformats 0002-patch-source3__libads__kerberos_keytab.c.patch as a Git-formatted patch. Signed-off-by: Thomas Petazzoni --- ...on-of-Samba-4.7.4-with-disabled-ADS.patch} | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) rename package/samba4/{0002-patch-source3__libads__kerberos_keytab.c.patch => 0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch} (58%) diff --git a/package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch b/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch similarity index 58% rename from package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch rename to package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch index 1213659c8d..45d3050a39 100644 --- a/package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch +++ b/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch @@ -1,5 +1,7 @@ -From: Timur I. Bakeyev -Subject: Fix compilation of Samba 4.7.4 with disabled ADS +From da2f2cf8e7a1dfcb661b707e4649cec1e8a0e79c Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 9 Aug 2018 10:03:06 +0200 +Subject: [PATCH] Fix compilation of Samba 4.7.4 with disabled ADS Downloaded from upstream mailinglist https://lists.samba.org/archive/samba-technical/2017-December/124629.html @@ -8,9 +10,14 @@ Patch originates from FreeBSD: https://svnweb.freebsd.org/ports/head/net/samba47/files/patch-source3__libads__kerberos_keytab.c?revision=457119&view=markup Signed-off-by: Bernd Kuhls +--- + source3/libads/kerberos_keytab.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/source3/libads/kerberos_keytab.c.orig 2017-12-23 14:23:53.247467000 +0100 -+++ b/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 +diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c +index 37ac7ba985e..71250962090 100644 +--- a/source3/libads/kerberos_keytab.c ++++ b/source3/libads/kerberos_keytab.c @@ -32,8 +32,6 @@ #ifdef HAVE_KRB5 @@ -20,7 +27,7 @@ Signed-off-by: Bernd Kuhls /* This MAX_NAME_LEN is a constant defined in krb5.h */ #ifndef MAX_KEYTAB_NAME_LEN #define MAX_KEYTAB_NAME_LEN 1100 -@@ -85,6 +83,8 @@ +@@ -85,6 +83,8 @@ out: return ret; } @@ -29,3 +36,6 @@ Signed-off-by: Bernd Kuhls /********************************************************************** Adds a single service principal, i.e. 'host' to the system keytab ***********************************************************************/ +-- +2.14.4 + From 15045fba99a688977dc1aaca01f7f0d42250a4dc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 Aug 2018 10:06:19 +0200 Subject: [PATCH 2332/2640] package/samba4: drop patch numbering in patch 0003 Signed-off-by: Thomas Petazzoni --- ...3-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch index 3b248e690d..1256d1c969 100644 --- a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch +++ b/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch @@ -1,7 +1,7 @@ From 4a63f267efab2ef86adbeddda45909127135d7c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jan 2018 11:57:11 +0100 -Subject: [PATCH 1/1] Fix uClibc build on 64bit platforms by including stdint.h +Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h Fixes an error detected by buildroot autobuilders: http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log From f38c8d7ed64df008b3a36237d237082eb6ff8995 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 8 Aug 2018 20:41:55 +0200 Subject: [PATCH 2333/2640] package/samba4: disable build of manpages and documentation Fixes http://autobuild.buildroot.net/results/3f214cbb1fe2dc2c2cbfb630032e13eba81c1b5a/ and many others Signed-off-by: Bernd Kuhls [Thomas: reformat patch as Git formatted] Signed-off-by: Thomas Petazzoni --- ...-build-of-manpages-and-documentation.patch | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 package/samba4/0004-Disable-build-of-manpages-and-documentation.patch diff --git a/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch b/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch new file mode 100644 index 0000000000..41a06801c7 --- /dev/null +++ b/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch @@ -0,0 +1,116 @@ +From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 9 Aug 2018 09:59:06 +0200 +Subject: [PATCH] Disable build of manpages and documentation + +This patch fixes a bug described in an upstream bug report +https://bugzilla.samba.org/show_bug.cgi?id=9515 +which was closed as WONTFIX by disabling the build of manpages and +documentation. + +If installed on the host, samba4 uses the docbook-xsl package to build +parts of the documentation. This package is broken, on Debian for +example the bug reported to samba4 was fixed in the docbook-xsl package: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567 + +Since we do not provide a host version of docbook-xsl we need to disable +the build of manpages and documentation. + +Patch was downloaded from +https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch + +Signed-off-by: Bernd Kuhls +--- + buildtools/wafsamba/wafsamba.py | 10 +++++----- + docs-xml/wscript_build | 34 +++++++++++++++++----------------- + source4/scripting/wscript_build | 4 ++-- + 3 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py +index 4bb19d070e2..a255d841111 100644 +--- a/buildtools/wafsamba/wafsamba.py ++++ b/buildtools/wafsamba/wafsamba.py +@@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source, + else: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) + +- if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and +- bld.env['XSLTPROC_MANPAGES']): +- bld.MANPAGES(manpages, install) ++# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and ++# bld.env['XSLTPROC_MANPAGES']): ++# bld.MANPAGES(manpages, install) + + + Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY +@@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source, + samba_ldflags = pie_ldflags + ) + +- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: +- bld.MANPAGES(manpages, install) ++# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: ++# bld.MANPAGES(manpages, install) + + Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY + +diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build +index 954c62a29bc..1169158fd57 100644 +--- a/docs-xml/wscript_build ++++ b/docs-xml/wscript_build +@@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all, + rule=smbdotconf_generate_parameter_list, + dep_vars=bld.dynconfig_varnames()) + +-def SMBDOTCONF_MANPAGE(bld, target): +- ''' assemble and build smb.conf.5 manual page''' +- bld.SAMBAMANPAGES(target, parameter_all) +- +-if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): +- +- SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') +- bld.SAMBAMANPAGES(manpages) +- +- if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): +- bld.SAMBAMANPAGES(pam_winbind_manpages) +- +- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): +- bld.SAMBAMANPAGES(krb5_locator_manpages) +- +- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): +- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') ++#def SMBDOTCONF_MANPAGE(bld, target): ++# ''' assemble and build smb.conf.5 manual page''' ++# bld.SAMBAMANPAGES(target, parameter_all) ++# ++#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): ++# ++# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') ++# bld.SAMBAMANPAGES(manpages) ++# ++# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): ++# bld.SAMBAMANPAGES(pam_winbind_manpages) ++# ++# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): ++# bld.SAMBAMANPAGES(krb5_locator_manpages) ++# ++# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): ++# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') +diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build +index 2f53cce12b7..9841ae0a116 100644 +--- a/source4/scripting/wscript_build ++++ b/source4/scripting/wscript_build +@@ -12,8 +12,8 @@ if sbin_files: + bld.INSTALL_FILES('${SBINDIR}', + sbin_files, + chmod=MODE_755, python_fixup=True, flat=True) +- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: +- bld.MANPAGES(man_files, True) ++# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: ++# bld.MANPAGES(man_files, True) + + if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): + bld.INSTALL_FILES('${BINDIR}', +-- +2.14.4 + From 14d287098aa6932d3337927d366a7faa8df1f9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Wed, 8 Aug 2018 22:40:05 +0200 Subject: [PATCH 2334/2640] wireshark: bump version to 2.2.16 (security) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes since 2.2.15: - wnpa-sec-2018-06 RPKI-Router infinite loop. Bug 14414. CVE-2018-7325. - wnpa-sec-2018-34 BGP dissector large loop. Bug 13741. CVE-2018-14342. - wnpa-sec-2018-35 ISMP dissector crash. Bug 14672. CVE-2018-14344. - wnpa-sec-2018-36 Multiple dissectors could crash. Bug 14675. CVE-2018-14340. - wnpa-sec-2018-37 ASN.1 BER dissector crash. Bug 14682. CVE-2018-14343. - wnpa-sec-2018-38 MMSE dissector infinite loop. Bug 14738. CVE-2018-14339. - wnpa-sec-2018-39 DICOM dissector crash. Bug 14742. CVE-2018-14341. - wnpa-sec-2018-40 Bazaar dissector infinite loop. Bug 14841. - wnpa-sec-2018-41 HTTP2 dissector crash. Bug 14869. Full release notes: https://www.wireshark.org/docs/relnotes/wireshark-2.2.16.html Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 4b9c646fa9..30b00b4dd0 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.15.txt -sha256 d73583e9282d47c42b69fc3a1ac9cafb6047d1305f5027d4cf18e95922d11844 wireshark-2.2.15.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.16.txt +sha256 7dcc4e9f29ad8dd75849aa3b6f70b6ec82ab6899cb168096572775a6d97ced8a wireshark-2.2.16.tar.bz2 # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c9a4ef202d..3d729ae090 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.15 +WIRESHARK_VERSION = 2.2.16 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From f93d138dd44be12a2b0dcb88386995c0aed71a98 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 7 Aug 2018 22:37:36 +0200 Subject: [PATCH 2335/2640] package/x11r7/xserver_xorg-server: bump version to 1.20.1 Release notes for this bugfix release: https://lists.x.org/archives/xorg-announce/2018-August/002912.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-modesettings-needs-dri2.patch | 0 ...02-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 .../0003-Remove-check-for-useSIGIO-option.patch | 0 .../0004-include-misc.h-fix-uClibc-build.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 ++-- .../x11r7/xserver_xorg-server/xserver_xorg-server.hash | 10 +++++----- 6 files changed, 7 insertions(+), 7 deletions(-) rename package/x11r7/xserver_xorg-server/{1.20.0 => 1.20.1}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.0 => 1.20.1}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.0 => 1.20.1}/0003-Remove-check-for-useSIGIO-option.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.0 => 1.20.1}/0004-include-misc.h-fix-uClibc-build.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.20.0/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.20.1/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.0/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.20.1/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.0/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.20.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.0/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.20.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.0/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.20.1/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.0/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.20.1/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xserver_xorg-server/1.20.1/0004-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch rename to package/x11r7/xserver_xorg-server/1.20.1/0004-include-misc.h-fix-uClibc-build.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 5af4d09eed..c6dc010980 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -61,7 +61,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - bool "1.20.0" + bool "1.20.1" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 select BR2_PACKAGE_XLIB_LIBXFONT2 @@ -79,7 +79,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.20.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 + default "1.20.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 691229a834..c0d93e5580 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,8 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2018-May/002893.html -md5 c1ca1ea0a905ea788da03c77cc38b06e xorg-server-1.20.0.tar.bz2 -sha1 a9e999c15a2322bc423d5d6e1978ba38f9635901 xorg-server-1.20.0.tar.bz2 -sha256 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6 xorg-server-1.20.0.tar.bz2 -sha512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde xorg-server-1.20.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-August/002912.html +md5 e525846d1d0af5732ba835f2e2ec066d xorg-server-1.20.1.tar.bz2 +sha1 fd43367c2b7bbb1a4b1dd90b06a021e68a9db240 xorg-server-1.20.1.tar.bz2 +sha256 59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918 xorg-server-1.20.1.tar.bz2 +sha512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b xorg-server-1.20.1.tar.bz2 From 904d5d7179cbecb062695ce45a03bab93f37443d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 8 Aug 2018 20:14:47 +0200 Subject: [PATCH 2336/2640] package/wpa_supplicant: add upstream security fix Fixes CVE-2018-14526: http://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/wpa_supplicant/wpa_supplicant.hash | 2 ++ package/wpa_supplicant/wpa_supplicant.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 65a6ae246f..dbc4438215 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -7,3 +7,5 @@ sha256 793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b rebase sha256 596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6 rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch sha256 c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch sha256 c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +sha256 960c3cf2a514479b0b4cf09665186a1a9f5d28e8b05dec23db75c6cc13eb1f7c rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch +sha256 3f6ca36d86668d6607389e01cf4766f38aa3b8ab2c144ad132541087b41c061d README diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 75ecbaa53c..2b451996ed 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,7 +13,8 @@ WPA_SUPPLICANT_PATCH = \ http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \ http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \ http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch + http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \ + http://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config From 8e1b07230ff9b2d4a51fc8d68334aa6f7f2b3598 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 9 Aug 2018 21:40:46 +0200 Subject: [PATCH 2337/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 36c1ddcdb8..7d7a6e1a61 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.146" if BR2_KERNEL_HEADERS_4_4 - default "4.9.118" if BR2_KERNEL_HEADERS_4_9 + default "4.4.147" if BR2_KERNEL_HEADERS_4_4 + default "4.9.119" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.61" if BR2_KERNEL_HEADERS_4_14 + default "4.14.62" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.13" if BR2_KERNEL_HEADERS_4_17 + default "4.17.14" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From fca2b138c70d424fd0f11235ac96406d69dd34e6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 9 Aug 2018 21:40:47 +0200 Subject: [PATCH 2338/2640] linux: bump default to version 4.17.14 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 4f31850ac0..5f2a6d738c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From c4a3cdd06a7a4acd08036ff3a77d107bb41592e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 9 Aug 2018 21:53:55 +0200 Subject: [PATCH 2339/2640] package/waylandpp: fix build error with gcc 4.4/4.9 Fixes http://autobuild.buildroot.net/results/51a/51afcd6d3c3c4839d8216b7b0dba35c8e38211f4/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...iler-error-missing-stdexcept-to-use-.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch diff --git a/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch b/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch new file mode 100644 index 0000000000..ad5b84257f --- /dev/null +++ b/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch @@ -0,0 +1,28 @@ +From 85b61589b0c73f6c6974862af678ed2f82806ac5 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 9 Aug 2018 21:44:46 +0200 +Subject: [PATCH] [scanner] Fix compiler error: missing to use + std::runtime_error + +Patch sent upstream as PR 50. + +Signed-off-by: Bernd Kuhls +--- + scanner/scanner.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp +index 9c97b7c..7019e0a 100644 +--- a/scanner/scanner.cpp ++++ b/scanner/scanner.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include "pugixml.hpp" + +-- +2.18.0 + From d9937b62e0d197644ddf68bde6bcfff6e916ba61 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 9 Aug 2018 17:57:28 +0200 Subject: [PATCH 2340/2640] chrony: backport upstream patch to fix blocking on getrandom() at startup with recent kernels chrony calls getrandom() at startup if available, so it needs a workaround for the blocking behaviour on recent (4.14.39+), similar to what was done for util-linux in commit c4d86707cd6 (util-linux: add two upstream patches to fix blocking on getrandom() with recent kernels). Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...o-reading-dev-urandom-when-getrandom.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch diff --git a/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch b/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch new file mode 100644 index 0000000000..d71685e5cd --- /dev/null +++ b/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch @@ -0,0 +1,42 @@ +From 7c5bd948bb7e21fa0ee22f29e97748b2d0360319 Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Thu, 17 May 2018 14:16:58 +0200 +Subject: [PATCH] util: fall back to reading /dev/urandom when getrandom() + blocks + +With recent changes in the Linux kernel, the getrandom() system call may +block for a long time after boot on machines that don't have enough +entropy. It blocks the chronyd's initialization before it can detach +from the terminal and may cause a chronyd service to fail to start due +to a timeout. + +At least for now, enable the GRND_NONBLOCK flag to make the system call +non-blocking and let the code fall back to reading /dev/urandom (which +never blocks) if the system call failed with EAGAIN or any other error. + +This makes the start of chronyd non-deterministic with respect to files +that it needs to open and possibly also makes it slightly easier to +guess the transmit/receive timestamp in client requests until the +urandom source is fully initialized. + +Signed-off-by: Peter Korsgaard +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 4b3e455..76417d5 100644 +--- a/util.c ++++ b/util.c +@@ -1224,7 +1224,7 @@ get_random_bytes_getrandom(char *buf, unsigned int len) + if (disabled) + break; + +- if (getrandom(rand_buf, sizeof (rand_buf), 0) != sizeof (rand_buf)) { ++ if (getrandom(rand_buf, sizeof (rand_buf), GRND_NONBLOCK) != sizeof (rand_buf)) { + disabled = 1; + break; + } +-- +2.11.0 + From b42fb29048128a432a130c0652e086dfde641d75 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 9 Aug 2018 16:57:22 +0200 Subject: [PATCH 2341/2640] ncurses: disable terminfo database install for host-ncurses Since commit b35ad5d0b45e (ncurses: make host-ncurses use host terminfo), we are now pointing host-ncurses to the host terminfo (typically) located in /usr/share/terminfo. With this change we are reusing the existing host terminfo database, so there is no point in trying to install our own on top. The user running buildroot typically will have no write access to /usr/share/terminfo, but tic in that case falls back to writing the database to $HOME/.terminfo. Neither of which are desirable. In case $HOME/.terminfo also isn't writable, tic fails, breaking the install step for host-ncurses: ** Building terminfo database, please wait... Running sh ./shlib tic to install /usr/share/terminfo ... You may see messages regarding extended capabilities, e.g., AX. These are extended terminal capabilities which are compiled using tic -x If you have ncurses 4.2 applications, you should read the INSTALL document, and install the terminfo without the -x option. "terminfo.tmp", line 21272, terminal 'v3220': /home/peko/.terminfo: permission denied (errno 30) To fix all of this, simply disable the terminfo database install. Suggested-by: Arnout Vandecappelle Signed-off-by: Peter Korsgaard Acked-by: Hollis Blanchard Signed-off-by: Thomas Petazzoni --- package/ncurses/ncurses.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 5b36df564c..e27598bd42 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -154,6 +154,7 @@ HOST_NCURSES_CONF_OPTS = \ --without-cxx-binding \ --without-ada \ --with-default-terminfo-dir=/usr/share/terminfo \ + --disable-db-install \ --without-normal $(eval $(autotools-package)) From 2d8d5ced107ab2a05d023873de4e8f12f081e5af Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Mon, 6 Aug 2018 00:17:14 -0300 Subject: [PATCH 2342/2640] makedevs: allow leading whitespace for capabilities Currently makedevs silently ignores extended attributes with leading whitespace, for example those added to a _PERMISSIONS following the recommended style from check-package. Makedevs already ignores leading whitespace for normal entries (file permission changes and device files creation). Do the same for extended attributes. Fixes: #11191. Reported-by: Jean-pierre Cartal Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/makedevs/makedevs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index 1ba5936342..c57b964f5c 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -510,7 +510,7 @@ int main(int argc, char **argv) linenum++; - if (1 == sscanf(line, "|xattr %254s", xattr)) { + if (1 == sscanf(line, " |xattr %254s", xattr)) { #ifdef EXTENDED_ATTRIBUTES if (!full_name) bb_error_msg_and_die("line %d should be after a file\n", linenum); From 5f201de0dca4f7ed9bd2be9d836fbb7955f5b572 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Mon, 6 Aug 2018 00:17:15 -0300 Subject: [PATCH 2343/2640] support/testing: add test for file capabilities Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 + support/testing/tests/core/device_table2.txt | 7 +++ .../tests/core/squashfs-xattr-kernel.config | 1 + .../tests/core/test_file_capabilities.py | 47 +++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 support/testing/tests/core/device_table2.txt create mode 100644 support/testing/tests/core/squashfs-xattr-kernel.config create mode 100644 support/testing/tests/core/test_file_capabilities.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0dc0ffa21..9d4301076f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -262,6 +262,7 @@ zynqmp_zcu106_defconfig: *defconfig tests.boot.test_atf.TestATFAllwinner: *runtime_test tests.boot.test_atf.TestATFMarvell: *runtime_test tests.boot.test_atf.TestATFVexpress: *runtime_test +tests.core.test_file_capabilities.TestFileCapabilities: *runtime_test tests.core.test_post_scripts.TestPostScripts: *runtime_test tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test diff --git a/support/testing/tests/core/device_table2.txt b/support/testing/tests/core/device_table2.txt new file mode 100644 index 0000000000..f8323217f3 --- /dev/null +++ b/support/testing/tests/core/device_table2.txt @@ -0,0 +1,7 @@ +# +/usr/sbin/getcap f 755 0 0 - - - - - +|xattr cap_sys_nice+eip +# leading spaces are ignored for xattr + |xattr cap_kill+eip +# leading tabs are ignored for xattr + |xattr cap_sys_time+eip diff --git a/support/testing/tests/core/squashfs-xattr-kernel.config b/support/testing/tests/core/squashfs-xattr-kernel.config new file mode 100644 index 0000000000..81b21b94c5 --- /dev/null +++ b/support/testing/tests/core/squashfs-xattr-kernel.config @@ -0,0 +1 @@ +CONFIG_SQUASHFS_XATTR=y diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py new file mode 100644 index 0000000000..945b48a4c3 --- /dev/null +++ b/support/testing/tests/core/test_file_capabilities.py @@ -0,0 +1,47 @@ +import os +import subprocess + +import infra.basetest + + +class TestFileCapabilities(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt {}" + BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_PACKAGE_LIBCAP=y + BR2_PACKAGE_LIBCAP_TOOLS=y + BR2_TARGET_ROOTFS_SQUASHFS=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format(infra.filepath("tests/core/device_table2.txt"), + infra.filepath("tests/core/squashfs-xattr-kernel.config")) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.squashfs") + subprocess.call(["truncate", "-s", "%1M", img]) + + self.emulator.boot(arch="armv7", + kernel=os.path.join(self.builddir, "images", "zImage"), + kernel_cmdline=["root=/dev/mmcblk0", + "rootfstype=squashfs"], + options=["-drive", "file={},if=sd,format=raw".format(img), + "-M", "vexpress-a9", + "-dtb", os.path.join(self.builddir, "images", "vexpress-v2p-ca9.dtb")]) + self.emulator.login() + + cmd = "getcap -v /usr/sbin/getcap" + output, _ = self.emulator.run(cmd) + self.assertIn("cap_kill", output[0]) + self.assertIn("cap_sys_nice", output[0]) + self.assertIn("cap_sys_time", output[0]) + self.assertIn("+eip", output[0]) From 03a808a0999ac031a1e93000d9a3c50ffbcb64a4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 10 Aug 2018 08:37:21 +0300 Subject: [PATCH 2344/2640] uboot-tools: force host CFLAGS U-Boot now adds -std=gnu11 when building its build utilities, like fixdep. This option is only supported since gcc version 4.7. https://gcc.gnu.org/gcc-4.7/changes.html Force usage of Buildroot HOST_CFLAGS, like we do already for host-uboot-tools, to avoid the -std=gnu11 option. Fixes: http://autobuild.buildroot.net/results/ea0/ea09b614a3c10d494939d9551c0c3bfca4626ece/ http://autobuild.buildroot.net/results/f8e/f8efd9af4d86c51fe4f5afe44db9abf9adc5718f/ http://autobuild.buildroot.net/results/c0a/c0ab35c3cb46f84863fe20c0ee92ecc2379578b6/ Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/uboot-tools/uboot-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index f5027d2da3..5ac7b1c293 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -19,6 +19,7 @@ endef UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ + HOSTCFLAGS="$(HOST_CFLAGS)" \ STRIP=$(TARGET_STRIP) ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y) From aeef2a971e5f7424c644c8cabe10fd4ceb1a87d5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 10 Aug 2018 00:12:19 +0200 Subject: [PATCH 2345/2640] busybox: bump version to 1.29.2 Includes fixes for fdisk (compat fixes, allow 2TB+ sizes), gzip (FEATURE_GZIP_LEVELS was producing badly-compressed .gz), hexedit (segfault fix). Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 11b9565df9..dc7c5613f8 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,3 +1,3 @@ -# From https://busybox.net/downloads/busybox-1.29.1.tar.bz2.sha256 -sha256 fc250730ea16d28839bfecda3c431683fa6bd4273ffca6b632cbeb3556c914c3 busybox-1.29.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.29.2.tar.bz2.sha256 +sha256 67d2fa6e147a45875fe972de62d907ef866fe784c495c363bf34756c444a5d61 busybox-1.29.2.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 3be6cbc7b1..ab0930a7fc 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.29.1 +BUSYBOX_VERSION = 1.29.2 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 From fd127c8e5962158eb02104d5e41a029ee31967be Mon Sep 17 00:00:00 2001 From: David Owens Date: Fri, 20 Jul 2018 07:30:07 -0500 Subject: [PATCH 2346/2640] mtd: backport upstream bug fix A regression in the mtd package prevents non-consecutive ubi volume IDs from working properly. This change backported from upstream reverts the commit [0]. The issue was originally described on the mtd mailing list: http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html [0] http://git.infradead.org/mtd-utils.git/commitdiff/dede98ffb706676309488d7cc660f569548d5930 Signed-off-by: David Owens Reviewed-by: Matt Weber Signed-off-by: Thomas Petazzoni --- ...ct-error-number-in-ubi_get_vol_info1.patch | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch diff --git a/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch b/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch new file mode 100644 index 0000000000..1fd4f7693b --- /dev/null +++ b/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch @@ -0,0 +1,92 @@ +From 0f833ac73ad631248826386e2918d8571ecf0347 Mon Sep 17 00:00:00 2001 +From: David Oberhollenzer +Date: Sat, 9 Jun 2018 16:45:22 +0200 +Subject: [PATCH] Revert "Return correct error number in ubi_get_vol_info1" + +This reverts commit dede98ffb706676309488d7cc660f569548d5930. + +The original commit tried to fix a descrepancy between the implementation +and the documentation by making the implementation comply. + +When making the change, it was overlooked, that ubinfo and ubirename were +written against the implementation instead of the behaviour specified by +the documentation. So were further internal functions like +ubi_get_vol_info1_nm which further breaks ubirmvol. + +A report with an outline of a resulting problem can be read on +the mailing list: + +http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html + +From the report: + +steps to reproduce: have mtd-utils 2.0.1 or 2.0.2 + +0. make a bunch of ubi volumes in sequential order + +ubimkvol /dev/ubi0 -s 64KiB -N test1 +ubimkvol /dev/ubi0 -s 64KiB -N test2 +ubimkvol /dev/ubi0 -s 64KiB -N test3 +ubimkvol /dev/ubi0 -s 64KiB -N test4 +.. + +1. delete the test1 volume, making a hole in the volume table + +ubirmvol /dev/ubi0 -N test1 + +2. try an affected tool (i.e. "ubirmvol /dev/ubi0 -N test4" ) + + |root at mr24:/# ubirmvol /dev/ubi0 -N test4 + |ubirmvol: error!: cannot find UBI volume "test4" + | error 19 (No such device) + +or "ubinfo -a" + + | root at mr24:/# ubinfo -a + | UBI version: 1 + | Count of UBI devices: 1 + | UBI control device major/minor: 10:59 + | Present UBI devices: ubi0 + | + | ubi0 + | Volumes count: 11 + | Logical eraseblock size: 15872 bytes, 15.5 KiB + | Total amount of logical eraseblocks: 1952 (30982144 bytes, 29.5 MiB) + | Amount of available logical eraseblocks: 75 (1190400 bytes, 1.1 MiB) + | Maximum count of volumes 92 + | Count of bad physical eraseblocks: 0 + | Count of reserved physical eraseblocks: 40 + | Current maximum erase counter value: 984 + | Minimum input/output unit size: 512 bytes + | Character device major/minor: 251:0 + | ubinfo: error!: libubi failed to probe volume 5 on ubi0 + | error 19 (No such device) + | Present volumes: 0, 1, 2, 3, 4root at mr24:/# + +Reported-by: Christian Lamparter +Signed-off-by: David Oberhollenzer +Signed-off-by: David Owens +--- + lib/libubi.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/lib/libubi.c b/lib/libubi.c +index b50e68a..978b433 100644 +--- a/lib/libubi.c ++++ b/lib/libubi.c +@@ -1240,11 +1240,8 @@ int ubi_get_vol_info1(libubi_t desc, int dev_num, int vol_id, + info->dev_num = dev_num; + info->vol_id = vol_id; + +- if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) { +- if (errno == ENOENT) +- errno = ENODEV; ++ if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) + return -1; +- } + + ret = vol_read_data(lib->vol_type, dev_num, vol_id, buf, 50); + if (ret < 0) +-- +2.14.4 + From 4c575ffde5fee6f3548b8907aa9c85660dc5ad2b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Aug 2018 10:06:47 +0200 Subject: [PATCH 2347/2640] package/vlc: Remove warning from Config.in Four years ago this warning was added to this package https://git.buildroot.net/buildroot/commit/package/vlc?id=e33019aaa0409e35b725dddffe09e3e2a42959d1 due to "autobuilder failures for vlc on many platforms". The last autobuilder failure occured May 1st, 2018 and was fixed by https://git.buildroot.net/buildroot/commit/package/vlc?id=9f115bfc2ac798c737d0c2a8ec8c96670e814a49 Therefore this warning is not needed anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 166e7d256a..78769ac27b 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -1,8 +1,3 @@ -if BR2_PACKAGE_VLC -comment "vlc is known not to work in all configurations" -comment "If you can fix it, please inform buildroot@buildroot.org" -endif - config BR2_PACKAGE_VLC bool "vlc" depends on BR2_USE_MMU # fork() From c4f18dd3c8664bb6715122c62a32e3b4388fa34e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Aug 2018 10:48:55 +0200 Subject: [PATCH 2348/2640] package/vlc: needs speexdsp for optional speex support Fixes configure warning: checking for SPEEX... yes checking for SPEEXDSP... no configure: WARNING: Package speexdsp was not found in the pkg-config search path. Perhaps you should add the directory containing `speexdsp.pc' to the PKG_CONFIG_PATH environment variable Package 'speexdsp', required by 'world', not found. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/vlc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 56bfdced53..af85377c94 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -381,9 +381,9 @@ else VLC_CONF_OPTS += --disable-sdl-image endif -ifeq ($(BR2_PACKAGE_SPEEX),y) +ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) VLC_CONF_OPTS += --enable-speex -VLC_DEPENDENCIES += speex +VLC_DEPENDENCIES += speex speexdsp else VLC_CONF_OPTS += --disable-speex endif From 98e3c1eee505b6c92c75daa1772ba543936b099f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 Aug 2018 23:46:32 +0200 Subject: [PATCH 2349/2640] mesa3d-headers: fix logic to generate the dri.pc file As noted by Arnout in [1], the logic in mesa3d-headers.mk generates a bogus dri.pc file, which looks like this: prefix=/usr exec_prefix=/usr libdir=/lib includedir=/include dridriverdir=/dri Indeed, the ${...} are expanded as shell variables when the sed command is executed, while the intention is that those ${...} should go in the .pc file. By escaping those using $${...}, we get the expected .pc file: prefix=/usr exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include dridriverdir=${libdir}/dri This was detected by the not yet committed check-package improvement from Ricardo that detects bogus ${...} usage to reference make variables. [1] http://lists.busybox.net/pipermail/buildroot/2018-July/225402.html Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index de8a9dc7cf..fc88f0ed60 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -35,9 +35,9 @@ ifeq ($(BR2_PACKAGE_XORG7),y) # contains -i. define MESA3D_HEADERS_BUILD_DRI_PC sed -e 's:@\(exec_\)\?prefix@:/usr:' \ - -e 's:@libdir@:${exec_prefix}/lib:' \ - -e 's:@includedir@:${prefix}/include:' \ - -e 's:@DRI_DRIVER_INSTALL_DIR@:${libdir}/dri:' \ + -e 's:@libdir@:$${exec_prefix}/lib:' \ + -e 's:@includedir@:$${prefix}/include:' \ + -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \ -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ -e 's:@DRI_PC_REQ_PRIV@::' \ $(@D)/src/mesa/drivers/dri/dri.pc.in \ From 21f0507cc193469b8ba7fccc3fc07a2bbd12784b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Aug 2018 09:45:20 +0200 Subject: [PATCH 2350/2640] ncmpc: fix build with some old toolchains With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4, 5.5 ...), the following error is raised by the compiler: ../src/screen.cxx:60:29: required from here /usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4: error: no matching function for call to 'std::pair >::pair(const screen_functions*, Page*)' [...] /usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr] _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b) ^ /usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: note: no known conversion for argument 2 from 'Page*' to 'const std::unique_ptr&' This is due to the fact that init function of screen_functions structure returns Page* but PageMap wants a std::unique_ptr To fix this, cast raw pointer into a unique_ptr with an explicit cast Fixes: - http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...e_ptr-error-with-some-old-toolchains.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch diff --git a/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch b/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch new file mode 100644 index 0000000000..47905d71d7 --- /dev/null +++ b/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch @@ -0,0 +1,54 @@ +From 63c0c47106007f7b2a791e3e4b062a5424d3dfe8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Aug 2018 09:02:50 +0200 +Subject: [PATCH] Fix unique_ptr error with some old toolchains + +With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4, +5.5 ...), the following error is raised by the compiler: + +../src/screen.cxx:60:29: required from here +/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4: +error: no matching function for call to 'std::pair >::pair(const screen_functions*, Page*)' + +[...] + +/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: +note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr] + _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b) + ^ +/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: +note: no known conversion for argument 2 from 'Page*' to 'const +std::unique_ptr&' + +This is due to the fact that init function of screen_functions +structure returns Page* but PageMap wants a std::unique_ptr + +To fix this, cast raw pointer into a unique_ptr with an explicit cast + +Fixes: + - http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015 + +Signed-off-by: Fabrice Fontaine +--- + src/screen.cxx | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/screen.cxx b/src/screen.cxx +index dd42b25..56afd11 100644 +--- a/src/screen.cxx ++++ b/src/screen.cxx +@@ -56,8 +56,9 @@ ScreenManager::MakePage(const struct screen_functions &sf) + return i; + + auto j = pages.emplace(&sf, +- sf.init(*this, main_window.w, +- main_window.size)); ++ std::unique_ptr(sf.init(*this, ++ main_window.w, ++ main_window.size))); + assert(j.second); + return j.first; + } +-- +2.14.1 + From 272bf797c9c4d67154316619ff6fcadb63d38511 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Aug 2018 16:09:28 +0200 Subject: [PATCH 2351/2640] configs/raspberrypi2: increase ext4 filesystem size The default size of the ext4 filesystem is no longer sufficient to hold all the kernel modules built by the RPi Linux kernel configuration. Let's increase to 120 MB, like we did for raspberrypi3_defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/88314938 Signed-off-by: Thomas Petazzoni --- configs/raspberrypi2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index b5e5110d00..11877496d7 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -30,6 +30,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" From f9707ac5840df8bd707a3fad9894441c34c2cf79 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Aug 2018 16:13:22 +0200 Subject: [PATCH 2352/2640] configs/snps_archs38_vdk: use post-build script instead of overlay In commit 2cdfa6c84951b25e805d329cb7bae833d333538f ("synopsys/axs10x: Update /etc/inittab by post-build"), two Synopsys platforms were changed to use a post-build script adding an extra getty in the inittab instead of a rootfs overlay containing a custom inittab. However, in this commit, configs/snps_archs38_vdk_defconfig was not changed, even though it was using the same rootfs overlay. This commit therefore adjusts configs/snps_archs38_vdk_defconfig to also use the newly introduced post-build script, fixing the build of configs/snps_archs38_vdk_defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/88314952 Signed-off-by: Thomas Petazzoni --- configs/snps_archs38_vdk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/snps_archs38_vdk_defconfig b/configs/snps_archs38_vdk_defconfig index 129e3267e5..f8766cff8a 100644 --- a/configs/snps_archs38_vdk_defconfig +++ b/configs/snps_archs38_vdk_defconfig @@ -5,7 +5,7 @@ BR2_archs38=y # System BR2_TARGET_GENERIC_HOSTNAME="archs38_vdk" BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" -BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" BR2_TARGET_ROOTFS_EXT2=y # Linux headers same as kernel, a 4.16 series From 6ee74275367d565ee988f92a93e64002e6f529ef Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Aug 2018 16:18:51 +0200 Subject: [PATCH 2353/2640] configs: add missing dependencies of Linux on host-openssl Four defconfigs have Linux kernel configuration that need OpenSSL on the host, but forgot to express this dependency, causing build failures. This commit adjusts those defconfigs, fixing the following defconfig builds: imx6ulpico_defconfig https://gitlab.com/buildroot.org/buildroot/-/jobs/88314839 imx7dpico_defconfig https://gitlab.com/buildroot.org/buildroot/-/jobs/88314841 mx51evk_defconfig https://gitlab.com/buildroot.org/buildroot/-/jobs/88314847 orangepi_lite_defconfig https://gitlab.com/buildroot.org/buildroot/-/jobs/88314883 Signed-off-by: Thomas Petazzoni --- configs/imx6ulpico_defconfig | 1 + configs/imx7dpico_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/orangepi_lite_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 69d1a8055d..56ae588752 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -19,6 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-pico-hobbit" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # wifi firmware for brcm4339 BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index 971e4022f2..93e3fd7414 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -19,6 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # bootloader BR2_TARGET_UBOOT=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index d9790ada21..3c2d56132d 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -32,3 +32,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index 109861f21c..1c3b99cf1d 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -11,6 +11,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y From f1bdb63ff4fddc53cdb43ad670dbf6f3401c19ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Aug 2018 16:29:15 +0200 Subject: [PATCH 2354/2640] board/technologic/ts7680: fix bogus size in genimage.cfg 512B is not a correct size to express "512 bytes", and causes a genimage failure: ERROR: Invalid size suffix 'B' in '512B' To express "512 bytes", using just "512" is sufficient. With this commit, genimage works fine, and we indeed have a 512 bytes unused partition: $ fdisk -l output/images/sdcard.img Disk output/images/sdcard.img: 60 MiB, 62915584 bytes, 122882 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: 0x00000000 Device Boot Start End Sectors Size Id Type output/images/sdcard.img1 1 1 1 512B 0 Empty output/images/sdcard.img2 2 524289 524288 256M 83 Linux Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/88314963 Signed-off-by: Thomas Petazzoni --- board/technologic/ts7680/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/technologic/ts7680/genimage.cfg b/board/technologic/ts7680/genimage.cfg index b5599823dc..70b1dac64f 100644 --- a/board/technologic/ts7680/genimage.cfg +++ b/board/technologic/ts7680/genimage.cfg @@ -3,7 +3,7 @@ image sdcard.img { } partition unused { - size = 512B + size = 512 } partition rootfs { From 395bc11dde5b4ef034118a9be568131f134daaa3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Aug 2018 16:53:31 +0200 Subject: [PATCH 2355/2640] configs/arm_juno: bump ATF to v1.3 ATF in version 1.2 fails to build with: ./build/juno/release/bl1/context_mgmt.o: In function `cm_prepare_el3_exit': context_mgmt.c:(.text.cm_prepare_el3_exit+0x54): undefined reference to `cm_set_next_context' context_mgmt.c:(.text.cm_prepare_el3_exit+0x54): relocation truncated to fit: R_AARCH64_JUMP26 against undefined symbol `cm_set_next_context' This has been fixed in ATF v1.3. Even though there are even newer versions of ATF available, we take a conservative approach, and bump to the first version that has the build issue fixed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/88314771 Signed-off-by: Thomas Petazzoni --- configs/arm_juno_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig index 54506d8061..98f257387d 100644 --- a/configs/arm_juno_defconfig +++ b/configs/arm_juno_defconfig @@ -12,7 +12,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y From 6d944d1523108a13c446917d2ed55cc6dedab1f0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 13 Aug 2018 20:39:49 +0200 Subject: [PATCH 2356/2640] qt5base: fix double-conversion compile for aarch64_be Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/1fe2be0f26e5b92db57a5cfb5646dd253b731a5c Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...ble-conversion-enable-for-aarch64_be.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch diff --git a/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch b/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch new file mode 100644 index 0000000000..838f4dd7ad --- /dev/null +++ b/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch @@ -0,0 +1,26 @@ +From e81ba4e0de16ff741417ae7ed7dfe7b5a83d66e2 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 13 Aug 2018 20:15:05 +0200 +Subject: [PATCH] double-conversion: enable for aarch64_be + +Signed-off-by: Peter Seiderer +--- + .../double-conversion/include/double-conversion/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 20bfd36c84..77baa2861a 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -65,7 +65,7 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) ++ defined(__AARCH64EL__) || defined(__AARCH64EB__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +2.18.0 + From 1f3f1fb8c7324c9a50383b1cafcbd2f9d74a91f9 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 14 Aug 2018 08:38:32 -0500 Subject: [PATCH 2357/2640] package/aircrack-ng: powerpc arch requires altivec The powerpc support in this package currently requires an arch with altivec accelerator support. This is a bug and the the powerpc arch should have a non-simd option like ARM/x86. Upstream issue: https://github.com/aircrack-ng/aircrack-ng/issues/1941 Fixes http://autobuild.buildroot.net/results/87e82a5e8d0b1c1ff10ec3e59d25bcd56b329075 Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/aircrack-ng/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in index f3e2bc4ef1..d821c5a0a2 100644 --- a/package/aircrack-ng/Config.in +++ b/package/aircrack-ng/Config.in @@ -4,6 +4,9 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h + # https://github.com/aircrack-ng/aircrack-ng/issues/1941 + depends on BR2_POWERPC_CPU_HAS_ALTIVEC || \ + !(BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le) select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help A set of tools for auditing wireless networks From 7c2eb68cac14ea1281cfaca6ab81f63e72bc8016 Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Mon, 30 Jul 2018 12:24:16 +0200 Subject: [PATCH 2358/2640] lighttpd: Add systemd tmpfile to fix lighttpd systemd boot Problem starting lighttpd application with systemd. /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf 2018-06-22 11:21:34: (server.c.733) opening errorlog '/var/log/lighttpd-error.log' failed: Permission denied 2018-06-22 11:21:34: (server.c.1420) Opening errorlog failed. Going down. Lighttpd can not write the 'lighttpd-access.log' and 'lighttpd-error.log' files to the directory '/var/log/'. When using systemd the directory '/var/log' does not allow the user www-data to write. To correct the problem, we add /usr/lib/tmpfiles.d/lighttpd.conf. This file create the 'lighttpd-access.log' and 'lighttpd-error.log' files with the permission Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.mk | 3 +++ package/lighttpd/lighttpd_tmpfiles.conf | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 package/lighttpd/lighttpd_tmpfiles.conf diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index c565fed4ff..06561e9f55 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -96,6 +96,9 @@ define LIGHTTPD_INSTALL_INIT_SYSTEMD ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service + + $(INSTALL) -D -m 644 package/lighttpd/lighttpd_tmpfiles.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf endef $(eval $(autotools-package)) diff --git a/package/lighttpd/lighttpd_tmpfiles.conf b/package/lighttpd/lighttpd_tmpfiles.conf new file mode 100644 index 0000000000..a24f3f7fbf --- /dev/null +++ b/package/lighttpd/lighttpd_tmpfiles.conf @@ -0,0 +1,2 @@ +f /var/log/lighttpd-access.log 0640 www-data www-data - +f /var/log/lighttpd-error.log 0640 www-data www-data - From 5313c50aa3c1533c32ecf8d04c0628fbbb14f58d Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 26 Jul 2018 19:15:23 +0200 Subject: [PATCH 2359/2640] package/lvm2: Fix runtime crash when using uclibc When using uclibc libdevmapper.so was calling dm_task_get_info_base() function recursively, leading to segmentation fault. This was happening because uclibc linker loader just takes first existing 'dm_task_get_info' (which is 'dm_task_get_info_base') symbol in elf binary, instead of default version. Add upstreamable lvm2 patch [1], which introduces --enable-symvers[=STYLE] switch. Use that switch to disable symbol versions, as we do not plan to support binaries compiled against old libdevmapper library. Fixes bug #10781. [1] https://www.redhat.com/archives/dm-devel/2018-July/msg00187.html Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- ...gure-Introduce-enable-symvers-option.patch | 277 ++++++++++++++++++ package/lvm2/lvm2.mk | 3 +- 2 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 package/lvm2/0001-configure-Introduce-enable-symvers-option.patch diff --git a/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch b/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch new file mode 100644 index 0000000000..8ca39c2cab --- /dev/null +++ b/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch @@ -0,0 +1,277 @@ +From f563334a76e31442f7b8693d2d350e6981c51c46 Mon Sep 17 00:00:00 2001 +From: Marcin Niestroj +Date: Fri, 20 Jul 2018 14:26:44 +0200 +Subject: [PATCH] configure: Introduce --enable-symvers option + +Only few libc (e.g. glibc) libraries support full symbol version +resolution in runtime. There are lot of standard libraries that do not +support that, such as dietlibc, musl and uclibc. Hence there is no +reason to generate symbol versions when compiling against them. + +Additionally libdevmapper.so was broken when compiled against +uclibc. Runtime linker loader caused calling dm_task_get_info_base() +function recursively, leading to segmentation fault. + +Introduce --enable-symvers[=STYLE] option, which allows to choose +between gnu and disabled symbol versioning. By default gnu symbol +versioning is used to provide backward compatibility. +__GNUC__ check is replaced now with GNU_SYMVER, which is generated by +configure script. Additionally ld version script is included only in +case of gnu option, which slightly reduces output size. + +Providing --disable-symvers to configure script when building against +uclibc library fixes segmentation fault error described above, due to +lack of several versions of the same symbol in libdevmapper.so +library. + +Signed-off-by: Marcin Niestroj +--- + configure | 32 ++++++++++++++++++++++++++++++-- + configure.in | 28 +++++++++++++++++++++++++--- + include/configure.h.in | 3 +++ + lib/misc/lib.h | 10 +++++----- + libdm/datastruct/bitset.c | 5 +---- + libdm/ioctl/libdm-iface.c | 2 +- + libdm/libdm-deptree.c | 2 +- + libdm/libdm-stats.c | 2 +- + 8 files changed, 67 insertions(+), 17 deletions(-) + +diff --git a/configure b/configure +index e1ae0e884..c5d11c1b6 100755 +--- a/configure ++++ b/configure +@@ -985,6 +985,7 @@ enable_fsadm + enable_blkdeactivate + enable_dmeventd + enable_selinux ++enable_symvers + enable_nls + with_localedir + with_confdir +@@ -1729,6 +1730,9 @@ Optional Features: + --disable-blkdeactivate disable blkdeactivate + --enable-dmeventd enable the device-mapper event daemon + --disable-selinux disable selinux support ++ --enable-symvers[=STYLE] ++ enables symbol versioning of the shared library ++ [default=gnu] + --enable-nls enable Native Language Support + + Optional Packages: +@@ -3169,7 +3173,6 @@ if test -z "$CFLAGS"; then : + fi + case "$host_os" in + linux*) +- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym + CLDWHOLEARCHIVE="-Wl,-whole-archive" +@@ -3190,7 +3193,6 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="$CLDFLAGS" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -14609,6 +14611,32 @@ done + LIBS=$lvm_saved_libs + fi + ++################################################################################ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable symbol versioning" >&5 ++$as_echo_n "checking whether to enable symbol versioning... " >&6; } ++# Check whether --enable-symvers was given. ++if test "${enable_symvers+set}" = set; then : ++ enableval=$enable_symvers; ++ case "$enableval" in ++ gnu|no) ;; ++ *) as_fn_error $? "Unknown argument to enable/disable symvers" "$LINENO" 5 ;; ++ esac ++else ++ enable_symvers=gnu ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_symvers" >&5 ++$as_echo "$enable_symvers" >&6; } ++ ++if test x$GCC = xyes && test x$enable_symvers = xgnu ; then ++ ++$as_echo "#define GNU_SYMVER 1" >>confdefs.h ++ ++ case "$host_os" in ++ linux*) CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" ;; ++ esac ++fi ++ + ################################################################################ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalisation" >&5 + $as_echo_n "checking whether to enable internationalisation... " >&6; } +diff --git a/configure.in b/configure.in +index 2e5e015c8..09c390850 100644 +--- a/configure.in ++++ b/configure.in +@@ -30,12 +30,10 @@ AC_CANONICAL_TARGET([]) + AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) + case "$host_os" in + linux*) +- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" +- LDDEPS="$LDDEPS .export.sym" + LIB_SUFFIX=so + DEVMAPPER=yes + BUILD_LVMETAD=no +@@ -51,7 +49,6 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="$CLDFLAGS" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -1742,6 +1739,31 @@ package as well (which may be called readline-devel or something similar).]) + LIBS=$lvm_saved_libs + fi + ++################################################################################ ++dnl -- Symbol versioning ++AC_MSG_CHECKING(whether to enable symbol versioning) ++AC_ARG_ENABLE(symvers, ++ AC_HELP_STRING([--enable-symvers[[[=STYLE]]]], ++ [enables symbol versioning of the shared library [default=gnu]]), ++ [ ++ case "$enableval" in ++ gnu|no) ;; ++ *) AC_MSG_ERROR(Unknown argument to enable/disable symvers) ;; ++ esac], ++ enable_symvers=gnu) ++AC_MSG_RESULT($enable_symvers) ++ ++if test x$GCC = xyes && test x$enable_symvers = xgnu ; then ++ AC_DEFINE(GNU_SYMVER, 1, ++ [Define to use GNU versioning in the shared library.]) ++ case "$host_os" in ++ linux*) ++ CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" ++ LDDEPS="$LDDEPS .export.sym" ++ ;; ++ esac ++fi ++ + ################################################################################ + dnl -- Internationalisation stuff + AC_MSG_CHECKING(whether to enable internationalisation) +diff --git a/include/configure.h.in b/include/configure.h.in +index 51726506c..3fc181b1e 100644 +--- a/include/configure.h.in ++++ b/include/configure.h.in +@@ -151,6 +151,9 @@ + /* Path to fsadm binary. */ + #undef FSADM_PATH + ++/* Define to use GNU versioning in the shared library. */ ++#undef GNU_SYMVER ++ + /* Define to 1 if you have the `alarm' function. */ + #undef HAVE_ALARM + +diff --git a/lib/misc/lib.h b/lib/misc/lib.h +index 8ed06f81d..9b3ce8a03 100644 +--- a/lib/misc/lib.h ++++ b/lib/misc/lib.h +@@ -42,16 +42,16 @@ + * macro DM_EXPORT_SYMBOL to export the function and bind it to the + * specified version string. + * +- * Since versioning is only available when compiling with GCC the entire +- * compatibility version should be enclosed in '#if defined(__GNUC__)', +- * for example: ++ * Since versioning is only available when compiling with GCC ++ * and GLIBC the entire compatibility version should be enclosed ++ * in '#if defined(GNU_SYMVER)', for example: + * + * int dm_foo(int bar) + * { + * return bar; + * } + * +- * #if defined(__GNUC__) ++ * #if defined(GNU_SYMVER) + * // Backward compatible dm_foo() version 1.02.104 + * int dm_foo_v1_02_104(void); + * int dm_foo_v1_02_104(void) +@@ -68,7 +68,7 @@ + * versions of library symbols prior to the introduction of symbol + * versioning: it must never be used for new symbols. + */ +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + #define DM_EXPORT_SYMBOL(func, ver) \ + __asm__(".symver " #func "_v" #ver ", " #func "@DM_" #ver ) + #define DM_EXPORT_SYMBOL_BASE(func) \ +diff --git a/libdm/datastruct/bitset.c b/libdm/datastruct/bitset.c +index b0826e1eb..2ec3f8f84 100644 +--- a/libdm/datastruct/bitset.c ++++ b/libdm/datastruct/bitset.c +@@ -242,7 +242,7 @@ bad: + return NULL; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Maintain backward compatibility with older versions that did not + * accept a 'min_num_bits' argument to dm_bitset_parse_list(). +@@ -253,7 +253,4 @@ dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem) + return dm_bitset_parse_list(str, mem, 0); + } + DM_EXPORT_SYMBOL(dm_bitset_parse_list, 1_02_129); +- +-#else /* if defined(__GNUC__) */ +- + #endif +diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c +index c47e08467..b98afb15d 100644 +--- a/libdm/ioctl/libdm-iface.c ++++ b/libdm/ioctl/libdm-iface.c +@@ -2137,7 +2137,7 @@ void dm_lib_exit(void) + _version_checked = 0; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Maintain binary backward compatibility. + * Version script mechanism works with 'gcc' compatible compilers only. +diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c +index cf4fd62e7..474871da5 100644 +--- a/libdm/libdm-deptree.c ++++ b/libdm/libdm-deptree.c +@@ -4110,7 +4110,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode, + dnode->callback_data = data; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Backward compatible implementations. + * +diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c +index bc498675f..d424928c7 100644 +--- a/libdm/libdm-stats.c ++++ b/libdm/libdm-stats.c +@@ -5064,7 +5064,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + * current dm_stats_create_region() version. + */ + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, const char *program_id, +-- +2.18.0 + diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 20e0dd0d5c..ccdc2c38e6 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -19,7 +19,8 @@ LVM2_CONF_OPTS += \ --enable-pkgconfig \ --enable-cmdlib \ --enable-dmeventd \ - --disable-nls + --disable-nls \ + --disable-symvers LVM2_DEPENDENCIES += host-pkgconf From a3c3a54da9394afc819f70215a2cf34162c05b82 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 14 Aug 2018 23:13:09 +0200 Subject: [PATCH 2360/2640] qt5serialbus: examples need qt5 widgets module Fixes [1]: make[2]: Entering directory '.../build/qt5serialbus-5.11.1/examples' Some of the required modules (qtHaveModule(widgets)) are not available. Skipped. [...] cp -dpfr .../host/mips64el-buildroot-linux-gnu/sysroot/usr/lib/qt/examples/serialbus .../target/usr/lib/qt/examples/ cp: cannot stat '.../host/mips64el-buildroot-linux-gnu/sysroot/usr/lib/qt/examples/serialbus': No such file or directory [1] http://autobuild.buildroot.net/results/147809b5f8758af935bee48c0fc83fd86a8509e9 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 6de9f9b7d3..98c4466cb8 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -36,7 +36,7 @@ define QT5SERIALBUS_INSTALL_TARGET_LIBS endef endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) define QT5SERIALBUS_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialbus $(TARGET_DIR)/usr/lib/qt/examples/ endef From 4eccbe3ef975fa7dcc8984fa9a19c778752d70af Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Wed, 15 Aug 2018 09:16:09 +0200 Subject: [PATCH 2361/2640] package/pkg-golang: post-pone evaluation of variables As explained in pkg-generic.mk, all variable references inside the inner-xxx-package should use $$(...). Otherwise, they are evaluated too early, and will not contain the expected value. In the content of the pkg-golang infrastructure, the _SRC_DOMAIN, _SRC_VENDOR and _SRC_SOFTWARE variables were not properly escaping their reference to the $$($(2)_SITE) variable. This was not visible until now, as only target Go packages were supported, where $(2)_SITE was always defined prior to this macro being expanded. With the upcoming support of host Go packages, we need to fix this, as $(2)_SITE may be defined later, inherited from $(3)_SITE. Signed-off-by: Mirza Krak [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index bf178622b5..6eacd14180 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -77,9 +77,9 @@ $(2)_INSTALL_BINS ?= $(1) # of GOPATH. It usually resolves around domain/vendor/software. By default, we # derive domain/vendor/software from the upstream URL of the project, but we # allow $(2)_SRC_SUBDIR to be overridden if needed. -$(2)_SRC_DOMAIN = $$(call domain,$($(2)_SITE)) -$(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$($(2)_SITE)))) -$(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$($(2)_SITE)))) +$(2)_SRC_DOMAIN = $$(call domain,$$($(2)_SITE)) +$(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) +$(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) $(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) $(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) From 3d7ce0124aa6ab116f430604db72c99bcd7a299a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 15 Aug 2018 07:23:00 +0200 Subject: [PATCH 2362/2640] package/samba4: security bump to version 4.8.4 Release notes: https://www.samba.org/samba/history/samba-4.8.4.html Fixes o CVE-2018-1139 (Weak authentication protocol allowed.) o CVE-2018-1140 (Denial of Service Attack on DNS and LDAP server.) o CVE-2018-10858 (Insufficient input validation on client directory listing in libsmbclient.) o CVE-2018-10918 (Denial of Service Attack on AD DC DRSUAPI server.) o CVE-2018-10919 (Confidential attribute disclosure from the AD LDAP server.) Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 4b1b1218ac..00c8466078 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.8.3.tar.asc -sha256 e0569a8a605d5dfb49f1fdd11db796f4d36fe0351c4a7f21387ef253010b82ed samba-4.8.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.asc +sha256 f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406 samba-4.8.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 52d59ffeb9..03ef6eeeb0 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.8.3 +SAMBA4_VERSION = 4.8.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 680789fa391a8c323f449d34a0ca722b17a85997 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 Aug 2018 22:16:08 +0200 Subject: [PATCH 2363/2640] domoticz: fix appversion.default Retrieve correct appversion.default (9700) from upstream Without this patch, the wrong version is displayed in the web ui and when the user checks for an update, domoticz wrongly says that a new version is available This issue was reported by an email from Eyal Eshed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/0001-Bumped-version.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 package/domoticz/0001-Bumped-version.patch diff --git a/package/domoticz/0001-Bumped-version.patch b/package/domoticz/0001-Bumped-version.patch new file mode 100644 index 0000000000..70426ba1aa --- /dev/null +++ b/package/domoticz/0001-Bumped-version.patch @@ -0,0 +1,20 @@ +From 98723b7da9467a49222b8a7ffaae276c5bc075c1 Mon Sep 17 00:00:00 2001 +From: gizmocuz +Date: Thu, 28 Jun 2018 08:00:58 +0200 +Subject: [PATCH] Bumped version + +Signed-off-by: Fabrice Fontaine +[Retrieved from https://github.com/domoticz/domoticz/commit/98723b7da9467a49222b8a7ffaae276c5bc075c1] +--- + appversion.default | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/appversion.default b/appversion.default +index beaa069bb..7d3530590 100644 +--- a/appversion.default ++++ b/appversion.default +@@ -1,3 +1,3 @@ +-#define APPVERSION 5876 ++#define APPVERSION 9700 + #define APPHASH "b97777b" + #define APPDATE 1478691222 From 73cdfc6a4d8ab9a1041f9e58be9102cad74f3647 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 Aug 2018 22:34:19 +0200 Subject: [PATCH 2364/2640] boost: locale needs thread with icu output/host/usr/bin/nios2-linux-readelf -d output/staging/usr/lib/libboost_locale.so Dynamic section at offset 0x125ec0 contains 36 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_chrono.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_thread.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] 0x00000001 (NEEDED) Shared library: [librt.so.1] 0x00000001 (NEEDED) Shared library: [libicudata.so.60] 0x00000001 (NEEDED) Shared library: [libicui18n.so.60] 0x00000001 (NEEDED) Shared library: [libicuuc.so.60] Fixes: - http://autobuild.buildroot.net/results/57838f7cd84f37b66ab7007deaea847af8f54b72 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 510ed336e4..035a450d12 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -190,6 +190,7 @@ config BR2_PACKAGE_BOOST_LOCALE # details. depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU) select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Provide localization and Unicode handling tools for C++. From 6607d6656319e8801ba2c9d5e74a54ad6e2900ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 Aug 2018 22:34:20 +0200 Subject: [PATCH 2365/2640] boost: thread needs chrono chrono is selected by thread (see libs/thread/build/Jamfile.v2): rule usage-requirements ( properties * ) { [...] result += /boost/chrono//boost_chrono ; } So add this select for BR2_PACKAGE_BOOST_THREAD and remove it from BR2_PACKAGE_BOOST_COROUTINE, BR2_PACKAGE_BOOST_LOG, BR2_PACKAGE_TYPE_ERASURE and BR2_PACKAGE_BOOST_WAVE Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 035a450d12..b7991ae367 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -101,7 +101,6 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context - select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD @@ -206,7 +205,6 @@ config BR2_PACKAGE_BOOST_LOG # log module depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) select BR2_PACKAGE_BOOST_ATOMIC - select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_REGEX @@ -314,6 +312,7 @@ config BR2_PACKAGE_BOOST_TEST config BR2_PACKAGE_BOOST_THREAD bool "boost-thread" + select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM help Portable C++ multi-threading. C++11, C++14. @@ -327,7 +326,6 @@ config BR2_PACKAGE_BOOST_TIMER config BR2_PACKAGE_BOOST_TYPE_ERASURE bool "boost-type_erasure" - select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help @@ -338,7 +336,6 @@ config BR2_PACKAGE_BOOST_WAVE # limitation of assembler for coldfire # error: Tried to convert PC relative branch to absolute jump depends on !BR2_m68k_cf - select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM From f45976b2c759b1630a2886e75312340b3b511f81 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 14 Aug 2018 07:24:51 +0300 Subject: [PATCH 2366/2640] bzip2: change upstream site The bzip.org website is down. Use the Buildroot backup download site. Remove the website link as there is no clear alternative upstream at this point. https://lwn.net/Articles/762264/ Signed-off-by: Baruch Siach Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/bzip2/Config.in | 2 -- package/bzip2/bzip2.mk | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/bzip2/Config.in b/package/bzip2/Config.in index dbc82496df..ca447bbb2d 100644 --- a/package/bzip2/Config.in +++ b/package/bzip2/Config.in @@ -5,5 +5,3 @@ config BR2_PACKAGE_BZIP2 It typically compresses files to within 10% to 15% of the best available techniques, while being around twice as fast at compression and six times faster at decompression. - - http://www.bzip.org diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index e43533072b..a3af322993 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -5,7 +5,7 @@ ################################################################################ BZIP2_VERSION = 1.0.6 -BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION) +BZIP2_SITE = http://sources.buildroot.net BZIP2_INSTALL_STAGING = YES BZIP2_LICENSE = bzip2 license BZIP2_LICENSE_FILES = LICENSE From 6288409642d8368104f916bd264d2cb042942dfa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 16 Aug 2018 11:42:18 +0200 Subject: [PATCH 2367/2640] libselinux: add patch to fix build with gcc < 4.7 This commit adds a patch from Hollis Blanchard on libselinux to fix build on host machines that have gcc < 4.7. Fixes: http://autobuild.buildroot.net/results/a82bb0c0b22ff24263ad7a7d165b21c0df7b3b1d/ Signed-off-by: Thomas Petazzoni --- ...ak-around-__atomic_-with-GCC-4.7.patch.txt | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt diff --git a/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt b/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt new file mode 100644 index 0000000000..85bd064066 --- /dev/null +++ b/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt @@ -0,0 +1,70 @@ +From abe76789f8e7ce61b357f693eaed5b28feab5ce2 Mon Sep 17 00:00:00 2001 +From: Hollis Blanchard +Date: Mon, 13 Aug 2018 12:11:33 -0700 +Subject: [PATCH] Fix build break around __atomic_*() with GCC<4.7 + +The __atomic_* GCC primitives were introduced in GCC 4.7, but Red Hat +Enterprise Linux 6.x (for example) provides GCC 4.4. Tweak the current code to +use the (most conservative) __sync_synchronize() primitive provided by those +older GCC versions. + +(Really, no __atomic or __sync operations are needed here at all, since POSIX +4.12 "Memory Synchronization" says pthread_mutex_lock() and +pthread_mutex_unlock() "synchronize memory with respect to other threads"...) + +Signed-off-by: Hollis Blanchard +--- + libselinux/src/label_file.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/libselinux/src/label_file.h b/libselinux/src/label_file.h +index 2fa85474..47859baf 100644 +--- a/libselinux/src/label_file.h ++++ b/libselinux/src/label_file.h +@@ -351,8 +351,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, + * init_routine does not take a parameter, it's not possible + * to use, so we generate the same effect with atomics and a + * mutex */ ++#ifdef __ATOMIC_RELAXED + regex_compiled = + __atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE); ++#else ++ /* GCC <4.7 */ ++ __sync_synchronize(); ++ regex_compiled = spec->regex_compiled; ++#endif + if (regex_compiled) { + return 0; /* already done */ + } +@@ -360,8 +366,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, + __pthread_mutex_lock(&spec->regex_lock); + /* Check if another thread compiled the regex while we waited + * on the mutex */ ++#ifdef __ATOMIC_RELAXED + regex_compiled = + __atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE); ++#else ++ /* GCC <4.7 */ ++ __sync_synchronize(); ++ regex_compiled = spec->regex_compiled; ++#endif + if (regex_compiled) { + __pthread_mutex_unlock(&spec->regex_lock); + return 0; +@@ -404,7 +416,13 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, + } + + /* Done. */ ++#ifdef __ATOMIC_RELAXED + __atomic_store_n(&spec->regex_compiled, true, __ATOMIC_RELEASE); ++#else ++ /* GCC <4.7 */ ++ spec->regex_compiled = true; ++ __sync_synchronize(); ++#endif + __pthread_mutex_unlock(&spec->regex_lock); + return 0; + } +-- +2.13.0 + From 9a1059b86a0fe9e880552bf0a4b64b8480f91738 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 16 Aug 2018 20:30:31 +0200 Subject: [PATCH 2368/2640] boost: put back chrono select for coroutine coroutine module does use chrono directly: ./libs/coroutine/performance/asymmetric/segmented/Jamfile.v2: /boost/chrono//boost_chrono ./libs/coroutine/performance/asymmetric/Jamfile.v2: /boost/chrono//boost_chrono ./libs/coroutine/performance/symmetric/segmented/Jamfile.v2: /boost/chrono//boost_chrono ./libs/coroutine/performance/symmetric/Jamfile.v2: /boost/chrono//boost_chrono So put back select of chrono for coroutine Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index b7991ae367..97695e17b7 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -101,6 +101,7 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD From 345a8eeda1cdb5d5d9a5c00a740e8143110e9f73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 15 Aug 2018 22:17:20 +0200 Subject: [PATCH 2369/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7d7a6e1a61..858db1f941 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.147" if BR2_KERNEL_HEADERS_4_4 - default "4.9.119" if BR2_KERNEL_HEADERS_4_9 + default "4.4.148" if BR2_KERNEL_HEADERS_4_4 + default "4.9.120" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.62" if BR2_KERNEL_HEADERS_4_14 + default "4.14.63" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.14" if BR2_KERNEL_HEADERS_4_17 + default "4.17.15" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 65c47ce0a8d646211a5222035a821056896a5886 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 15 Aug 2018 22:17:21 +0200 Subject: [PATCH 2370/2640] linux: bump default to version 4.17.15 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 5f2a6d738c..12f180370f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.15" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 8654a214ff5efc93401ba6dfae00d75f77ad1bd7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 17 Aug 2018 07:32:07 +0200 Subject: [PATCH 2371/2640] package/libopenssl: security bump to version 1.0.2p Fixes CVE-2018-0732 & CVE-2018-0737: https://www.openssl.org/news/vulnerabilities.html Added upstream sha1 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 6 ++++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 48b7471c20..2b1e048751 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,7 @@ -# From https://www.openssl.org/source/openssl-1.0.2o.tar.gz.sha256 -sha256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d openssl-1.0.2o.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha256 +sha256 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 openssl-1.0.2p.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha1 +sha1 f34b5322e92415755c7d58bf5d0d5cf37666382c openssl-1.0.2p.tar.gz # Locally computed sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 16a9c2e9d2..d8e3dd8b56 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.0.2o +LIBOPENSSL_VERSION = 1.0.2p LIBOPENSSL_SITE = http://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From 0f09daba15fc4d412aadb02491a4baab138d368e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Aug 2018 22:11:37 +0200 Subject: [PATCH 2372/2640] sheevaplug_defconfig: bump u-boot to 2018.07 to fix build issue u-boot 2016.05 no longer builds with the default gcc/binutils versions: https://gitlab.com/buildroot.org/buildroot/-/jobs/88314946 LD u-boot fs/built-in.o: In function `read_symbol': /builds/buildroot.org/buildroot/output/build/uboot-2016.05/fs/jffs2/mini_inflate.c:129: undefined reference to `pull_bit' fs/built-in.o: In function `decompress_huffman': /builds/buildroot.org/buildroot/output/build/uboot-2016.05/fs/jffs2/mini_inflate.c:159: undefined reference to `pull_bits' /builds/buildroot.org/buildroot/output/build/uboot-2016.05/fs/jffs2/mini_inflate.c:170: undefined reference to `pull_bits' .. /builds/buildroot.org/buildroot/output/host/bin/arm-buildroot-linux-uclibcgnueabi-ld.bfd: BFD (GNU Binutils) 2.29.1 assertion fail elf32-arm.c:9509 Makefile:1192: recipe for target 'u-boot' failed make[1]: *** [u-boot] Error 1 make[1]: Leaving directory '/builds/buildroot.org/buildroot/output/build/uboot-2016.05' Signed-off-by: Peter Korsgaard --- configs/sheevaplug_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index edafffe0a0..17139f7afb 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sheevaplug" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_FORMAT_KWB=y # BR2_TARGET_UBOOT_NETWORK is not set From 1c5b7ba27b8cf03f618464eebe062987a97d515c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Aug 2018 22:11:38 +0200 Subject: [PATCH 2373/2640] sheevaplug_defconfig: bump linux to 4.14.63 to include latest fixes Signed-off-by: Peter Korsgaard --- configs/sheevaplug_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 17139f7afb..052e39398a 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -26,7 +26,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.63" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 1ee626aab95f63105551334f7f29c9096436bfe9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Aug 2018 22:11:39 +0200 Subject: [PATCH 2374/2640] sheevaplug: add a basic readme Describing how to update the board. Signed-off-by: Peter Korsgaard --- board/sheevaplug/readme.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 board/sheevaplug/readme.txt diff --git a/board/sheevaplug/readme.txt b/board/sheevaplug/readme.txt new file mode 100644 index 0000000000..e0ed2684c9 --- /dev/null +++ b/board/sheevaplug/readme.txt @@ -0,0 +1,36 @@ +Sheevaplug +========== + +Once the build process is finished you will have the following files +in the output/images/ directory: + +- u-boot.kwb +- uImage.kirkwood-sheevaplug +- rootfs.jffs2 + +Copy these to a TFTP server, connect ethernet and mini-USB cable and +power up the board. Stop the board in U-Boot and update U-Boot by +executing: + +setenv serverip +setenv bootfile +bootp +nand erase 0x0 0x80000 +nand write $fileaddr 0x0 0x80000 +reset + +Once the new U-Boot boots up, stop it again and update Linux kernel +and rootfs by: + +setenv serverip +setenv bootfile +bootp +nand erase.part kernel +nand write $fileaddr kernel 0x400000 + +setenv bootfile +bootp +nand erase.part rootfs +nand write $fileaddr rootfs $filesize + +reset From 1b53b177a638eff051caf017d3f4b92cbb52223b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 16 Aug 2018 22:45:23 +0200 Subject: [PATCH 2375/2640] linux: replace shell for loop with make foreach loop This commit replaces the loop copying out-of-tree DTS into the kernel tree by a make foreach loop instead of a shell for loop. This allows to error out if one of the DTS file cannot be copied (for example if it doesn't exist). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- linux/linux.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7527b11673..e0d437427d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -389,9 +389,9 @@ endif # Compilation. We make sure the kernel gets rebuilt when the # configuration has changed. define LINUX_BUILD_CMDS - @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ - cp -f $${dts} $(LINUX_ARCH_PATH)/boot/dts/ ; \ - done + $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ + cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ + ) $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ From 1d8d6cbdcc9fb85db6f885ffd9019174ce9952bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Aug 2018 23:31:50 +0200 Subject: [PATCH 2376/2640] orangepi_pc_defconfig: bump u-boot to 2018.07 to fix build issue u-boot 2018.05 now fails to build with the following error: HOSTCC scripts/dtc/flattree.o In file included from /builds/buildroot.org/buildroot/output/host/include/libfdt.h:54:0, from /builds/buildroot.org/buildroot/output/build/uboot-2018.05/scripts/dtc/libfdt/fdt.c:54: /builds/buildroot.org/buildroot/output/host/include/libfdt_env.h:82:24: error: redefinition of 'fdt16_to_cpu' static inline uint16_t fdt16_to_cpu(fdt16_t x) ^~~~~~~~~~~~ In file included from /builds/buildroot.org/buildroot/output/build/uboot-2018.05/scripts/dtc/libfdt/fdt.c:51:0: /builds/buildroot.org/buildroot/output/build/uboot-2018.05/scripts/dtc/libfdt/libfdt_env.h:81:24: note: previous definition of 'fdt16_to_cpu' was here static inline uint16_t fdt16_to_cpu(fdt16_t x) ^~~~~~~~~~~~ https://gitlab.com/buildroot.org/buildroot/-/jobs/88314886 Fix it by bumping the u-boot version to 2018.07. Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 05199af53b..fc7e0040aa 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 19f1f071f511d332b8e3508b741c0cdc2bb580a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Aug 2018 23:31:51 +0200 Subject: [PATCH 2377/2640] orangepi_pc_defconfig: bump linux to 4.17.15 to include latest fixes Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index fc7e0040aa..313b7ab3a4 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 931111604c945fa4576ff59e0c5c5c93184bb215 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Aug 2018 00:16:00 +0200 Subject: [PATCH 2378/2640] orangepi_zero_defconfig: bump u-boot to 2018.07 to fix build issue u-boot 2018.01 now fails to build with the following error: CC arch/arm/lib/asm-offsets.s In file included from /builds/buildroot.org/buildroot/output/host/include/libfdt.h:54:0, from /builds/buildroot.org/buildroot/output/build/uboot-2018.01/scripts/dtc/libfdt/fdt.c:54: /builds/buildroot.org/buildroot/output/host/include/libfdt_env.h:82:24: error: redefinition of 'fdt16_to_cpu' static inline uint16_t fdt16_to_cpu(fdt16_t x) ^~~~~~~~~~~~ In file included from /builds/buildroot.org/buildroot/output/build/uboot-2018.01/scripts/dtc/libfdt/fdt.c:51:0: /builds/buildroot.org/buildroot/output/build/uboot-2018.01/scripts/dtc/libfdt/libfdt_env.h:81:24: note: previous definition of 'fdt16_to_cpu' was here static inline uint16_t fdt16_to_cpu(fdt16_t x) https://gitlab.com/buildroot.org/buildroot/-/jobs/88314891 Fix it by bumping the u-boot version to 2018.07. Signed-off-by: Peter Korsgaard --- configs/orangepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index fcf9b325cd..ae2b80900c 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From f881e72248aedd9b8a9b024f94563e0398fdafa0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Aug 2018 00:16:01 +0200 Subject: [PATCH 2379/2640] orangepi_zero_defconfig: bump linux to 4.17.15 to include latest fixes Signed-off-by: Peter Korsgaard --- configs/orangepi_zero_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index ae2b80900c..87962152f3 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" From 9c2bbc3fc9a6193ac866c06d474e99f6e428efbc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Aug 2018 09:01:21 +0200 Subject: [PATCH 2380/2640] libfuse: security bump to version 2.9.8 Fixes CVE-2018-10906 - In fuse before versions 2.9.8 and 3.x before 3.2.5, fusermount is vulnerable to a restriction bypass when SELinux is active. This allows non-root users to mount a FUSE file system with the 'allow_other' mount option regardless of whether 'user_allow_other' is set in the fuse configuration. An attacker may use this flaw to mount a FUSE file system, accessible by other users, and trick them into accessing files on that file system, possibly causing Denial of Service or other unspecified effects. And additionally: - libfuse no longer segfaults when fuse_interrupted() is called outside the event loop. - The fusermount binary has been hardened in several ways to reduce potential attack surface. Most importantly, mountpoints and mount options must now match a hard-coded whitelist. It is expected that this whitelist covers all regular use-cases. Signed-off-by: Peter Korsgaard --- package/libfuse/libfuse.hash | 2 +- package/libfuse/libfuse.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse/libfuse.hash b/package/libfuse/libfuse.hash index f02c78418e..3d1b973071 100644 --- a/package/libfuse/libfuse.hash +++ b/package/libfuse/libfuse.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874 fuse-2.9.7.tar.gz +sha256 5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3 fuse-2.9.8.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index dc177d03c1..e8a79a3166 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE_VERSION = 2.9.7 +LIBFUSE_VERSION = 2.9.8 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 From d9cfe343d230fe95ad84842b9b2ed87667da6430 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 15 Aug 2018 15:14:09 +0300 Subject: [PATCH 2381/2640] cryptsetup: fix build with pre C11 toolchains Add a patch removing a redefined typedef. Redefinition of typedef, even to the same type, used to be illegal before C11. Fixes: http://autobuild.buildroot.net/results/93b/93b300a62f2ddbad66eab08e25fc3225969f224b/ http://autobuild.buildroot.net/results/6c6/6c6092d633400498ee5b8090733a949a9632e473/ http://autobuild.buildroot.net/results/f46/f46ef6123b5fa92753ff534b4ef7bea3f53ac388/ Signed-off-by: Baruch Siach Tested-by: Hollis Blanchard Signed-off-by: Peter Korsgaard --- .../0001-Remove-json_object-typedef.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/cryptsetup/0001-Remove-json_object-typedef.patch diff --git a/package/cryptsetup/0001-Remove-json_object-typedef.patch b/package/cryptsetup/0001-Remove-json_object-typedef.patch new file mode 100644 index 0000000000..fa865314a7 --- /dev/null +++ b/package/cryptsetup/0001-Remove-json_object-typedef.patch @@ -0,0 +1,46 @@ +From 567e7f8664c621f8aeaa95d9f4ab4b590574f572 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Wed, 15 Aug 2018 14:13:46 +0300 +Subject: [PATCH] Remove json_object typedef + +The json-c header already defines the same typedef. While C11 allows +typedef redefinition to the same type, older versions of gcc disallow +that. + +In file included from lib/luks2/luks2_internal.h:32, + from lib/luks2/luks2_disk_metadata.c:24: +lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object' + +Signed-off-by: Baruch Siach +--- + lib/luks2/luks2.h | 1 - + lib/setup.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h +index ee57b41ba974..25e36190da45 100644 +--- a/lib/luks2/luks2.h ++++ b/lib/luks2/luks2.h +@@ -83,7 +83,6 @@ struct luks2_hdr_disk { + /* + * LUKS2 header in-memory. + */ +-typedef struct json_object json_object; + struct luks2_hdr { + size_t hdr_size; + uint64_t seqid; +diff --git a/lib/setup.c b/lib/setup.c +index fddbe7ef7897..856f6e80f465 100644 +--- a/lib/setup.c ++++ b/lib/setup.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "libcryptsetup.h" + #include "luks.h" +-- +2.18.0 + From 45768d28f171c4649d0f47ea174fca8ad66a1e6f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 17 Aug 2018 12:35:44 +0300 Subject: [PATCH 2382/2640] dbus: bump to version 1.2.10 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 5 +++-- package/dbus/dbus.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 91d270eb13..92c0c94210 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz.asc -sha256 e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3 dbus-1.12.8.tar.gz +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.10.tar.gz.asc +# using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F +sha256 4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7 dbus-1.12.10.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 8cf4367bf2..0a56de5a4e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.8 +DBUS_VERSION = 1.12.10 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From f70b13a7cb6eb01e9d78fddcb695b84a22e5699b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 17 Aug 2018 12:43:15 +0300 Subject: [PATCH 2383/2640] dahdi-tools: unify dependencies comments The threads dependency comment is currently shown even though the toolchain supports threads, only because kernel build is disabled. Merge the kernel and threads comments. This is similar to what we have in other packages that need the kernel. Cc: Yann E. MORIN Signed-off-by: Baruch Siach Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/dahdi-tools/Config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/dahdi-tools/Config.in b/package/dahdi-tools/Config.in index 39042df041..a5f145dfe8 100644 --- a/package/dahdi-tools/Config.in +++ b/package/dahdi-tools/Config.in @@ -15,9 +15,5 @@ config BR2_PACKAGE_DAHDI_TOOLS http://www.asterisk.org/downloads/dahdi -# Two comments, otherwise it may not fit in menuconfig for narrow terminals -comment "dahdi-tools needs a toolchain w/ threads" +comment "dahdi-tools needs a toolchain w/ threads and a Linux kernel to be built" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LINUX_KERNEL - -comment "dahdi-tools needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL From c48f8a64626c60bd1b46804b7cf1a699ff53cdf3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 14:38:03 +0200 Subject: [PATCH 2384/2640] package/m4: fix build on host with glibc-2.28 glibc-2.28 did quite some lifting in their headers, which breaks the way some packages were detecting glibc, like gnulib. However, packages do bundle gnulib (it was meant to be bundled), and so does m4. Since m4 hasn't seen the slightest commit since 2017-01-09, it is bundling an old gnulib version, that predates glibc-2.28, and thus breaks. It also means that upstream hasn't already fixed the issue. Furthermore, as upstream is using a git submodule for gnulib, and that the paths are not the same in the release tarball (in lib/) and in the git tree (in gnulib/), we can't do a plain backport. So, we selectively backport the two patches from gnulib upstream, restricted to only the files that happen to be used in m4. Signed-off-by: "Yann E. MORIN" Reported-by: c32 on IRC Signed-off-by: Peter Korsgaard --- ...adjust-to-glibc-2.28-libio.h-removal.patch | 166 ++++++++++++++++++ ...e-more-paranoid-about-libio.h-change.patch | 151 ++++++++++++++++ 2 files changed, 317 insertions(+) create mode 100644 package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch create mode 100644 package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch diff --git a/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch new file mode 100644 index 0000000000..5c5c11b990 --- /dev/null +++ b/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -0,0 +1,166 @@ +From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. + +[yann.morin.1998@free.fr: partially backport from upstream gnulib] +Signed-off-by: "Yann E. MORIN" + +--- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/stdio-impl.h | 6 ++++++ + 7 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c +index c84e3a5b4..789f50e4e 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c +index c2ecb5b28..23ec76ee5 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.14.1 + diff --git a/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch new file mode 100644 index 0000000000..a820ca8ca9 --- /dev/null +++ b/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch @@ -0,0 +1,151 @@ +From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 8 Mar 2018 16:42:45 -0800 +Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change + +Suggested by Eli Zaretskii in: +https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. +--- + lib/fflush.c | 9 ++++++--- + lib/fpending.c | 3 ++- + lib/fpurge.c | 3 ++- + lib/freadahead.c | 3 ++- + lib/freading.c | 3 ++- + lib/fseeko.c | 6 ++++-- + 6 files changed, 18 insertions(+), 9 deletions(-) + +[yann.morin.1998@free.fr: partially backport from upstream gnulib] +Signed-off-by: "Yann E. MORIN" + +diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c +index a6edfa105..a140b7ad9 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,8 @@ + #undef fflush + + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1) ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c +index 789f50e4e..7bc235ded 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,8 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c +index 3aedcc373..554790b56 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,8 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c +index 23ec76ee5..ed3dd0ebd 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c +index c24d0c88a..790f92ca3 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,8 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c +index 193f4e8ce..e5c5172e7 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +-- +2.14.1 + From ae977e942893ac7e5c9b69418f047acae1603c27 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Aug 2018 16:47:36 +0200 Subject: [PATCH 2385/2640] python-django: security bump to version 1.11.15 Bump to the latest release of the 1.11.x LTS series as 1.10.x is no longer supported upstream: https://www.djangoproject.com/download/ Fixes the following security issues: - CVE-2017-12794: Possible XSS in traceback section of technical 500 debug page (1.11.5) - CVE-2018-6188: Information leakage in AuthenticationForm (1.11.10) - CVE-2018-7536: Denial-of-service possibility in urlize and urlizetrunc template filters (1.11.11) - CVE-2018-7537: Denial-of-service possibility in truncatechars_html and truncatewords_html template filters (1.11.11) - CVE-2018-14574: Open redirect possibility in CommonMiddleware (1.11.15) Also add a hash for the license file. Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 6 +++--- package/python-django/python-django.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 09be18440b..bc7aed9479 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/django/json, sha256 locally computed -md5 693dfeabad62c561cb205900d32c2a98 Django-1.10.7.tar.gz -sha256 593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8 Django-1.10.7.tar.gz +# From https://www.djangoproject.com/m/pgp/Django-1.11.15.checksum.txt +sha256 b18235d82426f09733d2de9910cee975cf52ff05e5f836681eb957d105a05a40 Django-1.11.15.tar.gz +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 9056f00cf0..ae604dbc97 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 1.10.7 +PYTHON_DJANGO_VERSION = 1.11.15 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://pypi.python.org/packages/15/b4/d4bb7313e02386bd23a60e1eb5670321313fb67289c6f36ec43bce747aff +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/43/b5/b44286e56a5211d37b4058dcd5e62835afa5ce5aa6a38b56bd04c0d01cbc PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools From e477dc19b5264c8fd01ff235dded4f148fde7a65 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 17 Aug 2018 08:16:20 +1000 Subject: [PATCH 2386/2640] eigen: Fix pkg-config file prefix error eigen generates a pkg-config file which has a broken prefix (@CMAKE_INSTALL_PREFIX@). This broken prefix causes an incorrect path when other packages call pkg-config --cflags eigen. This patch fixes the prefix in the generated eigen pc file, so projects which depend on this pc file can now correctly find the eigen include directory at build time. Also correct the Cflags output to use the runtime prefix instead of the build time STAGING_DIR, like we do elsewhere. [Peter: drop backslashes, tweak commit message] Signed-off-by: Matt Flax Signed-off-by: Peter Korsgaard --- package/eigen/eigen.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 89f54fb948..27c4e212a9 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -23,7 +23,8 @@ endif # Generate the .pc file at build time define EIGEN_BUILD_CMDS sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \ - -e 's,^Cflags: .*,Cflags: -I$(EIGEN_DEST_DIR),' \ + -e 's,^Cflags: .*,Cflags: -I$$\{prefix\}/include/eigen3,' \ + -e 's,^prefix.*,prefix=/usr,' \ $(@D)/eigen3.pc.in >$(@D)/eigen3.pc endef From 46cfed78b10a8e17d3d2c35e38b8fb5bf80dd282 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Aug 2018 17:44:18 +0200 Subject: [PATCH 2387/2640] ruby: security bump to version 2.4.4 Fixes the following security issues: CVE-2017-17405: Command injection vulnerability in Net::FTP (2.4.3): https://www.ruby-lang.org/en/news/2017/12/14/net-ftp-command-injection-cve-2017-17405/ CVE-2017-17742: HTTP response splitting in WEBrick (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/http-response-splitting-in-webrick-cve-2017-17742/ CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/unintentional-file-and-directory-creation-with-directory-traversal-cve-2018-6914/ CVE-2018-8777: DoS by large request in WEBrick (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/large-request-dos-in-webrick-cve-2018-8777/ CVE-2018-8778: Buffer under-read in String#unpack (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/buffer-under-read-unpack-cve-2018-8778/ CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/poisoned-nul-byte-unixsocket-cve-2018-8779/ CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir (2.4.4): https://www.ruby-lang.org/en/news/2018/03/28/poisoned-nul-byte-dir-cve-2018-8780/ Multiple vulnerabilities in RubyGems (2.4.4): https://www.ruby-lang.org/en/news/2018/02/17/multiple-vulnerabilities-in-rubygems/ Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index d066186d56..dd4cfc202b 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# From https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/ -sha256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ruby-2.4.2.tar.xz +# From https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/ +sha256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ruby-2.4.4.tar.xz # License files, Locally calculated sha256 5cda9584acd5e1096276a375085b7e659fa67a072fd69ec2c3931e54f7f563bb LEGAL sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 365b8cead2..b85ee9d069 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 RUBY_VERSION_EXT = 2.4.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From d00ac6c7236945d026ea748c5f8739db1e4dec6d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 11:09:50 +0200 Subject: [PATCH 2388/2640] package/x11r7/xdriver_xf86-video-ati: fix glamor dependency Glamor support needs egl, fix dependency after https://git.buildroot.net/buildroot/commit/?id=5b4bcbdafbe8e7b42d4e085a0524d70665cdbaf5 Fixes http://autobuild.buildroot.net/results/6ac/6acd5ad820a47fc3442d3e3a5d8d72b396fb6e41/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index d283f789f8..4f1b4da8bd 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -15,7 +15,7 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor else XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor From addd279d7328007455abec8334ab4d7aa7f80fe9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 11:09:33 +0200 Subject: [PATCH 2389/2640] package/php: security bump to version 7.2.9 Version 7.2.8 fixed CVE-2018-12882, CVE-2018-14883 & CVE-2018-14851: http://www.php.net/ChangeLog-7.php#7.2.8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 4ddef44274..6e401dec00 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2 php-7.2.5.tar.xz +sha256 3585c1222e00494efee4f5a65a8e03a1e6eca3dfb834814236ee7f02c5248ae0 php-7.2.9.tar.xz # License file sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 028fa6fc55..04a32283c8 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.2.5 +PHP_VERSION = 7.2.9 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 6d3723147659542ec1cba4139981d75413d89edc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 10:08:01 +0200 Subject: [PATCH 2390/2640] package/samba4: Fix uClibc build on 64bit platforms by including stdint.h Patch needed to be updated for samba-4.8.4 Fixes http://autobuild.buildroot.net/results/140/1404a594583ff192d70086ef590f924472465c89/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-on-64bit-platforms-by-including-std.patch | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch index 1256d1c969..0f174d5369 100644 --- a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch +++ b/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch @@ -1,4 +1,4 @@ -From 4a63f267efab2ef86adbeddda45909127135d7c8 Mon Sep 17 00:00:00 2001 +From 3d91847322eba55e97adc76c5c95570382af7059 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jan 2018 11:57:11 +0100 Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h @@ -20,15 +20,19 @@ define uintptr_t, this patch includes stdint.h when needed. Patch sent upstream: https://lists.samba.org/archive/samba-technical/2018-January/125306.html +[updated for samba-4.8.4, v2 sent upstream + https://lists.samba.org/archive/samba-technical/2018-August/129732.html] + Signed-off-by: Bernd Kuhls --- lib/ldb/tests/ldb_mod_op_test.c | 1 + lib/ldb/tests/ldb_msg.c | 1 + + libcli/auth/tests/ntlm_check.c | 1 + libcli/smb/test_smb1cli_session.c | 1 + - 3 files changed, 3 insertions(+) + 4 files changed, 4 insertions(+) diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c -index cf2288c7bce..4690594186e 100644 +index c8b9c1aa9ff..4893dc3b38b 100644 --- a/lib/ldb/tests/ldb_mod_op_test.c +++ b/lib/ldb/tests/ldb_mod_op_test.c @@ -13,6 +13,7 @@ @@ -51,6 +55,18 @@ index f8de418e0dc..31786a9a318 100644 #include #include +diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c +index e87a0a276d4..65c7b086008 100644 +--- a/libcli/auth/tests/ntlm_check.c ++++ b/libcli/auth/tests/ntlm_check.c +@@ -40,6 +40,7 @@ + */ + #include + #include ++#include + #include + #include + diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c index d1e21d5431e..6a526c96b61 100644 --- a/libcli/smb/test_smb1cli_session.c @@ -63,5 +79,5 @@ index d1e21d5431e..6a526c96b61 100644 #include -- -2.11.0 +2.18.0 From 5f6f910cc9978910ebab5e088cb7c3870371b382 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Aug 2018 00:10:13 +0200 Subject: [PATCH 2391/2640] toolchain: add BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS hidden option Add BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS variable and use it in BR2_TOOLCHAIN_HAS_GCC_BUG_64735. This new variable will be used to select boost atomic when lock-free atomic ints are not available Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 3a53a32a6d..ad02af5215 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -69,18 +69,35 @@ comment "Toolchain Generic Options" config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 bool -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735 -# exception_ptr, nested_exception, and future from libstdc++ are not -# available for architectures not supporting always lock-free atomic -# ints before GCC 7 +# Atomic types can be: +# - never lock-free +# - sometimes lock-free +# - always lock-free +# see https://en.cppreference.com/w/c/atomic/ATOMIC_LOCK_FREE_consts +# +# On most architectures, gcc provides "always lock-free" atomic types, +# but a few architectures are limited to "sometimes lock-free" +# types. This hidden option allows to know if the architecture +# provides "always lock-free" atomic types. +config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS + bool + default y + depends on !BR2_nios2 + depends on !BR2_ARM_CPU_ARMV4 + depends on !BR2_ARM_CPU_ARMV5 + depends on !BR2_sparc_v8 + depends on !BR2_m68k_cf5208 + +# Prior to gcc 7.x, exception_ptr, nested_exception and future from +# libstdc++ would only be provided on architectures that support +# always lock-free atomic ints. See +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735. This issue has +# been removed in GCC 7.x, where exception propagation is now +# supported without lock-free atomic int. config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 bool - default y if BR2_nios2 - default y if BR2_ARM_CPU_ARMV4 - default y if BR2_ARM_CPU_ARMV5 - default y if BR2_sparc_v8 - default y if BR2_m68k_cf5208 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + default y if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS && \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no # longer exists in gcc 8.x. From e2928dfa080658c35f6f0b7c9e62a3ade438a827 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Aug 2018 00:10:14 +0200 Subject: [PATCH 2392/2640] boost: thread needs atomic if GCC hasn't lock-free When gcc has not always lock-free atomic ints: - lockfree boost::atomic_flag : no boost thread needs boost atomic: output/host/usr/bin/nios2-linux-readelf -d output/staging/usr/lib/libboost_thread.so Dynamic section at offset 0x2cee0 contains 32 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libboost_system.so.1.67.0] 0x00000001 (NEEDED) Shared library: [libboost_atomic.so.1.67.0] Fixes: - http://autobuild.buildroot.net/results/5a7db292f1365f27e32695527701d5b827f60092 - http://autobuild.buildroot.net/results/413dff87f5329d3c5180167a8711cdedea5dec67 - http://autobuild.buildroot.net/results/a7eb4cbcdbd9412c344f45336dec58c82e84dab9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 97695e17b7..57e98c72e4 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -313,6 +313,7 @@ config BR2_PACKAGE_BOOST_TEST config BR2_PACKAGE_BOOST_THREAD bool "boost-thread" + select BR2_PACKAGE_BOOST_ATOMIC if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM help From cb8d1743cab1449b91afbabe38c64cbb85bef6ba Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 21:31:40 +0200 Subject: [PATCH 2393/2640] libselinux: use correct name and content for patch 0004 Commit 6288409642d8368104f916bd264d2cb042942dfa ("libselinux: add patch to fix build with gcc < 4.7") introduced a patch, but its file name was incorrect, so it was never applied. In addition, the patch was generated against the Git repository of SELinux, which includes all projects, and therefore it doesn't apply to the libselinux source code extracted from the tarball: the "libselinux/" component path needs to be removed from the patch. This commit fixes both problems, which should finally and really fix: http://autobuild.buildroot.net/results/c3272566bb808e43bb77ec59cfe596f7e0fe9a64/ Signed-off-by: Thomas Petazzoni --- ...4-Fix-build-break-around-__atomic_-with-GCC-4.7.patch} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename package/libselinux/{0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt => 0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch} (91%) diff --git a/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt b/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch similarity index 91% rename from package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt rename to package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch index 85bd064066..88e3a79332 100644 --- a/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch.txt +++ b/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch @@ -14,13 +14,13 @@ pthread_mutex_unlock() "synchronize memory with respect to other threads"...) Signed-off-by: Hollis Blanchard --- - libselinux/src/label_file.h | 18 ++++++++++++++++++ + src/label_file.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -diff --git a/libselinux/src/label_file.h b/libselinux/src/label_file.h +diff --git a/src/label_file.h b/src/label_file.h index 2fa85474..47859baf 100644 ---- a/libselinux/src/label_file.h -+++ b/libselinux/src/label_file.h +--- a/src/label_file.h ++++ b/src/label_file.h @@ -351,8 +351,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, * init_routine does not take a parameter, it's not possible * to use, so we generate the same effect with atomics and a From dbe8483b20ad3c42607878cfd8adfa723bc73bc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 17:27:07 +0200 Subject: [PATCH 2394/2640] package/mariadb: security bump to version 10.1.35 Fixes CVE-2018-3064, CVE-2018-3063, CVE-2018-3058 & CVE-2018-3066: https://mariadb.com/kb/en/library/mariadb-10135-release-notes/ Added all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mariadb/mariadb.hash | 7 +++++-- package/mariadb/mariadb.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 7eea62ab7b..e4736465e0 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,8 @@ -# From https://downloads.mariadb.org/mariadb/10.1.33/ -sha256 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d mariadb-10.1.33.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.35/ +md5 935f401314ff08a4177beb70fed6055c mariadb-10.1.35.tar.gz +sha1 d322f0da17f4de475832dd534657eba5a936f77b mariadb-10.1.35.tar.gz +sha256 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d mariadb-10.1.35.tar.gz +sha512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa mariadb-10.1.35.tar.gz # Hash for license files sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index e395d387e5..23822187c3 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.33 +MARIADB_VERSION = 10.1.35 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text From b20c5ca3b8c5b180a6ee87556d0c87d474e86cde Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Aug 2018 21:47:25 +0200 Subject: [PATCH 2395/2640] boost: context needs thread without C++11 mutex Extract from output/build/boost-1.67.0/libs/context/build/Jamfile.v2: explicit cxx11_hdr_mutex_check ; local cxx11_mutex = [ check-target-builds cxx11_hdr_mutex_check "C++11 mutex" : : /boost/thread//boost_thread ] ; So select boost_thread if gcc <= 4.7 Fixes: - http://autobuild.buildroot.net/results/fb046c04fe18bec973d120e4ab33971f32ba5769 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boost/Config.in b/package/boost/Config.in index 57e98c72e4..0fd049d53c 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -83,6 +83,7 @@ config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 help C++11 context switching library. From ee2af55d38121e796d907f6e8a1703210a1658f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Aug 2018 22:10:52 +0200 Subject: [PATCH 2396/2640] boost: enable back log on powerpc with uclibc boost-log builds fine with powerpc on uclibc nowadays so enable it back. By removing this dependency, build failure on azmq is also fixed as this package is currently selecting boost-log without fulfilling this dependency Fixes: - http://autobuild.buildroot.net/results/9c373d0b5a1a59e2271d71c480d55a90a67b84cb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 0fd049d53c..389592fd32 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -203,9 +203,6 @@ comment "boost-locale needs a toolchain w/ dynamic library" config BR2_PACKAGE_BOOST_LOG bool "boost-log" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - # for some reason, uClibc on PowerPC fails to build the boost - # log module - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM @@ -217,7 +214,6 @@ config BR2_PACKAGE_BOOST_LOG comment "boost-log needs a toolchain w/ NPTL" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) config BR2_PACKAGE_BOOST_MATH bool "boost-math" From 9ff4167c8cf94b66a077651b27d796c1a521ac24 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:47 +0200 Subject: [PATCH 2397/2640] linux: explain why we need host-{flex, bison} The commit that added the dependency on host-{bison,flex} did so because the pre-generated kconfig parser source files were removed from the kernel tree, in linux-4.16. But then, in linux-4.17, the pre-generated dtc parser source files were in turn removed as well. So, document the two reasons why they are needed, so we don't accidentally remove them when we (soon) introduce the kconfig dependencies. (Also fix the first assignment to LINUX_DEPENDENCIES to be a simple assignement, not an append-assignment.) Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index e0d437427d..d307970065 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -62,7 +62,13 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) LINUX_INSTALL_IMAGES = YES -LINUX_DEPENDENCIES += host-bison host-flex host-kmod +LINUX_DEPENDENCIES = host-kmod + +# Starting with 4.16, the generated kconfig paser code is no longer +# shipped with the kernel sources, so we need flex and bison. +# Starting with 4.17, the generated dtc parser code is no longer +# shipped with the kernel sources, so we need flex and bison. +LINUX_DEPENDENCIES += host-bison host-flex # host tools needed for kernel compression ifeq ($(BR2_LINUX_KERNEL_LZ4),y) From e0e089acc491b0f2f97dccaa1c3f6a191873a3b8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:49 +0200 Subject: [PATCH 2398/2640] core/pkg-kconfig: allow dependencies before configurators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some users of kconfig need some packages to be built before their kconfig infra be used. For example, the linux kernel, starting with 4.16, needs flex and bison to generate the parser code. Furthermore, starting with 4.18, it will also need the cross-compiler before parsing the kconfig stuff, because that calls the compiler to check its features. Currently, this is broken, even the flex/bison ones, even though they are listed, because there is no way to define dependencie that are guaranteed before the (visual) configurators. For example: $ make distclean $ make menuconfig --> enable the linux kernel, choose a defconfig, save, exit $ make linux-menuconfig [...] HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c /bin/sh: bison: command not found LEX scripts/kconfig/zconf.lex.c scripts/Makefile.lib:196: recipe for target 'scripts/kconfig/zconf.tab.c' failed make[3]: *** [scripts/kconfig/zconf.tab.c] Error 127 make[3]: *** Waiting for unfinished jobs.... /bin/sh: flex: command not found scripts/Makefile.lib:188: recipe for target 'scripts/kconfig/zconf.lex.c' failed make[3]: *** [scripts/kconfig/zconf.lex.c] Error 127 Makefile:528: recipe for target 'rpc_defconfig' failed make[2]: *** [rpc_defconfig] Error 2 linux/linux.mk:511: recipe for target '/home/ymorin/dev/buildroot/buildroot/output/build/linux-4.17.11/.config' failed make[1]: *** [/home/ymorin/dev/buildroot/buildroot/output/build/linux-4.17.11/.config] Error 2 Makefile:79: recipe for target '_all' failed make: *** [_all] Error 2 So, we introduce a new type of dependencies for kconfig-based packages, that are guaranteed to be built and installed before the (visual) configurators are called. Since those dependencies are phony targets and therefore always out of date, a normal dependency would cause the .config target to be rebuilt on each invocation of make. So we use an order-only pre-requisite, like is done for the patch dependency. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Jan Kundrát Tested-by: Jan Kundrát Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-kconfig.txt | 4 ++++ package/pkg-kconfig.mk | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt index d4d8630a79..982c1229ea 100644 --- a/docs/manual/adding-packages-kconfig.txt +++ b/docs/manual/adding-packages-kconfig.txt @@ -81,3 +81,7 @@ be set to suit the needs of the package under consideration: be well suited for all packages that use the standard kconfig infrastructure as inherited from the Linux kernel; some packages use a derivative of kconfig that use a different location. + +* +FOO_KCONFIG_DEPENDENCIES+: the list of packages (most probably, host + packages) that need to be built before this package's kconfig is + interpreted. Seldom used. By default, empty. diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 81bba5220c..d6c95b897e 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -41,6 +41,10 @@ endef define inner-kconfig-package +# Register the kconfig dependencies as regular dependencies, so that +# they are also accounted for in the generated graphs. +$(2)_DEPENDENCIES += $$($(2)_KCONFIG_DEPENDENCIES) + # Call the generic package infrastructure to generate the necessary # make targets. # Note: this must be done _before_ attempting to use $$($(2)_DIR) in a @@ -121,6 +125,11 @@ $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_F # it explicitly. It doesn't hurt to always have it though. $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $(1)-patch +# Some packages may need additional tools to be present by the time their +# kconfig structure is parsed (e.g. the linux kernel may need to call to +# the compiler to test its features). +$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $$($(2)_KCONFIG_DEPENDENCIES) + # In order to get a usable, consistent configuration, some fixup may be needed. # The exact rules are specified by the package .mk file. define $(2)_FIXUP_DOT_CONFIG From 21d0077a2d1e6b8afba0812708d07a99e2738fc6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 00:00:13 +0200 Subject: [PATCH 2399/2640] package/bind: security bump to version 9.11.4-P1 Fixes CVE-2018-5740: https://ftp.isc.org/isc/bind9/9.11.4-P1/CHANGES Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 78f8015521..34d9891805 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.4/bind-9.11.4.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.11.4-P1/bind-9.11.4-P1.tar.gz.asc # with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57 -sha256 595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617 bind-9.11.4.tar.gz +sha256 b0e0dc3c8bf26989b1cad53f90d44a48e39404afc68f65c45bae79b446f0fe23 bind-9.11.4-P1.tar.gz sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index d478a7f6e1..0140041218 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.4 +BIND_VERSION = 9.11.4-P1 BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 9070ee65a95c41607a9ac631ec5bb12dfaa46a9f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 08:59:31 +0200 Subject: [PATCH 2400/2640] linux: bump default to version 4.17.17 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 12f180370f..26edc619ac 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.17" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From d2965cbb7e435b1ba0fb3cc6d1996c05d18faa66 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 08:59:32 +0200 Subject: [PATCH 2401/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 858db1f941..783cc7ea3a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.148" if BR2_KERNEL_HEADERS_4_4 - default "4.9.120" if BR2_KERNEL_HEADERS_4_9 + default "4.4.150" if BR2_KERNEL_HEADERS_4_4 + default "4.9.122" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.63" if BR2_KERNEL_HEADERS_4_14 + default "4.14.65" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.15" if BR2_KERNEL_HEADERS_4_17 + default "4.17.17" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From a3422534c8023f3d6d0e7d38a2904544317d5c79 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 11:25:34 +0200 Subject: [PATCH 2402/2640] package/ipsec-tools: add security patch to fix CVE-2016-10396 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ipsec-tools/0005-CVE-2016-10396.patch | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 package/ipsec-tools/0005-CVE-2016-10396.patch diff --git a/package/ipsec-tools/0005-CVE-2016-10396.patch b/package/ipsec-tools/0005-CVE-2016-10396.patch new file mode 100644 index 0000000000..8ef3b03753 --- /dev/null +++ b/package/ipsec-tools/0005-CVE-2016-10396.patch @@ -0,0 +1,208 @@ +Fix CVE-2016-10396 + +Description: Fix remotely exploitable DoS. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10396 +Source: vendor; https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=51682 +Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867986 + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/ipsec-tools/patches/010-CVE-2016-10396.patch + +Signed-off-by: Bernd Kuhls + +Index: ipsec-tools-0.8.2/src/racoon/isakmp_frag.c +=================================================================== +--- ipsec-tools-0.8.2.orig/src/racoon/isakmp_frag.c ++++ ipsec-tools-0.8.2/src/racoon/isakmp_frag.c +@@ -1,4 +1,4 @@ +-/* $NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $ */ ++/* $NetBSD: isakmp_frag.c,v 1.5.36.1 2017/04/21 16:50:42 bouyer Exp $ */ + + /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */ + +@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) + return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); + } + ++static int ++isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) ++{ ++ struct isakmp_frag_item *pitem = NULL; ++ struct isakmp_frag_item *citem = iph1->frag_chain; ++ ++ /* no frag yet, just insert at beginning of list */ ++ if (iph1->frag_chain == NULL) { ++ iph1->frag_chain = item; ++ return 0; ++ } ++ ++ do { ++ /* duplicate fragment number, abort (CVE-2016-10396) */ ++ if (citem->frag_num == item->frag_num) ++ return -1; ++ ++ /* need to insert before current item */ ++ if (citem->frag_num > item->frag_num) { ++ if (pitem != NULL) ++ pitem->frag_next = item; ++ else ++ /* insert at the beginning of the list */ ++ iph1->frag_chain = item; ++ item->frag_next = citem; ++ return 0; ++ } ++ ++ pitem = citem; ++ citem = citem->frag_next; ++ } while (citem != NULL); ++ ++ /* we reached the end of the list, insert */ ++ pitem->frag_next = item; ++ return 0; ++} ++ + int + isakmp_frag_extract(iph1, msg) + struct ph1handle *iph1; +@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) + item->frag_next = NULL; + item->frag_packet = buf; + +- /* Look for the last frag while inserting the new item in the chain */ +- if (item->frag_last) +- last_frag = item->frag_num; ++ /* Check for the last frag before inserting the new item in the chain */ ++ if (item->frag_last) { ++ /* if we have the last fragment, indices must match */ ++ if (iph1->frag_last_index != 0 && ++ item->frag_last != iph1->frag_last_index) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated last fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; ++ } + +- if (iph1->frag_chain == NULL) { +- iph1->frag_chain = item; +- } else { +- struct isakmp_frag_item *current; ++ last_frag = iph1->frag_last_index = item->frag_num; ++ } + +- current = iph1->frag_chain; +- while (current->frag_next) { +- if (current->frag_last) +- last_frag = item->frag_num; +- current = current->frag_next; +- } +- current->frag_next = item; ++ /* insert fragment into chain */ ++ if (isakmp_frag_insert(iph1, item) == -1) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; + } + +- /* If we saw the last frag, check if the chain is complete */ ++ /* If we saw the last frag, check if the chain is complete ++ * we have a sorted list now, so just walk through */ + if (last_frag != 0) { ++ item = iph1->frag_chain; + for (i = 1; i <= last_frag; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- ++ if (item->frag_num != i) ++ break; ++ item = item->frag_next; + if (item == NULL) /* Not found */ + break; + } + +- if (item != NULL) /* It is complete */ ++ if (i > last_frag) /* It is complete */ + return 1; + } + +@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) + } + data = buf->v; + ++ item = iph1->frag_chain; + for (i = 1; i <= frag_count; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- +- if (item == NULL) { ++ if (item->frag_num != i) { + plog(LLV_ERROR, LOCATION, NULL, + "Missing fragment #%d\n", i); + vfree(buf); +@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) + } + memcpy(data, item->frag_packet->v, item->frag_packet->l); + data += item->frag_packet->l; ++ item = item->frag_next; + } + + out: +Index: ipsec-tools-0.8.2/src/racoon/isakmp_inf.c +=================================================================== +--- ipsec-tools-0.8.2.orig/src/racoon/isakmp_inf.c ++++ ipsec-tools-0.8.2/src/racoon/isakmp_inf.c +@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + +Index: ipsec-tools-0.8.2/src/racoon/isakmp.c +=================================================================== +--- ipsec-tools-0.8.2.orig/src/racoon/isakmp.c ++++ ipsec-tools-0.8.2/src/racoon/isakmp.c +@@ -1071,6 +1071,7 @@ isakmp_ph1begin_i(rmconf, remote, local) + iph1->frag = 1; + else + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; +@@ -1175,6 +1176,7 @@ isakmp_ph1begin_r(msg, remote, local, et + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; +Index: ipsec-tools-0.8.2/src/racoon/handler.h +=================================================================== +--- ipsec-tools-0.8.2.orig/src/racoon/handler.h ++++ ipsec-tools-0.8.2/src/racoon/handler.h +@@ -1,4 +1,4 @@ +-/* $NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $ */ ++/* $NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $ */ + + /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */ + +@@ -141,6 +141,7 @@ struct ph1handle { + #endif + #ifdef ENABLE_FRAG + int frag; /* IKE phase 1 fragmentation */ ++ int frag_last_index; + struct isakmp_frag_item *frag_chain; /* Received fragments */ + #endif + From bfc5dc9920ffa9913b096cdc85572a06980ee9e2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 15:22:17 +0200 Subject: [PATCH 2403/2640] package/nodejs: security bump version to 8.11.4 Release notes: https://nodejs.org/en/blog/vulnerability/august-2018-security-releases/ Fixes CVE-2018-12115, also CVEs were fixed in included OpenSSL code which do not use for the target build. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index be4c3de4f7..8285172215 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From http://nodejs.org/dist/v8.11.3/SHASUMS256.txt -sha256 577c751fdca91c46c60ffd8352e5b465881373bfdde212c17c3a3c1bd2616ee0 node-v8.11.3.tar.xz +# From http://nodejs.org/dist/v8.11.4/SHASUMS256.txt +sha256 fbce7de6d96b0bcb0db0bf77f0e6ea999b6755e6930568aedaab06847552a609 node-v8.11.4.tar.xz # Hash for license file sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 61cd03bb8f..e2c94ba8db 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.11.3 +NODEJS_VERSION = 8.11.4 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 052d3cbb0ea6aec7123b8595780d6f819dc7c925 Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Sun, 19 Aug 2018 16:46:56 +0300 Subject: [PATCH 2404/2640] wireless_tools: Fix site URL does not work Replace broken http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux by https://hewlettpackard.github.io/wireless-tools. [Peter: also adjust URL in Config.in] Signed-off-by: Vadim Kochan Signed-off-by: Peter Korsgaard --- package/wireless_tools/Config.in | 2 +- package/wireless_tools/wireless_tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless_tools/Config.in b/package/wireless_tools/Config.in index e33af25b86..349908dbde 100644 --- a/package/wireless_tools/Config.in +++ b/package/wireless_tools/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_WIRELESS_TOOLS help A collection of tools to configure wireless lan cards. - http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html + https://hewlettpackard.github.io/wireless-tools/ if BR2_PACKAGE_WIRELESS_TOOLS diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk index 51320a9b25..b87ab20fb2 100644 --- a/package/wireless_tools/wireless_tools.mk +++ b/package/wireless_tools/wireless_tools.mk @@ -6,7 +6,7 @@ WIRELESS_TOOLS_VERSION_MAJOR = 30 WIRELESS_TOOLS_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR).pre9 -WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux +WIRELESS_TOOLS_SITE = https://hewlettpackard.github.io/wireless-tools WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz WIRELESS_TOOLS_LICENSE = GPL-2.0 WIRELESS_TOOLS_LICENSE_FILES = COPYING From df5bf982de4b038d0af18a09d98ce34d94c3ae95 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 23:02:08 +0200 Subject: [PATCH 2405/2640] python-pyqt5: add Qt 5.11 compatibility patch This commit adds a patch to python-pyqt5 to make it build properly against Qt 5.11. PyQt5 is using a dual-licensing model, and the commercial company behind it (RiverBank) only provides release tarballs, and no public Git repository, so we cannot see the individual changes they make. By diffing the PyQt5 5.10 and 5.11 releases, we could see that they opted for dropping entirely support for the waitForEvents() method, rather than keeping it for Qt < 5.11. We take the same approach in the below patch, since this is anyway what will happen when we will bump to PyQt5 5.11. The patch is not Git-formatted, because there is no upstream Git repository for this project. Fixes: http://autobuild.buildroot.net/results/1f1e92374fe71a1d4343243db5f530c33db06698/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...drop-qttest-qtestmouse-waitforevents.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch diff --git a/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch b/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch new file mode 100644 index 0000000000..352be9aee0 --- /dev/null +++ b/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch @@ -0,0 +1,32 @@ +Drop waitForEvents() method from qtestmouse + +This method was dropped in Qt 5.11: + + https://github.com/qt/qtbase/commit/75e583b3fcbdbbb999633eb5f2267720dd695cfa + +However, Python PyQt5 still generates a wrapper for it, causing a +build failure. The upstream PyQt5 maintainers have not kept +waitForEvents() support for older Qt versions, and instead entirely +dropped it unconditionally. This can be verified by diffing PyQt 5.10 +and PyQt 5.11. We take the same approach, and drop waitForEvents() +unconditionally, even when PyQt5 is built against the older Qt 5.6. + +Fedora is using a similar solution: +https://src.fedoraproject.org/rpms/python-qt5/c/47fb7fdc5d16582772f9c3fc8a6a674a41a7f605?branch=master. + +This patch can be dropped when PyQt5 is bumped to its 5.11 version. + +Signed-off-by: Thomas Petazzoni + +Index: b/sip/QtTest/qtestmouse.sip +=================================================================== +--- a/sip/QtTest/qtestmouse.sip ++++ b/sip/QtTest/qtestmouse.sip +@@ -41,7 +41,6 @@ + void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); + void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); + void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); +- void waitForEvents() /ReleaseGIL/; + void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); + void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); + void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); From a8cea94d5a6a63b6dd766068dd867670c1fb99f3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 19 Aug 2018 00:10:19 +0200 Subject: [PATCH 2406/2640] core: drop useless assignments to BISON and FLEX They were added back in 5432f26f0 (Adding Central config.cache options), supposedly to be able to cache the result of configure tests, but they were never, ever referenced anywhere in our code... Besides, we dropped the idea of getting a configure cache long ago now (it does not work)... They are causing spurious error messages on some distros (e.g. Fedora) which use GNU's which (whatever package that comes from), while it is silent on other distros (e.g. Ubuntu) which use debianutils' which. Drop them. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index f2962767cc..91b3e8f936 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -219,8 +219,6 @@ TARGET_STRIP = /bin/true STRIPCMD = $(TARGET_STRIP) endif INSTALL := $(shell which install || type -p install) -FLEX := $(shell which flex || type -p flex) -BISON := $(shell which bison || type -p bison) UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) From 670260d74bc9f5cc2549801b7e24233c9bcac461 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 19 Aug 2018 00:42:36 +0200 Subject: [PATCH 2407/2640] qt5base: fix double-conversion for or1k Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/a3535cdf5e91df011a59a4b9f60d69195f5efdcb Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...03-double-conversion-enable-for-or1k.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch diff --git a/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch b/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch new file mode 100644 index 0000000000..53c5a31832 --- /dev/null +++ b/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch @@ -0,0 +1,27 @@ +From f9920819e6600a68829fb4600f11b70ebc2a33e7 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 18 Aug 2018 23:44:20 +0200 +Subject: [PATCH] double-conversion: enable for or1k + +Signed-off-by: Peter Seiderer +--- + .../double-conversion/include/double-conversion/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 77baa2861a..b0a7d5d4f4 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -65,7 +65,8 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__AARCH64EB__) ++ defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ ++ defined(__or1k__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +2.18.0 + From a907ab7db518ce60deabb016b45619125361c569 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 20 Aug 2018 10:55:03 +0200 Subject: [PATCH 2408/2640] Update for 2018.08-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 31 +++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 351f6f80ce..d0744353bc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,34 @@ +2018.08-rc2, Released August 20th, 2018 + + Fixes all over the tree. + + pkg-kconfig: Support dependencies needed to run the + configurator, E.G. recent Linux kernel versions needing flex + and bison. + + Defconfigs: ARM Juno: Bump ATF to fix a build + issue. Raspberrypi2: Bump rootfs size. Snps_archs38_vdk: + Correct /etc/inittab. Technologic ts7680: Correct genimage + configuration. Orange PI PC / Zero, Sheevaplug: Bump U-boot to + 2018.07 to fix build issue. Ensure host-openssl is pulled in + for kernel builds where needed. + + Updated/fixed packages: aircrack-ng, bind, boost, + boot-wrapper-aarch64, bzip2, busybox, chrony, cryptsetup, + dahdi-tools, dbus, domoticz, eigen, ipsec-tools, libarchive, + libfuse, libgit2, libopenssl, libselinux, lighttpd, lvm2, m4, + makedevs, mariadb, mesa3d-headers, mono, ncmpc, ncurses, + nodejs, php, python-django, python-pyqt5, qt5base, + qt5serialbus, ruby, samba4, uboot-tools, uclibc, vlc, + waylandpp, wireless_tools, wireshark, wpa_supplicant, mtd, + xdriver_xf86-video-ati, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #10781: cryptsetup luksOpen container_file container causes.. + #10996: bogus musl ARM toolchain + #11191: xattr and check-package issue + 2018.08-rc1, Released August 5th, 2018 Toolchain: diff --git a/Makefile b/Makefile index f79d39fd26..413ec921cd 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.08-rc1 +export BR2_VERSION := 2018.08-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1533476000 +BR2_VERSION_EPOCH = 1534755000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 3a6e08ca91..4e8a40f6ce 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

            -

            Latest release candidate: 2018.08-rc1

            +

            Latest release candidate: 2018.08-rc2

            - +
            - +
            -

            buildroot-2018.08-rc1.tar.gz

            -

            PGP signature

            +

            buildroot-2018.08-rc2.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2018.08-rc1.tar.bz2

            -

            PGP signature

            +

            buildroot-2018.08-rc2.tar.bz2

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index 0535f96497..7461d3f5ea 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

            News

              +
            • +
              +
              +
              +

              2018.08-rc2 released

              +

              20 August 2018

              +
              +
              +

              Another week, another release candidate with more cleanups + and build fixes. See the + CHANGES + file for details.

              + +

              Head to the downloads page to pick up the + 2018.08-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

              +
              +
              +
              • +
            • From 373ac58b82d2430b745e90c7c8b39e319949882a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 19 Aug 2018 18:59:31 +0200 Subject: [PATCH 2409/2640] package/bison: fix build on host with glibc-2.28 Similarly to c48f8a6462 (package/m4: fix build on host with glibc-2.28), backport the two fixes fromn gnulib upstream, that allows building host-bison on systems using glibc 2.28. Signed-off-by: "Yann E. MORIN" Reported-by: c32 on IRC Signed-off-by: Thomas Petazzoni --- ...adjust-to-glibc-2.28-libio.h-removal.patch | 50 +++++++++++++++++++ ...e-more-paranoid-about-libio.h-change.patch | 46 +++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch create mode 100644 package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch diff --git a/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch new file mode 100644 index 0000000000..e9dee48af9 --- /dev/null +++ b/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -0,0 +1,50 @@ +From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH 1/1] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + lib/fseterr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +[yann.morin.1998@free.fr: partially backport from upstream gnulib] +Signed-off-by: "Yann E. MORIN" + +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +-- +2.14.1 + diff --git a/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch new file mode 100644 index 0000000000..035f8282c1 --- /dev/null +++ b/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch @@ -0,0 +1,46 @@ +From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 8 Mar 2018 16:42:45 -0800 +Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change + +Suggested by Eli Zaretskii in: +https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. +--- + lib/fseterr.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +[yann.morin.1998@free.fr: partially backport from upstream gnulib] +Signed-off-by: "Yann E. MORIN" + +diff --git a/lib/fseterr.c b/lib/fseterr.c +index adb637256..fd9da6338 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,8 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +-- +2.14.1 + From 3ab56f8a63daceeda8548b02f5db40e44fd2eb34 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:48 +0200 Subject: [PATCH 2410/2640] support/dependencies: check for system-provided bison and flex Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/dependencies/check-host-bison-flex.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 support/dependencies/check-host-bison-flex.mk diff --git a/support/dependencies/check-host-bison-flex.mk b/support/dependencies/check-host-bison-flex.mk new file mode 100644 index 0000000000..233b6c51cc --- /dev/null +++ b/support/dependencies/check-host-bison-flex.mk @@ -0,0 +1,10 @@ +# If the system lacks bison or flex, add +# dependencies to suitable host packages + +ifeq ($(shell which bison 2>/dev/null),) +BR2_BISON_HOST_DEPENDENCY = host-bison +endif + +ifeq ($(shell which flex 2>/dev/null),) +BR2_FLEX_HOST_DEPENDENCY = host-flex +endif From b01100cc901a83c480f86bc81545a011f65d6771 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:50 +0200 Subject: [PATCH 2411/2640] linux: kconfig may need host-{flex, bison} to build the configurators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rely on the system provided ones if avalable, and only resort to use our owns if the sytem does not provide them. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Jan Kundrát Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index d307970065..deb5a4ac57 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -64,12 +64,18 @@ LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod -# Starting with 4.16, the generated kconfig paser code is no longer -# shipped with the kernel sources, so we need flex and bison. # Starting with 4.17, the generated dtc parser code is no longer -# shipped with the kernel sources, so we need flex and bison. +# shipped with the kernel sources, so we need flex and bison. For +# reproducibility, we use our owns rather than the host ones. LINUX_DEPENDENCIES += host-bison host-flex +# Starting with 4.16, the generated kconfig paser code is no longer +# shipped with the kernel sources, so we need flex and bison, but +# only if the host does not have them. +LINUX_KCONFIG_DEPENDENCIES = \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + # host tools needed for kernel compression ifeq ($(BR2_LINUX_KERNEL_LZ4),y) LINUX_DEPENDENCIES += host-lz4 From 43ac3c8432a48b30c64b4c3ceac3ffdeb4befbca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:51 +0200 Subject: [PATCH 2412/2640] linux: host-{flex, bison} only needed for DTS host-{flex,bison} are only needed to generate the dtc parser, so we don't need them if the kernel does not have support for device tree. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index deb5a4ac57..d6b0853518 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -64,11 +64,6 @@ LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod -# Starting with 4.17, the generated dtc parser code is no longer -# shipped with the kernel sources, so we need flex and bison. For -# reproducibility, we use our owns rather than the host ones. -LINUX_DEPENDENCIES += host-bison host-flex - # Starting with 4.16, the generated kconfig paser code is no longer # shipped with the kernel sources, so we need flex and bison, but # only if the host does not have them. @@ -352,6 +347,11 @@ define LINUX_KCONFIG_FIXUP_CMDS endef ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) +# Starting with 4.17, the generated dtc parser code is no longer +# shipped with the kernel sources, so we need flex and bison. For +# reproducibility, we use our owns rather than the host ones. +LINUX_DEPENDENCIES += host-bison host-flex + ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),) define LINUX_BUILD_DTB $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_DTBS) From 3fc990a79834ce20992aca963817fcb6bf456171 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:52 +0200 Subject: [PATCH 2413/2640] linux: kconfig needs the toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting with linux-4.18, the kconfig from the kernel can call to the compiler to test its capabilities; see: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scripts/Kconfig.include Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Jan Kundrát Tested-by: Jan Kundrát Reviewed-by: Jan Kundrát Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index d6b0853518..675e7906a8 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -71,6 +71,11 @@ LINUX_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) +# Starting with 4.18, the kconfig in the kernel calls the +# cross-compiler to check its capabilities. So we need the +# toolchain before we can call the configurators. +LINUX_KCONFIG_DEPENDENCIES += toolchain + # host tools needed for kernel compression ifeq ($(BR2_LINUX_KERNEL_LZ4),y) LINUX_DEPENDENCIES += host-lz4 From 551454efff01c17aa2f0df1e0688276ec21e0035 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Aug 2018 18:06:53 +0200 Subject: [PATCH 2414/2640] boot/uboot: needs host-{flex,bison} Recent U-Boot no longer ship the flex/bison generated kconfig parser, as of commit e91610da7c8a9fe42f3e5a75f06c3d1a0cb5f815 (kconfig: re-sync with Linux 4.17-rc4). So, add the conditional kconfig dependencies, as we just did for the kernel. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 04c759be34..bddafe234d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -449,5 +449,8 @@ endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) $(eval $(generic-package)) else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) +UBOOT_KCONFIG_DEPENDENCIES = \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) $(eval $(kconfig-package)) endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY From 3a9fd97d43568f0acdd42618227b1396b76d686e Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:01 +0200 Subject: [PATCH 2415/2640] package/mender: fix install path for identity and inventory scripts These scripts are used to generate the device identity and to populate the the device inventory. The Mender client will call these and at least the mender-device-identity is required to be present at the correct location. Inventory scripts are there as an example and not actually required. Example output from identity script: $ ./mender-device-identity mac=de:ad:ca:fe:00:01 cpuid=1112233 Example output from inventory script: $ ./mender-inventory-network mac_br-fbfdad18c33c=02:42:7e:74:96:85 network_interfaces=br-fbfdad18c33c ipv4_br-fbfdad18c33c=172.21.0.1/16 mac_enp0s25=de:ad:be:ef:bb:05 network_interfaces=enp0s25 ipv4_enp0s25=123.22.0.197/16 ipv4_enp0s25=10.20.20.105/16 ipv6_enp0s25=fe80::2aad:beff:feef:bb05/64 Inventory and device identity data is presented on the Mender server front-end. Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 695b5e7a91..deab0cb039 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -14,12 +14,13 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/etc/mender/tenant.conf $(INSTALL) -D -m 0644 package/mender/server.crt \ $(TARGET_DIR)/etc/mender/server.crt + $(INSTALL) -D -m 0755 package/mender/mender-device-identity \ - $(TARGET_DIR)/var/share/mender/identity/mender-device-identity + $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity $(INSTALL) -D -m 0755 package/mender/mender-inventory-network \ - $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-network + $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-network $(INSTALL) -D -m 0755 package/mender/mender-inventory-hostinfo \ - $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-hostinfo + $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-hostinfo endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES From 9b297505eb7992965c32dc2cf1d083f26b563246 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:02 +0200 Subject: [PATCH 2416/2640] package/mender: provide sane values in mender.conf The current values that are in mender.conf will actually cause the Mender client to fail to start because of invalid values. Provide sane default values that at least allow the Mender client to parse the configuration options and start running. The values provided will actually work in a "Demo Environment", see https://docs.mender.io/getting-started/create-a-test-environment. Though an entry is required in /etc/hosts to resolve the URL to the local IP address of the running demo server. Example: echo "192.168.0.10 docker.mender.io s3.docker.mender.io" >> \ /etc/hosts Above is required because the demo certificate (/etc/mender/server.crt) is created for https://docker.mender.io. Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.conf | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/package/mender/mender.conf b/package/mender/mender.conf index a5c7c545c3..979f16aaf6 100644 --- a/package/mender/mender.conf +++ b/package/mender/mender.conf @@ -1,14 +1,10 @@ { - "ClientProtocol": "http", - "HttpsClient": { - "Certificate": "", - "Key": "" - }, - "RootfsPartA": "@MENDER_ROOTFS_PART_A@", - "RootfsPartB": "@MENDER_ROOTFS_PART_B@", - "UpdatePollIntervalSeconds": @MENDER_UPDATE_POLL_INTERVAL_SECONDS@, - "InventoryPollIntervalSeconds": @MENDER_INVENTORY_POLL_INTERVAL_SECONDS@, - "RetryPollIntervalSeconds": @MENDER_RETRY_POLL_INTERVAL_SECONDS@, - "ServerURL": "@MENDER_SERVER_URL@", - "ServerCertificate": "@MENDER_CERT_LOCATION@" + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "mmcblk0p2", + "RootfsPartB": "mmcblk0p3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy" } From 1770251816a0b6a80cd7418bb2156e9ccc5ca402 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:04 +0200 Subject: [PATCH 2417/2640] package/mender: create directory containing Mender state script Mender state-scripts are essentially "hooks" that can be provided to influence the update flow. They should be placed inside /etc/mender/scripts and the directory must contain a file containing the current state-script format version. It is currently "2". Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index deab0cb039..a90ca3d2a8 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -8,6 +8,9 @@ MENDER_VERSION = 1.4.0 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) define MENDER_INSTALL_CONFIG_FILES + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts + echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version + $(INSTALL) -D -m 0644 package/mender/mender.conf \ $(TARGET_DIR)/etc/mender/mender.conf $(INSTALL) -D -m 0644 package/mender/tenant.conf \ From 7c60fa9f88ed20c98819dc777ef0e2ae09d7874b Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:06 +0200 Subject: [PATCH 2418/2640] package/mender: select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV The Mender client uses fw_printenv/fw_setenv to manipulate the U-boot environment, e.g to change the boot candidate after a update has been done. Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mender/Config.in b/package/mender/Config.in index e461857486..aeb0b2694f 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_UBOOT_TOOLS # runtime + select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client From 3882c878fb9b96930570380cd39b45d5d99c73df Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:08 +0200 Subject: [PATCH 2419/2640] package/mender: remove tenant.conf Tenant Token is a configuration option that has to do with Hosted Mender, where you you need to set this for the devices to connect to the correct organization in a multi-tenant system. The removal of tenant.conf usage (and /var/lib/mender/authtentoken) was in Mender client version 1.2.0, where it was switched to be an mender.conf option instead as the example above demonstrates. As the first version that was integrated in Buildroot was 1.4.0, the inclusion of tenant.conf and the creation of the symlink is not necessary. Now it is specified as such in mender.conf: Example: /etc/mender/mender.conf { TenantToken: "very long base64 encoded string" } Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.mk | 3 +-- package/mender/mender.service | 1 - package/mender/tenant.conf | 0 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 package/mender/tenant.conf diff --git a/package/mender/mender.mk b/package/mender/mender.mk index a90ca3d2a8..a7ae1d388a 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -13,8 +13,7 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0644 package/mender/mender.conf \ $(TARGET_DIR)/etc/mender/mender.conf - $(INSTALL) -D -m 0644 package/mender/tenant.conf \ - $(TARGET_DIR)/etc/mender/tenant.conf + $(INSTALL) -D -m 0644 package/mender/server.crt \ $(TARGET_DIR)/etc/mender/server.crt diff --git a/package/mender/mender.service b/package/mender/mender.service index ec77fbc46c..9ede55acb5 100644 --- a/package/mender/mender.service +++ b/package/mender/mender.service @@ -7,7 +7,6 @@ Type=idle User=root Group=root ExecStartPre=/bin/mkdir -p -m 0700 /data/mender -ExecStartPre=/bin/ln -sf /etc/mender/tenant.conf /var/lib/mender/authtentoken ExecStart=/usr/bin/mender -daemon Restart=on-abort diff --git a/package/mender/tenant.conf b/package/mender/tenant.conf deleted file mode 100644 index e69de29bb2..0000000000 From 5a70d2ae5944b67e8452baad355c604213bfbd8d Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:09 +0200 Subject: [PATCH 2420/2640] package/mender: use inventory and identity script from upstream source These files are part of Mender sources and no point in keeping duplicate files locally. Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender-device-identity | 52 ------------------------ package/mender/mender-inventory-hostinfo | 21 ---------- package/mender/mender-inventory-network | 47 --------------------- package/mender/mender.mk | 10 ++--- 4 files changed, 5 insertions(+), 125 deletions(-) delete mode 100644 package/mender/mender-device-identity delete mode 100644 package/mender/mender-inventory-hostinfo delete mode 100644 package/mender/mender-inventory-network diff --git a/package/mender/mender-device-identity b/package/mender/mender-device-identity deleted file mode 100644 index d87f843357..0000000000 --- a/package/mender/mender-device-identity +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# Example script called by Mender agent to collect device identity data. The -# script needs to be located at -# $(datadir)/mender/identity/mender-device-identity path for the agent to find -# it. The script shall exit with non-0 status on errors. In this case the agent -# will discard any output the script may have produced. -# -# The script shall output identity data in = format, one -# entry per line. Example -# -# $ ./mender-device-identity -# mac=de:ad:ca:fe:00:01 -# cpuid=1112233 -# -# The example script collects the MAC address of a network interface with the -# type ARPHRD_ETHER and it will pick the interface with the lowest ifindex -# number if there are multiple interfaces with that type. The identity data is -# output in the following format: -# -# mac=00:01:02:03:04:05 -# - -set -ue - -SCN=/sys/class/net -min=65535 -arphrd_ether=1 -ifdev= - -# find iface with lowest ifindex, skip non ARPHRD_ETHER types (lo, sit ...) -for dev in $SCN/*; do - iftype=$(cat $dev/type) - if [ $iftype -ne $arphrd_ether ]; then - continue - fi - - idx=$(cat $dev/ifindex) - if [ $idx -lt $min ]; then - min=$idx - ifdev=$dev - fi -done - -if [ -z "$ifdev" ]; then - echo "no suitable interfaces found" >&2 - exit 1 -else - echo "using interface $ifdev" >&2 - # grab MAC address - echo "mac=$(cat $ifdev/address)" -fi diff --git a/package/mender/mender-inventory-hostinfo b/package/mender/mender-inventory-hostinfo deleted file mode 100644 index cf508fdf88..0000000000 --- a/package/mender/mender-inventory-hostinfo +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# The example script collects information about current host -# - -set -ue - -LC_ALL=C -export LC_ALL - -grep 'model name' /proc/cpuinfo | uniq | awk -F': ' ' - // { printf("cpu_model=%s\n", $2);} -' -echo "kernel=$(cat /proc/version)" - -cat /proc/meminfo | awk ' -/MemTotal/ {printf("mem_total_kB=%d\n", $2)} -' - -echo "hostname=$(cat /etc/hostname)" - diff --git a/package/mender/mender-inventory-network b/package/mender/mender-inventory-network deleted file mode 100644 index b017c4ea14..0000000000 --- a/package/mender/mender-inventory-network +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Example script called by Mender agent to collect inventory data for a -# particular devce. The script needs to be located in $(datadir)/mender and its -# name shall start with `mender-inventory-` prefix. The script shall exit with -# non-0 status on errors. In this case the agent will discard any output the -# script may have produced. -# -# The script shall output inventory data in = format, one entry per -# line. Entries appearing multiple times will be joined in a list under the same -# key. -# -# $ ./mender-inventory-network -# mac_br-fbfdad18c33c=02:42:7e:74:96:85 -# network_interfaces=br-fbfdad18c33c -# ipv4_br-fbfdad18c33c=172.21.0.1/16 -# mac_enp0s25=de:ad:be:ef:bb:05 -# network_interfaces=enp0s25 -# ipv4_enp0s25=123.22.0.197/16 -# ipv4_enp0s25=10.20.20.105/16 -# ipv6_enp0s25=fe80::2aad:beff:feef:bb05/64 -# -# -# The example script collects the list of network interfaces, as well as -# ethernet and IP addresses of each of the interfaces. -# - -set -ue - -SCN=/sys/class/net -min=65535 -ifdev= - -# find iface with lowest ifindex, except loopback -for devpath in $SCN/*; do - dev=$(basename $devpath) - if [ $dev = "lo" ]; then - continue - fi - echo "mac_$dev=$(cat $devpath/address)" - echo "network_interfaces=$dev" - - ip addr show dev $dev | awk -v dev=$dev ' - /inet / { printf("ipv4_%s=%s\n", dev, $2) } - /inet6 / {printf("ipv6_%s=%s\n", dev, $2) } - ' -done diff --git a/package/mender/mender.mk b/package/mender/mender.mk index a7ae1d388a..dd4a852209 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -17,12 +17,12 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0644 package/mender/server.crt \ $(TARGET_DIR)/etc/mender/server.crt - $(INSTALL) -D -m 0755 package/mender/mender-device-identity \ + $(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \ $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity - $(INSTALL) -D -m 0755 package/mender/mender-inventory-network \ - $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-network - $(INSTALL) -D -m 0755 package/mender/mender-inventory-hostinfo \ - $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-hostinfo + $(foreach f,hostinfo network, \ + $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ + $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) + ) endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES From 7175f968fbdaf8b12a42aaeca4ddef63772b204e Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:10 +0200 Subject: [PATCH 2421/2640] package/mender: update legal info Also added license checksums in mender.hash Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.hash | 39 ++++++++++++++++++++++++++++++++++++++ package/mender/mender.mk | 25 ++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 30a04fad7a..8faa740e3b 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,2 +1,41 @@ # Locally computed: sha256 267fa73ad472b034248ee298593b5c52ea0b105fd73c91febb3587280c61bee2 mender-1.4.0.tar.gz + +# Apache-2.0 license, locally computed +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 LICENSE + +# Vendor licenses +# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 + +# Apache-2.0 license. +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/mendersoftware/mender-artifact/LICENSE + +# BSD 2 Clause license. +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE + +# BSD 3 Clause license. +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md + +# ISC license. +sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE + +# MIT license. +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/Sirupsen/logrus/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt +sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md +sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE + +# OpenLDAP Public License +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md + +# sha256 of all the vendor licenses combined +sha256 54d6f54a2815cc2e3cef4f7dde5a3aae20f09b2cde394d8d3f1dce5d8a79d738 LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index dd4a852209..53c39c6f7a 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -6,6 +6,31 @@ MENDER_VERSION = 1.4.0 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) +MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 + +# Vendor license paths generated with: +# awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor +MENDER_LICENSE_FILES = \ + LICENSE \ + LIC_FILES_CHKSUM.sha256 \ + vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/mendersoftware/log/LICENSE \ + vendor/github.com/mendersoftware/log/COPYING \ + vendor/github.com/mendersoftware/scopestack/LICENSE \ + vendor/github.com/mendersoftware/scopestack/COPYING \ + vendor/github.com/mendersoftware/mender-artifact/LICENSE \ + vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/sys/LICENSE \ + vendor/golang.org/x/net/LICENSE \ + vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ + vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/Sirupsen/logrus/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/stretchr/testify/LICENCE.txt \ + vendor/github.com/stretchr/objx/LICENSE.md \ + vendor/github.com/ungerik/go-sysfs/LICENSE \ + vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts From ff2c8883fbbed2708bab2f00c1373859381eb495 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Mon, 20 Aug 2018 15:09:11 +0200 Subject: [PATCH 2422/2640] package/mender: set version in go linker This is used when calling the mender client with the -version option and it says "unknown" if not set in linker. Now it displays the following: # mender -version 1.4.0 runtime: go1.10.2 Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- package/mender/mender.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 53c39c6f7a..9275426a7b 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -32,6 +32,8 @@ MENDER_LICENSE_FILES = \ vendor/github.com/ungerik/go-sysfs/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md +MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) + define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version From c0be9c192e8f5eb21252aef2b0724e3985bdf0d8 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 20 Aug 2018 10:39:33 +0200 Subject: [PATCH 2423/2640] gr-osmosdr: add host-python-cheetah dependency Since b7f1b030413a51637323a755cbd985b06026990e host-python-cheetah is no more a dependency for gnuradio. So this package must be explicitly added for gr-osmosdr. Fix : http://autobuild.buildroot.net/results/aa208a69996548c15d937fc7c97d267162a56c48/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 55e043ef32..9ed4ad3118 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -12,7 +12,7 @@ GR_OSMOSDR_LICENSE_FILES = COPYING # gr-osmosdr prevents doing an in-source-tree build GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO -GR_OSMOSDR_DEPENDENCIES = gnuradio +GR_OSMOSDR_DEPENDENCIES = gnuradio host-python-cheetah GR_OSMOSDR_CONF_OPTS = -DENABLE_DEFAULT=OFF From 0debf55bad558ebea7d4212b99ada444ef8baeb7 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Mon, 20 Aug 2018 12:08:37 -0400 Subject: [PATCH 2424/2640] package/libconfuse: security bump to version 3.2.2 Fixes CVE-2018-14447: https://github.com/martinh/libconfuse/issues/109 Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- package/libconfuse/libconfuse.hash | 6 +++--- package/libconfuse/libconfuse.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libconfuse/libconfuse.hash b/package/libconfuse/libconfuse.hash index fa77af9cd1..adc93f99a3 100644 --- a/package/libconfuse/libconfuse.hash +++ b/package/libconfuse/libconfuse.hash @@ -1,5 +1,5 @@ -# From https://github.com/martinh/libconfuse/releases/download/v3.2.1/confuse-3.2.1.tar.xz.md5 -md5 ebd66bb669cf43e62a23ed00d475ba67 confuse-3.2.1.tar.xz +# From https://github.com/martinh/libconfuse/releases/download/v3.2.2/confuse-3.2.2.tar.xz.md5 +md5 978996e421e5005e6a9f6f84948fac44 confuse-3.2.2.tar.xz # Locally computed -sha256 23c63272baf2ef4e2cbbafad2cf57de7eb81f006ec347c00b954819824add25e confuse-3.2.1.tar.xz +sha256 a9240b653d02e8cfc52db48e8c4224426e528e1faa09b65e8ca08a197fad210b confuse-3.2.2.tar.xz sha256 dc3ff4b62f851dd2e94a151061ffeb7d28ddfc880a442068dc5283dbaa927306 LICENSE diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 9f265ae25f..b16bc9b7a7 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCONFUSE_VERSION = 3.2.1 +LIBCONFUSE_VERSION = 3.2.2 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) LIBCONFUSE_INSTALL_STAGING = YES From cba4062a34c62a4539cf8b0e6e5e033ddde8d344 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 19 Aug 2018 21:12:08 -0300 Subject: [PATCH 2425/2640] liburiparser: bump to version 0.8.6 Version 0.8.6 is a bugfix release including a nasty bug that has potential to crash applications when parsing certain URIs (like "//:%aa@", excluding quotes). For more details please check the change log at https://github.com/uriparser/uriparser/blob/uriparser-0.8.6/ChangeLog Signed-off-by: Carlos Santos Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index c03e832f9f..1fd65d2f19 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58eacd5c03d9e341c04eb0b30831faec89f3b415949ff8d72254e63432352cdd uriparser-0.8.5.tar.bz2 +sha256 0709a7e572417db763f0356250d91686c19a64ab48e9da9f5a1e8055dc2a4a54 uriparser-0.8.6.tar.bz2 sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 4b32b7f7f2..baed4506a4 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.8.5 +LIBURIPARSER_VERSION = 0.8.6 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause From 0bf656ead9801552f939217c5cc019fa24583b90 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Mon, 20 Aug 2018 04:13:02 -0700 Subject: [PATCH 2426/2640] oracle-mysql: fix hostname path MySQL detects on the build machine where the hostname program is located, and uses this value in a number of configuration files and scripts that are generated and installed in the target: output/target$ grep -r "bin/hostname" * etc/inittab:::sysinit:/bin/hostname -F /etc/hostname usr/share/mysql/mysql.server: pid_file=$datadir/mysqlmanager-`/usr/bin/hostname`.pid usr/share/mysql/mysql.server: server_pid_file=$datadir/`/usr/bin/hostname`.pid usr/bin/mysql_install_db:hostname=`/usr/bin/hostname` usr/bin/mysqld_safe: err_log=$DATADIR/`/usr/bin/hostname`.err usr/bin/mysqld_safe: pid_file="$DATADIR/`/usr/bin/hostname`.pid" However, the hostname on the build machine may not necessarily be at the same location as the hostname program on the target. Buildroot has its hostname program (coming from Busybox) in /bin, but some Linux distributions (such as Fedora) use /usr/bin/hostname, causing the incorrect hostname paths above. This commit fixes that by passing the appropriate autoconf cache variable value. Signed-off-by: Christopher McCrory [Thomas: add commit log] Signed-off-by: Thomas Petazzoni --- package/oracle-mysql/oracle-mysql.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index 7da5c547d9..0275a8428f 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -21,6 +21,7 @@ MYSQL_SOCKET = /run/mysql/mysql.sock ORACLE_MYSQL_CONF_ENV = \ ac_cv_sys_restartable_syscalls=yes \ ac_cv_path_PS=/bin/ps \ + ac_cv_path_HOSTNAME=/bin/hostname \ ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ From bfde78f48cde50bd4a8d0b0746dba3507b91c485 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Aug 2018 16:08:12 +0200 Subject: [PATCH 2427/2640] package/pkg-download: quiet the dl-wrapper call The download wrapper call is currently always being displayed, even without V=1, which is a bit annoying. It shows something like this: thomas@windsurf:~/projets/buildroot (master)$ make tslib-source >>> tslib 1.16 Downloading PATH="/home/thomas/projets/buildroot/output/host/bin:/home/thomas/projets/buildroot/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/home/thomas/.rvm/bin:/usr/local/sbin:/usr/sbin:/home/thomas/.rvm/bin:/home/thomas/sys/bin:/home/thomas/.gem/ruby/2.1.0/bin:/home/thomas/.rvm/bin" BR2_DL_DIR=/home/thomas/dl BUILD_DIR=/home/thomas/projets/buildroot/output/build O=/home/thomas/projets/buildroot/output flock /home/thomas/dl/tslib/ support/download/dl-wrapper -c '1.16' -d '/home/thomas/dl/tslib' -D '/home/thomas/dl' -f 'tslib-1.16.tar.xz' -H 'package/tslib//tslib.hash' -n 'tslib-1.16' -N 'tslib' -o '/home/thomas/dl/tslib/tslib-1.16.tar.xz' -u https+https://github.com/kergoth/tslib/releases/download/1.16 -u http\|urlencode+http://sources.buildroot.net/tslib -u http\|urlencode+http://sources.buildroot.net -- Let's silence this dl-wrapper call by prepending with $(Q). Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2ca6ccf44d..bf93b9a08e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -92,7 +92,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR) - $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ -d '$($(PKG)_DL_DIR)' \ -D '$(DL_DIR)' \ From b4e459a4ff6f34d598ddc42cf31d73a165e41d64 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Aug 2018 18:59:29 +0200 Subject: [PATCH 2428/2640] zeromq: fix build on m68k_cf An internal compiler error is raised on m68k_cf at dwarf2cfi.c:2752 in connect_traces. Error can be fixed by adding -fno-defer-pop, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 Fixes: - http://autobuild.buildroot.net/results/dad241acbe59b1c5a24a0a2f3da6b12a553aec84 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zeromq/zeromq.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index 8273cad763..4b25c7d678 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -23,6 +23,12 @@ ZEROMQ_CONF_ENV = libzmq_cv_sock_cloexec=yes \ libzmq_cv_tcp_keepidle=yes \ libzmq_cv_tcp_keepintvl=yes +# Internal error, aborting at dwarf2cfi.c:2752 in connect_traces +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 +ifeq ($(BR2_m68k_cf),y) +ZEROMQ_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-defer-pop" +endif + # Only tools/curve_keygen.c needs this, but it doesn't hurt to pass it # for the rest of the build as well (which automatically includes stdc++). ifeq ($(BR2_STATIC_LIBS),y) From b47b082e986e031a4206381a5654a2ae560f784c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Aug 2018 19:08:07 +0200 Subject: [PATCH 2429/2640] mutt: fix static build with libidn2 and libunistring When libidn2 is statically build with libunistring support, mutt needs to add -lunistring to LIBS. To do that, add a call to PKG_CHECK_MODULES to retrieve this information from libidn2.pc Fixes: - http://autobuild.buildroot.net/results/177da8f4798f69298db5385957184f1c53cca923 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-build-with-libidn2-and-libunistring.patch | 36 +++++++++++++++++++ package/mutt/mutt.mk | 4 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch diff --git a/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch b/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch new file mode 100644 index 0000000000..56b90f5e3b --- /dev/null +++ b/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch @@ -0,0 +1,36 @@ +From 1baceb95bd8e6f35c25bc7afdc6a88c8f6264f3f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Aug 2018 19:06:08 +0200 +Subject: [PATCH] Fix static build with libidn2 and libunistring + +When libidn2 is statically build with libunistring support, mutt needs +to add -lunistring to LIBS. +To do that, add a call to PKG_CHECK_MODULES to retrieve this information +from libidn2.pc + +Fixes: + - http://autobuild.buildroot.net/results/177da8f4798f69298db5385957184f1c53cca923 + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 29252173..2e69ac19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1341,6 +1341,10 @@ AC_ARG_WITH(idn2, AS_HELP_STRING([--with-idn2=@<:@PFX@:>@],[Use GNU libidn2 for + if test "$with_idn2" != "yes" ; then + CPPFLAGS="$CPPFLAGS -I$with_idn2/include" + LDFLAGS="$LDFLAGS -L$with_idn2/lib" ++ else ++ PKG_CHECK_MODULES([LIBIDN2], libidn2, ++ [CPPFLAGS="$CPPFLAGS $LIBIDN2_CFLAGS" ++ LIBS="$LIBIDN2_LIBS"]) + fi + fi + ], +-- +2.14.1 + diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 1c3021ece1..9918b45e64 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -8,8 +8,10 @@ MUTT_VERSION = 1.10.1 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL -MUTT_DEPENDENCIES = ncurses +MUTT_DEPENDENCIES = host-pkgconf ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp +# We're patching configure.ac +MUTT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv From ac26da5275af39e723547e0945de03752051e1ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Aug 2018 23:47:40 +0200 Subject: [PATCH 2430/2640] libssh: fix download location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current download location fails, and Buildroot falls back to sources.b.o: --2018-08-20 23:41:39-- https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz Resolving red.libssh.org (red.libssh.org)... 78.46.80.163 Connecting to red.libssh.org (red.libssh.org)|78.46.80.163|:443... connected. The certificate's owner does not match hostname ‘red.libssh.org’ --2018-08-20 23:41:39-- http://sources.buildroot.net/libssh/libssh-0.7.5.tar.xz Resolving sources.buildroot.net (sources.buildroot.net)... 104.25.211.19, 104.25.210.19, 2400:cb00:2048:1::6819:d313, ... Connecting to sources.buildroot.net (sources.buildroot.net)|104.25.211.19|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 351632 (343K) [application/x-xz] This commit fixes the download location: --2018-08-20 23:43:04-- https://www.libssh.org/files/0.7/libssh-0.7.5.tar.xz Resolving www.libssh.org (www.libssh.org)... 87.98.168.187, 2001:41d0:2:f80c::4 Connecting to www.libssh.org (www.libssh.org)|87.98.168.187|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 351632 (343K) [application/x-tar] This patch is extracted from a contribution from Bernd Kuhls who was also bumping the package at the same time (http://patchwork.ozlabs.org/patch/959192/). Signed-off-by: Thomas Petazzoni --- package/libssh/libssh.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 34716c502a..902865d73b 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -4,9 +4,10 @@ # ################################################################################ -LIBSSH_VERSION = 0.7.5 +LIBSSH_VERSION_MAJOR = 0.7 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz -LIBSSH_SITE = https://red.libssh.org/attachments/download/218 +LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 LIBSSH_LICENSE_FILES = COPYING LIBSSH_INSTALL_STAGING = YES From 38de43412327b68de1943ead3fea512ec42be625 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Wed, 15 Aug 2018 16:44:34 -0700 Subject: [PATCH 2431/2640] download: fix file:// BR2_PRIMARY_SITE (download cache) wget is the only downloader currently usable with BR2_PRIMARY_SITE, and that doesn't work at all for file:// URLs. The symptoms are these: support/download/dl-wrapper -c '2.4.47' -d '/PATH/build/sw/source/attr' -D '/PATH/build/sw/source' -f 'attr-2.4.47.src.tar.gz' -H 'package/attr//attr.hash' -n 'attr-2.4.47' -N 'attr' -o '/PATH/build/sw/source/attr/attr-2.4.47.src.tar.gz' -u file\|urlencode+file:///NFS/buildroot_dl_cache/attr -u file\|urlencode+file:///NFS/buildroot_dl_cache -u http+http://download.savannah.gnu.org/releases/attr -u http\|urlencode+http://sources.buildroot.net/attr -u http\|urlencode+http://sources.buildroot.net -- file:///NFS/buildroot_dl_cache/attr/attr-2.4.47.src.tar.gz: Unsupported scheme `file'. ERROR: attr-2.4.47.src.tar.gz has wrong sha256 hash: ERROR: expected: 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 ERROR: got : e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 ERROR: Incomplete download, or man-in-the-middle (MITM) attack In the case of custom Linux kernel versions, this is fatal, because there isn't necessarily a hash file to indicate that wget's empty tarball is wrong. This seems to have been broken by commit c8ef0c03b0b, because: 1. BR2_PRIMARY_SITE always appends "urlencode" (package/pkg-download.mk) 2. Anything with the "|urlencode" suffix in $uri will end up using wget due to the backend case wildcarding. 3. The wget backend rejects file:/// URLs ("unsupported scheme"), and we end up with an empty .tar.gz file in the downloads directory. Fix that by shell-extracting the backend name from the left of "|". I'm not positive if all URLs will have a "|", so this code only looks for a "|" left of the "+". Signed-off-by: Hollis Blanchard Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/dl-wrapper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 4059c37ebc..490335c859 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -88,7 +88,8 @@ main() { download_and_check=0 rc=1 for uri in "${uris[@]}"; do - backend=${uri%%+*} + backend_urlencode="${uri%%+*}" + backend="${backend_urlencode%|*}" case "${backend}" in git|svn|cvs|bzr|file|scp|hg) ;; *) backend="wget" ;; From 0d609585ff7991ce720d05b475c90b004c560f4b Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Mon, 20 Aug 2018 18:29:20 -0700 Subject: [PATCH 2432/2640] systemd: add optional dependency on elfutils systemd can use elfutils when available, so this commit adds the detection of this library. Signed-off-by: Keith Mok Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d7031ed21d..4813496670 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -65,6 +65,13 @@ else SYSTEMD_CONF_OPTS += -Daudit=false endif +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +SYSTEMD_DEPENDENCIES += elfutils +SYSTEMD_CONF_OPTS += -Delfutils=true +else +SYSTEMD_CONF_OPTS += -Delfutils=false +endif + # Both options can't be selected at the same time so prefer libidn2 ifeq ($(BR2_PACKAGE_LIBIDN2),y) SYSTEMD_DEPENDENCIES += libidn2 From 994a47649b4c95c2338d41d34144ebfb9639b717 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 20 Aug 2018 16:22:16 +0200 Subject: [PATCH 2433/2640] pv: fix build failures when building under a path containing 'yes' Depending on the configuration, the cpp output may contain the string 'yes' in a comment if built under a path containing 'yes', confusing the _AIX test: ${CROSS}-cpp conftest.h \# 1 "conftest.h" \# 1 "" \# 1 "" \# 31 "" \# 1 "/home/peko/source/buildroot/output-yes/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/stdc-predef.h" \# 32 "" 2 \# 1 "conftest.txt" If misdetected, the configure script adds -lc128 to LIBS, causing the AC_CHECKS_FUNCS check for stat64 to fail, which in turn causes compilation errors about redefinition of symbols: In file included from ./src/include/pv-internal.h:9:0, from src/pv/file.c:5: ./src/include/config.h:76:18: error: redefinition of 'struct stat' # define stat64 stat ^ Fix it by only matching on 'yes' on a line by itself. As pv doesn't cleanly autoreconf (it doesn't use automake and configure.in is located in subdir), instead directly patch configure. Signed-off-by: Peter Korsgaard Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../0001-configure.in-tighten-AIX-test.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/pv/0001-configure.in-tighten-AIX-test.patch diff --git a/package/pv/0001-configure.in-tighten-AIX-test.patch b/package/pv/0001-configure.in-tighten-AIX-test.patch new file mode 100644 index 0000000000..2e0d2af247 --- /dev/null +++ b/package/pv/0001-configure.in-tighten-AIX-test.patch @@ -0,0 +1,57 @@ +From cd7605723eb8e6d8231644f1cf62f1e80badf074 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Mon, 20 Aug 2018 15:57:22 +0200 +Subject: [PATCH] configure.in: tighten AIX test + +Depending on the configuration, the cpp output may contain the string 'yes' +in a comment if built under a path containing 'yes', confusing the _AIX +test: + +${CROSS}-cpp conftest.h +\# 1 "conftest.h" +\# 1 "" +\# 1 "" +\# 31 "" +\# 1 "/home/peko/source/buildroot/output-yes/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/stdc-predef.h" 1 3 4 +\# 32 "" 2 +\# 1 "conftest.txt" + +Fix it by only matching on 'yes' on a line by itself. + +Upstream-status: submitted to author +Signed-off-by: Peter Korsgaard +--- + + autoconf/configure.in | 2 +- + configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autoconf/configure.in b/autoconf/configure.in +index bd45004..487c42b 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -86,7 +86,7 @@ AC_PROG_MAKE_SET + + dnl AIX needs -lc128 + dnl +-AC_EGREP_CPP([yes], [#ifdef _AIX ++AC_EGREP_CPP([^yes$], [#ifdef _AIX + yes + #endif + ], [LIBS="$LIBS -lc128"]) +diff --git a/configure b/configure +index 7c11be0..59267b9 100755 +--- a/configure ++++ b/configure +@@ -3377,7 +3377,7 @@ yes + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then ++ $EGREP "^yes$" >/dev/null 2>&1; then + LIBS="$LIBS -lc128" + fi + rm -f conftest* +-- +2.11.0 + From b1db9038ddaf89c4abf69e17993eb13646da7e8d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 17 Jul 2018 14:01:43 +0300 Subject: [PATCH 2434/2640] busybox: don't clobber dangling symlinks We sometimes create dangling symlinks in the target directory. That is because we need canonical targets, as relative targets don't work well with BR2_ROOTFS_MERGED_USR. For example, the vim package installs the /bin/vi symlink to /usr/bin/vim. This symlink might be dangling when the build host has no vim installed there. Patch the busybox install.sh script to avoid clobber of dangling symlinks. Fixes: http://autobuild.buildroot.net/results/796/796107430db6545401d9926e84f19eaf2040b756/ Cc: Adam Duskett Cc: Carlos Santos Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...l.sh-don-t-clobber-dangling-symlinks.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch diff --git a/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch b/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch new file mode 100644 index 0000000000..b6fb5b9236 --- /dev/null +++ b/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch @@ -0,0 +1,38 @@ +From c9f1a877f1b9e2602913600d769edb17ee41d15d Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 17 Jul 2018 13:18:09 +0300 +Subject: [PATCH] install.sh: don't clobber dangling symlinks + +Symlinks in a subdirectory that is to become target rootfs are sometimes +dangling because they link to canonical file names that are not present +on the host, but are present relative to the target rootfs root. Don't +copy over dangling symlinks when noclobber is enabled + +The -e test treats dangling symlinks as non-existent files. Add -h test +that returns true for all symlinks. + +Cc: Yann E. MORIN +Signed-off-by: Baruch Siach +--- +Upstream status: +http://lists.busybox.net/pipermail/busybox/2018-July/086555.html + + applets/install.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/install.sh b/applets/install.sh +index 9aede0f530e2..415896893e86 100755 +--- a/applets/install.sh ++++ b/applets/install.sh +@@ -83,7 +83,7 @@ install -m 755 busybox "$prefix/bin/busybox" || exit 1 + for i in $h; do + appdir=`dirname "$i"` + app=`basename "$i"` +- if [ x"$noclobber" = x"1" ] && [ -e "$prefix/$i" ]; then ++ if [ x"$noclobber" = x"1" ] && ([ -e "$prefix/$i" ] || [ -h "$prefix/$i" ]); then + echo " $prefix/$i already exists" + continue + fi +-- +2.18.0 + From d67cebcda0edb4ed598c0ed800d0425c4ae14c02 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 4 Jul 2018 23:42:57 +0200 Subject: [PATCH 2435/2640] toolchain: improve musl check to support static toolchains The check_musl function currently builds a program and verifies if the program interpreter starts with /lib/ld-musl. While this works fine for dynamically linked programs, this obviously doesn't work for a purely static musl toolchain such as [1]. There is no easy way to identify a toolchain as using the musl C library. For glibc, dynamic linking is always supported, so we look at the dynamic linker name. For uClibc, there is a distinctive uClibc_config.h header file. There is no such distinctive feature in musl. We end up resorting to looking for the string MUSL_LOCPATH, which is used by musl locale_map.c source file. This string has been present in musl since 2014. It certainly isn't a very stable or convincing solution to identify the C library as being musl, but it's the best we could find. Note that we are sure there is a libc.a file, because the check_unusable_toolchain function checks that there is a such a file. [1] http://autobuild.buildroot.net/toolchains/tarballs/br-arm-musl-static-2018.05.tar.bz2 Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 9 +++------ toolchain/toolchain-external/pkg-toolchain-external.mk | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1792286add..e5520c00c3 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -241,14 +241,11 @@ check_glibc = \ # $2: cross-readelf path check_musl = \ __CROSS_CC=$(strip $1) ; \ - __CROSS_READELF=$(strip $2) ; \ - echo 'void main(void) {}' | $${__CROSS_CC} -x c -o $(BUILD_DIR)/.br-toolchain-test.tmp - >/dev/null 2>&1; \ - if ! $${__CROSS_READELF} -l $(BUILD_DIR)/.br-toolchain-test.tmp 2> /dev/null | grep 'program interpreter: /lib/ld-musl' -q; then \ - rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*; \ + libc_a_path=`$${__CROSS_CC} -print-file-name=libc.a` ; \ + if ! strings $${libc_a_path} | grep -q MUSL_LOCPATH ; then \ echo "Incorrect selection of the C library" ; \ exit -1; \ - fi ; \ - rm -f $(BUILD_DIR)/.br-toolchain-test.tmp* + fi # # Check the conformity of Buildroot configuration with regard to the diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 8b2c283654..02d992531d 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -557,8 +557,7 @@ define $(2)_CONFIGURE_CMDS $$(call check_uclibc,$$$${SYSROOT_DIR}) ; \ elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \ $$(call check_musl,\ - "$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\ - $$(TOOLCHAIN_EXTERNAL_READELF)) ; \ + "$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)") ; \ else \ $$(call check_glibc,$$$${SYSROOT_DIR}) ; \ fi From 530668ddb709cf27aa6694e00f44cf58af858b0b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Aug 2018 22:16:17 +0200 Subject: [PATCH 2436/2640] qt5base: fix double conversion for microblazeel/microblazebe Fixes [1]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/489/4891d96f45c64c2e66fe819bd4175cc1d6243a93 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...ble-conversion-enable-for-microblaze.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch diff --git a/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch new file mode 100644 index 0000000000..2d7164b67c --- /dev/null +++ b/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch @@ -0,0 +1,27 @@ +From 372d33fbe549ea73318c187505716ac99fbf3054 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 21 Aug 2018 21:11:40 +0200 +Subject: [PATCH] double-conversion: enable for microblaze + +Signed-off-by: Peter Seiderer +--- + .../double-conversion/include/double-conversion/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index b0a7d5d4f4..485f680180 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -66,7 +66,8 @@ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ +- defined(__or1k__) ++ defined(__or1k__) || \ ++ defined(__microblaze__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +2.18.0 + From a732f00379c8613a8fbe824fbc965d03ff88ac50 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 21 Aug 2018 22:53:25 +0200 Subject: [PATCH 2437/2640] package/x11r7/xlib_libX11: security bump to version 1.6.6 Fixes CVE-2018-14599, CVE-2018-14600 & CVE-2018-14598: https://lists.x.org/archives/xorg-announce/2018-August/002915.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libX11/xlib_libX11.hash | 9 +++++++-- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index b1a87b18e1..4dc934177a 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-February/002777.html -sha256 4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d libX11-1.6.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-August/002916.html +md5 6b0f83e851b3b469dd660f3a95ac3e42 libX11-1.6.6.tar.bz2 +sha1 b29cf4362b58188cb27fed2294788004af7428a9 libX11-1.6.6.tar.bz2 +sha256 65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f libX11-1.6.6.tar.bz2 +sha512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7 libX11-1.6.6.tar.bz2 +# Locally computed +sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index e2266cdfad..9eafd47e7b 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.6.5 +XLIB_LIBX11_VERSION = 1.6.6 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From b3c1f0869645b136b9399d7a93acca65957e0bfe Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Wed, 22 Aug 2018 12:54:49 +0200 Subject: [PATCH 2438/2640] DEVELOPERS: add mender to Mirza Krak Signed-off-by: Mirza Krak Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 215506c71c..a6d76dd9c4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1437,6 +1437,9 @@ F: package/libfribidi/ N: Min Xu F: package/shadowsocks-libev/ +N: Mirza Krak +F: package/mender/ + N: Morgan Delestre F: package/monkey/ From 0901b09a699ab3f54c193e3349d925b436c64642 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Aug 2018 22:30:08 +0200 Subject: [PATCH 2439/2640] mjpegtools: fix build on powerpc without altivec mpjegtools fails to build on powerpc without altivec: build_sub44_mests.c: In function 'build_sub44_mests_altivec': build_sub44_mests.c:268:9: internal compiler error: Segmentation fault vr1 = vec_ld(rowstride, (unsigned char*)s44blk); It seems mpjegtools is wrongly detecting altivec support: configure: - PowerPC Optimizations: configure: - AltiVec enabled : true Fix this by adding BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT and setting --enable-simd-accel / --disable-simd-accel Fixes: - http://autobuild.buildroot.net/results/c9464712f43efb8954fd2e5460126ad193660353 Signed-off-by: Fabrice Fontaine Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mjpegtools/Config.in | 5 +++++ package/mjpegtools/mjpegtools.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/mjpegtools/Config.in b/package/mjpegtools/Config.in index c486361a87..968f9e7d65 100644 --- a/package/mjpegtools/Config.in +++ b/package/mjpegtools/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_MJPEGTOOLS http://mjpeg.sourceforge.net +config BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT + bool + default y if BR2_X86_CPU_HAS_MMX + default y if BR2_POWERPC_CPU_HAS_ALTIVEC + comment "mjpegtools needs a toolchain w/ C++, threads" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mjpegtools/mjpegtools.mk b/package/mjpegtools/mjpegtools.mk index c7392fa2b3..14713c868e 100644 --- a/package/mjpegtools/mjpegtools.mk +++ b/package/mjpegtools/mjpegtools.mk @@ -10,6 +10,12 @@ MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg MJPEGTOOLS_LICENSE = GPL-2.0+ MJPEGTOOLS_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT),y) +MJPEGTOOLS_CONF_OPTS += --enable-simd-accel +else +MJPEGTOOLS_CONF_OPTS += --disable-simd-accel +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) MJPEGTOOLS_CONF_OPTS += --with-libpng MJPEGTOOLS_DEPENDENCIES += libpng From 78fd0038913f7df0b9c95bb482ab903bf6cc3115 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 22 Aug 2018 13:38:38 -0300 Subject: [PATCH 2440/2640] linux: bump default to version 4.17.18 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 26edc619ac..b7bee99051 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.17" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.18" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 59af8a3a223d2d5fdd6496ef59b79be38d957df5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 22 Aug 2018 13:38:39 -0300 Subject: [PATCH 2441/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 783cc7ea3a..adac3f6398 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.150" if BR2_KERNEL_HEADERS_4_4 - default "4.9.122" if BR2_KERNEL_HEADERS_4_9 + default "4.4.151" if BR2_KERNEL_HEADERS_4_4 + default "4.9.123" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.65" if BR2_KERNEL_HEADERS_4_14 + default "4.14.66" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.17" if BR2_KERNEL_HEADERS_4_17 + default "4.17.18" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 5ef5b39bd4006526717364b39b04a663ce174517 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 24 Aug 2018 07:56:14 +0300 Subject: [PATCH 2442/2640] openssh: security bump to version 7.8 Fixes CVE-2018-15473: user enumeration vulnerability due to not delaying bailout for an invalid authenticating user until after the packet containing the request has been fully parsed. Some OpenSSH developers don't consider this a security issue: https://lists.mindrot.org/pipermail/openssh-unix-dev/2018-August/037138.html Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 69d34ba65e..0b31f70ecc 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From http://www.openssh.com/txt/release-7.7 (base64 encoded) -sha256 d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f openssh-7.7p1.tar.gz +# From http://www.openssh.com/txt/release-7.8 (base64 encoded) +sha256 1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca openssh-7.8p1.tar.gz # Locally calculated sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index b28429e1bb..45a11ee65e 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 7.7p1 +OPENSSH_VERSION = 7.8p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE From f6c28c65a32891c54eb3f06611ee6cef0bc3705d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 24 Aug 2018 17:01:51 +0200 Subject: [PATCH 2443/2640] linux: bump default to version 4.17.19 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index b7bee99051..69042af168 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -120,7 +120,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.17.18" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.17.19" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 182a6c231b95e6f72af453632495151380a560de Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 24 Aug 2018 17:01:52 +0200 Subject: [PATCH 2444/2640] linux-headers: bump 4.{4, 9, 14, 17}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index adac3f6398..400258f6f1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -258,14 +258,14 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.151" if BR2_KERNEL_HEADERS_4_4 - default "4.9.123" if BR2_KERNEL_HEADERS_4_9 + default "4.4.152" if BR2_KERNEL_HEADERS_4_4 + default "4.9.124" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.66" if BR2_KERNEL_HEADERS_4_14 + default "4.14.67" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.17.18" if BR2_KERNEL_HEADERS_4_17 + default "4.17.19" if BR2_KERNEL_HEADERS_4_17 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7a7a1591350c29538e86cedebcb251ffac3daecc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 24 Aug 2018 18:27:15 +0200 Subject: [PATCH 2445/2640] mbedtls: security bump to version 2.7.5 Fixes the following security issues: - CVE-2018-0497: Remote plaintext recovery on use of CBC based ciphersuites through a timing side-channel - CVE-2018-0498: Plaintext recovery on use of CBC based ciphersuites through a cache based side-channel For more info, see the advisory: https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2018-02 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index cf347d299f..47e446dd07 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.11.0-2.7.4-and-2.1.13-released -sha1 20394e353050992c5f9699da7c9a336bd2ed2dea mbedtls-2.7.4-apache.tgz -sha256 34e164d49500e377970c5f6761a146078baae0e086ec88cdcfeb9c96878a38f5 mbedtls-2.7.4-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.12.0-2.7.5-and-2.1.14-released +sha1 180ca49e2bb6df3826113781b793529a81427ce3 mbedtls-2.7.5-apache.tgz +sha256 a1302ad9094aabb9880d2755927b466a6bac8e02b68e04dee77321f3859e9b40 mbedtls-2.7.5-apache.tgz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index ab415dd0b8..e07cc3d71c 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.7.4 +MBEDTLS_VERSION = 2.7.5 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From 3beba26d7657840c07bf014e33f9e80b6f1b09af Mon Sep 17 00:00:00 2001 From: Mark Corbin Date: Thu, 23 Aug 2018 17:19:28 +0100 Subject: [PATCH 2446/2640] package/linux-headers: add help text for manual header selection Add kconfig help text that explains how to manually specify an official Linux version to use for the kernel headers. Signed-off-by: Mark Corbin Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 400258f6f1..9f31bad9c3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -77,6 +77,14 @@ config BR2_KERNEL_HEADERS_4_17 config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" + help + This option allows you to use a specific official version from + kernel.org, like 2.6.x, 2.6.x.y, 3.x.y, ... + + Note: you cannot use this option to select a _longterm_ 2.6 + kernel, because these kernels are not located at the standard + URL at kernel.org. Instead, select "Custom tarball" and + specify the right URL directly. endchoice From db756327f5c765457514b005f70624c6f81688cf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 24 Aug 2018 14:35:17 +0200 Subject: [PATCH 2447/2640] rauc: add patch to make it build with Linux < 3.0 This commit adds a patch to RAUC that makes the eMMC boot partition support optional. This allows RAUC to build successfully on systems using Linux < 3.0. Fixes: http://autobuild.buildroot.net/results/7e1cbeb458cb6536a36eae0d24cefb36edb22f55/ Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" --- ...eMMC-boot-partition-support-optional.patch | 116 ++++++++++++++++++ package/rauc/rauc.mk | 2 + 2 files changed, 118 insertions(+) create mode 100644 package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch diff --git a/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch b/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch new file mode 100644 index 0000000000..f6177c9d54 --- /dev/null +++ b/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch @@ -0,0 +1,116 @@ +From d66502532fea652d8743bfb61f9843c796d305cf Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 24 Aug 2018 14:30:19 +0200 +Subject: [PATCH] build: make eMMC boot partition support optional + +The eMMC boot partition support, added in commit +ea5cc7ff606c65536da218bd1ef6d0ca279c9b17 ("src/update_handler: add +support for updating eMMC boot partitions"), requires +, only available starting from kernel headers 3.0. + +Even though it is pretty likely that people are going to use Linux >= +3.0 on their embedded systems these days, RAUC also needs to be built +natively on the build machine to produce update artifacts, and the +build machine is sometimes using an ancient Linux system, especially +in an enterprise contexts. + +In order to make sure that RAUC builds fine in this context, this +commit makes the eMMC boot partition support optional, by verifying +the availability of . + +Signed-off-by: Thomas Petazzoni +--- + Makefile.am | 5 ++++- + configure.ac | 6 ++++++ + src/update_handler.c | 6 ++++++ + 3 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 23eb2d1..7b4682d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,6 @@ librauc_la_SOURCES = \ + src/checksum.c \ + src/config_file.c \ + src/context.c \ +- src/emmc.c \ + src/install.c \ + src/manifest.c \ + src/mark.c \ +@@ -63,6 +62,10 @@ librauc_la_SOURCES = \ + include/update_handler.h \ + include/utils.h + ++if WANT_EMMC_BOOT_SUPPORT ++librauc_la_SOURCES += src/emmc.c ++endif ++ + if WANT_NETWORK + librauc_la_SOURCES += src/network.c include/network.h + endif +diff --git a/configure.ac b/configure.ac +index 2d6f940..1ec124b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,6 +102,12 @@ AC_SUBST(DBUS_SYSTEMSERVICEDIR) + + # Checks for header files. + ++AC_CHECK_HEADER([linux/mmc/ioctl.h], ++ AC_DEFINE([ENABLE_EMMC_BOOT_SUPPORT], [1], [Define to 1 to enable eMMC boot support]), ++ AC_DEFINE([ENABLE_EMMC_BOOT_SUPPORT], [0])) ++ ++AM_CONDITIONAL([WANT_EMMC_BOOT_SUPPORT], [test x$ac_cv_header_linux_mmc_ioctl_h != xno]) ++ + # Checks for typedefs, structures, and compiler characteristics. + + # Checks for library functions. +diff --git a/src/update_handler.c b/src/update_handler.c +index 62115ec..a9f233a 100644 +--- a/src/update_handler.c ++++ b/src/update_handler.c +@@ -57,6 +57,7 @@ out: + return outstream; + } + ++#if ENABLE_EMMC_BOOT_SUPPORT == 1 + static gboolean clear_slot(RaucSlot *slot, GError **error) + { + GError *ierror = NULL; +@@ -99,6 +100,7 @@ out: + g_clear_object(&outstream); + return res; + } ++#endif + + static gboolean ubifs_ioctl(RaucImage *image, int fd, GError **error) + { +@@ -1085,6 +1087,7 @@ out: + return res; + } + ++#if ENABLE_EMMC_BOOT_SUPPORT == 1 + static gboolean img_to_boot_emmc_handler(RaucImage *image, RaucSlot *dest_slot, const gchar *hook_name, GError **error) + { + +@@ -1245,6 +1248,7 @@ out: + + return res; + } ++#endif + + static gboolean img_to_raw_handler(RaucImage *image, RaucSlot *dest_slot, const gchar *hook_name, GError **error) + { +@@ -1329,7 +1333,9 @@ RaucUpdatePair updatepairs[] = { + {"*.img", "nand", img_to_nand_handler}, + {"*.img", "ubivol", img_to_ubivol_handler}, + {"*.squashfs", "ubivol", img_to_ubivol_handler}, ++#if ENABLE_EMMC_BOOT_SUPPORT == 1 + {"*.img", "boot-emmc", img_to_boot_emmc_handler}, ++#endif + {"*.img", "*", img_to_raw_handler}, /* fallback */ + {0} + }; +-- +2.14.4 + diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index f1705a8c33..36119c061d 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -9,6 +9,8 @@ RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 +# 0002-build-make-eMMC-boot-partition-support-optional.patch +RAUC_AUTORECONF = YES ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network From c9837870dab8c61e2801b39cc20b167fa4709c25 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 23 Aug 2018 16:40:36 +0200 Subject: [PATCH 2448/2640] package/mesa3d: vulkan with x11 needs dri3 Vulcan with X11 needs DRI3, which in turn requires xlib-libxshmfence. Fixes: http://autobuild.buildroot.org/results/356/35653fc6f57dc169a8aae6baedb1acd1049b50ec/ Signed-off-by: "Yann E. MORIN" Cc: Bernd Kuhls Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 3 +++ package/mesa3d/mesa3d.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index eec72654cd..06574ae513 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -210,16 +210,19 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert depends on BR2_PACKAGE_XORG7 # xorgproto select BR2_PACKAGE_MESA3D_VULKAN_DRIVER select BR2_PACKAGE_XORGPROTO + select BR2_PACKAGE_XLIB_LIBXSHMFENCE help Vulkan driver for Intel hardware from Ivy Bridge onward. comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.18" depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \ !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5c01f92e22..e1e21321b0 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -130,7 +130,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ --without-vulkan-drivers else +MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ + --enable-dri3 \ --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif From 0753ffb23d6d39c07c754bee009cfd13ed6509c5 Mon Sep 17 00:00:00 2001 From: Brad Love Date: Fri, 24 Aug 2018 08:54:06 -0500 Subject: [PATCH 2449/2640] i2c-tools: include LGPL-2.1+ license for libi2c Extend i2c-tools SPDX identifiers to include the library license. Also include COPYING.LGPL and README to license files. The ic2-tools readme states: LICENSE Check the documentation of individual tools for licensing information. The library is released under the LGPL version 2.1 or later, while most tools are released under the GPL version 2 or later, but there are a few exceptions. Signed-off-by: Brad Love [Thomas: add hashes for COPYING.LGPL and README.] Signed-off-by: Thomas Petazzoni --- package/i2c-tools/i2c-tools.hash | 4 +++- package/i2c-tools/i2c-tools.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/i2c-tools/i2c-tools.hash b/package/i2c-tools/i2c-tools.hash index 3475d20657..37563074fc 100644 --- a/package/i2c-tools/i2c-tools.hash +++ b/package/i2c-tools/i2c-tools.hash @@ -1,5 +1,7 @@ # Locally computed sha256 d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6 i2c-tools-4.0.tar.xz -# License file +# License files sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 158abc6886c2c6e2dec7e9cb11b46fd41cb13a015c5057c2a587ef581f9142f8 README diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index db26647eb5..ec06c73325 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -7,8 +7,8 @@ I2C_TOOLS_VERSION = 4.0 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools -I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus) -I2C_TOOLS_LICENSE_FILES = COPYING +I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) +I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog ifeq ($(BR2_PACKAGE_PYTHON),y) From a2e00031412ec0c0968539bc1e0adb7fb9b0cd67 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 23 Aug 2018 12:04:33 +0200 Subject: [PATCH 2450/2640] docs/manual: expand on why using a branch name is not supported Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index cc91e894bd..7be1754f54 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -200,11 +200,24 @@ information is (assuming the package name is +libfoo+) : package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is assumed to be the same as +LIBFOO_VERSION+. It can also be a revision number or a tag for packages that are fetched directly - from their version control system. Do not use a branch name as - version; it does not work. Examples: + from their version control system. Examples: ** a version for a release tarball: +LIBFOO_VERSION = 0.1.2+ ** a sha1 for a git tree: +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ ** a tag for a git tree +LIBFOO_VERSION = v0.1.2+ ++ +.Note: +Using a branch name as +FOO_VERSION+ is not supported, because it does +not and can not work as people would expect it should: ++ + 1. due to local caching, Buildroot will not re-fetch the repository, + so people who expect to be able to follow the remote repository + would be quite surprised and disappointed; + 2. because two builds can never be perfectly simultaneous, and because + the remote repository may get new commits on the branch anytime, + two users, using the same Buildroot tree and building the same + configuration, may get different source, thus rendering the build + non reproducible, and people would be quite surprised and + disappointed. * +LIBFOO_SOURCE+ may contain the name of the tarball of the package, which Buildroot will use to download the tarball from From 8909897ab357c433cf688243cbfa1154cc63a7a3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 22 Aug 2018 10:28:32 +0200 Subject: [PATCH 2451/2640] package/brltty: fix cross-compilation brltty has a very inventive buildsystem, where it internall runs ./configure for the build machine In doing so, it generates a list of make variables to define what the build machine supports, like it does for the target. However, the build variables are generated with a convoluted sed script that scans the target list, and appends _FOR_BUILD to each target variables. Then, both lists are included from the Makefile, on the assumption that the build variables will not clash with the target variables. Where it gets interesting, is that that sed script considers the variables names to match '[A-Za-z][A-Za-z0-9_]*' And there we see why ATSPI2_PACKAGE does not match: it contains a digit. So, some build variables will inevitably override target ones. Fix that by simply expanding the matching regexp to allow digits in variable names. Fixes: http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/ http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/ Signed-off-by: "Yann E. MORIN" Cc: Mario Lang Cc: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../0004-buildsys-fix-cross-compilation.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/brltty/0004-buildsys-fix-cross-compilation.patch diff --git a/package/brltty/0004-buildsys-fix-cross-compilation.patch b/package/brltty/0004-buildsys-fix-cross-compilation.patch new file mode 100644 index 0000000000..9a10d46414 --- /dev/null +++ b/package/brltty/0004-buildsys-fix-cross-compilation.patch @@ -0,0 +1,41 @@ +From 088666535a045dae71bd2fcc6b3a1553023106ce Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 22 Aug 2018 10:10:19 +0200 +Subject: [PATCH] buildsys: fix cross-compilation + +Some identifiers for includes and libs paths may contain digit, e.g. +X11_PACKAGE or ATSPI2_PACKAGE or GLIB2_PACKAGE... + +Also detect those identifiers when doing cros-compilation, so that the +_FOR_BUILD variants are really created and do not clash with the target +variants. + +Fixes: + http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/build-end.log + http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/build-end.log + [...] + +Signed-off-by: "Yann E. MORIN" +--- +Upstram status: submitted +https://github.com/brltty/brltty/pull/142 +--- + mk4build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk4build b/mk4build +index db90c86a9..551283825 100755 +--- a/mk4build ++++ b/mk4build +@@ -112,7 +112,7 @@ fi + + sedScript="${outputName}.${sedExtension}" + sed -n -e ' +-s/^ *\([A-Za-z][A-Za-z_]*\) *=.*$/\1/ ++s/^ *\([A-Za-z][A-Za-z0-9_]*\) *=.*$/\1/ + t found + d + :found +-- +2.14.1 + From f0f680d6736aa69ea11ecd7d0a0577fb14bc6d22 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 25 Aug 2018 23:46:07 +0200 Subject: [PATCH 2452/2640] openpowerlink: add patch to fix musl build This commit adds a one-liner patch that fixes the build with musl of the openpowerlink package, caused by a missing include. The patch has been submitted upstream. Fixes: http://autobuild.buildroot.net/results/8aff5f6d7bcab616129368c1fb22026bb164e454/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...-edrv-edrv-rawsock_linux.c-add-missi.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch diff --git a/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch b/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch new file mode 100644 index 0000000000..4e00ecdb67 --- /dev/null +++ b/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch @@ -0,0 +1,35 @@ +From 710e2b8ba2ecf51057a89de24e6f0d387614ea53 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 25 Aug 2018 23:36:39 +0200 +Subject: [PATCH] stack/src/kernel/edrv/edrv-rawsock_linux.c: add missing + include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is necessary to get the definition of the u_char type, otherwise +the build fails with the musl C library with: + +stack/src/kernel/edrv/edrv-rawsock_linux.c:373:46: error: ‘u_char’ undeclared (first use in this function) + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/371 +--- + stack/src/kernel/edrv/edrv-rawsock_linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/stack/src/kernel/edrv/edrv-rawsock_linux.c b/stack/src/kernel/edrv/edrv-rawsock_linux.c +index f8e0216f..e5230a52 100644 +--- a/stack/src/kernel/edrv/edrv-rawsock_linux.c ++++ b/stack/src/kernel/edrv/edrv-rawsock_linux.c +@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include ++#include + + //============================================================================// + // G L O B A L D E F I N I T I O N S // +-- +2.14.4 + From 4a3b0ba38fde05e8f8c3512d516d86803efa44c0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 26 Aug 2018 23:40:37 +0200 Subject: [PATCH 2453/2640] dropbear: add upstream security fix for CVE-2018-15599 dropbear is affected by an user enumeration vulnerability similar to the recent issue in openssh (CVE-2018-15473). Add an upstream patch fixing the issue. For more details, see the discussion on the mailing list: http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2018q3/002110.html Signed-off-by: Peter Korsgaard --- .../0002-Wait-to-fail-invalid-usernames.patch | 236 ++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 package/dropbear/0002-Wait-to-fail-invalid-usernames.patch diff --git a/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch b/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch new file mode 100644 index 0000000000..958ac9921e --- /dev/null +++ b/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch @@ -0,0 +1,236 @@ +From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Thu, 23 Aug 2018 23:43:12 +0800 +Subject: [PATCH] Wait to fail invalid usernames + +[hg: https://secure.ucc.asn.au/hg/dropbear/rev/5d2d1021ca00] +Signed-off-by: Peter Korsgaard +--- + auth.h | 6 +++--- + svr-auth.c | 19 +++++-------------- + svr-authpam.c | 26 ++++++++++++++++++++++---- + svr-authpasswd.c | 27 ++++++++++++++------------- + svr-authpubkey.c | 11 ++++++++++- + 5 files changed, 54 insertions(+), 35 deletions(-) + +diff --git a/auth.h b/auth.h +index da498f5..98f5468 100644 +--- a/auth.h ++++ b/auth.h +@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void); + void send_msg_userauth_failure(int partial, int incrfail); + void send_msg_userauth_success(void); + void send_msg_userauth_banner(const buffer *msg); +-void svr_auth_password(void); +-void svr_auth_pubkey(void); +-void svr_auth_pam(void); ++void svr_auth_password(int valid_user); ++void svr_auth_pubkey(int valid_user); ++void svr_auth_pam(int valid_user); + + #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT + int svr_pubkey_allows_agentfwd(void); +diff --git a/svr-auth.c b/svr-auth.c +index c19c090..edde86b 100644 +--- a/svr-auth.c ++++ b/svr-auth.c +@@ -149,10 +149,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_password(); +- goto out; +- } ++ svr_auth_password(valid_user); ++ goto out; + } + } + #endif +@@ -164,10 +162,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_pam(); +- goto out; +- } ++ svr_auth_pam(valid_user); ++ goto out; + } + } + #endif +@@ -177,12 +173,7 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PUBKEY_LEN && + strncmp(methodname, AUTH_METHOD_PUBKEY, + AUTH_METHOD_PUBKEY_LEN) == 0) { +- if (valid_user) { +- svr_auth_pubkey(); +- } else { +- /* pubkey has no failure delay */ +- send_msg_userauth_failure(0, 0); +- } ++ svr_auth_pubkey(valid_user); + goto out; + } + #endif +diff --git a/svr-authpam.c b/svr-authpam.c +index 05e4f3e..d201bc9 100644 +--- a/svr-authpam.c ++++ b/svr-authpam.c +@@ -178,13 +178,14 @@ pamConvFunc(int num_msg, + * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it + * gets very messy trying to send the interactive challenges, and read the + * interactive responses, over the network. */ +-void svr_auth_pam() { ++void svr_auth_pam(int valid_user) { + + struct UserDataS userData = {NULL, NULL}; + struct pam_conv pamConv = { + pamConvFunc, + &userData /* submitted to pamvConvFunc as appdata_ptr */ + }; ++ const char* printable_user = NULL; + + pam_handle_t* pamHandlep = NULL; + +@@ -204,12 +205,23 @@ void svr_auth_pam() { + + password = buf_getstring(ses.payload, &passwordlen); + ++ /* We run the PAM conversation regardless of whether the username is valid ++ in case the conversation function has an inherent delay. ++ Use ses.authstate.username rather than ses.authstate.pw_name. ++ After PAM succeeds we then check the valid_user flag too */ ++ + /* used to pass data to the PAM conversation function - don't bother with + * strdup() etc since these are touched only by our own conversation + * function (above) which takes care of it */ +- userData.user = ses.authstate.pw_name; ++ userData.user = ses.authstate.username; + userData.passwd = password; + ++ if (ses.authstate.pw_name) { ++ printable_user = ses.authstate.pw_name; ++ } else { ++ printable_user = ""; ++ } ++ + /* Init pam */ + if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { + dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", +@@ -242,7 +254,7 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; +@@ -253,12 +265,18 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; + } + ++ if (!valid_user) { ++ /* PAM auth succeeded but the username isn't allowed in for another reason ++ (checkusername() failed) */ ++ send_msg_userauth_failure(0, 1); ++ } ++ + /* successful authentication */ + dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", + ses.authstate.pw_name, +diff --git a/svr-authpasswd.c b/svr-authpasswd.c +index bdee2aa..69c7d8a 100644 +--- a/svr-authpasswd.c ++++ b/svr-authpasswd.c +@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) { + + /* Process a password auth request, sending success or failure messages as + * appropriate */ +-void svr_auth_password() { ++void svr_auth_password(int valid_user) { + + char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ + char * testcrypt = NULL; /* crypt generated from the user's password sent */ +- char * password; ++ char * password = NULL; + unsigned int passwordlen; +- + unsigned int changepw; + +- passwdcrypt = ses.authstate.pw_passwd; +- +-#ifdef DEBUG_HACKCRYPT +- /* debugging crypt for non-root testing with shadows */ +- passwdcrypt = DEBUG_HACKCRYPT; +-#endif +- + /* check if client wants to change password */ + changepw = buf_getbool(ses.payload); + if (changepw) { +@@ -73,12 +65,21 @@ void svr_auth_password() { + } + + password = buf_getstring(ses.payload, &passwordlen); +- +- /* the first bytes of passwdcrypt are the salt */ +- testcrypt = crypt(password, passwdcrypt); ++ if (valid_user) { ++ /* the first bytes of passwdcrypt are the salt */ ++ passwdcrypt = ses.authstate.pw_passwd; ++ testcrypt = crypt(password, passwdcrypt); ++ } + m_burn(password, passwordlen); + m_free(password); + ++ /* After we have got the payload contents we can exit if the username ++ is invalid. Invalid users have already been logged. */ ++ if (!valid_user) { ++ send_msg_userauth_failure(0, 1); ++ return; ++ } ++ + if (testcrypt == NULL) { + /* crypt() with an invalid salt like "!!" */ + dropbear_log(LOG_WARNING, "User account '%s' is locked", +diff --git a/svr-authpubkey.c b/svr-authpubkey.c +index aa6087c..ff481c8 100644 +--- a/svr-authpubkey.c ++++ b/svr-authpubkey.c +@@ -79,7 +79,7 @@ static int checkfileperm(char * filename); + + /* process a pubkey auth request, sending success or failure message as + * appropriate */ +-void svr_auth_pubkey() { ++void svr_auth_pubkey(int valid_user) { + + unsigned char testkey; /* whether we're just checking if a key is usable */ + char* algo = NULL; /* pubkey algo */ +@@ -102,6 +102,15 @@ void svr_auth_pubkey() { + keybloblen = buf_getint(ses.payload); + keyblob = buf_getptr(ses.payload, keybloblen); + ++ if (!valid_user) { ++ /* Return failure once we have read the contents of the packet ++ required to validate a public key. ++ Avoids blind user enumeration though it isn't possible to prevent ++ testing for user existence if the public key is known */ ++ send_msg_userauth_failure(0, 0); ++ goto out; ++ } ++ + /* check if the key is valid */ + if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { + send_msg_userauth_failure(0, 0); +-- +2.11.0 + From 65f96452636b96c01ea3f00db6e4e7a240837101 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Mon, 27 Aug 2018 06:21:27 -0700 Subject: [PATCH 2454/2640] php: fix build with mysqli This fixes autobuild failures like http://autobuild.buildroot.net/results/3288b742cee650ee47a41c5b4d6aaef1fe67bff1 php compile breaks with: ext/mysqlnd/mysqlnd_auth.o: In function `php_mysqlnd_scramble_sha2': mysqlnd_auth.c:(.text+0x1054): undefined reference to `PHP_SHA256Init' mysqlnd_auth.c:(.text+0x1064): undefined reference to `PHP_SHA256Update' mysqlnd_auth.c:(.text+0x1070): undefined reference to `PHP_SHA256Final' mysqlnd_auth.c:(.text+0x1078): undefined reference to `PHP_SHA256Init' mysqlnd_auth.c:(.text+0x1088): undefined reference to `PHP_SHA256Update' mysqlnd_auth.c:(.text+0x1094): undefined reference to `PHP_SHA256Final' mysqlnd_auth.c:(.text+0x109c): undefined reference to `PHP_SHA256Init' mysqlnd_auth.c:(.text+0x10ac): undefined reference to `PHP_SHA256Update' mysqlnd_auth.c:(.text+0x10bc): undefined reference to `PHP_SHA256Update' mysqlnd_auth.c:(.text+0x10c8): undefined reference to `PHP_SHA256Final' It looks like the php mysqli extension needs the hash extension to work. This seems to be a php Make dependany bug. This patch works around it until the upstream maintainers can fix it. Signed-off-by: Christopher McCrory Signed-off-by: Peter Korsgaard --- package/php/Config.ext | 1 + 1 file changed, 1 insertion(+) diff --git a/package/php/Config.ext b/package/php/Config.ext index 6b3d86925d..60ef1aee7c 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -113,6 +113,7 @@ endif config BR2_PACKAGE_PHP_EXT_MYSQLI bool "Mysqli" + select BR2_PACKAGE_PHP_EXT_HASH help MySQL Improved extension support From 46481878fe8943f67555d531aaaac84db618d9d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Aug 2018 22:40:40 +0200 Subject: [PATCH 2455/2640] aircrack-ng: fix build with mmx Commit 39387fc80f90f3a9ac9ef9f3aa32da5776a0721e removed mmx support however aircrack-ng fails to build on platforms with mmx because an error is raised if __MMX__ is defined. Fixes: - http://autobuild.buildroot.net/results/b7362b69435e9ef6fb2aedc50743e88dbd7a5c72 [Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1943)] Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../aircrack-ng/0001-Fix-build-with-mmx.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/aircrack-ng/0001-Fix-build-with-mmx.patch diff --git a/package/aircrack-ng/0001-Fix-build-with-mmx.patch b/package/aircrack-ng/0001-Fix-build-with-mmx.patch new file mode 100644 index 0000000000..620d806d88 --- /dev/null +++ b/package/aircrack-ng/0001-Fix-build-with-mmx.patch @@ -0,0 +1,71 @@ +From 37078a46346f01141cc13026bb5ad426bb98f3a0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Aug 2018 20:01:07 +0200 +Subject: [PATCH] Fix build with mmx + +Commit 39387fc80f90f3a9ac9ef9f3aa32da5776a0721e removed mmx support +however aircrack-ng fails to build on platforms with mmx because an +error is raised if __MMX__ is defined. + +Fixes: + - http://autobuild.buildroot.net/results/b7362b69435e9ef6fb2aedc50743e88dbd7a5c72 + +Signed-off-by: Fabrice Fontaine +[Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1943)] +--- + src/aircrack-crypto/arch.h | 3 --- + src/aircrack-crypto/memory.h | 3 --- + src/aircrack-crypto/pseudo_intrinsics.h | 9 --------- + 3 files changed, 15 deletions(-) + +diff --git a/src/aircrack-crypto/arch.h b/src/aircrack-crypto/arch.h +index 1a19ddd6..78b9e619 100644 +--- a/src/aircrack-crypto/arch.h ++++ b/src/aircrack-crypto/arch.h +@@ -357,9 +357,6 @@ + #elif __SSE2__ + #define SIMD_COEF_32 4 + #define SIMD_COEF_64 2 +-#elif __MMX__ +-#define SIMD_COEF_32 2 +-#define SIMD_COEF_64 1 + #endif + + /* +diff --git a/src/aircrack-crypto/memory.h b/src/aircrack-crypto/memory.h +index 83b048f0..24b1c95b 100644 +--- a/src/aircrack-crypto/memory.h ++++ b/src/aircrack-crypto/memory.h +@@ -70,9 +70,6 @@ + #elif __SSE2__ + #define SIMD_COEF_32 4 + #define SIMD_COEF_64 2 +-#elif __MMX__ +-#define SIMD_COEF_32 2 +-#define SIMD_COEF_64 1 + #endif + + /* +diff --git a/src/aircrack-crypto/pseudo_intrinsics.h b/src/aircrack-crypto/pseudo_intrinsics.h +index dd0ca379..f5527bdd 100644 +--- a/src/aircrack-crypto/pseudo_intrinsics.h ++++ b/src/aircrack-crypto/pseudo_intrinsics.h +@@ -658,15 +658,6 @@ _inline __m128i _mm_set1_epi64(long long a) + (vtype)(vtype64) { x0, x1 } + #endif + +-/******************************** MMX *********************************/ +- +-#elif __MMX__ +-#include +- +-typedef __m64i vtype; +- +-#error MMX intrinsics not implemented (contributions are welcome!) +- + #endif /* __SIMD__ elif __SIMD__ elif __SIMD__ */ + + /************************* COMMON STUFF BELOW *************************/ +-- +2.14.1 + From 68fe6d7d00ad5c998ee05d48cf1dbb6450621966 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Aug 2018 18:54:04 +0200 Subject: [PATCH 2456/2640] cutelyst: depends on C++11 thread-local storage is a C++11 feature available since gcc 4.8: https://gcc.gnu.org/projects/cxx-status.html#cxx11 Fixes: - http://autobuild.buildroot.net/results/2963bd55cd7c33ded3e5a75fc86079acfae844c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cutelyst/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/cutelyst/Config.in b/package/cutelyst/Config.in index 5a3974a454..91b559bd18 100644 --- a/package/cutelyst/Config.in +++ b/package/cutelyst/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_CUTELYST bool "cutelyst" depends on BR2_PACKAGE_QT5 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_GUI help @@ -8,3 +10,7 @@ config BR2_PACKAGE_CUTELYST the simple approach of Catalyst (Perl) framework. https://cutelyst.org + +comment "cutelyst needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_PACKAGE_QT5 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From 11241ac656af569894ead9561ebf53abb5d5f18d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 27 Aug 2018 23:16:42 +0200 Subject: [PATCH 2457/2640] mbedtls: fix x86 PIC build with GCC < 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/d6d/d6dc9a640aa1f6650a3e7b9397f2fe2ae3433f4d/ http://autobuild.buildroot.net/results/ab5/ab5a58ea7845f9f378454ee1aa7e872448618ba9/ ebx was recently added to the x86 inline asm MULADDC_STOP clobber list to fix #1550, but this causes the build to fail with GCC < 5 when building in PIC mode with errors like: include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ This is because older GCC versions treated the x86 ebx register (which is used for the GOT) as a fixed reserved register when building as PIC. This is fixed by an improved register allocator in GCC 5+. From the release notes: Register allocation improvements: Reuse of the PIC hard register, instead of using a fixed register, was implemented on x86/x86-64 targets. This improves generated PIC code performance as more hard registers can be used. https://www.gnu.org/software/gcc/gcc-5/changes.html As a workaround, add a patch to detect this situation and disable the inline assembly, similar to the MULADDC_CANNOT_USE_R7 logic. Patch submitted upstream: https://github.com/ARMmbed/mbedtls/pull/1986 Signed-off-by: Peter Korsgaard --- ...-PIC-inline-ASM-compilation-with-GCC.patch | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch diff --git a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch new file mode 100644 index 0000000000..60bf53f6e4 --- /dev/null +++ b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch @@ -0,0 +1,74 @@ +From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Mon, 27 Aug 2018 22:50:57 +0200 +Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes #1910 + +With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline +assembly fails to build with GCC < 5 in PIC mode with the following error: + +include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ + +This is because older GCC versions treated the x86 ebx register (which is +used for the GOT) as a fixed reserved register when building as PIC. + +This is fixed by an improved register allocator in GCC 5+. From the release +notes: + +Register allocation improvements: Reuse of the PIC hard register, instead of +using a fixed register, was implemented on x86/x86-64 targets. This +improves generated PIC code performance as more hard registers can be used. + +https://www.gnu.org/software/gcc/gcc-5/changes.html + +As a workaround, detect this situation and disable the inline assembly, +similar to the MULADDC_CANNOT_USE_R7 logic. + +Signed-off-by: Peter Korsgaard +Upstream: https://github.com/ARMmbed/mbedtls/pull/1986 +--- + include/mbedtls/bn_mul.h | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h +index b587317d9..74a2d29be 100644 +--- a/include/mbedtls/bn_mul.h ++++ b/include/mbedtls/bn_mul.h +@@ -50,13 +50,29 @@ + #if defined(__GNUC__) && \ + ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) + ++/* ++ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a ++ * fixed reserved register when building as PIC, leading to errors ++ * like: bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ ++ * ++ * This is fixed by an improved register allocator in GCC 5+. From the ++ * release notes: ++ * Register allocation improvements: Reuse of the PIC hard register, ++ * instead of using a fixed register, was implemented on x86/x86-64 ++ * targets. This improves generated PIC code performance as more hard ++ * registers can be used. ++ */ ++#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) ++#define MULADDC_CANNOT_USE_EBX ++#endif ++ + /* + * Disable use of the i386 assembly code below if option -O0, to disable all + * compiler optimisations, is passed, detected with __OPTIMIZE__ + * This is done as the number of registers used in the assembly code doesn't + * work with the -O0 option. + */ +-#if defined(__i386__) && defined(__OPTIMIZE__) ++#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) + + #define MULADDC_INIT \ + asm( \ +-- +2.11.0 + From 8a4536b2dddf7006da46706d1c133f4b0521457f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 28 Aug 2018 15:36:17 +0300 Subject: [PATCH 2458/2640] libsoup: add upstream security fix Fixes CVE-2018-12910: The get_cookies function in soup-cookie-jar.c in libsoup 2.63.2 allows attackers to have unspecified impact via an empty hostname. Cc: Fabrice Fontaine Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...-bail-if-hostname-is-an-empty-string.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch diff --git a/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch b/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch new file mode 100644 index 0000000000..46c7cb4fd8 --- /dev/null +++ b/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch @@ -0,0 +1,35 @@ +From 3f5635028bbad44287511fcd3c99f2a2fddf01cd Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sun, 24 Jun 2018 19:46:19 -0500 +Subject: [PATCH] cookie-jar: bail if hostname is an empty string + +There are several other ways to fix the problem with this function, but +skipping over all of the code is probably the simplest. + +Fixes #3 + + +(cherry picked from commit db2b0d5809d5f8226d47312b40992cadbcde439f) +Signed-off-by: Baruch Siach +--- +Upstream status: commit db2b0d5809d + + libsoup/soup-cookie-jar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c +index d12bc85a8e60..365da6abf9f4 100644 +--- a/libsoup/soup-cookie-jar.c ++++ b/libsoup/soup-cookie-jar.c +@@ -306,7 +306,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_ + + priv = SOUP_COOKIE_JAR_GET_PRIVATE (jar); + +- if (!uri->host) ++ if (!uri->host || !uri->host[0]) + return NULL; + + /* The logic here is a little weird, but the plan is that if +-- +2.18.0 + From b914fbdc1fa6cdf55b208b97857bb650a7e04341 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Aug 2018 16:22:25 +0200 Subject: [PATCH 2459/2640] Update for 2018.05.2 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit 4b8deaf34cca1a1c0196ab7e91ceb9720923d6aa) Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGES b/CHANGES index d0744353bc..7ab40770d2 100644 --- a/CHANGES +++ b/CHANGES @@ -97,6 +97,32 @@ #11121: statfs call corrupts memory struct statfs too small #11181: Switching toolchain does not work +2018.05.2, Released August 28th, 2018 + + Important / security related fixes. + + Defconfigs: Raspberrypi2: Bump rootfs size, T7680: Fix + genimage.cfg issue, ARM Juno: Bump ATF to v1.3 to fix build + issue. + + Updated/fixed packages: acl, attr, apache, bind, + boot-wrapper-aarch64, brltty, bzip2, chrony, crda, cryptsetup, + dahdi-tools, dmidecode, dropbear, eigen, ffmpeg, gawk, gcc, + ghostscript, gnutls, imx-gpu-viv, ipsec-tools, libarchive, + libfuse, libglib2, libopenssl, libselinux, libsoup, lighttpd, + linuxptp, lttng-modules, lttng-tools, lua-flu, lvm2, m4, + makedevs, mariadb, mbedtls, mesa3d-heders, mtd, ncurses, + nodejs, openssh, php, python-django, rauc, ruby, samba4, + stress-ng, ti-utils, uboot-tools, uclibc, vim, waylandpp, + wireless_tools, wireless-regdb, wireshark, wpa_supplicant, + xorriso, znc + + Issues resolved (http://bugs.uclibc.org): + + #10781: cryptsetup luksOpen container_file container causes.. + #10986: Installing package attr when already supplied by.. + #11191: xattr and check-package issue + 2018.05.1, Released July 20th, 2018 Important / security related fixes. From 511309cdbf69d13ac759fbaf237b8298c87a9e22 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Aug 2018 17:06:55 +0200 Subject: [PATCH 2460/2640] docs/website: update for 2018.05.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 4e8a40f6ce..5e8b98b67f 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
            -

            Latest stable release: 2018.05.1

            +

            Latest stable release: 2018.05.2

            - +
            - +
            -

            buildroot-2018.05.1.tar.gz

            -

            PGP signature

            +

            buildroot-2018.05.2.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2018.05.1.tar.bz2

            -

            PGP signature

            +

            buildroot-2018.05.2.tar.bz2

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index 7461d3f5ea..3b0776ef17 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

            News

              +
            • +
              +
              +
              +

              2018.05.2 released

              +

              28 August 2018

              +
              +
              +

              The 2018.05.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2018.05.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2018.05.2 release.

              +
              +
              +
              • +
            • From 3a3601fe583f937f433e03f954f1ee93ac01b537 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 28 Aug 2018 17:54:47 +0300 Subject: [PATCH 2461/2640] json-c: needs host-autoconf The json-c configure script uses the autoheader utility. Use the host-autoconf provided autoheader, as this tool is not always installed on the host. Fixes: http://autobuild.buildroot.net/results/030/030fddceda4f5bc6379f7bfcc405e92d2e24184a/ http://autobuild.buildroot.net/results/e48/e482f174b8124ace0690a26bb7daf073fe5fcd75/ http://autobuild.buildroot.net/results/482/4829425c38c58d9844aa07108532a93d47191d23/ Cc: Fabrice Fontaine Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 57d8c35dd5..bee57577ce 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -10,5 +10,9 @@ JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING +# configure requires autoheader +JSON_C_DEPENDENCIES = host-autoconf +HOST_JSON_C_DEPENDENCIES = host-autoconf + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 81ccf146a79983f52c055b734c57c8ab1e69c936 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 28 Aug 2018 12:31:27 -0400 Subject: [PATCH 2462/2640] postgresql: security bump to 10.5 Fixes CVE-2018-10915 & CVE-2018-10925 Changelog: https://www.postgresql.org/docs/10/static/release-10-5.html Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 533c398d59..a9cc93c76c 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v10.3/postgresql-10.3.tar.bz2.sha256 -sha256 6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a postgresql-10.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v10.5/postgresql-10.5.tar.bz2.sha256 +sha256 6c8e616c91a45142b85c0aeb1f29ebba4a361309e86469e0fb4617b6a73c4011 postgresql-10.5.tar.bz2 # License file, Locally calculated sha256 24cfc70cf16b3a23242c49ffce39510683bdd48cbedb8a46fe03976ee5f5c21e COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 0940873686..540e1540ca 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 10.3 +POSTGRESQL_VERSION = 10.5 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From e047dee241fe0660d92311a124757065c6c4c93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 28 Aug 2018 11:23:45 +0200 Subject: [PATCH 2463/2640] package/shairport-sync: add upstream patch to fix build issue with soxr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add upstream patch to fix build issue detected by the Buildroot autobuilder: ``` arm-buildroot-linux-uclibcgnueabi/sysroot/usr//lib/libsoxr.a(soxr.c.o): In function `soxr_create': soxr.c:(.text+0xd4c): undefined reference to `av_get_cpu_flags' collect2: error: ld returned 1 exit status ``` A quick look at the soxr source code shows that `soxr_create()` might use `av_get_cpu_flags()` depending on the architecture. For the sake of simplicity link with `-lavutil` if it is found when using soxr. Even better, as soxr provides a pkg-config file, this should be prefered. Upstream issue: https://github.com/mikebrady/shairport-sync/issues/733 Upstream status: 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Fixes: http://autobuild.buildroot.net/results/53d/53d21686780aa2485745b59e812b6280dd39f1c5 http://autobuild.buildroot.net/results/605/60576363adfca404c3a7883d5d46e8a4a9ee8171 http://autobuild.buildroot.net/results/806/806867ab1c6f42ad1b34d44844efc57272d48235 http://autobuild.buildroot.net/results/840/840810601fbb8a7957ea9dae175b959a7f9b7491 .. and more. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...ibsoxr-is-built-to-rely-on-libavutil.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch diff --git a/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch b/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch new file mode 100644 index 0000000000..32c52add33 --- /dev/null +++ b/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch @@ -0,0 +1,63 @@ +From 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Mon Sep 17 00:00:00 2001 +From: Mike Brady +Date: Sat, 25 Aug 2018 13:08:37 +0100 +Subject: [PATCH] Sometimes libsoxr is built to rely on libavutil. If libavutil + is detected, link to it when building libsoxr. Add pgk_config support to soxr + selection. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The Buildroot autobuilder detected a build issue [0] when building +shairport-sync statically: + +``` +arm-buildroot-linux-uclibcgnueabi/sysroot/usr//lib/libsoxr.a(soxr.c.o): In function `soxr_create': +soxr.c:(.text+0xd4c): undefined reference to `av_get_cpu_flags' +collect2: error: ld returned 1 exit status +``` + +A quick look at the soxr source code shows that `soxr_create()` might use +`av_get_cpu_flags()` depending on the architecture. + +For the sake of simplicity link with `-lavutil` if it is found when using soxr. + +Even better, as soxr provides a pkg-config file, this should be prefered. + +[0] http://autobuild.buildroot.org/results/53d/53d21686780aa2485745b59e812b6280dd39f1c5 + +Upstream status: 5101ab2d13e2b89ea3c1276df5fb7413634eeccd + +Signed-off-by: Jörg Krause +--- + configure.ac | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0c917a4..2b6fddb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p + # Look for soxr flag + AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation], [ + AC_MSG_RESULT(>>Including support for soxr-based interpolation) +- AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], ) ++ if test "x${with_pkg_config}" = xyes ; then ++ PKG_CHECK_MODULES( ++ [SOXR], [soxr], ++ [LIBS="${SOXR_LIBS} ${LIBS}"]) ++ else ++ AC_CHECK_LIB([avutil],[av_get_cpu_flags]) ++ if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then ++ # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found ++ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil]) ++ else ++ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!)) ++ fi ++ fi ++], ) + + # Look for metadata flag -- set flag for conditional compilation + AC_ARG_WITH(metadata, [ --with-metadata = include support for a metadata feed], [ +-- +2.18.0 From 37e8a054f29f927d72c3a4d5c82f0d4faac53e70 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Aug 2018 22:59:24 +0200 Subject: [PATCH 2464/2640] cutelyst: link with libatomic when needed On some architectures, atomic binutils are provided by the libatomic library from gcc. Linking with libatomic is therefore necessary, otherwise the build fails with: sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line This is often for example the case on sparcv8 32 bit. This atomic dependency is due to Qt >= 5.8, pkconfig can't be used as Qt5 pc files does not mention this dependency Fixes: - http://autobuild.buildroot.net/results/9e307ab9c7067b26d7b33a572204394808e25772 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cutelyst/cutelyst.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk index e8695a7b3a..8e117e3286 100644 --- a/package/cutelyst/cutelyst.mk +++ b/package/cutelyst/cutelyst.mk @@ -16,6 +16,11 @@ CUTELYST_CONF_OPTS += \ -DPLUGIN_CSRFPROTECTION=ON \ -DPLUGIN_VIEW_GRANTLEE=OFF +# Qt 5.8 needs atomics, which on various architectures are in -latomic +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +endif + ifeq ($(BR2_PACKAGE_LIBPWQUALITY),y) CUTELYST_CONF_OPTS += -DPLUGIN_VALIDATOR_PWQUALITY=ON CUTELYST_DEPENDENCIES += libpwquality From 434967638490a2c06c99723a39d82826bdb67c35 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 27 Aug 2018 18:14:27 -0500 Subject: [PATCH 2465/2640] package/aircrack-ng: powerpc support optional ALTIVEC This patch adds support for the powerpc arch to conditionally check if an arch provies altivec accelerator support, similar to other SIMD on ARM/x86. Upstream issue: aircrack-ng/aircrack-ng#1941 Fixes http://autobuild.buildroot.net/results/87e82a5e8d0b1c1ff10ec3e59d25bcd56b329075 Tested against both a e6500 with Altivec and a e500 target. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- ...otools-Fix-optional-SIMD-on-PPC-arch.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch diff --git a/package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch b/package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch new file mode 100644 index 0000000000..11568525e8 --- /dev/null +++ b/package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch @@ -0,0 +1,69 @@ +From 7cf680386de051cb8308510680299aef810fe743 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Fri, 17 Aug 2018 13:23:39 -0700 +Subject: [PATCH] autotools: Fix optional SIMD on PPC arch + +Resolves: +https://github.com/aircrack-ng/aircrack-ng/issues/1941 + +Upstream (applied to their master, not yet in a release): (squashed together) +https://github.com/aircrack-ng/aircrack-ng/commit/97838c6b903d33c8403a4bdcae60b8619fad7538 +https://github.com/aircrack-ng/aircrack-ng/commit/efc0b2718f4afd9582419902d205b242e546b9ab + +Signed-off-by: Joseph Benden +Signed-off-by: Matt Weber Date: Mon, 27 Aug 2018 18:14:28 -0500 Subject: [PATCH 2466/2640] Revert "package/aircrack-ng: powerpc arch requires altivec" This reverts commit 1f3f1fb8c7324c9a50383b1cafcbd2f9d74a91f9. Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni --- package/aircrack-ng/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in index d821c5a0a2..f3e2bc4ef1 100644 --- a/package/aircrack-ng/Config.in +++ b/package/aircrack-ng/Config.in @@ -4,9 +4,6 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h - # https://github.com/aircrack-ng/aircrack-ng/issues/1941 - depends on BR2_POWERPC_CPU_HAS_ALTIVEC || \ - !(BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le) select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help A set of tools for auditing wireless networks From 98af0fa066fd0afedd94350027980b1988e5c670 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 29 Aug 2018 07:07:09 +0300 Subject: [PATCH 2467/2640] json-c: drop host-autoconf dependency It turns out that the configure script attempts to run autoheader because the configure.ac timestamp is slightly later than that of config.h.in. Update the config.h.in timestamp after tarball extract to avoid autoheader run. With that we can drop the host-autoconf dependency. Cc: Fabrice Fontaine Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index bee57577ce..2788fe563b 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -10,9 +10,13 @@ JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -# configure requires autoheader -JSON_C_DEPENDENCIES = host-autoconf -HOST_JSON_C_DEPENDENCIES = host-autoconf +# update config.h.in timestamp to avoid autoheader run +define JSON_C_UPDATE_CONFIG_TIMESTAMP + touch $(@D)/config.h.in +endef + +JSON_C_POST_EXTRACT_HOOKS += JSON_C_UPDATE_CONFIG_TIMESTAMP +HOST_JSON_C_POST_EXTRACT_HOOKS += JSON_C_UPDATE_CONFIG_TIMESTAMP $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ad908f7330a5b26a691b7102e1611fb0e26cf14c Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 29 Aug 2018 13:54:05 +0200 Subject: [PATCH 2468/2640] mender: fix ioctl build failure on powerpc64le / power8 Build fails due to missing // +build ppc64le in ioctl_64_bit.go Add patch to append ppc64le to // +build list. Fixes http://autobuild.buildroot.net/results/f22/f222b4389f9308363c386da25ec22a0919bc29fb// Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- .../0001-FIX-Enabling-compiling-ppc64le.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/mender/0001-FIX-Enabling-compiling-ppc64le.patch diff --git a/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch b/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch new file mode 100644 index 0000000000..3197a0ec01 --- /dev/null +++ b/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch @@ -0,0 +1,37 @@ +From 2b13f9a50793fdc15199925000107cb0cc4e7bad Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Thu, 9 Aug 2018 09:28:06 +0200 +Subject: [PATCH] FIX: Enabling compiling ppc64le + +This patch enables Mender compilation on ppc64le + +Changelog: FIX: Enabling compiling ppc64le + +Signed-off-by: Angelo Compagnucci +Signed-off-by: Giulio Benetti +--- + ioctl_64_bit.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ioctl_64_bit.go b/ioctl_64_bit.go +index 6f61a6c..f1e2dd8 100644 +--- a/ioctl_64_bit.go ++++ b/ioctl_64_bit.go +@@ -1,4 +1,4 @@ +-// Copyright 2017 Northern.tech AS ++// Copyright 2018 Northern.tech AS + // + // Licensed under the Apache License, Version 2.0 (the "License"); + // you may not use this file except in compliance with the License. +@@ -12,7 +12,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + +-// +build amd64 arm64 ++// +build amd64 arm64 ppc64le + + package main + +-- +2.17.1 + From 8b3b8d876ce77d871ae2d717327c515e2a23584d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 29 Aug 2018 17:56:17 +0200 Subject: [PATCH 2469/2640] Update for 2018.02.5 [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard (cherry picked from commit b07116644d617a0365d70eaae57c68ca273e6183) Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGES b/CHANGES index 7ab40770d2..c1cecb8023 100644 --- a/CHANGES +++ b/CHANGES @@ -351,6 +351,32 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.5, Released August 29th, 2018 + + Important / security related fixes. + + Defconfigs: Raspberrypi2: Bump rootfs size, T7680: Fix + genimage.cfg issue, ARM Juno: Bump ATF to v1.3 to fix build + issue. + + Updated/fixed packages: acl, apache, attr, bind, + boot-wrapper-aarch64, brltty, bzip2, chrony, crda, cryptsetup, + dahdi-tools, dmidecode, dropbear, eigen, erlang, ffmpeg, gawk, + gcc, ghostscript, gnutls, ipsec-tools, libarchive, libfuse, + libopenssl, libselinux, libsoup, lighttpd, linuxptp, + lttng-modules, lttng-tools, lua-flu, lvm2, m4, makedevs, + mariadb, mbedtls, mesa3d-headers, mtd, ncurses, nodejs, + openssh, php, postgresql, python-django, qt5xmlpatterns, ruby, + samba4, shairport-sync, stress-ng, ti-utils, uboot-tools, vim, + waylandpp, wireless_tools, wireshark, wpa_supplicant, xorriso, + znc + + Issues resolved (http://bugs.uclibc.org): + + #10781: cryptsetup luksOpen container_file container causes.. + #10986: Installing package attr when already supplied by.. + #11191: xattr and check-package issue + 2018.02.4, Released July 21th, 2018 Important / security related fixes. From e058075189b0484a3808f127c08246c3e4d083a4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 29 Aug 2018 18:26:35 +0200 Subject: [PATCH 2470/2640] docs/website: update for 2018.02.5 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 5e8b98b67f..34c3221f51 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
              Download
              -

              Latest long term support release: 2018.02.4

              +

              Latest long term support release: 2018.02.5

              - +
              - +
              -

              buildroot-2018.02.4.tar.gz

              -

              PGP signature

              +

              buildroot-2018.02.5.tar.gz

              +

              PGP signature

              - +
              - +
              -

              buildroot-2018.02.4.tar.bz2

              -

              PGP signature

              +

              buildroot-2018.02.5.tar.bz2

              +

              PGP signature

              diff --git a/docs/website/news.html b/docs/website/news.html index 3b0776ef17..4bd18e91a3 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

              News

                +
              • +
                +
                +
                +

                2018.02.5 released

                +

                29 August 2018

                +
                +
                +

                The 2018.02.5 bugfix release is out, fixing a number of important / + security related issues discovered since the 2018.02.4 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2018.02.5 release.

                +
                +
                +
                • +
              • From e2f7fca4b8c668a4bd1eac57ddff37a3293f5df7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 29 Aug 2018 19:21:11 +0200 Subject: [PATCH 2471/2640] linux-headers: bump 4.4.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9f31bad9c3..065ea174db 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,7 +266,7 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.152" if BR2_KERNEL_HEADERS_4_4 + default "4.4.153" if BR2_KERNEL_HEADERS_4_4 default "4.9.124" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 From 12d70ebce673ab606c15f516dd81e808ef157e2f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Aug 2018 23:43:23 +0200 Subject: [PATCH 2472/2640] libkcapi: bump to version 1.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove patch (already in version). This version bump only contains a limited set of bug fixes: Changes 1.1.3 * Fix: default location of FIPS 140-2 HMAC control file is ..hmac (was accidentally moved to .hmac with 1.1.2) Changes 1.1.2 * Fix: Bug fixes for GCC 8.1.0 regarding string length checks by Krzysztof Kozlowski * Enhancement: ensure that tests execute on architectures other than X86 by Ondrej Mosnáček * Fix: Bug fix to initialize FDs at the correct time in kcapi-kernel-if.c by Ondrej Mosnáček * Test fix: Support test execution outside build environment by Ondrej Mosnáček Changes 1.1.1 * Fix: Bug fixes for kcapi_hasher by Ondrej Mosnáček Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-Fix-getrandom-call-in-kcapi-rng.c.patch | 31 ------------------- package/libkcapi/libkcapi.hash | 2 +- package/libkcapi/libkcapi.mk | 2 +- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 package/libkcapi/0001-Fix-getrandom-call-in-kcapi-rng.c.patch diff --git a/package/libkcapi/0001-Fix-getrandom-call-in-kcapi-rng.c.patch b/package/libkcapi/0001-Fix-getrandom-call-in-kcapi-rng.c.patch deleted file mode 100644 index d83edd9261..0000000000 --- a/package/libkcapi/0001-Fix-getrandom-call-in-kcapi-rng.c.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 581717cfb0e35c041246da0c0c591a6e9f7a40e5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 May 2018 21:03:45 +0200 -Subject: [PATCH] Fix getrandom call in kcapi-rng.c - -_GNU_SOURCE must be defined and unistd.h must be included to be able to -use getrandom - -Signed-off-by: Fabrice Fontaine - -[Upstream status: https://github.com/smuellerDD/libkcapi/pull/56] ---- - lib/kcapi-rng.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/kcapi-rng.c b/lib/kcapi-rng.c -index 45f4d18..9ceabd4 100644 ---- a/lib/kcapi-rng.c -+++ b/lib/kcapi-rng.c -@@ -18,6 +18,8 @@ - * DAMAGE. - */ - -+#define _GNU_SOURCE -+#include - #include - #ifdef HAVE_GETRANDOM - #include --- -2.14.1 - diff --git a/package/libkcapi/libkcapi.hash b/package/libkcapi/libkcapi.hash index 9cb1e80ccb..b340ea84b6 100644 --- a/package/libkcapi/libkcapi.hash +++ b/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ac80211317750f6a545b1e5547cfb6ae450b37c11acb6d24982a581705eb5250 libkcapi-1.1.0.tar.xz +sha256 19c044310eda0bf5403fae8df2eeffcfef33b67cb5b01def5f440d41ff16b55f libkcapi-1.1.3.tar.xz sha256 b0336f8f07a6abf8b0a59d961f53601d7c4a7c09a8137805b730a34a976039f8 COPYING sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index 1a45f4f996..1557d2017a 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKCAPI_VERSION = 1.1.0 +LIBKCAPI_VERSION = 1.1.3 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz LIBKCAPI_SITE = http://www.chronox.de/libkcapi LIBKCAPI_AUTORECONF = YES From f57d68a229c4d71ef3c8d94ae155092ff26683b0 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 29 Aug 2018 17:15:54 +0200 Subject: [PATCH 2473/2640] board/freescale/imx8mqevk: remove hardware support section from readme At first the support for i.MX8MQ processors was minimal, hence this section in the readme file. Since then, GPU support was added [1] in master and VPU in next [2]. So drop this section as it is confusing people and no one maintains it. [1] https://git.buildroot.net/buildroot/commit/?id=84afda9c [2] https://git.buildroot.net/buildroot/commit/?id=82732071 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/freescale/imx8mqevk/readme.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/board/freescale/imx8mqevk/readme.txt b/board/freescale/imx8mqevk/readme.txt index 1840290edb..a32c122f91 100644 --- a/board/freescale/imx8mqevk/readme.txt +++ b/board/freescale/imx8mqevk/readme.txt @@ -5,12 +5,6 @@ Freescale i.MX8MQ EVK board This file documents the Buildroot support for the Freescale i.MX8MQ EVK board. -Hardware support -================ - -Currently only basic support for hardware is available, currently no -support for GPU, VPU and other HW features. - Build ===== From 83d33f76f6bb94e0a91285ae4c3f8aa072c1dd8f Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Wed, 29 Aug 2018 13:05:17 +0200 Subject: [PATCH 2474/2640] qt5quickcontrols: update license file names for Qt 5.6 version Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 6e551d5a27..3e0c5effb3 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -11,7 +11,12 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) + +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL +else +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +endif define QT5QUICKCONTROLS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) From 827b4bb117bd22c8a02d561b59b6c8e863d9d540 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 30 Aug 2018 08:32:00 +0200 Subject: [PATCH 2475/2640] CHANGES: add note about Vivante graphics / i.MX8MQ support for 2018.08-rc1 As requested by Gary Bisson. Signed-off-by: Peter Korsgaard --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index c1cecb8023..36bcfe0bb3 100644 --- a/CHANGES +++ b/CHANGES @@ -54,6 +54,8 @@ - X.org server bumped to 1.20, and all X.org proto packages replaced by the single xorgproto package - i.MX6 support packages bumped to 6.2.4 + - i.MX Vivante graphics version bumped to 6.2.4.p1.2, + adding support for Wayland and i.MX8MQ platforms Linux: bumped to 4.17 by default. From db619da8d5a49b7971192be0279adacfb7dea842 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 31 Aug 2018 15:38:18 +0200 Subject: [PATCH 2476/2640] minicom: add COPYING sha256 to hash In minicom package hash file lacks sha256 entry for COPYING file even if it is added to MINICOM_LICENSE_FILES. Add COPYING sha256 entry to minicom.hash file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/minicom/minicom.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index ca3087160b..f49e430c67 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 minicom-2.7.1.tar.gz +sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING From 24b5ff16aeeeea37227364219b7f270000cda008 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 1 Sep 2018 00:28:13 +0200 Subject: [PATCH 2477/2640] Update for 2018.08-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 36bcfe0bb3..8c2ffb0469 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,32 @@ +2018.08-rc3, Released August 31th, 2018 + + Fixes all over the tree. + + linux: additional improvements to the flex / bison dependency + handling, use system provided variant if available. Ensure + toolchain is available when configuring for 4.18+ support. + + Download: Fix handling of primary sites using file:// + + Toolchain: Correct external toolchain musl detection for + static toolchains. + + Updated/fixed packages: aircrack-ng, bison, brltty, busybox, + cutelyst, dropbear, gr-osmosdr, i2c-tools, json-c, libconfuse, + libkcapi, libsoup, libssh, liburiparser, mbedtls, mender, + mesa3d, minicom, mjpegtools, mutt, openpowerlink, openssh, + oracle-mysql, php, postgresql, pv, qt5base, qt5quickcontrols, + rauc, shairport-sync, systemd, xlib_libX11, zeromq, + + Issues resolved (http://bugs.uclibc.org): + + #11091: BR2_PRIMARY_SITE doesn't work (wget is selected... + #11141: WF111 package no longer available + #11211: Internal compiler error: Killed (program cc1plus).. + #11236: util-linux fails to build on Travis CI when python.. + #11246: Glibc 2.28 - fails to build host-bison and host-m4 + #11256: Add python-falcon and python-mimeparse packages + 2018.08-rc2, Released August 20th, 2018 Fixes all over the tree. diff --git a/Makefile b/Makefile index 413ec921cd..9d66bbacf4 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.08-rc2 +export BR2_VERSION := 2018.08-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1534755000 +BR2_VERSION_EPOCH = 1535752000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 34c3221f51..830cf1bffb 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
              -

              Latest release candidate: 2018.08-rc2

              +

              Latest release candidate: 2018.08-rc3

              - +
              - +
              -

              buildroot-2018.08-rc2.tar.gz

              -

              PGP signature

              +

              buildroot-2018.08-rc3.tar.gz

              +

              PGP signature

              - +
              - +
              -

              buildroot-2018.08-rc2.tar.bz2

              -

              PGP signature

              +

              buildroot-2018.08-rc3.tar.bz2

              +

              PGP signature

              diff --git a/docs/website/news.html b/docs/website/news.html index 4bd18e91a3..84468351b8 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

              News

                +
              • +
                +
                +
                +

                2018.08-rc3 released

                +

                31 August 2018

                +
                +
                +

                Another week, another release candidate with more cleanups + and build fixes. See the + CHANGES + file for details.

                + +

                Head to the downloads page to pick up the + 2018.08-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

                +
                +
                +
                • +
              • From b105dc2b0b7f248a8da82c64e0c71f1e987b3fa6 Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Thu, 30 Aug 2018 12:05:49 +0200 Subject: [PATCH 2478/2640] qt5webengine: add separate file for chromium license files for Qt LTS The qtwebengine package used by Qt LTS has a different set of license files for chromium, so this commit introduces a separate chromium-lts.inc with the right contents. This fixes legal-info of qt5webengine with Qt LTS. Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-lts.inc | 248 ++++++++++++++++++++++ package/qt5/qt5webengine/qt5webengine.mk | 4 + 2 files changed, 252 insertions(+) create mode 100644 package/qt5/qt5webengine/chromium-lts.inc diff --git a/package/qt5/qt5webengine/chromium-lts.inc b/package/qt5/qt5webengine/chromium-lts.inc new file mode 100644 index 0000000000..bff7931656 --- /dev/null +++ b/package/qt5/qt5webengine/chromium-lts.inc @@ -0,0 +1,248 @@ +CHROMIUM_LICENSE_FILES = \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ + src/3rdparty/chromium/base/third_party/nspr/LICENSE \ + src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/icu/LICENSE \ + src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ + src/3rdparty/chromium/testing/gtest/LICENSE \ + src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ + src/3rdparty/chromium/testing/gmock/LICENSE \ + src/3rdparty/chromium/ppapi/LICENSE \ + src/3rdparty/chromium/third_party/class-dump/LICENSE \ + src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/talloc/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/cld/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/libva/COPYING \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ + src/3rdparty/chromium/third_party/python_gflags/COPYING \ + src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/libexif/sources/COPYING \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/lcov/COPYING \ + src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ + src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ + src/3rdparty/chromium/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ + src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ + src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/drmemory/LICENSE \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/mesa/LICENSE \ + src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ + src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ + src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ + src/3rdparty/chromium/third_party/typ/LICENSE \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ + src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ + src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/WebKit/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ + src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/wayland/LICENSE \ + src/3rdparty/chromium/third_party/wayland/src/COPYING \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE \ + src/3rdparty/chromium/third_party/hwcplus/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ + src/3rdparty/chromium/third_party/nss/nss/COPYING \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/closure_linter/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/COPYING \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/angle/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ + src/3rdparty/chromium/third_party/npapi/LICENSE \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/appurify-python/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flac/COPYING.GPL \ + src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/mojo/LICENSE \ + src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/mozilla/LICENSE \ + src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ + src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 986ed0ec79..7caaec9c7a 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -12,7 +12,11 @@ QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \ host-pkgconf host-python QT5WEBENGINE_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) include package/qt5/qt5webengine/chromium.inc +else +include package/qt5/qt5webengine/chromium-lts.inc +endif QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ LICENSE.GPLv3 LICENSE.LGPL3 $(CHROMIUM_LICENSE_FILES) From b36fd21f2c55f73b36e262816a8f5c5cfe81236c Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Sat, 1 Sep 2018 10:04:49 +0200 Subject: [PATCH 2479/2640] qt5webengine: rename chromium.inc to chromium-latest.inc For consistency with chromium-lts.inc, rename chromium.inc to chromium-latest.inc. Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/{chromium.inc => chromium-latest.inc} | 0 package/qt5/qt5webengine/qt5webengine.mk | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename package/qt5/qt5webengine/{chromium.inc => chromium-latest.inc} (100%) diff --git a/package/qt5/qt5webengine/chromium.inc b/package/qt5/qt5webengine/chromium-latest.inc similarity index 100% rename from package/qt5/qt5webengine/chromium.inc rename to package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 7caaec9c7a..c4ae961126 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -13,7 +13,7 @@ QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \ QT5WEBENGINE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -include package/qt5/qt5webengine/chromium.inc +include package/qt5/qt5webengine/chromium-latest.inc else include package/qt5/qt5webengine/chromium-lts.inc endif From beb2b891ec4de38427a2a882d374c323acf3c0ef Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Sat, 1 Sep 2018 10:12:19 +0200 Subject: [PATCH 2480/2640] qt5webengine: fix chromium-latest.inc with the current license files chromium-latest.inc was not properly updated with the latest version bumps of Qt, and it no longer matches the license files of Qt5Webengine 5.11. This commit fixes this legal-info failure: $ make qt5webengine-legal-info [...] cp: cannot stat '/home/thomas/projets/buildroot/output/build/qt5webengine-5.11.1/src/3rdparty/chromium/buildtools/third_party/libc++abi/trunk/LICENSE.TXT': No such file or directory Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-latest.inc | 679 +++++++++++-------- 1 file changed, 400 insertions(+), 279 deletions(-) diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index da709fd5a0..3e98052b38 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -1,310 +1,431 @@ CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ + src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ + src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.fdlibm \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ src/3rdparty/chromium/base/third_party/nspr/LICENSE \ src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/buildtools/third_party/libc++abi/trunk/LICENSE.TXT \ - src/3rdparty/chromium/buildtools/third_party/libc++/trunk/LICENSE.TXT \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ + src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/icu/LICENSE \ + src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ - src/3rdparty/chromium/testing/gmock/LICENSE \ - src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ - src/3rdparty/chromium/testing/gtest/LICENSE \ - src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ - src/3rdparty/chromium/third_party/afl/src/docs/COPYING \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ - src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ - src/3rdparty/chromium/third_party/apache_velocity/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blimp_fonts/LICENSE \ - src/3rdparty/chromium/third_party/blimp_fonts/LICENSE.Apache \ - src/3rdparty/chromium/third_party/blimp_fonts/LICENSE.OFL \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/cld/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/closure_linter/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/MODULE_LICENSE_BSD \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-dev/LICENSE \ - src/3rdparty/chromium/third_party/drmemory/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/hamcrest/LICENSE \ src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/pdfium/LICENSE \ + src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ + src/3rdparty/chromium/third_party/libevdev/LICENSE \ + src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ + src/3rdparty/chromium/third_party/s2cellid/LICENSE \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/leakcanary/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ src/3rdparty/chromium/third_party/fontconfig/LICENSE \ src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype2/src/docs/GPLv2.TXT \ - src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/grpc/LICENSE \ - src/3rdparty/chromium/third_party/grpc/src/node/health_check/LICENSE \ - src/3rdparty/chromium/third_party/grpc/src/php/ext/grpc/LICENSE \ - src/3rdparty/chromium/third_party/grpc/third_party/nanopb/LICENSE.txt \ - src/3rdparty/chromium/third_party/grpc/third_party/rake-compiler-dock/LICENSE.txt \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/haha/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ - src/3rdparty/chromium/third_party/hwcplus/LICENSE \ + src/3rdparty/chromium/third_party/bazel/LICENSE \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/intellij/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/javax_inject/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leakcanary/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ + src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ + src/3rdparty/chromium/third_party/shaderc/LICENSE \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ + src/3rdparty/chromium/third_party/openvr/src/LICENSE \ src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libva/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/vulkan/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ + src/3rdparty/chromium/third_party/axe-core/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ src/3rdparty/chromium/third_party/mesa/LICENSE \ src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/python_gflags/COPYING \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/guava/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/license_template.txt \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ + src/3rdparty/chromium/third_party/yara/src/COPYING \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ - src/3rdparty/chromium/third_party/shaderc/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3100200/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/cld_3/LICENSE \ + src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/protobuf/LICENSE \ src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ - src/3rdparty/chromium/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/wayland/src/COPYING \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ + src/3rdparty/chromium/third_party/intellij/LICENSE \ + src/3rdparty/chromium/third_party/glslang/LICENSE \ + src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/gonzales/MIT-LICENSE.txt \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \ src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/jsmin/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ + src/3rdparty/chromium/third_party/icu4j/LICENSE \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/wayland/LICENSE \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ + src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/espresso/LICENSE \ + src/3rdparty/chromium/third_party/pystache/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ + src/3rdparty/chromium/third_party/haha/LICENSE \ + src/3rdparty/chromium/third_party/wds/LICENSE \ + src/3rdparty/chromium/third_party/wds/src/COPYING \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ + src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ + src/3rdparty/chromium/third_party/ced/LICENSE \ + src/3rdparty/chromium/third_party/ced/src/LICENSE \ + src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ + src/3rdparty/chromium/third_party/gestures/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/minizip/src/LICENSE \ + src/3rdparty/chromium/third_party/javax_inject/LICENSE \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ + src/3rdparty/chromium/third_party/gson/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ + src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ + src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ + src/3rdparty/chromium/third_party/netty4/LICENSE \ + src/3rdparty/chromium/third_party/objenesis/LICENSE \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/xstream/LICENSE \ + src/3rdparty/chromium/third_party/libsrtp/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/angle/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/content_shell_fonts/LICENSE \ + src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flac/COPYING.GPL \ + src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ + src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/sqlite/sqlite-src-3210000/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/libovr/LICENSE \ src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/GNU_GPL-2.0 \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/GNU_LGPL-2.0 \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/gn/out/Release/obj/third_party/widevine/cdm/widevine_test_license_server.ninja \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ + src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ + src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ + src/3rdparty/chromium/third_party/node/LICENSE \ + src/3rdparty/chromium/third_party/libxml/src/COPYING \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/libsync/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/mozilla/LICENSE \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/ninja/COPYING From 1098f64d7bdd650d46ee404834fa5087496b86a9 Mon Sep 17 00:00:00 2001 From: Laurent Hartanerot Date: Thu, 30 Aug 2018 12:07:03 +0200 Subject: [PATCH 2481/2640] qt5webengine: use QT5WEBENGINE prefix for CHROMIUM_LICENSE_FILES variable The qt5webengine package currently uses the CHROMIUM_LICENSE_FILES variable to hold the list of license files for the chromium source code embedded inside the qt5webengine code. However, using this variable would clash with a hypothetical "chromium" package, and anyway violates our rule that all variables of a package should be prefixed by the package name. This commit fixes that by adding the QT5WEBENGINE to this variable. Signed-off-by: Laurent Hartanerot Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-latest.inc | 2 +- package/qt5/qt5webengine/chromium-lts.inc | 2 +- package/qt5/qt5webengine/qt5webengine.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index 3e98052b38..671b2383a3 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -1,4 +1,4 @@ -CHROMIUM_LICENSE_FILES = \ +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ diff --git a/package/qt5/qt5webengine/chromium-lts.inc b/package/qt5/qt5webengine/chromium-lts.inc index bff7931656..d45e9692de 100644 --- a/package/qt5/qt5webengine/chromium-lts.inc +++ b/package/qt5/qt5webengine/chromium-lts.inc @@ -1,4 +1,4 @@ -CHROMIUM_LICENSE_FILES = \ +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ src/3rdparty/chromium/tools/gyp/LICENSE \ diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index c4ae961126..a3cfcec26e 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -19,7 +19,7 @@ include package/qt5/qt5webengine/chromium-lts.inc endif QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ From 19b04d844277467fcd9c605f6b7ee57d979a630a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Aug 2018 18:38:26 +0200 Subject: [PATCH 2482/2640] domoticz: do not use static version of openssl Due to the dependency on mosquitto, domoticz depends on !BR2_STATIC_LIBS so set USE_OPENSSL_STATIC to OFF (default value is ON) This parameter has been added in release 4.9700. Fixes: - http://autobuild.buildroot.net/results/b1b84b8c12d31b9242b5732fcdd1eb76b1217366 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 3d6cae4746..7f094d0976 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -19,8 +19,10 @@ DOMOTICZ_DEPENDENCIES = \ zlib # Due to the dependency on mosquitto, domoticz depends on -# !BR2_STATIC_LIBS so set USE_STATIC_BOOST to OFF -DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF +# !BR2_STATIC_LIBS so set USE_STATIC_BOOST and USE_OPENSSL_STATIC to OFF +DOMOTICZ_CONF_OPTS += \ + -DUSE_STATIC_BOOST=OFF \ + -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for # lua, sqlite and mqtt From 75f975f8ad7b9f8dee8f1de9ce3243d69763637b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Aug 2018 18:31:46 +0200 Subject: [PATCH 2483/2640] qt: fix build on powerpc_e500mc gcc bug internal compiler error: in validate_condition_mode, at config/rs6000/rs6000.c:180744. Bug is fixed since gcc 7. Workaround is to set -mno-isel, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60818 and https://gcc.gnu.org/ml/gcc-patches/2016-02/msg01036.html This bug is also raised on BR2_powerpc_8540, BR2_powerpc_8548 and BR2_powerpc_e5500. Fixes: - http://autobuild.buildroot.net/results/9b9d11b3281a72c8f54fc675408acb96d24d8e7e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/qt/qt.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 1dcb05d6af..921ff13d29 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -32,6 +32,15 @@ QT_LDFLAGS = $(TARGET_LDFLAGS) # use an older c++ standard to prevent build failure QT_CXXFLAGS += -std=gnu++98 +# gcc bug internal compiler error: in validate_condition_mode, at +# config/rs6000/rs6000.c:180744. Bug is fixed since gcc 7. +# Workaround is to set -mno-isel, see +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60818 and +# https://gcc.gnu.org/ml/gcc-patches/2016-02/msg01036.html +ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc)$(BR2_powerpc_e5500):$(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y:) +QT_CXXFLAGS += -mno-isel +endif + # Qt has some assembly function that are not present in thumb1 mode: # Error: selected processor does not support Thumb mode `swp r3,r7,[r4]' # so, we desactivate thumb mode From bedbef936fcb7166ba0be13b9f4514588028e927 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Aug 2018 23:48:05 +0200 Subject: [PATCH 2484/2640] DEVELOPERS: add myself for some packages Add my entry for expat, libv4l and minizip Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a6d76dd9c4..3f1f491fb7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -693,6 +693,7 @@ F: package/alljoyn-tcl/ F: package/alljoyn-tcl-base/ F: package/boinc/ F: package/cairo/ +F: package/expat/ F: package/flatbuffers/ F: package/gtksourceview/ F: package/gssdp/ @@ -734,9 +735,11 @@ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ F: package/libupnp18/ +F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ F: package/minissdpd/ +F: package/minizip/ F: package/motion/ F: package/mutt/ F: package/ncmpc/ From d1144944565f0a852cddbb1dd6f8f012c304dc0a Mon Sep 17 00:00:00 2001 From: Peter Thompson Date: Thu, 30 Aug 2018 20:51:26 -0600 Subject: [PATCH 2485/2640] sdl2: add upstream patch to fix DirectFB renderer handling The configure script enables the DirectFB video driver, but forgets to enable the renderer driver, causing SDL_CreateRenderer() to fail. Add an upstream patch to fix this. [Peter: reword/extend commit text, add git formatted patch from https://github.com/spurious/SDL-mirror] Signed-off-by: Peter Thompson Signed-off-by: Peter Korsgaard --- ...FB-renderer-not-being-enabled-in-aut.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch diff --git a/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch b/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch new file mode 100644 index 0000000000..53926c03b5 --- /dev/null +++ b/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch @@ -0,0 +1,42 @@ +From a0acea5bcce3f47badbfeeab7bc2e36eba08fd84 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Mon, 27 Aug 2018 11:51:05 -0700 +Subject: [PATCH] Fixed the DirectFB renderer not being enabled in autoconf + builds + +Upstream-url: https://hg.libsdl.org/SDL/raw-rev/751cdc74d55c +Signed-off-by: Peter Korsgaard +--- + configure | 3 +++ + configure.in | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/configure b/configure +index e88b38001..40ac14d21 100755 +--- a/configure ++++ b/configure +@@ -21501,6 +21501,9 @@ fi + + $as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h + ++ ++$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h ++ + SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" + +diff --git a/configure.in b/configure.in +index 5bf5d717b..ce1d57ea1 100644 +--- a/configure.in ++++ b/configure.in +@@ -2163,6 +2163,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[ + , enable_directfb_shared=yes) + + AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ]) ++ AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ]) + SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" + +-- +2.11.0 + From ed0e55675eaf91e61d8004128169cb195a4fb72a Mon Sep 17 00:00:00 2001 From: Richard Kunze Date: Sun, 2 Sep 2018 00:06:00 +0200 Subject: [PATCH 2486/2640] package/squashfs: fix build on hosts with glibc >= 2.28 Since glibc 2.28, sys/sysmacros.h is no longer included from sys/types.h This patch fixes the resulting build error by explicitly including sys/sysmacros.h See also https://github.com/plougher/squashfs-tools/pull/52 Signed-off-by: Richard Kunze Signed-off-by: Peter Korsgaard --- package/squashfs/0001-include-sysmacros.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/squashfs/0001-include-sysmacros.patch diff --git a/package/squashfs/0001-include-sysmacros.patch b/package/squashfs/0001-include-sysmacros.patch new file mode 100644 index 0000000000..d794836c04 --- /dev/null +++ b/package/squashfs/0001-include-sysmacros.patch @@ -0,0 +1,47 @@ +From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Wed, 1 Aug 2018 12:17:10 +0200 +Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From glibc 2.25 release notes: +https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html +"* The inclusion of by is deprecated. + This means that in a future release, the macros “major”, “minor”, and + “makedev” will only be available from ." + +See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 . + +Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch +Signed-off-by: Richard Kunze +--- + squashfs-tools/mksquashfs.c | 1 + + squashfs-tools/unsquashfs.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index d696a51..8d57c3e 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index a57f85c..a492b27 100644 +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -33,6 +33,7 @@ + #include "fnmatch_compat.h" + + #include ++#include + #include + #include + #include From 45215ffc8a75377228a477bebbf2ad9c78d40a35 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 2 Sep 2018 09:57:35 +0200 Subject: [PATCH 2487/2640] php: pdo mysql extension needs hash as well Fixes: http://autobuild.buildroot.net/results/69cf9326539c8df8fa50c5e7acb2ce3bb985ede2/ The PDO mysql extension also needs the hash extension - so select it, similar to how it was done for the mysqli extension in commit 65f96452636 (php: fix build with mysqli). Signed-off-by: Peter Korsgaard --- package/php/Config.ext | 1 + 1 file changed, 1 insertion(+) diff --git a/package/php/Config.ext b/package/php/Config.ext index 60ef1aee7c..51dcbbf4a4 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -132,6 +132,7 @@ if BR2_PACKAGE_PHP_EXT_PDO config BR2_PACKAGE_PHP_EXT_PDO_MYSQL bool "MySQL" + select BR2_PACKAGE_PHP_EXT_HASH help PDO driver for MySQL From 811734ef9044bbdfc067da76358153061fae2031 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 2 Sep 2018 10:33:21 +0200 Subject: [PATCH 2488/2640] imagemagick: security bump to version 7.0.7-39 >From the release notes: 2018-06-06 7.0.7-39 * Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz). The most critical of these are: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8772 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8782 Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index cf529b597c..9d5a39567e 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac957ef303fb870cb92331947ebcdcef5b553e80c7897c0aec866889f35e1a23 7.0.7-38.tar.gz +sha256 e7c1b19923bb97ed456c78b63b3259b809ebc8e3967c6d086450370c67eedf06 7.0.7-39.tar.gz sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 4aa9d56db2..b75d65375b 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-38 +IMAGEMAGICK_VERSION = 7.0.7-39 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From 2989e3c87a1123350728904fd789ad513e76b073 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Sep 2018 18:23:40 +0200 Subject: [PATCH 2489/2640] chipmunk: fix build on musl Build fails on: /home/test/autobuild/run/instance-0/output/build/chipmunk-7.0.2/src/cpHastySpace.c:11:24: fatal error: sys/sysctl.h: No such file or directory Indeed, sys/sysctl.h is not available on musl so include this header only if __APPLE__ is defined as sysctlbyname is only used in this case. Fixes: - http://autobuild.buildroot.org/results/e5be2f8eb9315a9054e1c8d854dec37cbb28eed7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-failure-on-musl.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/chipmunk/0001-Fix-build-failure-on-musl.patch diff --git a/package/chipmunk/0001-Fix-build-failure-on-musl.patch b/package/chipmunk/0001-Fix-build-failure-on-musl.patch new file mode 100644 index 0000000000..4485e937ca --- /dev/null +++ b/package/chipmunk/0001-Fix-build-failure-on-musl.patch @@ -0,0 +1,37 @@ +From 231c1fb97785290aaac89ed74d7cb24eaa74b363 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Sep 2018 12:05:22 +0200 +Subject: [PATCH] Fix build failure on musl + +Build fails on: +/home/test/autobuild/run/instance-0/output/build/chipmunk-7.0.2/src/cpHastySpace.c:11:24: fatal error: sys/sysctl.h: No such file or directory + +Indeed, sys/sysctl.h is not available on musl so include this header +only if __APPLE__ is defined as sysctlbyname is only used in this case. + +Fixes: + - http://autobuild.buildroot.org/results/e5be2f8eb9315a9054e1c8d854dec37cbb28eed7 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/slembcke/Chipmunk2D/pull/171] +--- + src/cpHastySpace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cpHastySpace.c b/src/cpHastySpace.c +index 8dca425..e087df8 100644 +--- a/src/cpHastySpace.c ++++ b/src/cpHastySpace.c +@@ -8,7 +8,9 @@ + + //#include + #ifndef _WIN32 ++#ifdef __APPLE__ + #include ++#endif + #include + #else + #ifndef WIN32_LEAN_AND_MEAN +-- +2.17.1 + From daf7dd87f4d93923df5e757fd43b3ad214a4a2ae Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 4 Sep 2018 15:12:51 +0200 Subject: [PATCH 2490/2640] mediastreamer: fix avcodec functions conflict Autotools miss avcodec function check when linking statically, leading to conflicts between local functions and avcodec functions. Add patch to swap $FFMPEG_LIBS and -lavutil which are checked when AC_CHECK_LIB on avcodec_* functions. $FFMPEG_LIBS contain -ldrm that must be listed after -lavutil. Fixes: http://autobuild.buildroot.net/results/394/3945e06ea0dd1e16013184fbab5b67b3561c87ce/ http://autobuild.buildroot.net/results/576/576c7d71313c45753848462717200b2b8ff5bb0e/ http://autobuild.buildroot.net/results/f33/f339ac6ea30815eeb8ecb144c971f56c06a9f995 [Peter: adjust commit message to clarify that this is for static linking] Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ffmpeg-and-avcodec-function-conflict.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch diff --git a/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch b/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch new file mode 100644 index 0000000000..cdaa0fab24 --- /dev/null +++ b/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch @@ -0,0 +1,42 @@ +From d12e74a559602b3dff9a6bf38fcbb139535c9c9c Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 3 Sep 2018 20:27:00 +0200 +Subject: [PATCH] m4: fix local ffmpeg and avcodec function conflict + +Autotools miss avcodec function check. +This is due to linker library list order, -ldrm is appended too early +respect to -lavutil. This results in missing drm library functions for +avcodec functions: +- drmGetVersion() +- drmFreeVersion() +So these functions: +- avcodec_get_context_defaults3 +- avcodec_open2 +- avcodec_encode_video2 +can't link correctly during check and they seem not to be present. +Then macros HAVE_FUN_avcodec_* are not defined in mediastreamer-config.h +So local avcodec functions conflict with real avcodec library functions. + +In acinclude.m4 file, swap $FFMPEG_LIBS and -lavutil if avcodec is found. + +Signed-off-by: Giulio Benetti +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 6c31ed82..89ff6643 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -110,7 +110,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[ + if test x$avcodec_found = xno ; then + AC_MSG_WARN([Could not find libavcodec (from ffmpeg) headers and library.]) + else +- FFMPEG_LIBS="$FFMPEG_LIBS -lavutil" ++ FFMPEG_LIBS="-lavutil $FFMPEG_LIBS" + fi + + +-- +2.17.1 + From 13c6754f3c1d2a14516f641490e9dd6f4c183d7c Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 4 Sep 2018 14:13:47 -0500 Subject: [PATCH 2491/2640] package/xen: disable tools/qemu-xen/ opengl Resolves: http://autobuild.buildroot.net/results/a7f2bf387458c2f0db6a4b555c51004f321f9320 Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- package/xen/xen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 29699cf0f9..a1685d371d 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -45,7 +45,7 @@ XEN_DEPENDENCIES += argp-standalone endif XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools XEN_MAKE_OPTS += dist-tools -XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl" +XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl --disable-opengl" define XEN_INSTALL_INIT_SYSV mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons From d496329a19c1989856cd5cef80f0d05255a27445 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 5 Sep 2018 19:26:44 +0200 Subject: [PATCH 2492/2640] screen: fix rare build failure on T_N undeclared /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/arm-none-linux-gnueabi-gcc -c -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DETCSCREENRC='"/usr/etc/screenrc"' -DSCREENENCODINGS='"/usr/share/screen/utf8encodings"' -DHAVE_CONFIG_H -DGIT_REV=\"\" \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE list_display.c In file included from screen.h:150:0, from list_display.c:36: display.h:154:19: error: 'T_N' undeclared here (not in a function) union tcu d_tcs[T_N]; /* terminal capabilities */ Macro T_N is defined in header file term.h but it may not be created then fails. Backport patch to make sure term.h is created before compile other source codes. Fixes: - http://autobuild.buildroot.org/results/a62bea1fd32246526d59f029df3dca60f1cd710f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0010-comm-h-now-depends-on-term-h.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/screen/0010-comm-h-now-depends-on-term-h.patch diff --git a/package/screen/0010-comm-h-now-depends-on-term-h.patch b/package/screen/0010-comm-h-now-depends-on-term-h.patch new file mode 100644 index 0000000000..6ff6f3da0b --- /dev/null +++ b/package/screen/0010-comm-h-now-depends-on-term-h.patch @@ -0,0 +1,28 @@ +From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 +From: Mike Gerwitz +Date: Tue, 24 Dec 2013 22:16:31 -0500 +Subject: comm.h now depends on term.h + +Signed-off-by: Fabrice Fontaine +[Patch retrieved and updated from: +http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index e791e79..d4f7c0b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -113,7 +113,7 @@ term.h: term.c term.sh + + kmapdef.c: term.h + +-comm.h: comm.c comm.sh config.h ++comm.h: comm.c comm.sh config.h term.h + AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh + + docs: +-- +cgit v1.0-41-gc330 + From 84efe72b785c7c2437a07a07d92f39a811c647f6 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Wed, 5 Sep 2018 09:48:39 -0700 Subject: [PATCH 2493/2640] package/gcc: xtensa: fix atomic NAND code generation xtensa gcc incorrectly generates code for atomic NAND operation as ~a1 & a2 instead of ~(a1 & a2). Fix that. Backported from: r264087 Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- ...ix-NAND-code-in-xtensa_expand_atomic.patch | 39 +++++++++++++++++++ ...ix-NAND-code-in-xtensa_expand_atomic.patch | 39 +++++++++++++++++++ ...ix-NAND-code-in-xtensa_expand_atomic.patch | 39 +++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch diff --git a/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file mode 100644 index 0000000000..d62d7c1566 --- /dev/null +++ b/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch @@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 + diff --git a/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file mode 100644 index 0000000000..d62d7c1566 --- /dev/null +++ b/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch @@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 + diff --git a/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file mode 100644 index 0000000000..d62d7c1566 --- /dev/null +++ b/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch @@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 + From cdf07abac58df3ec0154cd984792715489962878 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 5 Sep 2018 16:28:54 +0200 Subject: [PATCH 2494/2640] busybox: add patch to fix 'head -n -1' Busybox 1.29.0 introduces a regression causing head to fail with negative '-n' parameters, e.g. 'head -n -1'. Instead of showing all but the last one line, no lines are printed whatsoever. The issue was reported with http://lists.busybox.net/pipermail/busybox/2018-August/086617.html . This commit backports the revert applied upstream. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- ...ove-unnecessary-variable-in-xmalloc_.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch diff --git a/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch b/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch new file mode 100644 index 0000000000..ba2d214c29 --- /dev/null +++ b/package/busybox/0003-Revert-libbb-remove-unnecessary-variable-in-xmalloc_.patch @@ -0,0 +1,39 @@ +From 0d598ab9f03dbf320f7b81c05e4a94cb303dfbc7 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Sun, 2 Sep 2018 18:35:29 +0200 +Subject: [PATCH] Revert "libbb: remove unnecessary variable in xmalloc_fgets" + +The variable is in fact necessary. + + commit 2da9724b56169f00bd7fb6b9a11c9409a7620981 + Author: Quentin Rameau + Date: Sun Apr 1 17:05:35 2018 +0200 + libbb: remove unnecessary variable in xmalloc_fgets + +Signed-off-by: Denys Vlasenko +[Thomas De Schampheleire: added to unbreak 'head -n -1', +see http://lists.busybox.net/pipermail/busybox/2018-August/086617.html ] +Signed-off-by: Thomas De Schampheleire + +--- + libbb/get_line_from_file.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c +index f3d6c6203..49ef093c2 100644 +--- a/libbb/get_line_from_file.c ++++ b/libbb/get_line_from_file.c +@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end) + /* Get line, including trailing \n if any */ + char* FAST_FUNC xmalloc_fgets(FILE *file) + { +- return bb_get_chunk_from_file(file, NULL); ++ int i; ++ ++ return bb_get_chunk_from_file(file, &i); + } + /* Get line. Remove trailing \n */ + char* FAST_FUNC xmalloc_fgetline(FILE *file) +-- +2.16.4 + From b1b35eb9c5743cf179029bdbe763f258515273f4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 5 Sep 2018 00:18:07 +0200 Subject: [PATCH 2495/2640] moarvm: fix build on powerpc64 / powerpc64le Build fails with: In file included from dyncall_callback.c:35:0: dyncall_callback_ppc64.c: In function 'dcbNewCallback': dyncall_callback_ppc64.c:42:13: warning: implicit declaration of function 'dcAllocWX' [-Wimplicit-function-declaration] int err = dcAllocWX(sizeof(DCCallback), (void**) &pcb); ^~~~~~~~~ dyncall_callback_ppc64.c: In function 'dcbFreeCallback': dyncall_callback_ppc64.c:53:3: warning: implicit declaration of function 'dcFreeWX' [-Wimplicit-function-declaration] dcFreeWX(pcb, sizeof(DCCallback)); ^~~~~~~~ dyncall_callback_ppc64.S: Assembler messages: dyncall_callback_ppc64.S:180: Error: operand out of range (3 is not between 0 and 1) So select BR2_PACKAGE_LIBFFI for BR2_powerpc64 and BR2_powerpc64le as it is already done for MIPS Fixes: - http://autobuild.buildroot.org/results/97b53a74d9847c07f26178daeb1daff3b6c24813 - http://autobuild.buildroot.org/results/c35ac4bbc5fb04aabf5a719eddeedf55f7f1f4eb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/moarvm/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 3ff4f827e0..c370a0f229 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -12,7 +12,8 @@ config BR2_PACKAGE_MOARVM select BR2_PACKAGE_LIBATOMIC_OPS # dyncall does not work on MIPS; libffi needs to be used. # See: https://github.com/MoarVM/MoarVM/issues/222 - select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # dyncall does not work also on powerpc64 and powerpc64le + select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc64 || BR2_powerpc64le help Short for "Metamodel On A Runtime", MoarVM is a virtual machine built especially for Rakudo Perl 6 and the NQP From 0e749a6f30a7b102da65f6101f89fa1a2228833e Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Wed, 5 Sep 2018 13:22:36 +0100 Subject: [PATCH 2496/2640] boot/uboot: Set MAKE_ENV for kconfig build system U-Boot fails to build in a GitLab CI context because the kconfig-package build stage is unable to find bison or flex even though they are installed in HOST_DIR. To fix this, set UBOOT_MAKE_ENV so that UBOOT_KCONFIG_MAKE uses the correct PATH. Signed-off-by: Thomas Preston Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index bddafe234d..a19cb72458 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -449,6 +449,7 @@ endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) $(eval $(generic-package)) else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) +UBOOT_MAKE_ENV = $(TARGET_MAKE_ENV) UBOOT_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) From 945a8361748c4b9817f0b308bcfa03386eababda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 3 Sep 2018 08:37:44 -0400 Subject: [PATCH 2497/2640] qt5virtualkeyboard: fix patch applied to 2.0 version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch 0001-remove-weird-install-path-for-example.patch using patch: does not apply properly and needs to be fixed. The patch was backported from 5.7 [1] with path adaptation in commit (cb97d9473b qt5virtualkeyboard: allow to build with qt5.6), but the submitted patch did not reflect that said adaptation. Apply the said patch adaptation (i.e. add missing basic subdirectory) to apply properly the patch. Fixes: >>> qt5virtualkeyboard 2.0 Patching Applying 0001-remove-weird-install-path-for-example.patch using patch: patching file examples/virtualkeyboard/basic/basic.pro Hunk #1 FAILED at 7. 1 out of 1 hunk FAILED -- saving rejects to file examples/virtualkeyboard/basic/basic.pro.rej make: ***[/home/test/autobuild/run/instance-2/output/build/qt5virtualkeyboard-2.0/.stamp_patched] Error 1 [1]: https://github.com/qt/qtvirtualkeyboard/commit/aef55eb7b3470ba6dee4abc67acda1d308c90e97 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- .../2.0/0001-remove-weird-install-path-for-example.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch index 2f8ea3bc94..367cc4a1f7 100644 --- a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch +++ b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch @@ -23,13 +23,13 @@ index 28cc4dc..0f71e0e 100644 QTPLUGIN += qtvirtualkeyboardplugin } -android-no-sdk|!isEmpty(CROSS_COMPILE) { -- TARGETPATH = /data/user/qt/virtualkeyboard +- TARGETPATH = /data/user/qt/virtualkeyboard/basic -} else { -- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard +- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic -} -target.path = $$TARGETPATH + -+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard ++target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic INSTALLS += target RESOURCES += \ From b63fb1de164e728983d5eb2ab3446e7ec4e90cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 3 Sep 2018 08:37:46 -0400 Subject: [PATCH 2498/2640] qt5virtualkeyboard: fix legal-info with 5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5virtualkeyboard 2.0 (shipped with Qt 5.6) doesn't contain any "main" license files with the GPLv3 license text. Conditionally remove LICENSE.GPL3 from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6. Fixes: >>> qt5virtualkeyboard 2.0 Collecting legal info sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/LICENSE.GPL3: No such file or directory ERROR: LICENSE.GPL3 has wrong sha256 hash: ERROR: expected: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack Also, the lipi-toolkit has a different filename between both supported Qt major version (5.6 and latest). Conditionally set the license in QT5VIRTUALKEYBOARD_LICENSE_FILES for lipi-toolkit according to the Qt major version used. Fixes: >>> qt5virtualkeyboard 2.0 Collecting legal info ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: No such file or directory ERROR: src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt has wrong sha256 hash: ERROR: expected: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Gaël PORTAY [Thomas: add hash for lipi-toolkit license file, tweak commit log.] Signed-off-by: Thomas Petazzoni --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 1 + package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index bb916c06d3..8d70cd803d 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -7,3 +7,4 @@ sha256 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b qtvirtu # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt +sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index cbe24d27dc..8d26394c96 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -16,7 +16,9 @@ QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 +endif QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) @@ -44,8 +46,12 @@ ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y) QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt +else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt endif +endif ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS From 9f81f578eb0af218752db0d69f7adf94584ada31 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Sep 2018 23:43:47 +0200 Subject: [PATCH 2499/2640] lcms2: add upstream security fix for CVE-2018-16435 Little CMS (aka Little Color Management System) 2.9 has an integer overflow in the AllocateDataSet function in cmscgats.c, leading to a heap-based buffer overflow in the SetData function via a crafted file in the second argument to cmsIT8LoadFromFile. For more details, see: https://github.com/mm2/Little-CMS/issues/171 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16435 The upstream fix unfortunately includes a number of unrelated changes, but thse files are not used when building for Linux. Signed-off-by: Peter Korsgaard --- ...0001-Upgrade-Visual-studio-2017-15.8.patch | 174 ++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch diff --git a/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch b/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch new file mode 100644 index 0000000000..c43d934342 --- /dev/null +++ b/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch @@ -0,0 +1,174 @@ +From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001 +From: Marti Maria +Date: Wed, 15 Aug 2018 20:07:56 +0200 +Subject: [PATCH] Upgrade Visual studio 2017 15.8 + +- Upgrade to 15.8 +- Add check on CGATS memory allocation (thanks to Quang Nguyen for +pointing out this) + +Signed-off-by: Peter Korsgaard +--- + Projects/VC2017/jpegicc/jpegicc.vcxproj | 1 + + Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj | 2 +- + Projects/VC2017/lcms2_static/lcms2_static.vcxproj | 2 +- + Projects/VC2017/linkicc/linkicc.vcxproj | 2 +- + Projects/VC2017/psicc/psicc.vcxproj | 2 +- + Projects/VC2017/testbed/testbed.vcxproj | 2 +- + Projects/VC2017/tiffdiff/tiffdiff.vcxproj | 2 +- + Projects/VC2017/tifficc/tifficc.vcxproj | 2 +- + Projects/VC2017/transicc/transicc.vcxproj | 1 + + src/cmscgats.c | 14 ++++++++++---- + 10 files changed, 19 insertions(+), 11 deletions(-) + +diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj +index ab26a53..39cfd00 100644 +--- a/Projects/VC2017/jpegicc/jpegicc.vcxproj ++++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj +@@ -22,6 +22,7 @@ + {62812507-F926-4968-96A9-17678460AD90} + jpegicc + Win32Proj ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj +index 4c8aa3f..d1bf3eb 100644 +--- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj ++++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj +@@ -22,7 +22,7 @@ + {8C51BE48-ADB8-4089-A9EC-F6BF993A0548} + lcms2_DLL + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj +index 2a9988a..9fc05ce 100644 +--- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj ++++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj +@@ -22,7 +22,7 @@ + {71DEDE59-3F1E-486B-A899-4283000F76B5} + lcms2_static + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj +index 30c2b4e..51586dd 100644 +--- a/Projects/VC2017/linkicc/linkicc.vcxproj ++++ b/Projects/VC2017/linkicc/linkicc.vcxproj +@@ -22,7 +22,7 @@ + {FBFBE1DC-DB84-4BA1-9552-B4780F457849} + linkicc + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj +index 9dcf89a..8f26e12 100644 +--- a/Projects/VC2017/psicc/psicc.vcxproj ++++ b/Projects/VC2017/psicc/psicc.vcxproj +@@ -22,7 +22,7 @@ + {EF6A8851-65FE-46F5-B9EF-14F0B671F693} + psicc + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj +index 0af3762..3f6aea3 100644 +--- a/Projects/VC2017/testbed/testbed.vcxproj ++++ b/Projects/VC2017/testbed/testbed.vcxproj +@@ -22,7 +22,7 @@ + {928A3A2B-46EF-4279-959C-513B3652FF0E} + testbed + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj +index 7edfe28..3a6d837 100644 +--- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj ++++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj +@@ -22,7 +22,7 @@ + {75B91835-CCD7-48BE-A606-A9C997D5DBEE} + tiffdiff + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj +index cd9f04c..5ef954f 100644 +--- a/Projects/VC2017/tifficc/tifficc.vcxproj ++++ b/Projects/VC2017/tifficc/tifficc.vcxproj +@@ -22,7 +22,7 @@ + {2256DE16-ED92-4A6F-9C54-F65BB61E64A2} + tifficc + Win32Proj +- 8.1 ++ 10.0.17134.0 + + + +diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj +index d9b77c6..b3173d8 100644 +--- a/Projects/VC2017/transicc/transicc.vcxproj ++++ b/Projects/VC2017/transicc/transicc.vcxproj +@@ -22,6 +22,7 @@ + {9EE22D66-C849-474C-9ED5-C3E141DAB160} + transicc + Win32Proj ++ 10.0.17134.0 + + + +diff --git a/src/cmscgats.c b/src/cmscgats.c +index 1a87613..8c3e96d 100644 +--- a/src/cmscgats.c ++++ b/src/cmscgats.c +@@ -1,7 +1,7 @@ + //--------------------------------------------------------------------------------- + // + // Little Color Management System +-// Copyright (c) 1998-2017 Marti Maria Saguer ++// Copyright (c) 1998-2018 Marti Maria Saguer + // + // Permission is hereby granted, free of charge, to any person obtaining + // a copy of this software and associated documentation files (the "Software"), +@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8) + t-> nSamples = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS")); + t-> nPatches = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS")); + +- t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*)); +- if (t->Data == NULL) { ++ if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe) ++ { ++ SynError(it8, "AllocateDataSet: too much data"); ++ } ++ else { ++ t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*)); ++ if (t->Data == NULL) { + +- SynError(it8, "AllocateDataSet: Unable to allocate data array"); ++ SynError(it8, "AllocateDataSet: Unable to allocate data array"); ++ } + } + + } +-- +2.11.0 + From a3da00bdea5bdb1a516bad485e8a2232b16db507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 3 Sep 2018 08:37:47 -0400 Subject: [PATCH 2500/2640] qt5virtualkeyboard: add hashes of 3rd-party licenses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing license hashes for those three third-parties: - src/virtualkeyboard/3rdparty/openwnn/NOTICE - src/virtualkeyboard/3rdparty/pinyin/NOTICE - src/virtualkeyboard/3rdparty/tcime/COPYING Fixes: >>> qt5virtualkeyboard 5.11.1 Collecting legal info LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903) ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10) In order to make this possible, we use a different hash file for the old version (2.0, used with Qt 5.6) and new (5.11, used with Qt 5.11) versions of qt5virtualkeyboard. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++ package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash diff --git a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash new file mode 100644 index 0000000000..266fc3b695 --- /dev/null +++ b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash @@ -0,0 +1,5 @@ +# Hashes for license files: +sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE +sha256 ca3dd653e13c4a935622cfce00dc4e2d7a8295b64da99bd1d4f2a8ddb6b0956e src/virtualkeyboard/3rdparty/tcime/COPYING diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 8d70cd803d..9270366b93 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -7,4 +7,6 @@ sha256 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b qtvirtu # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt -sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/virtualkeyboard/3rdparty/tcime/COPYING From 7f0372f9ca8f3c362c9def3ef03dc73e9ee741b0 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Mon, 3 Sep 2018 10:26:09 +0200 Subject: [PATCH 2501/2640] DEVELOPERS: Fix file order list maintained by me Files list maintained by me in DEVELOPERS file is not in proper order, fix it with ascending order. Signed-off-by: Jagan Teki Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3f1f491fb7..2a5c8dc786 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -904,8 +904,6 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: configs/amarula_vyasa_rk3288_defconfig -F: configs/asus_tinker_rk3288_defconfig F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a64-olinuxino/ @@ -914,8 +912,15 @@ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ +F: configs/amarula_vyasa_rk3288_defconfig +F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m1_defconfig F: configs/bananapi_m64_defconfig +F: configs/engicam_imx6qdl_icore_defconfig +F: configs/engicam_imx6qdl_icore_qt5_defconfig +F: configs/engicam_imx6qdl_icore_rqs_defconfig +F: configs/engicam_imx6ul_geam_defconfig +F: configs/engicam_imx6ul_isiot_defconfig F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a64_olinuxino_defconfig @@ -925,11 +930,6 @@ F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig -F: configs/engicam_imx6qdl_icore_defconfig -F: configs/engicam_imx6qdl_icore_qt5_defconfig -F: configs/engicam_imx6qdl_icore_rqs_defconfig -F: configs/engicam_imx6ul_geam_defconfig -F: configs/engicam_imx6ul_isiot_defconfig N: James Knight F: package/atkmm/ From 87d58cccf19039fdca30ad5274ed75030919656d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Sep 2018 23:40:49 +0200 Subject: [PATCH 2502/2640] libcurl: security bump to version 7.61.1 Fixes CVE-2018-14618: NTLM password overflow via integer overflow For more details, see the advisory: https://curl.haxx.se/docs/CVE-2018-14618.html Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 9a57153d2b..395307653d 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.61.0.tar.xz.asc +# https://curl.haxx.se/download/curl-7.61.1.tar.xz.asc # with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720 curl-7.61.0.tar.xz +sha256 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891 curl-7.61.1.tar.xz sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index e0ecb081b7..c3da8aa3e5 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.61.0 +LIBCURL_VERSION = 7.61.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 2809b6e98f4d852357da9406edd987569e7a96a5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 6 Sep 2018 13:33:57 -0300 Subject: [PATCH 2503/2640] linux-headers: bump 4.{4, 9, 14}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 065ea174db..132cf6aecc 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.153" if BR2_KERNEL_HEADERS_4_4 - default "4.9.124" if BR2_KERNEL_HEADERS_4_9 + default "4.4.154" if BR2_KERNEL_HEADERS_4_4 + default "4.9.125" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.67" if BR2_KERNEL_HEADERS_4_14 + default "4.14.68" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From f0a0e1d72b5222843d24013504f3933f04538c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 6 Sep 2018 08:42:29 -0400 Subject: [PATCH 2504/2640] qt5virtualkeyboard: fix target install issue with Qt 5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5virtualkeyboard 2.0 (shipped with Qt 5.6) installs the QML plugin under the directory Enterprise while the later versions install it without that directory. Differentiate installation to target of the QML plugin according to the Qt major version in use. Also, make sure the /usr/qml/QtQuick directory exists before the copy. Fixes: >>> qt5virtualkeyboard 2.0 Installing to target mkdir -p /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard /home/gportay/src/buildroot/output/target/usr/qml/QtQuick cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard': No such file or directory package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed' failed make: *** [/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed] Error 1 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 8d26394c96..4aa5fc9575 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -71,6 +71,18 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML + mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ +endef +else +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML + mkdir -p $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/ +endef +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/ @@ -81,7 +93,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) endef From cb3c56e3557cd57be806ba599baa461452f07bef Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Thu, 6 Sep 2018 13:51:32 -0300 Subject: [PATCH 2505/2640] cutelyst: Add dependency on Kernel headers >= 3.3 Cutelyst-WSGI module uses SO_REUSEPORT Fixes: http://autobuild.buildroot.net/results/d38411eda9edf16e2c40d8931bcfc889faae43dc/ Signed-off-by: Daniel Nicoletti Signed-off-by: Peter Korsgaard --- package/cutelyst/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/cutelyst/Config.in b/package/cutelyst/Config.in index 91b559bd18..b2b48baa69 100644 --- a/package/cutelyst/Config.in +++ b/package/cutelyst/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_CUTELYST depends on BR2_PACKAGE_QT5 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_GUI help @@ -11,6 +12,7 @@ config BR2_PACKAGE_CUTELYST https://cutelyst.org -comment "cutelyst needs a toolchain w/ C++, gcc >= 4.8" +comment "cutelyst needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.3" depends on BR2_PACKAGE_QT5 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 From c59c6c162e2ce516506b71f238b7976a70536505 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 21:35:54 +0200 Subject: [PATCH 2506/2640] toolchain: add 4.18.x choice for headers Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7f62d8122bc42b84608cad34fb005b4870c143d5) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index ad02af5215..c2192a52b1 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -357,10 +357,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 6a9921c149..4639232bfb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,6 +123,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_18 + bool "4.18.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_17 bool "4.17.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 From 8354c7fe11ec3c0b7216381826ea0b668521bceb Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 5 Sep 2018 16:19:46 +0200 Subject: [PATCH 2507/2640] qt5location: fix build failure due to GCC < 5.x bug in implicit casts GCC < 5.x has some bug in implicit casts, this leads to build failure. In particular QPointer in m_map QDeclarativeGeoMap class, when passed to connect(m_map, ...) should directly cast to m_map.data(). Add reworked patch referred on QTBUG-69512: https://bugreports.qt.io/browse/QTBUG-69512 Fixes: http://autobuild.buildroot.org/results/dc5/dc5c354f3aae54b77dad74ad44aca6d12425a457/ http://autobuild.buildroot.org/results/3ab/3ab6f79a36543fa677555bc9ec3500baa46ab0f8/ http://autobuild.buildroot.org/results/8b5/8b5531e44c4f4258c950902b2cd92d1ac8a8491e/ http://autobuild.buildroot.org/results/089/089d03ab14a7c70e465cce891506a082049f2998/ http://autobuild.buildroot.org/results/da8/da87ca470b22d599bb25998af8f25136921f35a7/ http://autobuild.buildroot.org/results/5fe/5fe91fd762c5d4eda01378947b13f7ffc084a8be/ http://autobuild.buildroot.org/results/a84/a84182145122935c8f10105818dbf0e3aa23fd11/ http://autobuild.buildroot.org/results/5b9/5b9106351a04646f42697215ed497e09c62c12fa/ http://autobuild.buildroot.org/results/397/397acc3f5d4998a8d632749ef7d21533c35d501a/ http://autobuild.buildroot.org/results/b18/b186ec0e297d6857a9e0a6a063e476b5049ccf93/ http://autobuild.buildroot.org/results/bf2/bf241beeb1ce10eec99d247cdd331870c08e0ac8/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...tivegeomap-fix-building-with-GCC-5.x.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/qt5/qt5location/5.11.1/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch diff --git a/package/qt5/qt5location/5.11.1/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch b/package/qt5/qt5location/5.11.1/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch new file mode 100644 index 0000000000..f893c33d50 --- /dev/null +++ b/package/qt5/qt5location/5.11.1/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch @@ -0,0 +1,48 @@ +From ad78b1a671edac369ede86bff376ec8af2cafbf2 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 5 Sep 2018 12:51:41 +0200 +Subject: [PATCH] qdeclarativegeomap: fix building with GCC < 5.x + +With GCC < 5.x implicit casts don't work as expected, in particular +QPointer in m_map QDeclarativeGeoMap class when passed to +connect(m_map, ...) should directly cast to m_map.data(). + +Workaround this using connect(m_map.data(), ...). + +Signed-off-by: Giulio Benetti +--- + src/location/declarativemaps/qdeclarativegeomap.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp +index 09f9d01c..dc5a32ed 100644 +--- a/src/location/declarativemaps/qdeclarativegeomap.cpp ++++ b/src/location/declarativemaps/qdeclarativegeomap.cpp +@@ -694,11 +694,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized() + QImage copyrightImage; + if (!m_initialized && width() > 0 && height() > 0) { + QMetaObject::Connection copyrightStringCatcherConnection = +- connect(m_map, ++ connect(m_map.data(), + QOverload::of(&QGeoMap::copyrightsChanged), + [©rightString](const QString ©){ copyrightString = copy; }); + QMetaObject::Connection copyrightImageCatcherConnection = +- connect(m_map, ++ connect(m_map.data(), + QOverload::of(&QGeoMap::copyrightsChanged), + [©rightImage](const QImage ©){ copyrightImage = copy; }); + m_map->setViewportSize(QSize(width(), height())); +@@ -719,8 +719,8 @@ void QDeclarativeGeoMap::mappingManagerInitialized() + emit m_map->copyrightsChanged(copyrightImage); + + +- connect(m_map, &QGeoMap::sgNodeChanged, this, &QQuickItem::update); +- connect(m_map, &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); ++ connect(m_map.data(), &QGeoMap::sgNodeChanged, this, &QQuickItem::update); ++ connect(m_map.data(), &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); + + // This prefetches a buffer around the map + m_map->prefetchData(); +-- +2.17.1 + From 695c9696f9b3abab61fbb712fe3d3bdf6dc3c092 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 5 Sep 2018 11:03:07 +0200 Subject: [PATCH 2508/2640] qt5location: fix build failure due to missing qt5base gui dependency qt5location fails to build due to missing Qt5 Gui module. In configure.json features.opengl is referred, but it is available only if qt5base gui submodule is built. Add BR2_PACKAGE_QT5BASE_GUI to qt5location Config.in to assure gui submodule is built before qt5location. Fixes: http://autobuild.buildroot.org/results/1e1/1e12a819750c677c9ef204a324c8bf06212e5135/ http://autobuild.buildroot.org/results/223/223ec6565beba1ca73d4ff488296feec53656b40/ http://autobuild.buildroot.org/results/84f/84fe1c84e3537167ee3791e83c9fe2cc2805ccb5/ http://autobuild.buildroot.org/results/9c9/9c96d2106222e623a379f9995bd059725eb27769/ http://autobuild.buildroot.org/results/fa0/fa01513d28d896ca8819966c5b1ed5c35283e92f/ http://autobuild.buildroot.org/results/5d7/5d7333470c31b83c697218382dc77f74af86c666/ http://autobuild.buildroot.org/results/db7/db7b4c61bb41d32e0f7960c194588cd1559ff3f7/ http://autobuild.buildroot.org/results/2b7/2b71f186b8d67c4805393c9c016d641893d46220/ http://autobuild.buildroot.org/results/1e1/1e12a819750c677c9ef204a324c8bf06212e5135/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/qt5/qt5location/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index e1778182a0..7c39979eff 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for developers using C++. From 07613c8890f6a7fea2b1ebbad0ee03a9c91ebb6c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Sep 2018 22:03:33 +0200 Subject: [PATCH 2509/2640] cutelyst: fix kconfig syntax Commit cb3c56e35 (cutelyst: Add dependency on Kernel headers >= 3.3) used invalid kconfig syntax, breaking menuconfig: make menuconfig package/cutelyst/Config.in:19: syntax error package/cutelyst/Config.in:18: invalid option Makefile:900: recipe for target 'menuconfig' failed Fix it by using 'depends ON' instead. Signed-off-by: Peter Korsgaard --- package/cutelyst/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cutelyst/Config.in b/package/cutelyst/Config.in index b2b48baa69..3e28cff95d 100644 --- a/package/cutelyst/Config.in +++ b/package/cutelyst/Config.in @@ -15,4 +15,4 @@ config BR2_PACKAGE_CUTELYST comment "cutelyst needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.3" depends on BR2_PACKAGE_QT5 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 From 339d550e92ac15de8668f32d66d16f198137006c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Sep 2018 22:05:26 +0200 Subject: [PATCH 2510/2640] Update for 2018.08 Signed-off-by: Peter Korsgaard --- CHANGES | 31 +++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 8c2ffb0469..a505d7ec69 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,34 @@ +2018.08, Released September 6th, 2018 + + Minor fixes. + + Known issues: + + - Glibc 2.28 on the build host breaks compilation of a number + of host packages. 2018.08 contains fixes for some of these + packages, but not all. Consider building on hosts (or in + containers) using older Glibc versions. + + - host-dtc 1.4.7 breaks compilation of older U-Boot and Linux + kernel configurations using FDT/DTC. Consider updating the + Linux kernel to >= 4.17 and U-Boot to >= 2018.07 or + backporting commit 9130ba8846 (scripts/dtc: Update to + upstream version v1.4.6-9-gaadd0b65c987) for the Linux + kernel / commit db405d1980 for U-Boot. + Alternatively revert commit 7b929ddcf0 (dtc: bump version to + 1.4.7) and ensure your build host does not have the libfdt + development headers installed. + + Updated/fixed packages: busybox, chipmunk, cutelyst, + domoticz, gcc, imagemagick, lcms2, libcurl, mediastreamer, + moarvm, php, qt, qt5virtualkeyboard, qt5webengine, screen, + sdl2, squashfs, uboot, xen + + Issues resolved (http://bugs.uclibc.org): + + #11261: ccache using wrong cached objects + #11276: Understanding the patch for kernel-4.9 and other.. + 2018.08-rc3, Released August 31th, 2018 Fixes all over the tree. diff --git a/Makefile b/Makefile index 9d66bbacf4..3e1319c1ea 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.08-rc3 +export BR2_VERSION := 2018.08 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1535752000 +BR2_VERSION_EPOCH = 1536263000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 830cf1bffb..626b67a531 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,40 +42,40 @@
              -

              Latest stable release: 2018.05.2

              +

              Latest stable release: 2018.08

              - +
              - +
              -

              buildroot-2018.05.2.tar.gz

              -

              PGP signature

              +

              buildroot-2018.08.tar.gz

              +

              PGP signature

              - +
              - +
              -

              buildroot-2018.05.2.tar.bz2

              -

              PGP signature

              +

              buildroot-2018.08.tar.bz2

              +

              PGP signature

              - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
            diff --git a/docs/website/news.html b/docs/website/news.html index 84468351b8..b46c69660f 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

            News

              +
            • +
              +
              +
              +

              2018.08 released

              +

              6 September 2018

              +
              +
              +

              The stable 2018.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2018.08 release.

              +
              +
              +
              • +
            • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index cca0a3db3d..2d550613d5 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2018.05' +RELEASE='2018.08' ### Change here for more memory/cores ### VM_MEMORY=2048 From ea968163b67b007a1f261b46436c71e0ffae8408 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 9 Sep 2018 11:59:39 +0200 Subject: [PATCH 2511/2640] android-tools: fix minor()/major() build failure due to glibc 2.28 glibc 2.28 no longer includes from , and therefore must be included explicitly when major()/minor() are used. This commit adds a patch to directly include into all usb_linux.c files where minor() and major() macros are used. Fixes: http://autobuild.buildroot.net/results/901/9011c6af71fb81988c2a05f2acee913a2bae2eff// http://autobuild.buildroot.net/results/142/142c5672fdc44f2d68f18df3509e5051b3295df5// http://autobuild.buildroot.net/results/b55/b55aa69654e758af5232ae69618ba1ea5c245074// Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit c8e8f8b0f5f5a283ecfad00401df6e8f9b605f0b) Signed-off-by: Peter Korsgaard --- ...smacros.h-to-compile-with-glibc-2.28.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch diff --git a/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch b/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch new file mode 100644 index 0000000000..77b457f604 --- /dev/null +++ b/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch @@ -0,0 +1,42 @@ +usb_linux.c: fix minor()/major() build failure due to glibc 2.28 + +glibc 2.28 no longer includes from , +and therefore must be included explicitly when +major()/minor() are used. + +This commit adds a patch to directly include into +all usb_linux.c files where minor() and major() macros are used. + +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100 ++++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200 +@@ -20,6 +20,7 @@ + #include + + #include ++#include + #include + #include + #include +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200 ++++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200 +@@ -20,6 +20,7 @@ + #include + + #include ++#include + #include + #include + #include +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100 ++++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200 +@@ -33,6 +33,7 @@ + + #include + #include ++#include + #include + #include + #include From ce1e6f2671b4e813064235194993994556bb493b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 9 Sep 2018 21:50:23 +0200 Subject: [PATCH 2512/2640] fio: fix license fio does not have any special conditions since version 2.2.6 indeed MORAL-LICENSE has been updated to replace "promising" by "encouraged" and "must" by "should": https://github.com/axboe/fio/commit/67f4822ce3dc6af76b963c6ac467a8f0471a7faf So fix LICENSE, add MORAL-LICENSE to LICENSE_FILES and add hash for both licenses Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c4f923176a4f9b3a15186b4220ac8f3d064beb02) Signed-off-by: Peter Korsgaard --- package/fio/fio.hash | 2 ++ package/fio/fio.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/fio/fio.hash b/package/fio/fio.hash index 7eb08140c5..d136fd595b 100644 --- a/package/fio/fio.hash +++ b/package/fio/fio.hash @@ -1,2 +1,4 @@ # Locally computed sha256 1952db4d534221e6e8454f851dfcc38328b0ed4a3f499ea25a51ca2b5ccc8136 fio-fio-2.20.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/package/fio/fio.mk b/package/fio/fio.mk index c109f0795c..aabdff9925 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -6,8 +6,8 @@ FIO_VERSION = fio-2.20 FIO_SITE = git://git.kernel.dk/fio.git -FIO_LICENSE = GPL-2.0 + special obligations -FIO_LICENSE_FILES = COPYING +FIO_LICENSE = GPL-2.0 +FIO_LICENSE_FILES = COPYING MORAL-LICENSE ifeq ($(BR2_PACKAGE_LIBAIO),y) FIO_DEPENDENCIES += libaio From 345a2d358a82095d23aa86b162ea4e1114a3253c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 9 Sep 2018 18:37:49 +0200 Subject: [PATCH 2513/2640] package/gdb: move patch directory commit 9cf4964da56863dfe4ce729c32400bd9acf25ee7 forgot to move patch directory. Fixes: https://gitlab.com/free-electrons/toolchains-builder/-/jobs/95552306 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 521676cfe021497b535e87c98c484ac0790c4db4) Signed-off-by: Peter Korsgaard --- ...001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 package/gdb/{8.1 => 8.1.1}/0003-use-asm-sgidefs.h.patch | 0 .../gdb/{8.1 => 8.1.1}/0004-gdbserver-fix-build-for-m68k.patch | 0 .../0005-nat-fork-inferior-include-linux-ptrace.h.patch | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename package/gdb/{8.1 => 8.1.1}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{8.1 => 8.1.1}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{8.1 => 8.1.1}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{8.1 => 8.1.1}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{8.1 => 8.1.1}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) diff --git a/package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/8.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/8.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/8.1/0003-use-asm-sgidefs.h.patch b/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/8.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/8.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/8.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch From 0dedba776b619a6c6d27db018ed6b1c56313aad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 9 Sep 2018 11:43:17 +0200 Subject: [PATCH 2514/2640] shairport-sync: add upstream patch to fix soxr configure issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit e047dee241fe0660d92311a124757065c6c4c93d adds an upstream patch to fix a build issue with soxr. The patch also adds detecting soxr using pkg-config. Upstream detected an config issue [1], where the resulting binary lacks soxr support, although libsoxr was correctly detected. This patch adds a define for `HAVE_LIBSOXR` when using pkg-config. Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 [1] https://github.com/mikebrady/shairport-sync/issues/740 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni (cherry picked from commit ac4bca24adf2a50d1d9ac858cec26fdcd39578ef) Signed-off-by: Peter Korsgaard --- ...f-HAVE_LIBSOXR-with-using-pkg_config.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch diff --git a/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch b/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch new file mode 100644 index 0000000000..66ce961ab1 --- /dev/null +++ b/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch @@ -0,0 +1,35 @@ +From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001 +From: Mike Brady +Date: Sat, 8 Sep 2018 15:06:18 +0100 +Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit e047dee241fe0660d92311a124757065c6c4c93d adds an upstream patch +to fix a build issue with soxr. The patch also adds detecting soxr +using pkg-config. Upstream detected a config issue [1], where the +resulting binary lacks soxr support, although libsoxr was correctly +detected. + +Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 + +Signed-off-by: Jörg Krause +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ceec4af..690a774 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,6 +180,7 @@ AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation + PKG_CHECK_MODULES( + [SOXR], [soxr], + [LIBS="${SOXR_LIBS} ${LIBS}"]) ++ AC_DEFINE([HAVE_LIBSOXR],[1],[Define to 1 if you are including support for soxr interpolation]) + else + AC_CHECK_LIB([avutil],[av_get_cpu_flags]) + if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then +-- +2.18.0 From eb09c44764659e27de6c8c04c892a9eb0c85a972 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 10 Sep 2018 16:04:20 +0200 Subject: [PATCH 2515/2640] parted: fix minor()/major() build failure due to glibc 2.28 glibc 2.28 no longer includes from , and therefore must be included explicitly when major()/minor() are used. This commit adds a patch to directly include into libparted/arch/linux.c files where minor() and major() macros are used. Patch has been taken from parted upstream commit: http://git.savannah.gnu.org/cgit/parted.git/commit/?id=ba5e0451b51c983e40afd123b6e0d3eddb55e610 Fixes: http://autobuild.buildroot.net/results/323/3230abaf78b8df8d23310b37b4099050fdc76eb0// http://autobuild.buildroot.net/results/d3a/d3a3cd9963e5a2be1cec8fb553f5b20fc2e3c85c// http://autobuild.buildroot.net/results/ecf/ecfb634b5e6dac2c88b399fc1f1adc68ca42504c// Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit b1bc14626e01bbf28b156798f70bdf786c668846) Signed-off-by: Peter Korsgaard --- ...lude-sys-sysmacros.h-for-major-macro.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch diff --git a/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch b/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch new file mode 100644 index 0000000000..e0b4c2acba --- /dev/null +++ b/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch @@ -0,0 +1,27 @@ +From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 24 Mar 2018 17:37:02 +0000 +Subject: [PATCH] linux: Include for major() macro. + +Since glibc 2.27 this header is required. + +Signed-off-by: Giulio Benetti +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 31b98ab..7e86b51 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include /* for uname() */ + #include + #include ++#include + #ifdef ENABLE_DEVICE_MAPPER + #include + #endif +-- +2.17.1 + From 60ebac8fb812da216bc9167a754584b5882092bf Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 30 Aug 2018 10:21:20 -0300 Subject: [PATCH 2516/2640] acpid: use shutdown for poweroff, if available, not /sbin/poweroff It's preferable to use "shutdown -hP now" to ensure that the runlevel is known, preventing this message on the system console and log: WARNING: could not determine runlevel - doing soft poweroff (it's better to use shutdown instead of poweroff from the command line) Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni (cherry picked from commit ab842ce21df58e7731dae675e08894c6e9024e56) Signed-off-by: Peter Korsgaard --- package/acpid/acpid.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 2141a1a9e0..87378d8106 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -15,9 +15,15 @@ define ACPID_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S02acpid endef +ifeq ($(BR2_INIT_SYSV)$(BR2_INIT_SYSTEMD),y) +ACPID_POWEROFF_CMD = /sbin/shutdown -hP now +else +ACPID_POWEROFF_CMD = /sbin/poweroff +endif + define ACPID_SET_EVENTS mkdir -p $(TARGET_DIR)/etc/acpi/events - printf "event=button[ /]power\naction=/sbin/poweroff\n" \ + printf 'event=button[ /]power\naction=%s\n' '$(ACPID_POWEROFF_CMD)' \ >$(TARGET_DIR)/etc/acpi/events/powerbtn endef From 9fde9651825623ea94882154de1a098c2cee90de Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Sep 2018 23:13:33 +0200 Subject: [PATCH 2517/2640] linux-headers: bump 4.{4, 9, 14}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 57022f5160311332e234dc03b6f4f7db681d0ef0) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 132cf6aecc..ec92e88b84 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.154" if BR2_KERNEL_HEADERS_4_4 - default "4.9.125" if BR2_KERNEL_HEADERS_4_9 + default "4.4.155" if BR2_KERNEL_HEADERS_4_4 + default "4.9.126" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.68" if BR2_KERNEL_HEADERS_4_14 + default "4.14.69" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From 3f38562d65a4ea95f2570082a5d333818e245abe Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 12 Sep 2018 13:18:35 +0200 Subject: [PATCH 2518/2640] vboot-utils: fix major() build failure due to glibc 2.28 glibc 2.28 no longer includes from , and therefore must be included explicitly when major() are used. This commit adds an upstream patch to directly include into cgpt_wrapper.c and dump_kernel_config_lib.c files where major() macro is used. The upstream patch has been taken from: https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/435fbcee218b37a87368e2b22fa33366875d458c Fixes: http://autobuild.buildroot.net/results/4a2/4a21307984cb16d7879149dd9b9b062181b0388f/ http://autobuild.buildroot.net/results/899/899569165112fe577cf191cd4f0c698cbedeb9b1/ http://autobuild.buildroot.net/results/0e5/0e527d231fa791ec8e3375804f1a0043f92d73d0/ http://autobuild.buildroot.net/results/184/1849be60dd13c1debfbcfb8fba5cec113e81af62/ http://autobuild.buildroot.net/results/38f/38fcefe4feabfd95692cf6b3f7ecf84259fca4de/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 2834e06c950c16923d18db89246e274edc42277d) Signed-off-by: Peter Korsgaard --- ...05-include-sys-sysmacros.h-for-major.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch diff --git a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch new file mode 100644 index 0000000000..5d76428eb6 --- /dev/null +++ b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch @@ -0,0 +1,51 @@ +From 435fbcee218b37a87368e2b22fa33366875d458c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 19 Apr 2016 13:58:49 -0400 +Subject: [PATCH] include sys/sysmacros.h for major() + +The major() func is defined in the sys/sysmacros.h header, so include it +explicitly for the prototype. Upstream C libs are moving away from having +sys/types.h include it all the time implicitly. + +BUG=None +TEST=precq passes +BRANCH=None + +Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71 +Reviewed-on: https://chromium-review.googlesource.com/339680 +Commit-Ready: Mike Frysinger +Tested-by: Mike Frysinger +Reviewed-by: Bill Richardson +Signed-off-by: Giulio Benetti +--- + cgpt/cgpt_wrapper.c | 1 + + futility/dump_kernel_config_lib.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c +index dcfaab9c..1716cdde 100644 +--- a/cgpt/cgpt_wrapper.c ++++ b/cgpt/cgpt_wrapper.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c +index 4fe990c3..abf37ae1 100644 +--- a/futility/dump_kernel_config_lib.c ++++ b/futility/dump_kernel_config_lib.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.17.1 + From 4e39c0fb5371b17c0e3216d658d6cbbd2c501760 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Mon, 3 Sep 2018 15:11:16 +0200 Subject: [PATCH 2519/2640] support/scripts/mkusers: preserve group members When the function add_one_group is called on an existing group, make sure the members of this group are not removed in the process of deleting then re-adding the group. Signed-off-by: Johan Oudinet Reviewed-by: "Yann E. MORIN" [Thomas: add curly braces when referencing ${members}, as suggested by Yann.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 497f7134fca4b111499b2fd23501d7e048303e7c) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 5bbec3e10f..d00ba33823 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -75,6 +75,14 @@ get_gid() { '$1 == group { printf( "%d\n", $3 ); }' "${GROUP}" } +#---------------------------------------------------------------------------- +get_members() { + local group="${1}" + + awk -F: -v group="${group}" \ + '$1 == group { printf( "%s\n", $4 ); }' "${GROUP}" +} + #---------------------------------------------------------------------------- get_username() { local uid="${1}" @@ -211,16 +219,17 @@ generate_gid() { add_one_group() { local group="${1}" local gid="${2}" - local _f + local members # Generate a new GID if needed if [ ${gid} -eq -1 ]; then gid="$( generate_gid "${group}" )" fi + members=$(get_members "$group") # Remove any previous instance of this group, and re-add the new one sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GROUP}" - printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}" + printf "%s:x:%d:%s\n" "${group}" "${gid}" "${members}" >>"${GROUP}" # Ditto for /etc/gshadow if it exists if [ -f "${GSHADOW}" ]; then From 74e73e9830c0c6be330962dfc2913a633c808740 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 Sep 2018 20:51:29 +0200 Subject: [PATCH 2520/2640] package/php: security bump to version 7.2.10 Changelog: http://de2.php.net/ChangeLog-7.php#7.2.10 Fixes https://bugs.php.net/bug.php?id=76582, CVE ID pending. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7f3e2d258069f2930fc63e5e2be3380aa548f4de) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 6e401dec00..2774c44d6d 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 3585c1222e00494efee4f5a65a8e03a1e6eca3dfb834814236ee7f02c5248ae0 php-7.2.9.tar.xz +sha256 01c2154a3a8e3c0818acbdbc1a956832c828a0380ce6d1d14fea495ea21804f0 php-7.2.10.tar.xz # License file sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 04a32283c8..f92e9b6565 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.2.9 +PHP_VERSION = 7.2.10 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From a858fa6ed4ea09c6dc0cbbf2603a71bb8d25de47 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 13 Sep 2018 20:24:19 +0200 Subject: [PATCH 2521/2640] zeromq: fix static build with libatomic Second patch added support to link with -latomic if needed however using LDFLAGS doesn't work when statically linking because LDFLAGS is added before LIBS Detection of atomic fails with: configure:23230: /accts/mlweber1/instance-2/output/host/bin/sparc-linux-g++ -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -pedantic -Werror -Wall -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -latomic conftest.cpp -lrt -lpthread -lstdc++ >&5 /tmp/ccgrvVTg.o: In function `main': conftest.cpp:(.text.startup+0x10): undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status So use LIBS instead of LDFLAGS As second patch was already merged upstream, a new PR was sent: https://github.com/zeromq/libzmq/pull/3250 Fixes: - http://autobuild.buildroot.net/results/c471d6b1061a8516f7772735e471db68a32965aa Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 14f5cb7daa54644da981cae0e1dbbfc6d4c18993) Signed-off-by: Peter Korsgaard --- ...cinclude.m4-check-if-latomic-is-needed.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch b/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch index a0c188a5c3..233b364662 100644 --- a/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch +++ b/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch @@ -11,9 +11,11 @@ try fails, we try to link again with -latomic and add LIBS="-latomic" in case we succeeded. Signed-off-by: Asaf Kahlon +Signed-off-by: Fabrice Fontaine +[Update to use LIBS: https://github.com/zeromq/libzmq/pull/3250] --- - acinclude.m4 | 32 ++++++++++++++++++++++++++++---- - 1 file changed, 28 insertions(+), 4 deletions(-) + acinclude.m4 | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f648ed0f..aa35195f 100644 @@ -28,7 +30,7 @@ index f648ed0f..aa35195f 100644 /* atomic intrinsics test */ int v = 0; int main (int, char **) -@@ -677,9 +677,33 @@ int main (int, char **) +@@ -677,9 +677,32 @@ int main (int, char **) return t; } ])], @@ -39,8 +41,8 @@ index f648ed0f..aa35195f 100644 + [libzmq_cv_has_atomic_instrisics="no"]) + + if test "x$libzmq_cv_has_atomic_instrisics" = "xno"; then -+ save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -latomic" ++ save_LIBS=$LIBS ++ LIBS="$LIBS -latomic" + AC_LINK_IFELSE([AC_LANG_SOURCE([ + /* atomic intrinsics test */ + int v = 0; @@ -50,9 +52,8 @@ index f648ed0f..aa35195f 100644 + return t; + } + ])], -+ [libzmq_cv_has_atomic_instrisics="yes" LIBS="-latomic"], -+ [libzmq_cv_has_atomic_instrisics="no"]) -+ LDFLAGS=$save_LDFLAGS ++ [libzmq_cv_has_atomic_instrisics="yes"], ++ [libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS]) + fi + + if test "x$libzmq_cv_has_atomic_instrisics" = "xyes"; then From e211503c8cc15bdf57984a0fb38cb9c9a4531773 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 13 Sep 2018 22:12:33 +0200 Subject: [PATCH 2522/2640] boot/uboot: needs bison/flex even for the legacy buildsystem When using the legacy buildsystem, the kconfig parser may still be used, as reported by Thomas: >>> uboot 2018.09 Configuring ...] HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o YACC scripts/kconfig/zconf.tab.c bin/sh: 1: bison: not found ake[3]: *** [scripts/kconfig/zconf.tab.c] Error 127 ake[3]: *** Waiting for unfinished jobs.... LEX scripts/kconfig/zconf.lex.c bin/sh: 1: flex: not found However, in that case, the kconfig parser is only generated during the 'configure' step, so we can add bison/flex as standard dependencies. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit e7b2a7dfffa0d22208b67b9c09018617a67c1d80) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index a19cb72458..451f8c5d72 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -447,6 +447,9 @@ endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) +UBOOT_DEPENDENCIES += \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) $(eval $(generic-package)) else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) UBOOT_MAKE_ENV = $(TARGET_MAKE_ENV) From be477fe37ecb5750545f05933d523ad5cf720549 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 14 Sep 2018 23:23:29 +0200 Subject: [PATCH 2523/2640] package/gdb: add patch fixing gnulib related issue with musl toolchains Backport the upstream patch fixing the gdb build with musl toolchains. Only gdb 8.1.1 [1] and 8.2 [2] release are affected. Fixes: https://gitlab.com/free-electrons/toolchains-builder/-/jobs/95552308 [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2441702a72f324e41a1624dc042b334f375e2d81 [2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=25e3c82c0e927398e759e2d5e35623012b8683f7 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 8688ff6caf837ae4ee89b9d373233020022e7c10) Signed-off-by: Peter Korsgaard --- ...file-from-common-utils.c-to-filestuf.patch | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch diff --git a/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch b/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch new file mode 100644 index 0000000000..fa1647495f --- /dev/null +++ b/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch @@ -0,0 +1,172 @@ +From 083849deeeec2854b2657b46380273ee13f4fa1b Mon Sep 17 00:00:00 2001 +From: Sergio Durigan Junior +Date: Wed, 12 Sep 2018 13:16:02 -0400 +Subject: [PATCH] Move 'is_regular_file' from common-utils.c to filestuff.c + +There is no reason for 'is_regular_file' to be in common-utils.c; it +belongs to 'filestuff.c'. This commit moves the function definition +and its prototype to the appropriate files. + +The motivation behind this move is a failure that happens on certain +cross-compilation environments when compiling the IPA library, due to +the way gnulib probes the need for a 'stat' call replacement. Because +configure checks when cross-compiling are more limited, gnulib decides +that it needs to substitute the 'stat' calls its own 'rpl_stat'; +however, the IPA library doesn't link with gnulib, which leads to an +error when compiling 'common-utils.c': + + ... + /opt/x86-core2--musl--bleeding-edge-2018.09-1/bin/i686-buildroot-linux-musl-g++ -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -I. -I. -I./../common -I./../regformats -I./.. -I./../../include -I./../gnulib/import -Ibuild-gnulib-gdbserver/import -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized -DGDBSERVER \ + -Wl,--dynamic-list=./proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipa.o linux-i386-ipa.o linux-x86-tdesc-ipa.o arch/i386-ipa.o -ldl -pthread + /opt/x86-core2--musl--bleeding-edge-2018.09-1/lib/gcc/i686-buildroot-linux-musl/8.2.0/../../../../i686-buildroot-linux-musl/bin/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)': + common-utils.c:(.text+0x695): undefined reference to `rpl_stat' + collect2: error: ld returned 1 exit status + Makefile:413: recipe for target 'libinproctrace.so' failed + make[1]: *** [libinproctrace.so] Error 1 + ... + +More details can also be found at: + + https://sourceware.org/ml/gdb-patches/2018-09/msg00304.html + +The most simple fix for this problem is to move 'is_regular_file' to +'filestuff.c', which is not used by IPA. This ends up making the +files more logically organized as well, since 'is_regular_file' is a +file operation. + +No regressions found. + +gdb/ChangeLog: +2018-09-12 Sergio Durigan Junior + + * common/common-utils.c: Don't include ''. + (is_regular_file): Move to... + * common/filestuff.c (is_regular_file): ... here. + * common/common-utils.h (is_regular_file): Move to... + * common/filestuff.h (is_regular_file): ... here. + +(cherry picked from commit 3c025cfe5efc44eb4dfb03b53dca28e75096dd1e) +[Romain: backport to gdb 8.1 and remove ChangeLog enty] +Signed-off-by: Romain Naour +--- + gdb/common/common-utils.c | 30 ------------------------------ + gdb/common/common-utils.h | 5 ----- + gdb/common/filestuff.c | 31 +++++++++++++++++++++++++++++++ + gdb/common/filestuff.h | 5 +++++ + 4 files changed, 36 insertions(+), 35 deletions(-) + +diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c +index 80de826ba78..90a06390141 100644 +--- a/gdb/common/common-utils.c ++++ b/gdb/common/common-utils.c +@@ -20,7 +20,6 @@ + #include "common-defs.h" + #include "common-utils.h" + #include "host-defs.h" +-#include + #include + + /* The xmalloc() (libiberty.h) family of memory management routines. +@@ -411,32 +410,3 @@ stringify_argv (const std::vector &args) + } + + /* See common/common-utils.h. */ +- +-bool +-is_regular_file (const char *name, int *errno_ptr) +-{ +- struct stat st; +- const int status = stat (name, &st); +- +- /* Stat should never fail except when the file does not exist. +- If stat fails, analyze the source of error and return true +- unless the file does not exist, to avoid returning false results +- on obscure systems where stat does not work as expected. */ +- +- if (status != 0) +- { +- if (errno != ENOENT) +- return true; +- *errno_ptr = ENOENT; +- return false; +- } +- +- if (S_ISREG (st.st_mode)) +- return true; +- +- if (S_ISDIR (st.st_mode)) +- *errno_ptr = EISDIR; +- else +- *errno_ptr = EINVAL; +- return false; +-} +diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h +index 5408c354693..2320318de74 100644 +--- a/gdb/common/common-utils.h ++++ b/gdb/common/common-utils.h +@@ -146,9 +146,4 @@ in_inclusive_range (T value, T low, T high) + return value >= low && value <= high; + } + +-/* Return true if the file NAME exists and is a regular file. +- If the result is false then *ERRNO_PTR is set to a useful value assuming +- we're expecting a regular file. */ +-extern bool is_regular_file (const char *name, int *errno_ptr); +- + #endif +diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c +index f5a754ffa66..fa10165a7ca 100644 +--- a/gdb/common/filestuff.c ++++ b/gdb/common/filestuff.c +@@ -417,3 +417,34 @@ make_cleanup_close (int fd) + *saved_fd = fd; + return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree); + } ++ ++/* See common/filestuff.h. */ ++ ++bool ++is_regular_file (const char *name, int *errno_ptr) ++{ ++ struct stat st; ++ const int status = stat (name, &st); ++ ++ /* Stat should never fail except when the file does not exist. ++ If stat fails, analyze the source of error and return true ++ unless the file does not exist, to avoid returning false results ++ on obscure systems where stat does not work as expected. */ ++ ++ if (status != 0) ++ { ++ if (errno != ENOENT) ++ return true; ++ *errno_ptr = ENOENT; ++ return false; ++ } ++ ++ if (S_ISREG (st.st_mode)) ++ return true; ++ ++ if (S_ISDIR (st.st_mode)) ++ *errno_ptr = EISDIR; ++ else ++ *errno_ptr = EINVAL; ++ return false; ++} +diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h +index 92a2a5f4c70..cc6dd861379 100644 +--- a/gdb/common/filestuff.h ++++ b/gdb/common/filestuff.h +@@ -84,4 +84,9 @@ extern int gdb_pipe_cloexec (int filedes[2]); + + extern struct cleanup *make_cleanup_close (int fd); + ++/* Return true if the file NAME exists and is a regular file. ++ If the result is false then *ERRNO_PTR is set to a useful value assuming ++ we're expecting a regular file. */ ++extern bool is_regular_file (const char *name, int *errno_ptr); ++ + #endif /* FILESTUFF_H */ +-- +2.14.4 + From 1ff5c35df7607b1b31c4b39a82de13a417418f2b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 12 Sep 2018 16:17:54 +0200 Subject: [PATCH 2524/2640] system: update Config.in comment about systemd dependencies In commit 879fa7f82a86ffdc6d1cf7c9bfbb5cf830583d69, the BR2_INIT_SYSTEMD option was changed to allow selecting with a uClibc toolchain. Unfortunately, the corresponding Config.in comment, which was already bogus, was not updated to take into account the numerous dependencies of BR2_INIT_SYSTEMD. Due to this, even if you have uClibc enabled, the BR2_INIT_SYSTEMD option may not be visible, and the Config.in comment may also not be visible, leaving the user in the dark. This commit fixes the dependencies of the Config.in comment so that they match the one of the BR2_INIT_SYSTEMD option. Reported-by: Raphael Jacob Cc: Raphael Jacob Signed-off-by: Thomas Petazzoni (cherry picked from commit 3c631c741c35f4afd9c7b6a41bcbcae40ecf8d49) Signed-off-by: Peter Korsgaard --- system/Config.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/system/Config.in b/system/Config.in index d14a864ca5..f63f27b126 100644 --- a/system/Config.in +++ b/system/Config.in @@ -137,9 +137,15 @@ config BR2_INIT_SYSTEMD select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD -comment "systemd needs a glibc or uClibc toolchain, headers >= 3.10" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC \ - && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10) +comment "systemd needs a glibc or uClibc toolchain w/ wchar, threads, SSP, dynamic library, headers >= 3.10" + depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ + !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_SSP || \ + BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 config BR2_INIT_NONE bool "None" From fd102d6c9807440db4a79aec7a94c0bef8811960 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Sep 2018 14:18:05 +0200 Subject: [PATCH 2525/2640] package/x11r7/xlib_libXfont: remove autoreconf Nine years ago we added autoreconf to fix libtool-related problems with the matchbox package: https://git.buildroot.net/buildroot/commit/?id=51ef5b81224c243aa7f937c4690b1a120c81ccbc Autoreconf for this package needs the xutil_util-macros but after building this defconfig with autoreconf removed from this package BR2_x86_64=y BR2_x86_core_avx2=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XLIB_LIBXFONT=y BR2_PACKAGE_MATCHBOX=y BR2_PACKAGE_MATCHBOX_SM=y BR2_PACKAGE_MATCHBOX_COMMON=y BR2_PACKAGE_MATCHBOX_COMMON_PDA=y BR2_PACKAGE_MATCHBOX_DESKTOP=y BR2_PACKAGE_MATCHBOX_KEYBOARD=y BR2_PACKAGE_MATCHBOX_PANEL=y BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR=y it is obvious that the problem which existed nine years ago seems to be gone. So instead of fixing autoreconf we remove it from this package because there is no need for it anymore. Fixes http://autobuild.buildroot.net/results/30c/30cf5cc139f9f6a9dc070953270f74e18b9310d4/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 534706e260b536d0389a058bb15085c9ea06f335) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXfont/xlib_libXfont.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 61b6f99785..a1acfba83b 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -9,7 +9,6 @@ XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT_LICENSE = MIT XLIB_LIBXFONT_LICENSE_FILES = COPYING -XLIB_LIBXFONT_AUTORECONF = YES XLIB_LIBXFONT_INSTALL_STAGING = YES XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xorgproto From 567cebbff41054161ff8c9c26968403390d53ff2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Sep 2018 14:18:06 +0200 Subject: [PATCH 2526/2640] package/x11r7/xlib_libXft: remove autoreconf Nine years ago we added autoreconf to fix libtool-related problems with the matchbox package: https://git.buildroot.net/buildroot/commit/?id=51ef5b81224c243aa7f937c4690b1a120c81ccbc After building this defconfig with autoreconf removed from this package BR2_x86_64=y BR2_x86_core_avx2=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XLIB_LIBXFONT=y BR2_PACKAGE_MATCHBOX=y BR2_PACKAGE_MATCHBOX_SM=y BR2_PACKAGE_MATCHBOX_COMMON=y BR2_PACKAGE_MATCHBOX_COMMON_PDA=y BR2_PACKAGE_MATCHBOX_DESKTOP=y BR2_PACKAGE_MATCHBOX_KEYBOARD=y BR2_PACKAGE_MATCHBOX_PANEL=y BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR=y it is obvious that the problem which existed nine years ago seems to be gone, therefore we remove autoreconf from this package because there is no need for it anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3ae61eac51459c4ec9ad3167567d164f25178791) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXft/xlib_libXft.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 64415cfd30..9c5757e657 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -9,7 +9,6 @@ XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFT_LICENSE = MIT XLIB_LIBXFT_LICENSE_FILES = COPYING -XLIB_LIBXFT_AUTORECONF = YES XLIB_LIBXFT_INSTALL_STAGING = YES XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xorgproto From bb59b98d99651d2897b2963af8e8695b72eec972 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 15 Sep 2018 12:35:54 -0300 Subject: [PATCH 2527/2640] linux-headers: bump 4.{4, 9, 14, 18}.x series [Peter: drop 4.18.x change] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit ebe0636db8119870f2cb6a48186bb14c5f20db0c) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ec92e88b84..1b83c48563 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.155" if BR2_KERNEL_HEADERS_4_4 - default "4.9.126" if BR2_KERNEL_HEADERS_4_9 + default "4.4.156" if BR2_KERNEL_HEADERS_4_4 + default "4.9.127" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.69" if BR2_KERNEL_HEADERS_4_14 + default "4.14.70" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From 42296685393bfda74aec2815f4c6d32cd4fda459 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Sep 2018 11:59:06 +0200 Subject: [PATCH 2528/2640] ipsec-tools: needs host-bison Making all in racoon /bin/sh ../../ylwrap cfparse.y y.tab.c cfparse.c y.tab.h `echo cfparse.c | sed -e s/cc$/hh/ -e s/cpp$/hpp/ -e s/cxx$/hxx/ -e s/c++$/h++/ -e s/c$/h/` y.output cfparse.output -- yacc -d ../../ylwrap: line 176: yacc: command not found make[5]: *** [cfparse.c] Error 127 Fixes: - http://autobuild.buildroot.org/results/88c8bba943300df98b428646387c240f4522f40a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 7dd5c78afa76be5165c6d392c2f9752dc7260776) Signed-off-by: Peter Korsgaard --- package/ipsec-tools/ipsec-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index ddae9a75f3..8672272538 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -9,7 +9,7 @@ IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2 IPSEC_TOOLS_SITE = http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/$(IPSEC_TOOLS_VERSION) IPSEC_TOOLS_INSTALL_STAGING = YES IPSEC_TOOLS_MAKE = $(MAKE1) -IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex +IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex host-bison # we patch configure.ac IPSEC_TOOLS_AUTORECONF = YES From 1c890f7418864c35e215b8cfcef06cae67a2c659 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 15 Sep 2018 17:54:13 +0200 Subject: [PATCH 2529/2640] package/gcc: glibc >= 2.27 needs gcc >= 5 on aarch64 With the following defconfig: BR2_aarch64=y BR2_BINUTILS_VERSION_2_28_X=y BR2_GCC_VERSION_4_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y The build fail with this error: In file included from ../sysdeps/ieee754/flt-32/math_config.h:23:0, from ../sysdeps/ieee754/flt-32/e_expf.c:29: ../sysdeps/aarch64/fpu/math_private.h: In function 'roundtoint': ../sysdeps/aarch64/fpu/math_private.h:311:3: error: implicit declaration of function 'vrndn_f64' [-Werror=implicit-function-declaration] return vget_lane_f64 (vrndn_f64 (vld1_f64 (&x)), 0); ^ cc1: all warnings being treated as errors vrndn_f64 function has been introduced in glibc code since version 2.27 [1]. So we can't build a glibc based toolchain with gcc 4.9 anymore. Add a new dependency in the toolchain infra to avoid selecting glibc toolchain using gcc 4.9. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=72aa623345ada1276ed89dbc00fdff9639cb8eaf Signed-off-by: Romain Naour Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni (cherry picked from commit 1380f4c9a67f44a2fc172a1b8845f0ecc10beb90) Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 01bf8fa561..5a8f684a4c 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -32,6 +32,8 @@ config BR2_GCC_VERSION_4_9_X depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # glibc >= 2.26 needs gcc >= 6.2 depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) + # glibc >= 2.27 needs gcc >= 5 + depends on !(BR2_TOOLCHAIN_USES_GLIBC && (BR2_aarch64 || BR2_aarch64_be)) select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_GCC_VERSION_5_X From 48a445bdc4e535bc564c34eb803472322f93b221 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 18 Sep 2018 13:27:50 +0930 Subject: [PATCH 2530/2640] dtc: Fix segfault reading powernv device tree When running this command on a powernv machine, dtc crashes: dtc -f -I fs -O dts /sys/firmware/devicetree Upstream has fixed the segfault but have not made a release yet so we add the patch for now. Signed-off-by: Joel Stanley Signed-off-by: Thomas Petazzoni (cherry picked from commit 3729389a68f518bf069001783e70eee58dbe9924) Signed-off-by: Peter Korsgaard --- ...001-Kill-bogus-TYPE_BLOB-marker-type.patch | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch diff --git a/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch b/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch new file mode 100644 index 0000000000..d9c660ef51 --- /dev/null +++ b/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch @@ -0,0 +1,138 @@ +From 9619c8619c37b9aea98100bcc15c51a5642e877e Mon Sep 17 00:00:00 2001 +From: Greg Kurz +Date: Thu, 30 Aug 2018 12:01:59 +0200 +Subject: [PATCH] Kill bogus TYPE_BLOB marker type + +Since commit 32b9c6130762 "Preserve datatype markers when emitting dts +format", we no longer try to guess the value type. Instead, we reuse +the type of the datatype markers when they are present, if the type +is either TYPE_UINT* or TYPE_STRING. + +This causes 'dtc -I fs' to crash: + +Starting program: /root/dtc -q -f -O dts -I fs /proc/device-tree +/dts-v1/; + +/ { + +Program received signal SIGSEGV, Segmentation fault. +__strlen_power8 () at ../sysdeps/powerpc/powerpc64/power8/strlen.S:47 +47 ld r12,0(r4) /* Load doubleword from memory. */ +(gdb) bt +#0 __strlen_power8 () at ../sysdeps/powerpc/powerpc64/power8/strlen.S:47 +#1 0x00007ffff7de3d10 in __GI__IO_fputs (str=, + fp=) at iofputs.c:33 +#2 0x000000001000c7a0 in write_propval (prop=0x100525e0, + f=0x7ffff7f718a0 <_IO_2_1_stdout_>) at treesource.c:245 + +The offending line is: + + fprintf(f, "%s", delim_start[emit_type]); + +where emit_type is TYPE_BLOB and: + +static const char *delim_start[] = { + [TYPE_UINT8] = "[", + [TYPE_UINT16] = "/bits/ 16 <", + [TYPE_UINT32] = "<", + [TYPE_UINT64] = "/bits/ 64 <", + [TYPE_STRING] = "", +}; + +/* Data blobs */ +enum markertype { + TYPE_NONE, + REF_PHANDLE, + REF_PATH, + LABEL, + TYPE_UINT8, + TYPE_UINT16, + TYPE_UINT32, + TYPE_UINT64, + TYPE_BLOB, + TYPE_STRING, +}; + +Because TYPE_BLOB < TYPE_STRING and delim_start[] is a static array, +delim_start[emit_type] is 0x0. The glibc usually prints out "(null)" +when one passes 0x0 to %s, but it seems to call fputs() internally if +the format is exactly "%s", hence the crash. + +TYPE_BLOB basically means the data comes from a file and we don't know +its type. We don't care for the former, and the latter is TYPE_NONE. + +So let's drop TYPE_BLOB completely and use TYPE_NONE instead when reading +the file. Then, try to guess the data type at emission time, like the +code already does for refs and labels. + +Instead of adding yet another check for TYPE_NONE, an helper is introduced +to check if the data marker has type information, ie, >= TYPE_UINT8. + +Fixes: 32b9c61307629ac76c6ac0bead6f926d579b3d2c +Suggested-by: David Gibson +Signed-off-by: Greg Kurz +Signed-off-by: David Gibson +Signed-off-by: Joel Stanley +--- + data.c | 2 +- + dtc.h | 1 - + treesource.c | 9 +++++++-- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/data.c b/data.c +index accdfaef6668..4a204145cc7b 100644 +--- a/data.c ++++ b/data.c +@@ -95,7 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen) + { + struct data d = empty_data; + +- d = data_add_marker(d, TYPE_BLOB, NULL); ++ d = data_add_marker(d, TYPE_NONE, NULL); + while (!feof(f) && (d.len < maxlen)) { + size_t chunksize, ret; + +diff --git a/dtc.h b/dtc.h +index 303c2a6a73b7..51c03ef64dbe 100644 +--- a/dtc.h ++++ b/dtc.h +@@ -82,7 +82,6 @@ enum markertype { + TYPE_UINT16, + TYPE_UINT32, + TYPE_UINT64, +- TYPE_BLOB, + TYPE_STRING, + }; + extern const char *markername(enum markertype markertype); +diff --git a/treesource.c b/treesource.c +index f99544d72344..53e62036ad0e 100644 +--- a/treesource.c ++++ b/treesource.c +@@ -133,9 +133,14 @@ static void write_propval_int(FILE *f, const char *p, size_t len, size_t width) + } + } + ++static bool has_data_type_information(struct marker *m) ++{ ++ return m->type >= TYPE_UINT8; ++} ++ + static struct marker *next_type_marker(struct marker *m) + { +- while (m && (m->type == LABEL || m->type == REF_PHANDLE || m->type == REF_PATH)) ++ while (m && !has_data_type_information(m)) + m = m->next; + return m; + } +@@ -225,7 +230,7 @@ static void write_propval(FILE *f, struct property *prop) + size_t chunk_len; + const char *p = &prop->val.val[m->offset]; + +- if (m->type < TYPE_UINT8) ++ if (!has_data_type_information(m)) + continue; + + chunk_len = type_marker_length(m); +-- +2.17.1 + From ab84d0a6c835ad8960363be7c99697c1797b9487 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Mon, 17 Sep 2018 11:10:54 -0700 Subject: [PATCH 2531/2640] Makefile: fix issue with printvars executing giant shell command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The underlying problem is that $(foreach V,1 2 3,) does not evaluate to an empty string. It evaluates to "  ", three empty strings separated by whitespace. A construct of this format, with a giant list in the foreach, is part of the printvars command. This means that "@:$(foreach ....)", which is intended to expand to a null command, in fact expands to "@: " with a great deal of whitespace. Make chooses to execute this command with: execve("/bin/sh", ["/bin/sh", "-c", ": "] But with far more whitespace. So much that it can exceed shell command line length limits. This solution is to move the foreach to another step in the recipe. The "@:" is retained as the first line so the recipe is not Empty, which would cause a change in make behavior when make builds the target. The 2nd line, all whitespace, will be skipped by make. Signed-off-by: Trent Piepho Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit b8d0aadc6d52733cfc914ba3cd6f506238bd19f7) Signed-off-by: Peter Korsgaard --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3e1319c1ea..f7636e669d 100644 --- a/Makefile +++ b/Makefile @@ -977,7 +977,8 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) # displayed. .PHONY: printvars printvars: - @:$(foreach V, \ + @: + $(foreach V, \ $(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ From 6a3a2e13e7bf9528b658392e5764b22f1556dfd5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 16 Sep 2018 16:55:10 +0200 Subject: [PATCH 2532/2640] brltty: add license brltty 5.5 is licensed under GPL-2.0+ with exceptions in LGPL-2.1+ for data and client side as specified in README so add this information in BRLTTY_LICENSE, update BRLTTY_LICENSE_FILES and add hash for README Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ecf832704bd360f40dc0c898d48c3ea2e8b7fb53) Signed-off-by: Peter Korsgaard --- package/brltty/brltty.hash | 1 + package/brltty/brltty.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/brltty/brltty.hash b/package/brltty/brltty.hash index 3bc2f9cf54..01b4c13fcc 100644 --- a/package/brltty/brltty.hash +++ b/package/brltty/brltty.hash @@ -1,3 +1,4 @@ sha256 4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 brltty-5.5.tar.xz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE-GPL sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL +sha256 6ba58188449642de8adefd7adabb436185792c5c51a4b5d04650423c2151dc50 README diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index df3e9c7888..0fcd4f4258 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -9,7 +9,8 @@ BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install -BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL +BRLTTY_LICENSE = GPL-2.0+, LGPL-2.1+ (data, client side) +BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL README BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \ $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) From 17eff6f3cbc3bbde568df9602de3060031ad6113 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 20 Sep 2018 12:27:04 -0300 Subject: [PATCH 2533/2640] linux-headers: bump 4.{4, 9, 14, 18}.x series [Peter: drop 4.18.x change] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit aad44932660d6edf80016ea183e7d5b6e35dc1c9) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1b83c48563..e1b80eefc9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.156" if BR2_KERNEL_HEADERS_4_4 - default "4.9.127" if BR2_KERNEL_HEADERS_4_9 + default "4.4.157" if BR2_KERNEL_HEADERS_4_4 + default "4.9.128" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.70" if BR2_KERNEL_HEADERS_4_14 + default "4.14.71" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From 570e400b030503c54c317c38c679207fb57a47d7 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:57 -0500 Subject: [PATCH 2534/2640] boot/vexpress-firmware: add upstream URL in Config.in help text Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 49fff788d6ce84f01fc4c89019204d2436e7d5a7) Signed-off-by: Peter Korsgaard --- boot/vexpress-firmware/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/vexpress-firmware/Config.in b/boot/vexpress-firmware/Config.in index 8479df3d57..265fb4be1d 100644 --- a/boot/vexpress-firmware/Config.in +++ b/boot/vexpress-firmware/Config.in @@ -4,3 +4,5 @@ config BR2_TARGET_VEXPRESS_FIRMWARE help Versatile Express firmware from ARM, with Linaro mods last change. + + https://git.linaro.org/arm/vexpress-firmware.git From 268bbc59769b5b1dc57f662064295861005ef64f Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:48 -0500 Subject: [PATCH 2535/2640] boot/at91bootstrap3: add upstream URL in Config.in help text Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 8084c33b39a64c6d2906296d042263a348fc0c99) Signed-off-by: Peter Korsgaard --- boot/at91bootstrap3/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 614363c9a6..f6c310af23 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -10,6 +10,8 @@ config BR2_TARGET_AT91BOOTSTRAP3 - Physical media algorithm such as DataFlash, NandFlash, NOR Flash... + https://www.at91.com/linux4sam/bin/view/Linux4SAM/AT91Bootstrap + if BR2_TARGET_AT91BOOTSTRAP3 choice From 1ed276fbccef1b9dd954f18ec01575b038d01830 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:51 -0500 Subject: [PATCH 2536/2640] package/android-tools: update upstream URL in Config.in help Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit b7490dbd31bd995d29465cb2d47811d19088e891) Signed-off-by: Peter Korsgaard --- package/android-tools/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index 96e36e6cd7..478f1392dc 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -15,6 +15,8 @@ config BR2_PACKAGE_ANDROID_TOOLS can be used to interact with target devices using of these protocols. + https://wiki.debian.org/AndroidTools#Original_android-tools_package + if BR2_PACKAGE_ANDROID_TOOLS # We need kernel headers that support the __SANE_USERSPACE_TYPES__ From d2edaa70b13f4943e46b6af1e86c3dbda25b2819 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:52 -0500 Subject: [PATCH 2537/2640] package/arp-scan: update upstream URL in Config.in help Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 98350254765ff84c9e24828316eecf039778b72d) Signed-off-by: Peter Korsgaard --- package/arp-scan/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arp-scan/Config.in b/package/arp-scan/Config.in index cc47a72b01..ed70b39586 100644 --- a/package/arp-scan/Config.in +++ b/package/arp-scan/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ARP_SCAN arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. - http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation + https://github.com/royhills/arp-scan From 9d23a7b2775d4bf820411d5ad0d782b972e4a974 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:54 -0500 Subject: [PATCH 2538/2640] package/connman: simplify upstream URL The "For more information, see" is a bit useless, and not having the URL alone on its own line prevents scripted URL checking. Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit b7de9139e99e1957fb0bdf8540840087fd60d640) Signed-off-by: Peter Korsgaard --- package/connman/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/connman/Config.in b/package/connman/Config.in index 253c604e88..5177c939a4 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CONNMAN for managing internet connections within embedded devices running the Linux operating system. - For more information, see https://01.org/connman + https://01.org/connman if BR2_PACKAGE_CONNMAN From dc43b89656a96fe358ada5b6a44f7f4461ae0257 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:53 -0500 Subject: [PATCH 2539/2640] package/bandwidthd: put upstream URL on separate lines in Config.in help Allows scripting of URL checking to be simplier Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 4bdb24c5d95ad1ec5f656ed135d34eabc9e90199) Signed-off-by: Peter Korsgaard --- package/bandwidthd/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in index a503da43ff..8a19733c2c 100644 --- a/package/bandwidthd/Config.in +++ b/package/bandwidthd/Config.in @@ -25,8 +25,10 @@ config BR2_PACKAGE_BANDWIDTHD available on github that works on making BandwidthD's build process more compatible with buildroot's. - Upstream: http://bandwidthd.sourceforge.net/ - Github fork: http://github.com/nroach44/bandwidthd + Upstream: + http://bandwidthd.sourceforge.net/ + Github fork: + http://github.com/nroach44/bandwidthd if BR2_PACKAGE_BANDWIDTHD From e751a51e53825cda52c45c8b47ac240aede8d806 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 20 Sep 2018 08:24:50 -0500 Subject: [PATCH 2540/2640] boot/xloader: add upstream URL in Config.in help Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 78dd830f15b0c175cb8c9d2fef7f0641a8733b29) Signed-off-by: Peter Korsgaard --- boot/xloader/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/xloader/Config.in b/boot/xloader/Config.in index c411be478b..f687b897ea 100644 --- a/boot/xloader/Config.in +++ b/boot/xloader/Config.in @@ -5,6 +5,8 @@ config BR2_TARGET_XLOADER The x-loader bootloader. It is mainly used on OMAP-based platforms. + http://omappedia.org/wiki/Linux_OMAP_Kernel_Main + if BR2_TARGET_XLOADER config BR2_TARGET_XLOADER_BOARDNAME string "x-loader board name" From 951961823bba36fb386a418d4577a34db597d9de Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 18 Sep 2018 23:34:03 +0200 Subject: [PATCH 2541/2640] cppcms: fix license cppcms contains embedded third party software so add THIRD_PARTY_SOFTWARE.TXT to CPPCMS_LICENSE_FILES as well as the additional licenses to CPPCMS_LICENSE. Also add hash for COPYING.TXT and THIRD_PARTY_SOFTWARE.TXT Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c17310450b5e720e7ad2294f79a4655e607b22b1) Signed-off-by: Peter Korsgaard --- package/cppcms/cppcms.hash | 2 ++ package/cppcms/cppcms.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cppcms/cppcms.hash b/package/cppcms/cppcms.hash index 28e998c6c1..6bfc680ac0 100644 --- a/package/cppcms/cppcms.hash +++ b/package/cppcms/cppcms.hash @@ -3,3 +3,5 @@ sha1 15f21897c14acfd4b0c74622e49d95857f2fe939 cppcms-1.0.5.tar.bz2 md5 d668c201dd31fff8090380ebdc0bcc2b cppcms-1.0.5.tar.bz2 # Locally computed: sha256 84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865 cppcms-1.0.5.tar.bz2 +sha256 2ff22bab712c46dbadf9bae0f759bbc95d5d87614cacb7ebc3d5a50910603d6a COPYING.TXT +sha256 70fbf0194bee0f444c57ecd47e7d976a3e5a890e4421a21aab49f2d214267e69 THIRD_PARTY_SOFTWARE.TXT diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index f3ea2628ea..5fb6375d80 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -6,8 +6,8 @@ CPPCMS_VERSION = 1.0.5 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2 -CPPCMS_LICENSE = LGPL-3.0 -CPPCMS_LICENSE_FILES = COPYING.TXT +CPPCMS_LICENSE = LGPL-3.0, BSL-1.0 (boost), MIT (base64.cpp), Public Domain (json2.js), Zlib (md5) +CPPCMS_LICENSE_FILES = COPYING.TXT THIRD_PARTY_SOFTWARE.TXT CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION) CPPCMS_INSTALL_STAGING = YES CPPCMS_CXXFLAGS = $(TARGET_CXXFLAGS) From a89f2b1f5f2bd2a46b461cd5f0b49af23deaffac Mon Sep 17 00:00:00 2001 From: Ferdinand van Aartsen Date: Fri, 21 Sep 2018 16:58:36 +0200 Subject: [PATCH 2542/2640] libxslt: point to the correct xml2-config location Currently libxslt configure finds native /usr/bin/xml2-config. Signed-off-by: Ferdinand van Aartsen Signed-off-by: Thomas Petazzoni (cherry picked from commit f8f8ff33472641f9192a5e1ca65ebc614821665a) Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 972d5b80d5..5b1c0ae268 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -13,7 +13,8 @@ LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ --without-debug \ - --without-python + --without-python \ + --with-libxml-prefix=$(STAGING_DIR)/usr LIBXSLT_CONFIG_SCRIPTS = xslt-config LIBXSLT_DEPENDENCIES = host-pkgconf libxml2 From c10d3f85c3e31ca5388fed3f3ee9b6b7a1ead091 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 22 Sep 2018 21:44:42 +0200 Subject: [PATCH 2543/2640] libnfs: fix license and add hashes for license files As specified in COPYING, examples are licensed under GPL-3.0+ and .x files are licensed under BSD-2-Clause. So update LIBNFS_LICENSE, add COPYING, LICENCE-BSD.txt and LICENCE-GPL-3.txt to LIBNFS_LICENSE_FILES and add hash for all license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1b486d4fa32a698ca9b454d7cfb874473009d20f) Signed-off-by: Peter Korsgaard --- package/libnfs/libnfs.hash | 3 +++ package/libnfs/libnfs.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index cfe6678842..2bd8caf255 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,3 +1,6 @@ # Locally calculated sha256 7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e libnfs-libnfs-2.0.0.tar.gz +sha256 2d152e3a2f31ef0fe14d4908377277f8215fb5c82ec9329d1eed081c845fc85f COPYING +sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENCE-GPL-3.txt diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index d961fd1d4e..0cf07d2143 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -8,8 +8,8 @@ LIBNFS_VERSION = libnfs-2.0.0 LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES -LIBNFS_LICENSE = LGPL-2.1+ -LIBNFS_LICENSE_FILES = LICENCE-LGPL-2.1.txt +LIBNFS_LICENSE = LGPL-2.1+ (library), BSD-2-Clause (protocol, .x files), GPL-3.0+ (examples) +LIBNFS_LICENSE_FILES = COPYING LICENCE-BSD.txt LICENCE-LGPL-2.1.txt LICENCE-GPL-3.txt LIBNFS_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBTIRPC),y) From 664663238444f1e2be618d5e6775dc02af76e22b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 21 Sep 2018 23:29:06 +0200 Subject: [PATCH 2544/2640] igmpproxy: fix license mrouted part of igmpproxy is licensed under BSD-3-Clause so add this in IGMPPROXY_LICENSE and add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c60c92861408d73e83fc819ac861f9fde962121c) Signed-off-by: Peter Korsgaard --- package/igmpproxy/igmpproxy.hash | 3 +++ package/igmpproxy/igmpproxy.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/igmpproxy/igmpproxy.hash b/package/igmpproxy/igmpproxy.hash index 2e3a374618..313af52fbe 100644 --- a/package/igmpproxy/igmpproxy.hash +++ b/package/igmpproxy/igmpproxy.hash @@ -1,2 +1,5 @@ # Locally computed: sha256 e60331031f85d1fb834c5272a134f32d32e7834718da19ba3f787dff68389a31 igmpproxy-f47644d8fa7266a784f3ec7b251e7d318bc2f0a9.tar.gz +sha256 be3d05af93dbbc4650f8d641d8e1bec220af4a729e07ba71e949c25b93a1b4f6 COPYING +sha256 c4f65d5d396ad518a37d30b83fe33897661858dc174ff64a15d0461630ce64e4 GPL.txt +sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 Stanford.txt diff --git a/package/igmpproxy/igmpproxy.mk b/package/igmpproxy/igmpproxy.mk index 8989c74de0..9c19f76f0c 100644 --- a/package/igmpproxy/igmpproxy.mk +++ b/package/igmpproxy/igmpproxy.mk @@ -7,7 +7,7 @@ IGMPPROXY_VERSION = f47644d8fa7266a784f3ec7b251e7d318bc2f0a9 IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION)) IGMPPROXY_AUTORECONF = YES -IGMPPROXY_LICENSE = GPL-2.0+ -IGMPPROXY_LICENSE_FILES = COPYING +IGMPPROXY_LICENSE = GPL-2.0+, BSD-3-Clause (mrouted) +IGMPPROXY_LICENSE_FILES = COPYING GPL.txt Stanford.txt $(eval $(autotools-package)) From 61df494a4d9c7164b06da4f8c1851160ce227df2 Mon Sep 17 00:00:00 2001 From: Marcel Patzlaff Date: Tue, 25 Sep 2018 16:48:48 +0200 Subject: [PATCH 2545/2640] libesmtp: update/fix site URL The old URL was not working for quite some time. Signed-off-by: Marcel Patzlaff Signed-off-by: Thomas Petazzoni (cherry picked from commit 43e7667fc82d55d0a9fdfad91375a0621efb7576) Signed-off-by: Peter Korsgaard --- package/libesmtp/Config.in | 2 +- package/libesmtp/libesmtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libesmtp/Config.in b/package/libesmtp/Config.in index ba9d52751c..f3ed521d22 100644 --- a/package/libesmtp/Config.in +++ b/package/libesmtp/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBESMTP help Library for sending emails through SMTP. - http://www.stafford.uklinux.net/libesmtp + http://brianstafford.info/libesmtp comment "libesmtp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index b0f88c7a3b..9c336793a4 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -6,7 +6,7 @@ LIBESMTP_VERSION = 1.0.6 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 -LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp +LIBESMTP_SITE = http://brianstafford.info/libesmtp LIBESMTP_INSTALL_STAGING = YES LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) From bae8e78df8944cff19866a65938c61724cfde3ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 Sep 2018 22:11:49 +0200 Subject: [PATCH 2546/2640] imlib2: update license - Use SPDX short identifier (Imlib2) instead of full name - Add COPYING-PLAIN to license files - Add hash for license files Signed-off-by: Fabrice Fontaine Acked-by: Petr Vorel Signed-off-by: Thomas Petazzoni (cherry picked from commit e29fcc14809dcd34f2bccc0fb949ee2cd46489ef) Signed-off-by: Peter Korsgaard --- package/imlib2/imlib2.hash | 4 ++++ package/imlib2/imlib2.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/imlib2/imlib2.hash b/package/imlib2/imlib2.hash index 0c234c8c23..62ebac32ea 100644 --- a/package/imlib2/imlib2.hash +++ b/package/imlib2/imlib2.hash @@ -1,3 +1,7 @@ # From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.4.10/ md5 a0de8524592bbd9f24fcc6cb8352137c imlib2-1.4.10.tar.bz2 sha1 664df65c6265a2825d685d2f3a4f0d072eb626ac imlib2-1.4.10.tar.bz2 + +# Locally computed +sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6 COPYING +sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5 COPYING-PLAIN diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index b5012a69a8..21a96cb1ca 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -7,8 +7,8 @@ IMLIB2_VERSION = 1.4.10 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) -IMLIB2_LICENSE = imlib2 license -IMLIB2_LICENSE_FILES = COPYING +IMLIB2_LICENSE = Imlib2 +IMLIB2_LICENSE_FILES = COPYING COPYING-PLAIN IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkgconf freetype From 839bd81b69de8feb433ca9a648c0b075141e06fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 23 Sep 2018 15:37:59 +0200 Subject: [PATCH 2547/2640] xlib_libxshmfence: drop AUTORECONF In commit 2524acd4179fccc627a72ff188bf51c95fed9867 ("package/x11r7/xlib_libxshmfence: bump version to 1.3"), the patch 0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch was dropped, but the corresponding AUTORECONF = YES was not dropped. This causes a build issue if just xlib_libxshmfence is built (using "make xlib_libxshmfence" or using per-package host/target directories): >>> xlib_libxshmfence 1.3 Autoreconfiguring configure.ac:40: error: must install xorg-macros 1.3 or later before running autoconf/autogen configure.ac:40: the top level This commit fixes that by dropping the no longer needed AUTORECONF = YES. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit bcf4b72def49ce82fef2582f45414594f6b8dffa) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index f395ebe172..605408fff7 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -12,7 +12,4 @@ XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xorgproto -# 0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch -XLIB_LIBXSHMFENCE_AUTORECONF = YES - $(eval $(autotools-package)) From ab2042940d5f0652ee59c1ea289e368120d14d4c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 23 Sep 2018 15:50:07 +0200 Subject: [PATCH 2548/2640] package/x11r7/xutil_makedepend: add missing dependency on host-pkgconf The configure script of xutil_makedepend uses PKG_CHECK_MODULES(), so it should depend on host-pkgconf. Otherwise, a "make host-xutil_makedepend" fails with: """ checking for X... configure: error: in `/home/thomas/projets/buildroot/output/build/host-xutil_makedepend-1.0.5': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables X_CFLAGS and X_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . """ This was detected using per-package host/target directories, but can be reproduced without it. Signed-off-by: Thomas Petazzoni (cherry picked from commit 73185f1270b6f86f7d02eefa8c70e568b30dd4cf) Signed-off-by: Peter Korsgaard --- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index 8a058efcec..a50320ba93 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -10,8 +10,8 @@ XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING -XUTIL_MAKEDEPEND_DEPENDENCIES = xorgproto -HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xorgproto +XUTIL_MAKEDEPEND_DEPENDENCIES = xorgproto host-pkgconf +HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xorgproto host-pkgconf $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 1a5f1348572cd927470e375a2990745d8e57f5a4 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sun, 23 Sep 2018 02:53:29 +0300 Subject: [PATCH 2549/2640] webkitgtk: bump to version 2.22.2 Release notes: https://webkitgtk.org/2018/09/03/webkitgtk2.22.0-released.html https://webkitgtk.org/2018/09/20/webkitgtk2.22.1-released.html https://webkitgtk.org/2018/09/21/webkitgtk2.22.2-released.html No corresponding security advisories for 2.22.x have been published. Nevertheless, due to skipping over versions in the 2.20.x series, the following 2.20.x advisories apply: https://webkitgtk.org/security/WSA-2018-0003.html https://webkitgtk.org/security/WSA-2018-0004.html https://webkitgtk.org/security/WSA-2018-0005.html https://webkitgtk.org/security/WSA-2018-0006.html This also bumps the required GCC version, due to the WebKit code now using more modern C++ features which were introduced in version 6.x of the compiler. The dependency is propagated to the midori package as well. Last but not least, BR2_PACKAGE_WEBP_DEMUX and BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX are selected as they are unconditionally needed by the newer WebKitGTK+ releases when multimedia support is enabled. An upstream patch for 32-bit ARM which did not make it to be included in this new version is included as well, and can be removed once it gets picked in a new release. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit bd1bde0dc81451b4f429a66a8ee3a022b442bec8) Signed-off-by: Peter Korsgaard --- package/midori/Config.in | 6 +-- ...ightingNEON.cpp-fails-due-to-missing.patch | 41 +++++++++++++++++++ package/webkitgtk/Config.in | 9 ++-- package/webkitgtk/webkitgtk.hash | 8 ++-- package/webkitgtk/webkitgtk.mk | 2 +- 5 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch diff --git a/package/midori/Config.in b/package/midori/Config.in index bc37c6a95b..f0767c85f9 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,7 +1,7 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5, host gcc >= 4.8" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI @@ -10,7 +10,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # webkitgtk depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # webkitgtk + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # GCR can only be used with the X11 backend diff --git a/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch b/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch new file mode 100644 index 0000000000..6fb309d9fb --- /dev/null +++ b/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch @@ -0,0 +1,41 @@ +From b252c7aed3fa6f22db8a26c3ab0bfe66e3490eef Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Sun, 23 Sep 2018 02:34:26 +0300 +Subject: [PATCH xserver] [ARM] Building FELightingNEON.cpp fails due to + missing lightVector member https://bugs.webkit.org/show_bug.cgi?id=189890 + +Reviewed by NOBODY (OOPS!). + +No new tests needed. + +* platform/graphics/cpu/arm/filters/FELightingNEON.h: +(WebCore::FELighting::platformApplyNeon): Adapt to new layout of "struct PaintingData" after r225122. +--- + Source/WebCore/ChangeLog | 12 ++++++++++++ + .../graphics/cpu/arm/filters/FELightingNEON.h | 6 +++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +Fetch from: https://bugs.webkit.org/show_bug.cgi?id=189890 +Upstream-Status: Pending +Signed-off-by: Adrian Perez de Castro + +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +index 42af922374b..b542a4c81aa 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + neonData.flags |= FLAG_CONE_EXPONENT_IS_1; + } else { + ASSERT(m_lightSource->type() == LS_DISTANT); +- floatArguments.lightX = paintingData.lightVector.x(); +- floatArguments.lightY = paintingData.lightVector.y(); +- floatArguments.lightZ = paintingData.lightVector.z(); ++ floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); ++ floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); ++ floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); + floatArguments.padding2 = 1; + } + +-- +2.19.0 + diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 31794ed2a4..df2aeef3d9 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -11,19 +11,19 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5, host gcc >= 4.8" +comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_HOST_GCC_AT_LEAST_4_8 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -41,6 +41,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 @@ -67,6 +68,8 @@ comment "webkitgtk https support needs a toolchain w/ dynamic library" config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA bool "multimedia support" select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index dd2b28d372..0b9b94ca49 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz.sums -md5 c1a548595135ee75ad3bf2e18ac83112 webkitgtk-2.18.6.tar.xz -sha1 fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23 webkitgtk-2.18.6.tar.xz -sha256 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c webkitgtk-2.18.6.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.22.2.tar.xz.sums +md5 207d50d313c07b03726f3a7f22643934 webkitgtk-2.22.2.tar.xz +sha1 ff0c40e81e240aa0743f7e6483f175defebd1417 webkitgtk-2.22.2.tar.xz +sha256 345487d4d1896e711683f951d1e09387d3b90d7cf59295c0e634af7f515e99ba webkitgtk-2.22.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index eb39664b1e..eccd9bbae5 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.6 +WEBKITGTK_VERSION = 2.22.2 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 5e8d616ed202a9237b62db3e02c4ce1a5b9c553c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sun, 23 Sep 2018 02:53:30 +0300 Subject: [PATCH 2550/2640] webkitgtk: add dependency on the woff2 package The woff2 dependency is used to support Web fonts in WOFF2 format. This is a Web-facing feature that Web sites expect WebKit to support, and it is recommended to be unconditionally enabled. While it is possible to disable the feature at build time, upstream only recommends doing so if the target system cannot provide a woff2 package. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 51b3fe094a2fdcfcab649d6ddb2f23d0833e6e95) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index df2aeef3d9..96a7ab0c94 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -42,6 +42,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WOFF2 select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index eccd9bbae5..f28417ac73 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ - libtasn1 libxml2 libxslt sqlite webp + libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_GEOLOCATION=OFF \ @@ -22,6 +22,7 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ + -DENABLE_WOFF2=ON \ -DPORT=GTK \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF From 7f7e9f92b3011ea13b54daebf0a722115679e37c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 21 Sep 2018 14:13:50 +0200 Subject: [PATCH 2551/2640] xlib_libXdmcp: add missing dependency on host-pkgconf The libXdmcp configure script uses pkg-config, but the Buildroot package does not depend on host-pkgconf. This is not seen by the autobuilders most likely because another package that is always built before libXdmcp builds pkg-config. However, running: $ make xlib_libXdmcp triggers the following build failure: checking pkg-config is at least version 0.9.0... ./configure: line 12323: /home/thomas/projets/buildroot/output/host/bin/pkg-config: No such file or directory no [...] checking for XDMCP... configure: error: in `/home/thomas/projets/buildroot/output/build/xlib_libXdmcp-1.1.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. This was detected using per-package target/host folders, because with this, only the dependencies explicitly expressed by a package are available to the package. Signed-off-by: Thomas Petazzoni (cherry picked from commit a517df56d641e1b3d4ce5988eb5d1747cd78a69a) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 179234e73f..44a6f00543 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -10,8 +10,8 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING XLIB_LIBXDMCP_INSTALL_STAGING = YES -XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xorgproto -HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xorgproto +XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xorgproto host-pkgconf +HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xorgproto host-pkgconf $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 3b3074ca268e18893cfb60681a84c04b556076be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 21 Sep 2018 00:01:18 +0200 Subject: [PATCH 2552/2640] domoticz: depends on gcc >= 4.8 sleep_for is not always defined with gcc <= 4.7, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52680 To fix this issue, add a dependency to gcc >= 4.8 Fixes: - http://autobuild.buildroot.net/results/0dada8dd727f32a4500670f6620adb05943ed0b7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5208e9507f5fa33e7f584815d53dac551e449a63) Signed-off-by: Peter Korsgaard --- package/domoticz/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 530027f273..4c5338df0a 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOMOTICZ depends on BR2_USE_MMU # mosquitto depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto depends on !BR2_STATIC_LIBS # mosquitto + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP @@ -27,10 +28,11 @@ config BR2_PACKAGE_DOMOTICZ http://domoticz.com -comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, NPTL, wchar, dynamic library" +comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3) From 91aa53243eba6b5250f79407db3e8dceaaea6915 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 26 Sep 2018 09:44:59 -0300 Subject: [PATCH 2553/2640] linux-headers: bump 4.{4, 9, 14, 18}.x series [Peter: drop 4.18.x change] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit fbfda3fc06d65ddd02befe3c46334a118f0e5e7f) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e1b80eefc9..e9b3a9b339 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.157" if BR2_KERNEL_HEADERS_4_4 - default "4.9.128" if BR2_KERNEL_HEADERS_4_9 + default "4.4.158" if BR2_KERNEL_HEADERS_4_4 + default "4.9.129" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.71" if BR2_KERNEL_HEADERS_4_14 + default "4.14.72" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From 4556bd42c3ebae956256af508c2dd327bfeaca30 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Sep 2018 19:47:40 +0200 Subject: [PATCH 2554/2640] wireguard: bump version to 0.0.20180925 Signed-off-by: Peter Korsgaard (cherry picked from commit 0a656bc0658e79f7ddc4c9734ad9c52a5df46296) Signed-off-by: Peter Korsgaard --- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index d0cd65ad4f..fe6439fbc2 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2018-July/003112.html -sha256 5e38d554f7d1e3a64e3a5319ca1a3b790c84ed89c896586c490a93ac1f953a91 WireGuard-0.0.20180708.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2018-September/003395.html +sha256 4a0488a07e40ec17e798f3e40a85cedf55f0560b1c3a8fd95806c7d4266cb0e8 WireGuard-0.0.20180925.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index cc8ad7c4cc..faddbf93ad 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20180708 +WIREGUARD_VERSION = 0.0.20180925 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 From fac91ebe092bf1cd909533be265466c33f1d3e40 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 26 Sep 2018 20:20:44 +0200 Subject: [PATCH 2555/2640] nilfs-utils: no comment if BR2_USE_MMU is true Don't display comment if BR2_USE_MMU is true Moreover, move BR2_USE_MMU dependency at the top of dependency list Signed-off-by: Fabrice Fontaine Acked-by: Kurt Van Dijck Signed-off-by: Peter Korsgaard (cherry picked from commit 0dbab1bb45d0eb1bf37e693b0ad9ca95831d5180) Signed-off-by: Peter Korsgaard --- package/nilfs-utils/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/nilfs-utils/Config.in b/package/nilfs-utils/Config.in index e49cab369b..e245dc4656 100644 --- a/package/nilfs-utils/Config.in +++ b/package/nilfs-utils/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_NILFS_UTILS bool "nilfs-utils" + depends on BR2_USE_MMU # util-linux libmount, libblkid depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() - depends on BR2_USE_MMU # util-linux libmount, libblkid select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT @@ -13,5 +13,6 @@ config BR2_PACKAGE_NILFS_UTILS https://github.com/nilfs-dev/nilfs-utils comment "nilfs-utils needs a toolchain w/ threads, NPTL" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL From 25e9a27a77be9ed1022c86c75b1b5c38e2bdacb9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 27 Sep 2018 18:00:23 +0200 Subject: [PATCH 2556/2640] ghostscript: security bump to version 9.25 Fixes the following security issues: - CVE-2018-16543: In Artifex Ghostscript before 9.24, gssetresolution and gsgetresolution allow attackers to have an unspecified impact - CVE-2018-17183: Artifex Ghostscript before 9.25 allowed a user-writable error exception table, which could be used by remote attackers able to supply crafted PostScript to potentially overwrite or replace error handlers to inject code. Signed-off-by: Peter Korsgaard (cherry picked from commit b054797ecafec2b4b8945ad654242133749bf653) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index bb41841012..f8ca6c8d4e 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs923/SHA512SUMS -sha512 0c1f59b743f92f9cf7000b06f6209010e583ef4d6899c20ed245721dea3c08fd58b9e2d1513fe83765ab6be233bc7ab250cf18054e4d09de4073b1111e38035f ghostscript-9.23.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/SHA512SUMS +sha512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651 ghostscript-9.25.tar.xz # Hash for license file: sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 8ea6610be5..9b5e144888 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,8 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.23 -GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs923 +GHOSTSCRIPT_VERSION = 9.25 +GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE From e926a221ddc373eaafead82119e2cca8c99233af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 Oct 2018 18:34:19 +0200 Subject: [PATCH 2557/2640] package/ghostscript: fix removal of included lcms2 Ghostscript 9.24 changed the internal lcms2 version: https://www.ghostscript.com/doc/9.24/News.htm With this change the directory name was also changed which broke our code to force the usage of the buildroot lcms2 package. Fixes http://autobuild.buildroot.net/results/d04/d04ad017bf06a442a7397f935959994ba72824e1/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d5f83cfc885c4a9ea6d35d38b7d5a8eaf725aee2) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 9b5e144888..b1f5e1edb1 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -27,8 +27,8 @@ GHOSTSCRIPT_DEPENDENCIES = \ # Inspired by linuxfromscratch: # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html define GHOSTSCRIPT_REMOVE_LIBS - rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2 \ - $(@D)/lcms2art $(@D)/libpng $(@D)/tiff $(@D)/zlib + rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2mt \ + $(@D)/libpng $(@D)/tiff $(@D)/zlib endef GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS From 999270122881d624e345fad67fc436f42e0bc5d7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 29 Sep 2018 21:30:39 +0200 Subject: [PATCH 2558/2640] bind: security bump to version 9.11.4-P2 >From the release notes (http://ftp.isc.org/isc/bind9/9.11.4-P2/RELEASE-NOTES-bind-9.11.4-P2.txt): * There was a long-existing flaw in the documentation for ms-self, krb5-self, ms-subdomain, and krb5-subdomain rules in update-policy statements. Though the policies worked as intended, operators who configured their servers according to the misleading documentation may have thought zone updates were more restricted than they were; users of these rule types are advised to review the documentation and correct their configurations if necessary. New rule types matching the previously documented behavior will be introduced in a future maintenance release. [GL !708] * named could crash during recursive processing of DNAME records when deny-answer-aliases was in use. This flaw is disclosed in CVE-2018-5740. [GL #387] Signed-off-by: Peter Korsgaard (cherry picked from commit 63eb34fa121c4e7448dd5ec25491ed742a7ca262) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 2 +- package/bind/bind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 34d9891805..19d5f61f6d 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ # Verified from https://ftp.isc.org/isc/bind9/9.11.4-P1/bind-9.11.4-P1.tar.gz.asc # with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57 -sha256 b0e0dc3c8bf26989b1cad53f90d44a48e39404afc68f65c45bae79b446f0fe23 bind-9.11.4-P1.tar.gz +sha256 a85af7b629109d41285c7adeae1515daac638bbe4d5dc30d1f4b343dff09d811 bind-9.11.4-P2.tar.gz sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 0140041218..95f615bf81 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.4-P1 +BIND_VERSION = 9.11.4-P2 BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 6e9ddee511fc249e77deffe74c12d9f4bcaddcf8 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 29 Sep 2018 17:09:02 +0200 Subject: [PATCH 2559/2640] ocrad: add license hash Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard (cherry picked from commit 31e1768150e773b0dcda1096e625b30898e309d2) Signed-off-by: Peter Korsgaard --- package/ocrad/ocrad.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index 5f093d241e..5cde4d3ac4 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature sha256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c ocrad-0.26.tar.lz +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING From f05926ac4b32fe7d3c35bb63e1dd4b2be758db31 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 29 Sep 2018 17:09:03 +0200 Subject: [PATCH 2560/2640] httping: add license hash Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard (cherry picked from commit 1e2ca0455e6fddb86b75d2b1422f228aedb5533c) Signed-off-by: Peter Korsgaard --- package/httping/httping.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/httping/httping.hash b/package/httping/httping.hash index a50eedb744..c396157646 100644 --- a/package/httping/httping.hash +++ b/package/httping/httping.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz +sha256 c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d license.txt From 0f3608c4106fe947dd8b6d3fda93380f4d851d71 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Sep 2018 09:59:17 +0200 Subject: [PATCH 2561/2640] package/apache: security bump to version 2.4.35 Fixes: CVE-2018-11763: mod_http2, DoS via continuous SETTINGS frames https://lists.apache.org/thread.html/d435b0267a76501b9e06c552b20c887171064cde38e46d678da4d3dd@%3Cannounce.httpd.apache.org%3E Release notes: https://lists.apache.org/thread.html/5d604774652fc073b1b161584d0d1efbdba7898c40ae2e2334725e5f@%3Cannounce.httpd.apache.org%3E Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ac22fafdc83e285d305a618ba9655671eadf42cf) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 74a48ae914..32743656fd 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.sha256 -sha256 fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0 httpd-2.4.34.tar.bz2 +# From http://archive.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.sha256 +sha256 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56 httpd-2.4.35.tar.bz2 # Locally computed sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index d50e3774ff..3ac317216d 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.34 +APACHE_VERSION = 2.4.35 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From bcecdc9e814f1dbbf393af6453347ccd164151f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 24 Aug 2018 17:50:32 +0200 Subject: [PATCH 2562/2640] package/mosquitto: bump version to 1.5.1 Removed patch 0001, applied upstream. Replaced patch 0002 with a more generic solution as patch 0001. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f5336412d54397f35daa09c4f9eab952afadd3fe) Signed-off-by: Peter Korsgaard --- .../0001-Fix-subs-memory-issue.patch | 151 ------------------ ...GNU_SOURCE-needed-for-EAI_INPROGRESS.patch | 46 ++++++ ...-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch | 34 ---- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 5 files changed, 48 insertions(+), 187 deletions(-) delete mode 100644 package/mosquitto/0001-Fix-subs-memory-issue.patch create mode 100644 package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch delete mode 100644 package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch diff --git a/package/mosquitto/0001-Fix-subs-memory-issue.patch b/package/mosquitto/0001-Fix-subs-memory-issue.patch deleted file mode 100644 index 49ec15630a..0000000000 --- a/package/mosquitto/0001-Fix-subs-memory-issue.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 67fe32672b60afd6cf91f7a3ccc969259dc68a19 Mon Sep 17 00:00:00 2001 -From: Tatsuzo Osawa -Date: Thu, 24 Aug 2017 12:22:33 +0000 -Subject: [PATCH] Fix subs memory issue. - -Patches retrieved from: https://github.com/eclipse/mosquitto/pull/531 - -Both patches have been merged in a single one as second patch is putting -back code that is wrongly deleted in first patch. -First patch needs also an update to apply on version 1.5 - -Signed-off-by: Tatsuzo Osawa -Signed-off-by: Fabrice Fontaine ---- - src/database.c | 16 ++++++++++++---- - src/mosquitto_broker_internal.h | 4 ++-- - src/subs.c | 21 ++++++++++++--------- - 3 files changed, 26 insertions(+), 15 deletions(-) - -diff --git a/src/database.c b/src/database.c -index 670cf710..9e02de2d 100644 ---- a/src/database.c -+++ b/src/database.c -@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at - - Contributors: - Roger Light - initial implementation and documentation. -+ Tatsuzo Osawa - Fix subs memory issue. - */ - - #include -@@ -121,10 +122,10 @@ int db__open(struct mosquitto__config *config, struct mosquitto_db *db) - - db->subs = NULL; - -- subhier = sub__add_hier_entry(&db->subs, "", strlen("")); -+ subhier = sub__add_hier_entry(NULL, &db->subs, "", strlen("")); - if(!subhier) return MOSQ_ERR_NOMEM; - -- subhier = sub__add_hier_entry(&db->subs, "$SYS", strlen("$SYS")); -+ subhier = sub__add_hier_entry(NULL, &db->subs, "$SYS", strlen("$SYS")); - if(!subhier) return MOSQ_ERR_NOMEM; - - db->unpwd = NULL; -diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h -index 3508c555..808b4f2b 100644 ---- a/src/mosquitto_broker_internal.h -+++ b/src/mosquitto_broker_internal.h -@@ -12,7 +12,7 @@ and the Eclipse Distribution License is available at - - Contributors: - Roger Light - initial implementation and documentation. -- Tatsuzo Osawa - Add epoll. -+ Tatsuzo Osawa - Add epoll. Fix subs memory issue. - */ - - #ifndef MOSQUITTO_BROKER_INTERNAL_H -@@ -547,7 +547,7 @@ void sys_tree__update(struct mosquitto_db *db, int interval, time_t start_time); - * Subscription functions - * ============================================================ */ - int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub, int qos, struct mosquitto__subhier **root); --struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len); -+struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len); - int sub__remove(struct mosquitto_db *db, struct mosquitto *context, const char *sub, struct mosquitto__subhier *root); - void sub__tree_print(struct mosquitto__subhier *root, int level); - int sub__clean_session(struct mosquitto_db *db, struct mosquitto *context); -diff --git a/src/subs.c b/src/subs.c -index 7b9b457c..b1c0fc78 100644 ---- a/src/subs.c -+++ b/src/subs.c -@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at - - Contributors: - Roger Light - initial implementation and documentation. -+ Tatsuzo Osawa - Fix subs memory issue. - */ - - /* A note on matching topic subscriptions. -@@ -314,7 +315,7 @@ static int sub__add_recurse(struct mosquitto_db *db, struct mosquitto *context, - return sub__add_recurse(db, context, qos, branch, tokens->next); - }else{ - /* Not found */ -- branch = sub__add_hier_entry(&subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); -+ branch = sub__add_hier_entry(subhier, &subhier->children, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); - if(!branch) return MOSQ_ERR_NOMEM; - - return sub__add_recurse(db, context, qos, branch, tokens->next); -@@ -406,18 +407,18 @@ static void sub__search(struct mosquitto_db *db, struct mosquitto__subhier *subh - } - - --struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **parent, const char *topic, size_t len) -+struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier *parent, struct mosquitto__subhier **head, const char *topic, size_t len) - { - struct mosquitto__subhier *child; - -- assert(parent); -+ assert(head); - - child = mosquitto__malloc(sizeof(struct mosquitto__subhier)); - if(!child){ - log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); - return NULL; - } -- child->parent = *parent; -+ child->parent = parent; - child->topic_len = strlen(topic); - if(UHPA_ALLOC_TOPIC(child) == 0){ - child->topic_len = 0; -@@ -433,13 +434,13 @@ struct mosquitto__subhier *sub__add_hier_entry(struct mosquitto__subhier **paren - - if(child->topic_len+1 > sizeof(child->topic.array)){ - if(child->topic.ptr){ -- HASH_ADD_KEYPTR(hh, *parent, child->topic.ptr, child->topic_len, child); -+ HASH_ADD_KEYPTR(hh, *head, child->topic.ptr, child->topic_len, child); - }else{ - mosquitto__free(child); - return NULL; - } - }else{ -- HASH_ADD(hh, *parent, topic.array, child->topic_len, child); -+ HASH_ADD(hh, *head, topic.array, child->topic_len, child); - } - - return child; -@@ -460,7 +461,7 @@ int sub__add(struct mosquitto_db *db, struct mosquitto *context, const char *sub - - HASH_FIND(hh, *root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len, subhier); - if(!subhier){ -- subhier = sub__add_hier_entry(root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); -+ subhier = sub__add_hier_entry(NULL, root, UHPA_ACCESS_TOPIC(tokens), tokens->topic_len+1); - if(!subhier){ - sub__topic_tokens_free(tokens); - log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); -@@ -545,12 +546,14 @@ static struct mosquitto__subhier *tmp_remove_subs(struct mosquitto__subhier *sub - return NULL; - } - -- if(sub->children || sub->subs){ -+ if(sub->children || sub->subs || sub->retained){ - return NULL; - } - - parent = sub->parent; -- HASH_DELETE(hh, parent, sub); -+ HASH_DELETE(hh, parent->children, sub); -+ UHPA_FREE_TOPIC(sub); -+ mosquitto__free(sub); - - if(parent->subs == NULL - && parent->children == NULL diff --git a/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch b/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch new file mode 100644 index 0000000000..e350e465b4 --- /dev/null +++ b/package/mosquitto/0001-_GNU_SOURCE-needed-for-EAI_INPROGRESS.patch @@ -0,0 +1,46 @@ +From d684055b2b92e7ec5793e70c9a80c7f8e45e0696 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 24 Aug 2018 16:38:42 +0200 +Subject: [PATCH] _GNU_SOURCE needed for EAI_INPROGRESS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Define of _GNU_SOURCE is needed to be able to use EAI_INPROGRESS in +loop.c. + +This patch fixes a build error + +loop.c:334:17: error: ‘EAI_INPROGRESS’ undeclared (first use in this function) + if(rc == EAI_INPROGRESS){ + +occuring with a glibc-2.27-based buildroot toolchain for sparc64 + +Target: sparc64-buildroot-linux-gnu +[...] +gcc version 6.4.0 (Buildroot 2018.05) + +Source: +http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2018.05.tar.bz2 + +Patch sent upstream as PR 933. + +Signed-off-by: Bernd Kuhls +--- + config.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 7607019..ba0ba93 100644 +--- a/config.h ++++ b/config.h +@@ -39,4 +39,6 @@ + # define _POSIX_C_SOURCE 200809L + #endif + ++#define _GNU_SOURCE ++ + #endif +-- +2.18.0 + diff --git a/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch b/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch deleted file mode 100644 index 88f9cbd94a..0000000000 --- a/package/mosquitto/0002-websockets-_GNU_SOURCE-needed-for-S_IF-DIR-REG.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d4442c3df7552756f53e656e446bc1bd7dc79a88 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 18 Jun 2018 19:52:58 +0200 -Subject: [PATCH] websockets: _GNU_SOURCE needed for S_IF{DIR,REG} - -Define of _GNU_SOURCE is needed to be able to use S_IFDIR and S_IFREG in -src/websockets.c - -Fixes: - - http://autobuild.buildroot.net/results/7dcfb6ca9d14a5cd6872590065549356f1ab42a0 - -[Upstream status: https://github.com/eclipse/mosquitto/pull/862] - -Signed-off-by: Fabrice Fontaine ---- - src/websockets.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/websockets.c b/src/websockets.c -index 1e513ae..7722b4d 100644 ---- a/src/websockets.c -+++ b/src/websockets.c -@@ -29,6 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. - - #ifdef WITH_WEBSOCKETS - -+#define _GNU_SOURCE -+ - #include "config.h" - - #include --- -2.14.1 - diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 87ddad9578..96817d464d 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,5 +1,5 @@ # Locally calculated after checking gpg signature -sha256 80c9606a906c736fe582b67bdfb650ee45239fea058fe34927f81277d3486e21 mosquitto-1.5.tar.gz +sha256 8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0 mosquitto-1.5.1.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 993da2f925..7ac6487488 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.5 +MOSQUITTO_VERSION = 1.5.1 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 31ad690c56ff0f32dc425e1e18231648280a4457 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 28 Sep 2018 23:22:07 +0200 Subject: [PATCH 2563/2640] mosquitto: security bump to version 1.5.3 Fix CVE-2018-12543. If a message is sent to Mosquitto with a topic that begins with $, but is not $SYS, then an assert that should be unreachable is triggered and Mosquitto will exit. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5e62304359d150b6befa4bab4030ead09bcfdfdf) Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 96817d464d..b38830b8b5 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,5 +1,5 @@ # Locally calculated after checking gpg signature -sha256 8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0 mosquitto-1.5.1.tar.gz +sha256 3081a998d303a883b1cd064009beabc88aa9159e26f5258a4ae6007160491d10 mosquitto-1.5.3.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 7ac6487488..1d72f9b16e 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.5.1 +MOSQUITTO_VERSION = 1.5.3 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 28a341501dfb9553bbdf177c7ff00457d85712a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 30 Sep 2018 22:12:15 +0200 Subject: [PATCH 2564/2640] strongswan: add upstream security patch Fixes the following security issues: CVE-2018-16151: The OID parser in the ASN.1 code in gmp allows any number of random bytes after a valid OID. CVE-2018-16152: The algorithmIdentifier parser in the ASN.1 code in gmp doesn't enforce a NULL value for the optional parameter which is not used with any PKCS#1 algorithm. For more details, see the advisory: https://www.strongswan.org/blog/2018/09/24/strongswan-vulnerability-(cve-2018-16151,-cve-2018-16152).html Signed-off-by: Peter Korsgaard (cherry picked from commit 5e04cdde197f17472a85423f4063b8f6ee19a82c) Signed-off-by: Peter Korsgaard --- package/strongswan/strongswan.hash | 1 + package/strongswan/strongswan.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 9a800572d7..abbdbc2bf1 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -3,5 +3,6 @@ md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 # Calculated based on the hash above sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 # Locally calculated +sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 5c597d572a..9ef4e183e2 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -7,6 +7,8 @@ STRONGSWAN_VERSION = 5.6.3 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org +STRONGSWAN_PATCH = \ + $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf From a92358e624a472f153a8d49ac21d25b4a2609387 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 2 Oct 2018 17:35:52 +0200 Subject: [PATCH 2565/2640] strongswan: add upstream security fix for CVE-2018-17540 The fix for CVE-2018-16151 / 16152 contained an exploitable bug. For details, see: https://www.strongswan.org/blog/2018/10/01/strongswan-vulnerability-(cve-2018-17540).html Signed-off-by: Peter Korsgaard (cherry picked from commit 040cf15a8760c91f82b61a3e2cadf1b91b7c45af) Signed-off-by: Peter Korsgaard --- package/strongswan/strongswan.hash | 1 + package/strongswan/strongswan.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index abbdbc2bf1..4d1a593a5c 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -4,5 +4,6 @@ md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2 sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2 # Locally calculated sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch +sha256 415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263 strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 9ef4e183e2..30693de7cb 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -8,7 +8,8 @@ STRONGSWAN_VERSION = 5.6.3 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_PATCH = \ - $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch + $(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \ + $(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf From c5279179970a3b808b94e441ff150d1d655525f2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 30 Sep 2018 22:43:54 +0200 Subject: [PATCH 2566/2640] xen: security bump to version 4.10.2 Drop 0003-memfd-fix-configure-test.patch applied upstream. The 4.10.2 version brings a large number of fixes: https://xenproject.org/downloads/xen-archives/xen-project-410-series/xen-4102.html Including a number of security fixes: XSA-260: x86: mishandling of debug exceptions (CVE-2018-8897) XSA-261: x86 vHPET interrupt injection errors (CVE-2018-10982) XSA-262: qemu may drive Xen into unbounded loop (CVE-2018-10981) XSA-263: Speculative Store Bypass (CVE-2018-3639) XSA-264: preemption checks bypassed in x86 PV MM handling (CVE-2018-12891) XSA-265: x86: #DB exception safety check can be triggered by a guest (CVE-2018-12893) XSA-266: libxl fails to honour readonly flag on HVM emulated SCSI disks (CVE-2018-12892) XSA-267: Speculative register leakage from lazy FPU context switching (CVE-2018-3665) XSA-268: Use of v2 grant tables may cause crash on ARM (CVE-2018-15469) XSA-269: x86: Incorrect MSR_DEBUGCTL handling lets guests enable BTS (CVE-2018-15468) XSA-272: oxenstored does not apply quota-maxentity (CVE-2018-15470) XSA-273: L1 Terminal Fault speculative side channel (CVE-2018-3620, CVE-2018-3646) Signed-off-by: Peter Korsgaard (cherry picked from commit 059d655f5cfa321ae3e0847599c80acb238d39c1) Signed-off-by: Peter Korsgaard --- .../xen/0003-memfd-fix-configure-test.patch | 62 ------------------- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/xen/0003-memfd-fix-configure-test.patch diff --git a/package/xen/0003-memfd-fix-configure-test.patch b/package/xen/0003-memfd-fix-configure-test.patch deleted file mode 100644 index 95cb49bcf7..0000000000 --- a/package/xen/0003-memfd-fix-configure-test.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini -Signed-off-by: Baruch Siach -[ Changes by AF: - - Port the patch to the qemu-xen tree -] -Signed-off-by: Alistair Francis ---- -Upstream status: commit 75e5b70e6b5 - - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a98bd4..99ccc1725ace 100755 ---- a/tools/qemu-xen/configure -+++ b/tools/qemu-xen/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba866..412e94a405fc 100644 ---- a/tools/qemu-xen/util/memfd.c -+++ b/tools/qemu-xen/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -2.16.2 - diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 5daebd4d65..1b3fc12f94 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf xen-4.10.1.tar.gz +sha256 d5a944a34e47e9d52b2837f616821eb4a9514c8fd0955dcc723111dba499acd4 xen-4.10.2.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index a1685d371d..fb34d64c3f 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.10.1 +XEN_VERSION = 4.10.2 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING From cea60ba7feb6044375bc1ce62a849a05bce17795 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 28 Sep 2018 19:35:18 +0200 Subject: [PATCH 2567/2640] lua: fix dynamic library install In 0002-shared-libs-for-lua.patch, revision number is used to set library name: TO_SOLIB = liblua.so.$(R) However, library is built using PKG_VERSION which is passed only during build step: $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? As a result, dynamic library is not installed in staging or target paths since bump to lua 5.3.5 So, instead of replacing R by PKG_VERSION and passing this variable in all steps, simply update R to 5 Fixes: - http://autobuild.buildroot.net/results/28b6672188bb0082ac1467d3b45904880e3634f3 Signed-off-by: Fabrice Fontaine Acked-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ca287f204426446fd782544131429030c4825f0e) Signed-off-by: Peter Korsgaard --- .../lua/5.3.5/0003-fix-revision-number.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/lua/5.3.5/0003-fix-revision-number.patch diff --git a/package/lua/5.3.5/0003-fix-revision-number.patch b/package/lua/5.3.5/0003-fix-revision-number.patch new file mode 100644 index 0000000000..ed2e0460eb --- /dev/null +++ b/package/lua/5.3.5/0003-fix-revision-number.patch @@ -0,0 +1,31 @@ +Fix revision number + +In 0002-shared-libs-for-lua.patch, revision number is used to set +library name: +TO_SOLIB = liblua.so.$(R) + +However, library is built using PKG_VERSION which is passed only during +build step: +$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? + +As a result, dynamic library is not installed in staging or target paths +since bump to lua 5.3.5 + +So, instead of replacing R by PKG_VERSION and passing this variable in +all steps, simply update R to 5 + +Signed-off-by: Fabrice Fontaine + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -47,6 +47,6 @@ + + # Lua version and release. + V= 5.3 +-R= $V.4 ++R= $V.5 + + # Targets start here. + all: $(PLAT) From a624b5d2a413faec78eca82925e6d81ddc65564a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Oct 2018 22:57:39 +0200 Subject: [PATCH 2568/2640] x265: disable parallel build It seems package has a parallel build issue on ARM cortex A8 or A9 since at least version 2.5: [ 94%] Linking CXX shared library libx265.so ipfilter8.S.o: file not recognized: File truncated collect2: error: ld returned 1 exit status CMakeFiles/x265-shared.dir/build.make:221: recipe for target 'libx265.so.160' failed Fixes: - http://autobuild.buildroot.org/results/f6ea88324a8f9ac8ee780ddd71ec61f922e20210 - http://autobuild.buildroot.org/results/3bd91a5694936650ce936a408ddd50338f65f8b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 03bfbc5ab26c9aed0c0cfce55341a1d1f05deca3) Signed-off-by: Peter Korsgaard --- package/x265/x265.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 0ad27ee006..fe317d09d0 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -11,6 +11,7 @@ X265_LICENSE = GPL-2.0+ X265_LICENSE_FILES = COPYING X265_SUBDIR = source X265_INSTALL_STAGING = YES +X265_MAKE = $(MAKE1) ifeq ($(BR2_i386)$(BR2_x86_64),y) X265_DEPENDENCIES += host-nasm From 8696365a76f38c93971fea211a8640eddad7f14d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 2 Oct 2018 11:30:15 +0200 Subject: [PATCH 2569/2640] links: fix X11 library/includes detection Fixes: http://autobuild.buildroot.net/results/4b0/4b02713ed5c10b58f390f96ea25f2a45c9a47af4/ http://autobuild.buildroot.net/results/ac6/ac668f867b9de7a2c61d263a894480afc181dd9b/ http://autobuild.buildroot.net/results/f02/f0248b3bf4a73210f210f422c8df067a6ea28aa1/ The configure script uses AC_PATH_X, which searches the host for the X11 libraries/headers, causing build failures. https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/System-Services.html Fix it by using --x-includes / --x-libraries like we do elsewhere. Signed-off-by: Peter Korsgaard (cherry picked from commit 49a04acca3d4b8a570b7c1468d236e65111efb69) Signed-off-by: Peter Korsgaard --- package/links/links.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/links/links.mk b/package/links/links.mk index dd6adb29b1..651a089fda 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -15,7 +15,10 @@ ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics LINKS_DEPENDENCIES += libpng ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y) -LINKS_CONF_OPTS += --with-x +LINKS_CONF_OPTS += \ + --with-x \ + --x-includes=$(STAGING_DIR)/usr/include \ + --x-libraries=$(STAGING_DIR)/usr/lib LINKS_DEPENDENCIES += xlib_libXt else LINKS_CONF_OPTS += --without-x From a2ec66d59d052c1b7f30795393bb172deff6971e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 1 Oct 2018 13:32:55 +0200 Subject: [PATCH 2570/2640] python-django: bump version to 1.11.16 Fixes a race condition in QuerySet.update_or_create() that could result in data loss: https://code.djangoproject.com/ticket/29499 Signed-off-by: Peter Korsgaard (cherry picked from commit feb811f56756bdbbbdd5a2230545462d46b2ea61) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index bc7aed9479..6e6e7708db 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,3 +1,3 @@ -# From https://www.djangoproject.com/m/pgp/Django-1.11.15.checksum.txt -sha256 b18235d82426f09733d2de9910cee975cf52ff05e5f836681eb957d105a05a40 Django-1.11.15.tar.gz +# From https://www.djangoproject.com/m/pgp/Django-1.11.16.checksum.txt +sha256 29268cc47816a44f27308e60f71da635f549c47d8a1d003b28de55141df75791 Django-1.11.16.tar.gz sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index ae604dbc97..9f43ffab85 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 1.11.15 +PYTHON_DJANGO_VERSION = 1.11.16 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/43/b5/b44286e56a5211d37b4058dcd5e62835afa5ce5aa6a38b56bd04c0d01cbc +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/35/1d/59836bce4c9cfded261e21c0abd6a4629de6d289522d0fd928117d8eb985 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools From 1f6991999d9720f6dfbb3d755674f921c43ac13c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Oct 2018 20:16:52 +0200 Subject: [PATCH 2571/2640] package/clamav: security bump to 0.100.2 Fixes CVE-2018-15378, CVE-2018-14680, CVE-2018-14681 & CVE-2018-14682: http://lists.clamav.net/pipermail/clamav-announce/2018/000033.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit bbd6fb9c2d9dd64e3e655ab9fac7be87bbd64ff3) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 0cb8f51d87..390251fc24 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 84e026655152247de7237184ee13003701c40be030dd68e0316111049f58a59f clamav-0.100.1.tar.gz +sha256 4a2e4f0cd41e62adb5a713b4a1857c49145cd09a69957e6d946ecad575206dd6 clamav-0.100.2.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 9db90bddea..50990abad6 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.100.1 +CLAMAV_VERSION = 0.100.2 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From ff6f868270f102c8c8e672b0c7135908269c8f98 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Oct 2018 23:06:24 +0200 Subject: [PATCH 2572/2640] screen: fix parallel build comm.h is needed to build list_display.o and list_generic.o otherwise parallel builds will sometimes fail Fixes: - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 72e6c208094376d668f836d2b6255ab6414025bd) Signed-off-by: Peter Korsgaard --- ...-needed-for-list_-display-generic-.o.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch diff --git a/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch b/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch new file mode 100644 index 0000000000..f406a1afac --- /dev/null +++ b/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch @@ -0,0 +1,35 @@ +From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 3 Oct 2018 22:29:32 +0200 +Subject: [PATCH] comm.h needed for list_{display,generic}.o + +comm.h is needed to build list_display.o and list_generic.o otherwise +parallel builds will sometimes fail + +Fixes: + - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc + - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://savannah.gnu.org/bugs/index.php?54776] +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index af5938b..e6d5247 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -265,7 +265,7 @@ braille.h + viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ + comm.h layer.h term.h image.h display.h window.h extern.h \ + braille.h +-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h +-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h ++list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h ++list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h + list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h + +-- +2.17.1 + From 2a228a83cd83f98e67809a346d77619ec0510d3d Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Wed, 3 Oct 2018 00:25:48 +0000 Subject: [PATCH 2573/2640] gnupg: drop mandatory dependency on ncurses This package only needs ncurses when readline support is enabled, as it's the autoconf macro file for readline (used by autoconf to create the gnupg configure script) that checks for and pulls in ncurses. Since readline already depends on ncurses, gnupg need only depend on readline (when enabled). The host package always forces readline support off, so the host-ncurses dependency can be removed entirely. Signed-off-by: Trent Piepho Signed-off-by: Thomas Petazzoni (cherry picked from commit 51e17496cc403c49bc20d3a81f9c71a8a20edd0f) Signed-off-by: Peter Korsgaard --- package/gnupg/Config.in | 1 - package/gnupg/gnupg.mk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 7c31612298..2db46318f1 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_GNUPG bool "gnupg" depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_NCURSES help GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880. GnuPG allows diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index ac9047894d..bedcf6c985 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -9,7 +9,7 @@ GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG_LICENSE = GPL-3.0+ GNUPG_LICENSE_FILES = COPYING -GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv) GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no GNUPG_CONF_OPTS = \ --disable-rpath \ @@ -18,7 +18,7 @@ GNUPG_CONF_OPTS = \ --enable-sha256 \ --enable-sha512 -HOST_GNUPG_DEPENDENCIES = host-zlib host-ncurses +HOST_GNUPG_DEPENDENCIES = host-zlib HOST_GNUPG_CONF_OPTS = \ --disable-rpath \ --enable-minimal \ From 5cb24d72b2835defb03b0448ac51c5ee1d9ee3b0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 7 Oct 2018 11:32:23 +0200 Subject: [PATCH 2574/2640] Update for 2018.08.1 Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index a505d7ec69..aa5c2ad047 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2018.08.1, Released October 7th, 2018 + + Important / security related fixes. + + Add a number of patches to fix build errors for host utilities + on modern distributions using glibc-2.28. + + mkusers: Ensure existing group members are preserved when a + group is reprocessed. + + printvars: Fix issue with exceeding shell command line length + limits for certain setups. + + Updated/fixed packages: acpid, android-tools, apache, + arp-scan, bandwidthd, bind, brltty, clamav, connman, cppcms, + domoticz, dtc, fio, gcc, gdb, ghostscript, gnupg, httpping, + igmpproxy, imlib2, ipsec-tools, libesmtp, libnfs, libxslt, + links, lua, mosquitto, nilfs-utils, ocrad, parted, php, + python-django, screen, shairport-sync, strongswan, + vboot-utils, webkitgtk, wireguard, x265 xen, xlib_libXdmcp, + xlib_libXfont, xlib_libXft, xlib_libxshmfence, + xutil_makedepend, zeromq + 2018.08, Released September 6th, 2018 Minor fixes. diff --git a/Makefile b/Makefile index f7636e669d..31569472a7 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.08 +export BR2_VERSION := 2018.08.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1536263000 +BR2_VERSION_EPOCH = 1538904000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 542da6ccff77b6cffea42584586b3f5d0dfa7935 Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Sat, 6 Oct 2018 22:02:45 +0200 Subject: [PATCH 2575/2640] cups-filters: add autoreconf Because we are patching Makefile.am, Makefile.am is newer than Makefile.in Signed-off-by: Olivier Schonken Signed-off-by: Peter Korsgaard --- package/cups-filters/cups-filters.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 131e58246e..3c5e13da89 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -8,7 +8,8 @@ CUPS_FILTERS_VERSION = 1.20.3 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING - +# 0001-Replace-relative-linking-with-absolute-linking.patch +CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ From 74953365a635aa5147a908523e4d0a3a78f6eec0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 7 Oct 2018 12:47:21 +0200 Subject: [PATCH 2576/2640] git: security bump to version 2.16.5 Fixes CVE-2018-17456: RCE issue in handling of git submodules For more details, see the announcement: https://marc.info/?l=git&m=153875888916397&w=2 Signed-off-by: Peter Korsgaard (cherry picked from commit 063eff9bc622b223530e7a2a83a45f7adb5c7d6d) Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 4bcc5ee5d3..35c8774d75 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 6e69b0e9c487e5da52a14d4829f0b6a28b2c18a0bb6fb67c0dc8b5b5658bd532 git-2.16.4.tar.xz +sha256 dfb71b053cbc38a9c5b08c2fe8b5eae210b4e3b63892426923e10cfd6ba63862 git-2.16.5.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index ac7b8f2e8c..9b176d3661 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.16.4 +GIT_VERSION = 2.16.5 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 6ab58316146eb717e736885dde16df73b0a694b7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Aug 2018 08:51:46 +0200 Subject: [PATCH 2577/2640] package/netsnmp: security bump to version 5.8 Fixes CVE-2018-18065: _set_key in agent/helpers/table_container.c in Net-SNMP before 5.8 has a NULL Pointer Exception bug that can be used by an authenticated attacker to remotely cause the instance to crash via a crafted UDP packet, resulting in Denial of Service. For more details, see description and PoC: https://dumpco.re/blog/net-snmp-5.7.3-remote-dos Removed patch, applied upstream, autoreconf is not needed anymore. Added sha256 hashes for tarball and license file. Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 1fe32e837597ac23bcc52f121257d1de126fb5c2) Signed-off-by: Peter Korsgaard --- ...ate-the-hard-coded-libnl-3-include-p.patch | 300 ------------------ package/netsnmp/netsnmp.hash | 9 +- package/netsnmp/netsnmp.mk | 5 +- 3 files changed, 8 insertions(+), 306 deletions(-) delete mode 100644 package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch diff --git a/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch b/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch deleted file mode 100644 index cf0592233e..0000000000 --- a/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch +++ /dev/null @@ -1,300 +0,0 @@ -From 57d6c3d36045aab8957ffeb7324728bf17faf8bd Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 2 Feb 2015 20:31:29 +0100 -Subject: [PATCH] configure: Eliminate the hard-coded libnl-3 include path - -See also commit 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a. - -(cherry picked from commit 852dcd644cfe4cfc7177649eaec163d6221f2be1) - -Original commit included modifications to configure script. -Do not keep these modifications, since they caused lots of conflicts, and -configure script is meant to be automatically generated. - -Signed-off-by: Julien Floret - -Conflicts: - configure ---- - aclocal.m4 | 1 + - configure.d/config_os_libs2 | 30 ++++++- - m4/pkg.m4 | 214 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 243 insertions(+), 2 deletions(-) - create mode 100644 m4/pkg.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index cd80c7486f2f..45e3608ed480 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -22,3 +22,4 @@ m4_include([m4/ltversion.m4]) - m4_include([m4/lt~obsolete.m4]) - m4_include([m4/netsnmp_arg.m4]) - m4_include([m4/netsnmp_search_libs.m4]) -+m4_include([m4/pkg.m4]) -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 47491e24ce0a..10bd414b879e 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -225,11 +225,37 @@ fi - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ # The test below verifies whether the libnl-3 package been installed. -+ # This test works as follows: -+ # - If pkg-config was not installed at the time autogen.sh was run, -+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by -+ # autogen.sh. Augogen.sh will generate a configure script that prints -+ # a warning about pkg-config and proceeds as if libnl-3 has not been -+ # installed. -+ # - If pkg-config was installed at the time autogen.sh was run, -+ # the generated configure script will try to detect the presence of -+ # the libnl-3 library by looking up compile and linker flags in the -+ # file called libnl-3.pc. -+ # - pkg-config settings can be overridden via the configure variables -+ # LIBNL3_CFLAGS and LIBNL3_LIBS (added by the pkg-config m4 macro's to -+ # the configure script -- see also ./configure --help). -+ # - The LIBNL3_CFLAGS and LIBNL3_LIBS configure variables can be used -+ # even if the pkg-config executable is not present on the system on -+ # which the configure script is run. -+ ifdef( -+ [PKG_CHECK_EXISTS], -+ [PKG_CHECK_EXISTS([libnl-3.0], -+ [PKG_CHECK_MODULES([LIBNL3], [libnl-3.0])]) -+ ], -+ AC_MSG_WARN([pkg-config has not been installed or is too old.]) -+ AC_MSG_WARN([Detection of libnl-3.0 will be skipped.]) -+ ) -+ - netsnmp_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" -+ CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS" - NETSNMP_SEARCH_LIBS(nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h) -- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], -+ EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES ${LIBNL3_CFLAGS}"], - [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) - if test "x$ac_cv_header_netlink_netlink_h" != xyes; then - NETSNMP_SEARCH_LIBS(nl_connect, nl, [ -diff --git a/m4/pkg.m4 b/m4/pkg.m4 -new file mode 100644 -index 000000000000..c5b26b52e6cd ---- /dev/null -+++ b/m4/pkg.m4 -@@ -0,0 +1,214 @@ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# serial 1 (pkg-config-0.24) -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+# only at the first occurence in configure.ac, so if the first place -+# it's called might be skipped (such as if it is within an "if", you -+# have to call PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_default([$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ elif test -n "$PKG_CONFIG"; then -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes ], -+ [pkg_failed=yes]) -+ else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ AC_MSG_RESULT([no]) -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ m4_default([$4], [AC_MSG_ERROR( -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT])[]dnl -+ ]) -+elif test $pkg_failed = untried; then -+ AC_MSG_RESULT([no]) -+ m4_default([$4], [AC_MSG_FAILURE( -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])[]dnl -+ ]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ $3 -+fi[]dnl -+])# PKG_CHECK_MODULES -+ -+ -+# PKG_INSTALLDIR(DIRECTORY) -+# ------------------------- -+# Substitutes the variable pkgconfigdir as the location where a module -+# should install pkg-config .pc files. By default the directory is -+# $libdir/pkgconfig, but the default can be changed by passing -+# DIRECTORY. The user can override through the --with-pkgconfigdir -+# parameter. -+AC_DEFUN([PKG_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([pkgconfigdir], -+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, -+ [with_pkgconfigdir=]pkg_default) -+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+]) dnl PKG_INSTALLDIR -+ -+ -+# PKG_NOARCH_INSTALLDIR(DIRECTORY) -+# ------------------------- -+# Substitutes the variable noarch_pkgconfigdir as the location where a -+# module should install arch-independent pkg-config .pc files. By -+# default the directory is $datadir/pkgconfig, but the default can be -+# changed by passing DIRECTORY. The user can override through the -+# --with-noarch-pkgconfigdir parameter. -+AC_DEFUN([PKG_NOARCH_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([noarch-pkgconfigdir], -+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, -+ [with_noarch_pkgconfigdir=]pkg_default) -+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+]) dnl PKG_NOARCH_INSTALLDIR -+ -+ -+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# ------------------------------------------- -+# Retrieves the value of the pkg-config variable for the given module. -+AC_DEFUN([PKG_CHECK_VAR], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl -+ -+_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -+AS_VAR_COPY([$1], [pkg_cv_][$1]) -+ -+AS_VAR_IF([$1], [""], [$5], [$4])dnl -+])# PKG_CHECK_VAR --- -2.1.0 - diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index fc77926023..d05a7de9da 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,3 +1,6 @@ -# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.7.3/ -md5 d4a3459e1577d0efa8d96ca70a885e53 net-snmp-5.7.3.tar.gz -sha1 97dc25077257680815de44e34128d365c76bd839 net-snmp-5.7.3.tar.gz +# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.8/ +md5 63bfc65fbb86cdb616598df1aff6458a net-snmp-5.8.tar.gz +sha1 78f70731df9dcdb13fe8f60eb7d80d7583da4d2c net-snmp-5.8.tar.gz +# Locally computed +sha256 b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf net-snmp-5.8.tar.gz +sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 742fa6e3b3..6c712ae075 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETSNMP_VERSION = 5.7.3 -NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) +NETSNMP_VERSION = 5.8 +NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING @@ -36,7 +36,6 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config -NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big From 214be1c1abd63fdfb5ddffbf4cd1fd684013fa4d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 17 Sep 2018 22:39:12 +0200 Subject: [PATCH 2578/2640] netsnmp: fix static build failure due to missing -lssl and -lz During configure some checking needing -lssl and -lz don't have them appended to linker tail. Since we are building static this leads to configure failure because of mandatory functions lack produces: "configure: error: The DTLS based transports require the libssl library from OpenSSL to be available and support DTLS" - Add 1 patch to fix -lssl lack in configure and .ac modules: upstreamed: https://sourceforge.net/p/net-snmp/code/ci/bd59be8e4e339870a1400f6866a7b73ca11f6460/ - Add 2 patches to fix -lz lack in configure and .ac modules: 1 upstreamed: https://sourceforge.net/p/net-snmp/code/ci/13da2bcde8e22dd0127a668374fdf79bed04d353/ 1 in Merge Request: https://sourceforge.net/p/net-snmp/code/merge-requests/19/ - Add NETSNMP_AUTORECONF = YES Fixes: http://autobuild.buildroot.net/results/ece/ece7af756c910f65f618c1d04a5de70cc574b5f4/ http://autobuild.buildroot.net/results/2a7/2a7020de6a4095cf9991d09fbe8f6e364783f63b/ http://autobuild.buildroot.net/results/e27/e2787d15f72949cbb347e8a1d344f5f80b4d7697/ http://autobuild.buildroot.net/results/439/4393ce8ddee294f91bdc3e6fb53e08d56fe52184/ http://autobuild.buildroot.net/results/da6/da6bbbbb3a8d8193ec1389b9d976164181e88ae2/ http://autobuild.buildroot.net/results/cf5/cf57686e7620cc0ec361631a9ff906aa0123fdb4/ http://autobuild.buildroot.net/results/104/1043a958314529240627005d1bf21a76f4e6fcf5/ http://autobuild.buildroot.net/results/885/8855545bd09388e0da451a3cb53b312e13b29c2c/ http://autobuild.buildroot.net/results/a3d/a3dab9618a7ed88f94597418a5892c87adc23c66/ http://autobuild.buildroot.net/results/18e/18e70b88c9bcb3b8ede7308e54bba9417d1fd3fb/ http://autobuild.buildroot.net/results/ee3/ee34f65f26da20c0f2fdb9e86bcbddd389f59a29/ http://autobuild.buildroot.net/results/a1e/a1eb848079080ddf7cf2fc9e554cdd63ade0e9aa/ http://autobuild.buildroot.net/results/4dc/4dc8b53ff9f504c0a3dfc2d72c2609ad4d34559b/ http://autobuild.buildroot.net/results/9cc/9cc19e481de20ea0b4b5163e45c5aee525b81229/ http://autobuild.buildroot.net/results/f15/f15c22e0257d7498456049d8aae195ed6a265d2e/ http://autobuild.buildroot.net/results/1b3/1b30f9813a4605056963bfe4532374f725830fda/ http://autobuild.buildroot.net/results/d02/d02afc174ac4c9888f0a2cf725820cc1f05fc4bf/ http://autobuild.buildroot.net/results/57b/57b3f4663058d728987ef848e4b346656cae21d4/ http://autobuild.buildroot.net/results/ed4/ed4c27bdffccc4374ab7f951c30baba8171d30e1/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit 13722d58f77d0e9fea9eefc50bf083d19f835433) Signed-off-by: Peter Korsgaard --- ...figure-static-linking-Fix-SSL-checks.patch | 142 ++++++++++++++++++ .../0002-configure-Fix-lcrypto-lz-test.patch | 41 +++++ ...-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch | 41 +++++ package/netsnmp/netsnmp.mk | 1 + 4 files changed, 225 insertions(+) create mode 100644 package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch create mode 100644 package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch create mode 100644 package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch diff --git a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch new file mode 100644 index 0000000000..8431d46868 --- /dev/null +++ b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch @@ -0,0 +1,142 @@ +From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 12 Sep 2018 20:16:39 +0200 +Subject: [PATCH 1/3] configure, static linking: Fix SSL checks + +During checking of DTLS_method, the stub program is linked only with -ssl +libssl.a lacks some function from -lcrypto: +RAND_*() +ERR_*() +BUF_MEM_*() +etc. +and -lz: +- inflate() +- deflate() + +Append -lcrypto and -lz to LIBS variable when checking DTLS_method. + +See also https://sourceforge.net/p/net-snmp/patches/1374/. + +Signed-off-by: Giulio Benetti +[bvanassche: Edited subject / rewrote this patch] +--- + configure | 52 ++++++++++++++++++++++++++++++++++--- + configure.d/config_os_libs2 | 14 +++++++--- + 2 files changed, 58 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 6504a8e58..1116cecaa 100755 +--- a/configure ++++ b/configure +@@ -23228,16 +23228,60 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 + $as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } + if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : +- CRYPTO="crypto" ++ CRYPTO="crypto"; LIBCRYPTO="-lcrypto" ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 ++$as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } ++if ${ac_cv_lib_crypto_EVP_md5+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lcrypto -lz $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char EVP_md5 (); ++int ++main () ++{ ++return EVP_md5 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_crypto_EVP_md5=yes ++else ++ ac_cv_lib_crypto_EVP_md5=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 ++$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } ++if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : ++ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" + fi + +- fi ++ ++fi ++ ++ else ++ LIBCRYPTO="-l${CRYPTO}" ++ fi + + if test x$CRYPTO != x; then + + $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h + +- LIBCRYPTO="-l${CRYPTO}" + netsnmp_save_LIBS="$LIBS" + LIBS="$LIBCRYPTO" + for ac_func in AES_cfb128_encrypt EVP_sha224 EVP_sha384 EVP_MD_CTX_create EVP_MD_CTX_destroy EVP_MD_CTX_new EVP_MD_CTX_free DH_set0_pqg DH_get0_pqg DH_get0_key ASN1_STRING_get0_data X509_NAME_ENTRY_get_object X509_NAME_ENTRY_get_data X509_get_signature_nid +@@ -23291,7 +23335,7 @@ _ACEOF + LIBS="$netsnmp_save_LIBS" + fi + netsnmp_save_LIBS="$LIBS" +- LIBS="-lssl" ++ LIBS="-lssl $LIBCRYPTO" + for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 4a1ad1551..75214cfff 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + LIBS="$netsnmp_save_LIBS" + + if test x$CRYPTO = x; then +- AC_CHECK_LIB([crypto], [EVP_md5], [CRYPTO="crypto"]) +- fi ++ AC_CHECK_LIB([crypto], [EVP_md5], ++ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ ++ AC_CHECK_LIB([crypto], [EVP_md5], ++ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], ++ [-lz]) ++ ]) ++ else ++ LIBCRYPTO="-l${CRYPTO}" ++ fi + + if test x$CRYPTO != x; then + AC_DEFINE(HAVE_LIBCRYPTO, 1, + [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) +- LIBCRYPTO="-l${CRYPTO}" + netsnmp_save_LIBS="$LIBS" + LIBS="$LIBCRYPTO" + AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl +@@ -342,7 +348,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + LIBS="$netsnmp_save_LIBS" + fi + netsnmp_save_LIBS="$LIBS" +- LIBS="-lssl" ++ LIBS="-lssl $LIBCRYPTO" + AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl + [SSL_library_init SSL_load_error_strings]) + LIBS="$netsnmp_save_LIBS" +-- +2.17.1 + diff --git a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch new file mode 100644 index 0000000000..3ec0c2278f --- /dev/null +++ b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch @@ -0,0 +1,41 @@ +From d8694929b12b47febb0f7f43f46041387874fe52 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Mon, 17 Sep 2018 07:33:34 -0700 +Subject: [PATCH 2/3] configure: Fix -lcrypto -lz test + +Avoid that the second crypto library test uses the cached result from +the first test by explicitly clearing the cached test result. + +Signed-off-by: Giulio Benetti +--- + configure | 1 + + configure.d/config_os_libs2 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/configure b/configure +index 1116cecaa..33b8c93e5 100755 +--- a/configure ++++ b/configure +@@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : + CRYPTO="crypto"; LIBCRYPTO="-lcrypto" + else + ++ unset ac_cv_lib_crypto_EVP_md5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 + $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } + if ${ac_cv_lib_crypto_EVP_md5+:} false; then : +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 75214cfff..81788a209 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + if test x$CRYPTO = x; then + AC_CHECK_LIB([crypto], [EVP_md5], + [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ ++ unset ac_cv_lib_crypto_EVP_md5 + AC_CHECK_LIB([crypto], [EVP_md5], + [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], + [-lz]) +-- +2.17.1 + diff --git a/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch b/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch new file mode 100644 index 0000000000..5cbc35600f --- /dev/null +++ b/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch @@ -0,0 +1,41 @@ +From 77062d4a76f5dbd8aee03a25e9eb514b7d924bcc Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 17 Sep 2018 21:44:20 +0200 +Subject: [PATCH 3/3] configure: Invert AC_CHECK_LIB(EVP_md5,..) without -lz + with -lz + +First AC_CHECK_LIB(EVP_md5,...) is going to succeed due to +[other-libraries] fields, but in that case it won't add -lz to LIBCRYPTO +resulting in failing AC_CHECH_FUNCS() with LIBS=LIBCRYPTO. + +Try AC_CHECK_LIB(EVP_md5,..) where LIBS can miss -lz +and in action-if-not-found try AC_CHECK_LIB(EVP_md5,...) without -lz. +In the first case append -lz to LIBCRYPTO, in the second don't. +This is done to check if -lz is present and used in -lcrypto. + +Signed-off-by: Giulio Benetti +--- + configure.d/config_os_libs2 | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 81788a209..bfd14c191 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -307,11 +307,10 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + + if test x$CRYPTO = x; then + AC_CHECK_LIB([crypto], [EVP_md5], +- [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ ++ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [ + unset ac_cv_lib_crypto_EVP_md5 + AC_CHECK_LIB([crypto], [EVP_md5], +- [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], +- [-lz]) ++ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], []) + ]) + else + LIBCRYPTO="-l${CRYPTO}" +-- +2.17.1 + diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 6c712ae075..65a3f16a4d 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -36,6 +36,7 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config +NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big From deb1c87ea00e9c23111786cfee8cf564371cb609 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 15 Oct 2018 23:59:55 +0200 Subject: [PATCH 2579/2640] netsnmp: improve linking avoiding useless -lz listing in shared build In commit: https://git.buildroot.net/buildroot/commit/?id=13722d58f77d0e9fea9eefc50bf083d19f835433 Patch "0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch" was intended to fix AC_CHECK_FUNCS() failure on openssl functions. This was due to missing -lz during static linking. But the patch is wrong and results in explicitly linking against -lz in both shared and static build. This makes no sense, since shared linking has transitive dependency so it doesn't need to list -lz after -lssl, -lssl is enough. Differently static linking needs -lz to be listed after -lssl. So the real cause of previous build failure: http://autobuild.buildroot.net/results/881/881139fb049738b16609d39ad5a49bd77ff6b4aa/ is that when AC_CHECK_FUNCS(), $LIBS variable is overwritten with $LIBCRYPTO without taking into accout previous $LIBS content(i.e. where -lz is present). This results in AC_CHEC_FUNCS() to fail while trying to statically link without listing -lz. Then: - Remove current "0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch" - Add patch "0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch" where add $LIBS content to tail of new $LIBS variable like this: LIBS="$LIBCRYPTO $LIBS" NOTE: $LIBS is at the end to ensure static linking to work correctly. - Add patch 0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch where add $LIBS content to tail of new $LIBS variable like this: LIBS="-lssl $LIBCRYPTO $LIBS" NOTE: $LIBS is at the end to ensure static linking to work correctly. This way AC_CHECK_FUNCS(), when static linking, try to link with -lz too appending it at the end of linking library list. And after every AC_CHECK_FUNCS(), previously saved $LIBS variable gets back to its original value(i.e. containing -lz if present) resulting in having or not -lz appended to library list according to static or shared build. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit c5a7c287de4a3108d8aaf965731ef7978a903875) Signed-off-by: Peter Korsgaard --- ...-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch | 41 ------------------- ..._CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch | 39 ++++++++++++++++++ ..._CHECK_FUNCS-TLS_method-TLSv1_method.patch | 39 ++++++++++++++++++ 3 files changed, 78 insertions(+), 41 deletions(-) delete mode 100644 package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch create mode 100644 package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch create mode 100644 package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch diff --git a/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch b/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch deleted file mode 100644 index 5cbc35600f..0000000000 --- a/package/netsnmp/0003-configure-Invert-AC_CHECK_LIB-EVP_md5-.-without-lz-w.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 77062d4a76f5dbd8aee03a25e9eb514b7d924bcc Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 17 Sep 2018 21:44:20 +0200 -Subject: [PATCH 3/3] configure: Invert AC_CHECK_LIB(EVP_md5,..) without -lz - with -lz - -First AC_CHECK_LIB(EVP_md5,...) is going to succeed due to -[other-libraries] fields, but in that case it won't add -lz to LIBCRYPTO -resulting in failing AC_CHECH_FUNCS() with LIBS=LIBCRYPTO. - -Try AC_CHECK_LIB(EVP_md5,..) where LIBS can miss -lz -and in action-if-not-found try AC_CHECK_LIB(EVP_md5,...) without -lz. -In the first case append -lz to LIBCRYPTO, in the second don't. -This is done to check if -lz is present and used in -lcrypto. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 81788a209..bfd14c191 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -307,11 +307,10 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - - if test x$CRYPTO = x; then - AC_CHECK_LIB([crypto], [EVP_md5], -- [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [ - unset ac_cv_lib_crypto_EVP_md5 - AC_CHECK_LIB([crypto], [EVP_md5], -- [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], -- [-lz]) -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], []) - ]) - else - LIBCRYPTO="-l${CRYPTO}" --- -2.17.1 - diff --git a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch b/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch new file mode 100644 index 0000000000..0829042128 --- /dev/null +++ b/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch @@ -0,0 +1,39 @@ +From 8e273c688aa235ed9c68570a700d31596bac14df Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 15 Oct 2018 19:07:05 +0200 +Subject: [PATCH 1/2] configure: fix AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) + failure on static linking + +If building as static lib, AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) +fails due to missing -lz in $LIBS. +At the moment, $LIBS contains $LIBCRYPTO only discarding previous $LIBS +content. + +Add $LIBS to: +LIBS="$LIBCRYPTO" +as: +LIBS="$LIBCRYPTO $LIBS" +This way $LIBS will contain -lz at the end of linking command that in +static linking build is mandatory. + +Signed-off-by: Giulio Benetti +--- + configure.d/config_os_libs2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 81788a209..93044000b 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -321,7 +321,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + AC_DEFINE(HAVE_LIBCRYPTO, 1, + [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) + netsnmp_save_LIBS="$LIBS" +- LIBS="$LIBCRYPTO" ++ LIBS="$LIBCRYPTO $LIBS" + AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl + [EVP_sha224 EVP_sha384 ]dnl + [EVP_MD_CTX_create EVP_MD_CTX_destroy]dnl +-- +2.17.1 + diff --git a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch new file mode 100644 index 0000000000..a731f25761 --- /dev/null +++ b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch @@ -0,0 +1,39 @@ +From 1ab6e3fc3cf61fa5a7b7363e59095e868474524b Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 15 Oct 2018 19:34:26 +0200 +Subject: [PATCH 2/2] configure: fix AC_CHECK_FUNCS(TLS_method TLSv1_method + ...) failure on static linking + +If building as static lib, AC_CHECK_FUNCS(TLS_method TLSv1_method ...) +fails due to missing -lz in $LIBS. +At the moment, $LIBS contains "-lssl $LIBCRYPTO" only discarding +previous $LIBS content. + +Add $LIBS to: +LIBS="-lssl $LIBCRYPTO" +as: +LIBS="-lssl $LIBCRYPTO $LIBS" +This way $LIBS will contain -lz at the end of linking command that in +static linking build is mandatory. + +Signed-off-by: Giulio Benetti +--- + configure.d/config_os_libs2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 93044000b..c811c63ec 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -349,7 +349,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then + LIBS="$netsnmp_save_LIBS" + fi + netsnmp_save_LIBS="$LIBS" +- LIBS="-lssl $LIBCRYPTO" ++ LIBS="-lssl $LIBCRYPTO $LIBS" + AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl + [SSL_library_init SSL_load_error_strings]) + LIBS="$netsnmp_save_LIBS" +-- +2.17.1 + From 4afedc3d7e570073617c645439066ea7f471d76d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 27 Apr 2018 11:40:54 -0400 Subject: [PATCH 2580/2640] qemu: bump to 2.12.0 In addition: - Update 0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch with new line numbers and file location. - Remove upstream 0002-memfd-fix-configure-test.patch - Add new options found in 2.12.0 in qemu.mk as disabled. - Remove --with-system-pixman as it's no longer optional. Tested with test-pkg: ./utils/test-pkg -p qemu -c configs/qemu_min_defconfig br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: SKIPPED br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK armv5-ctng-linux-gnueabi [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 06e3957c16ae58745a29c56436c537170e246ea2) Signed-off-by: Peter Korsgaard --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 8 +-- .../qemu/0002-memfd-fix-configure-test.patch | 58 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 13 ++++- 4 files changed, 16 insertions(+), 65 deletions(-) delete mode 100644 package/qemu/0002-memfd-fix-configure-test.patch diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index 6d6d024d9d..a0c4a6203c 100644 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -17,11 +17,11 @@ Signed-off-by: Thomas Petazzoni user-exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/user-exec.c b/user-exec.c +diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 6db0758..2b3d116 100644 ---- a/user-exec.c -+++ b/user-exec.c -@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +--- a/accel/tcg/user-exec.c ++++ b/accel/tcg/user-exec.c +@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch deleted file mode 100644 index 3e06c0e932..0000000000 --- a/package/qemu/0002-memfd-fix-configure-test.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini -Signed-off-by: Baruch Siach ---- -Upstream status: commit 75e5b70e6b5 - - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a98bd4..99ccc1725ace 100755 ---- a/configure -+++ b/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba866..412e94a405fc 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -2.16.2 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 1173c1bf3d..fc0b4e87bf 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f qemu-2.10.2.tar.xz +sha256 e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc qemu-2.12.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 0a6a6c0609..aec803c1ae 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.10.2 +QEMU_VERSION = 2.12.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -95,7 +95,6 @@ define QEMU_CONFIGURE_CMDS ./configure \ --prefix=/usr \ --cross-prefix=$(TARGET_CROSS) \ - --with-system-pixman \ --audio-drv-list= \ --enable-kvm \ --enable-attr \ @@ -120,6 +119,16 @@ define QEMU_CONFIGURE_CMDS --disable-strip \ --disable-seccomp \ --disable-sparse \ + --disable-mpath \ + --disable-sanitizers \ + --disable-hvf \ + --disable-whpx \ + --disable-malloc-trim \ + --disable-membarrier \ + --disable-vhost-crypto \ + --disable-libxml2 \ + --disable-capstone \ + --disable-git-update \ $(QEMU_OPTS) \ ) endef From 282c870f986c9a945ac7ff112e2b9e5a3ecf3401 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Oct 2018 09:08:42 +0200 Subject: [PATCH 2581/2640] qemu: security bump to 2.12.1 >From the release notes: This update contains new mitigation functionality for CVE-2018-3639 (Speculative Store Bypass) in x86. There are also bug fixes for migration, Intel IOMMU emulation, block layer/image handling, ARM emulation, and various other areas. https://www.mail-archive.com/qemu-devel@nongnu.org/msg553574.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit b400c2ae0b06e0be99925a56f1166bed37ff3986) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index fc0b4e87bf..2b27008b73 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc qemu-2.12.0.tar.xz +sha256 33583800e0006cd00b78226b85be5a27c8e3b156bed2e60e83ecbeb7b9b8364f qemu-2.12.1.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index aec803c1ae..0b53d130af 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.12.0 +QEMU_VERSION = 2.12.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From fd5ec84f5888c1a5d7824146181e6acaa6fa9205 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Oct 2018 09:43:33 +0200 Subject: [PATCH 2582/2640] utils/get-developers: add -e flag to only list email addresses for git send-email When called with a list of patches, get-developers prints the entire git send-email invocation line: ./utils/get-developers 0001-git-security-bump-to-version-2.16.5.patch git send-email --to buildroot@buildroot.org --cc "Matt Weber " This may be handy when creating an entire patch series and editing a cover letter, but it does mean that this has to be explicitly executed and get-developers cannot be used directly by the --cc-cmd option of git send-email to automatically CC affected developers. So add an -e flag to only let get-developers print the email addresses of the affected developers in the one-email-per-line format expected by git send-email, similar to how get_maintainer.pl works in the Linux kernel. With this and a suitable git configuration: git config sendemail.to buildroot@buildroot.org git config sendemail.ccCmd "$(pwd)/utils/get-developers -e" You can simply do: git send-email master To automatically mail the buildroot list and CC affected developers on patches. Signed-off-by: Peter Korsgaard Acked-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit bcf2ed5cc3e6cba61aedb9eeb34f39d96d612867) Signed-off-by: Peter Korsgaard --- utils/get-developers | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/utils/get-developers b/utils/get-developers index f525ff2226..9135b41662 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -18,6 +18,8 @@ def parse_args(): help='find developers in charge of these files') parser.add_argument('-c', dest='check', action='store_const', const=True, help='list files not handled by any developer') + parser.add_argument('-e', dest='email', action='store_const', + const=True, help='only list affected developer email addresses') return parser.parse_args() @@ -90,12 +92,16 @@ def __main__(): if i in dev.infras: matching_devs.add(dev.name) - result = "--to buildroot@buildroot.org" - for dev in matching_devs: - result += " --cc \"%s\"" % dev + if args.email: + for dev in matching_devs: + print dev + else: + result = "--to buildroot@buildroot.org" + for dev in matching_devs: + result += " --cc \"%s\"" % dev - if result != "": - print("git send-email %s" % result) + if result != "": + print("git send-email %s" % result) __main__() From de8e95f0b25ee7092029e2d0be2fed224e8b5118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= Date: Fri, 12 Oct 2018 01:00:50 +0200 Subject: [PATCH 2583/2640] utils/get-developers: fix python 3.x compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a syntax error introduced in bcf2ed5cc3. Output before the patch: $ ./utils/get-developers outgoing/* File "./utils/get-developers", line 97 print dev ^ SyntaxError: Missing parentheses in call to 'print'. Did you mean print(dev)? Output after the patch: $ ./utils/get-developers outgoing/* git send-email --to buildroot@buildroot.org Signed-off-by: Grégoire Delattre Signed-off-by: Peter Korsgaard (cherry picked from commit 8320ad3341b9242eaf82df7a4d4c1a367991ec3d) Signed-off-by: Peter Korsgaard --- utils/get-developers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/get-developers b/utils/get-developers index 9135b41662..ce882e6699 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -94,7 +94,7 @@ def __main__(): if args.email: for dev in matching_devs: - print dev + print(dev) else: result = "--to buildroot@buildroot.org" for dev in matching_devs: From 17f798d47840f2ede91f3b1bd73ceeab2341872a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 20 Oct 2018 18:02:31 +0200 Subject: [PATCH 2584/2640] utils/get-developers: make it callable from elsewhere than the toplevel directory get-developers tries to open DEVELOPERS in the current directory, so it breaks when calling it from elsewhere than the toplevel Buildroot directory. Traceback (most recent call last): File "../utils/get-developers", line 107, in __main__() File "../utils/get-developers", line 26, in __main__ devs = getdeveloperlib.parse_developers(os.path.dirname() File "/home/peko/source/buildroot/utils/getdeveloperlib.py", line 161, in parse_developers with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: IOError: [Errno 2] No such file or directory: '/home/peko/source/buildroot/output-foo/DEVELOPERS' Fix it by instead figuring out where the DEVELOPERS file is relative to the location of get-developers (E.G. one level up). Signed-off-by: Peter Korsgaard [Arnout: - add realpath to support a symlinked get-developers script; - pass devs_dir argument to check_developers() to support -c in subdir; - convert basepath to absolute path to support -f option. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 62d5558f76a790d1c1b3a1834f1736dc86b6e34f) Signed-off-by: Peter Korsgaard --- utils/get-developers | 6 ++++-- utils/getdeveloperlib.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/get-developers b/utils/get-developers index ce882e6699..c887938859 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -24,7 +24,9 @@ def parse_args(): def __main__(): - devs = getdeveloperlib.parse_developers() + # DEVELOPERS is one level up from here + devs_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..') + devs = getdeveloperlib.parse_developers(devs_dir) if devs is None: sys.exit(1) args = parse_args() @@ -50,7 +52,7 @@ def __main__(): # Handle the check action if args.check: - files = getdeveloperlib.check_developers(devs) + files = getdeveloperlib.check_developers(devs, devs_dir) for f in files: print(f) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 2c8d477583..84665520c6 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -158,6 +158,8 @@ def parse_developers(basepath=None): linen = 0 if basepath is None: basepath = os.getcwd() + else: + basepath = os.path.abspath(basepath) with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: files = [] name = None From 26109e34c35377590dc7956df2665c7354f814d1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Oct 2018 22:28:34 +0200 Subject: [PATCH 2585/2640] file: explicitly disable libseccomp support for host Fixes: http://autobuild.buildroot.net/results/8a2/8a2ea2e4426416447705492237f526fc84b595d7/ http://autobuild.buildroot.net/results/a1f/a1f2369d31c2387efdec908877e0bcaa728b5aeb/ file-5.33 added optional seccomp support, but the filters did not cover all needed syscalls, leading to errors when the freshly built host-file is executed as part of the build on distributions with seccomp support (E.G. Arch Linux): checking for seccomp_init in -lseccomp... yes .. ../src/file -C -m magic make[3]: *** [Makefile:764: magic.mgc] Bad system call This has been fixed in file-5.34, but it anyway makes sense to explicitly disable libseccomp support for consistency as we do not need it for the host build. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit a609f83296a27f7677ba53ba40d60c9da21237a9) Signed-off-by: Peter Korsgaard --- package/file/file.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/file/file.mk b/package/file/file.mk index 422e29b1ce..1f04dad688 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -12,6 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +HOST_FILE_CONF_OPTS = --disable-libseccomp ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) FILE_CONF_OPTS += --enable-libseccomp From 8c390b86d0257030c39b0e3c380595b0c8201481 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Oct 2018 23:13:51 +0200 Subject: [PATCH 2586/2640] leveldb: fix parallel build Build of leveldb sometimes fails on: Fatal error: can't create out-shared/db/db_bench.o: No such file or directory Patch is not upstreamable as upstream switched to cmake Fixes: - http://autobuild.buildroot.net/results/945bb8096c1f98f307161a6def5a9f7f25b2454a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit abba4e701246f69bc22ca9045e9932abfe9228e9) Signed-off-by: Peter Korsgaard --- package/leveldb/0003-fix-parallel-build.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/leveldb/0003-fix-parallel-build.patch diff --git a/package/leveldb/0003-fix-parallel-build.patch b/package/leveldb/0003-fix-parallel-build.patch new file mode 100644 index 0000000000..8aafbc2e02 --- /dev/null +++ b/package/leveldb/0003-fix-parallel-build.patch @@ -0,0 +1,36 @@ +From 293e1b08317567b2e479d24530986676ae4d2221 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 8 Oct 2018 23:08:19 +0200 +Subject: [PATCH] fix parallel build + +Build of leveldb sometimes fails on: +Fatal error: can't create out-shared/db/db_bench.o: No such file or directory + +Fix this, by creating $(SHARED_OUTDIR) before building +(SHARED_OUTDIR)/db/db_bench.o + +Fixes: + - http://autobuild.buildroot.net/results/945bb8096c1f98f307161a6def5a9f7f25b2454a + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as upstream switched to cmake] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f7cc7d7..edb56a5 100644 +--- a/Makefile ++++ b/Makefile +@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $( + $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) + $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) + +-$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) ++$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR) $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) + $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) + + .PHONY: run-shared +-- +2.17.1 + From c5e98d9e994e60e435614396e1d0a43358200c26 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Oct 2018 22:52:22 +0200 Subject: [PATCH 2587/2640] nmap: update license nmap is licensed under GPL-2.0 but with additional restrictions (see COPYING, especially the "IMPORTANT NMAP LICENSE TERMS" part). So, following advices of Yann and Arnout (see https://patchwork.ozlabs.org/patch/979081), set license to nmap license Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f6199d3654d0a78d8ac5557679086e8618132854) Signed-off-by: Peter Korsgaard --- package/nmap/nmap.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 420aec82d7..8809d4c037 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -10,7 +10,7 @@ NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ --with-libdnet=included --with-liblinear=included -NMAP_LICENSE = GPL-2.0 +NMAP_LICENSE = nmap license NMAP_LICENSE_FILES = COPYING # needed by libpcap From e373f8396f8c54d5a6c77178462635451bfa4e8a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Oct 2018 15:25:58 +0200 Subject: [PATCH 2588/2640] support/testing: fix TestATFAllwinner test case This test case uses a too old U-Boot version, which is affected by the infamous libfdt header conflict issue. Let's update to U-Boot 2017.11, which is used by our current bananapi_m64_defconfig that was the inspiration for this test case. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/107860310 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 2a63cea587f66d328ad2528423f8b12f1005dd13) Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 75cea01fc8..ab2239e51e 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -40,7 +40,7 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From 0a98905c8885cbe7f73df0cd2f212bf6bdf78d85 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Oct 2018 15:25:59 +0200 Subject: [PATCH 2589/2640] support/testing: fix TestATFMarvell test case This test case uses a too old U-Boot version, which is affected by the infamous libfdt header conflict issue. We update U-Boot and ATF to what is used in the current version of solidrun_macchiatobin_mainline_defconfig, for which the problem no longer exists. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/107860312 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 22c2b27249107930ddedb3ed14c575e2ae8254e6) Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index ab2239e51e..bb3701baed 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -63,7 +63,7 @@ class TestATFMarvell(infra.basetest.BRTest): BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="43965481990fd92e9666cf9371a8cf478055ec7c" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -74,7 +74,7 @@ class TestATFMarvell(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" BR2_TARGET_UBOOT_NEEDS_DTC=y """ From f5644f596e37df04a8e223a65de059ad28380830 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 21 Oct 2018 19:53:31 +0200 Subject: [PATCH 2590/2640] package/binutils: remove binutils 2.27 patches binutils 2.27 support was removed in commit 453d29f1f45736d0156071930a09015def68994a. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 9861d487e1c6965d15d8ffcdcad2c30af84ef0e3) Signed-off-by: Peter Korsgaard --- .../2.27/0100-elf32-arm-no-data-fix.patch | 22 -- package/binutils/2.27/0120-sh-conf.patch | 46 --- ....c-fixup-xg_reverse_shift_count-typo.patch | 33 -- ...-memory-corruption-by-broken-sysregs.patch | 42 --- package/binutils/2.27/0300-ld-makefile.patch | 41 --- .../2.27/0301-check-ldrunpath-length.patch | 36 --- .../0500-add-sysroot-fix-from-bug-3049.patch | 52 --- .../2.27/0600-poison-system-directories.patch | 306 ------------------ ...dynamic-tag-VMA-and-size-from-dynami.patch | 36 --- .../2.27/0906-microblaze-pr21180.patch | 33 -- ...able-CRC-instructions-on-supported-A.patch | 88 ----- 11 files changed, 735 deletions(-) delete mode 100644 package/binutils/2.27/0100-elf32-arm-no-data-fix.patch delete mode 100644 package/binutils/2.27/0120-sh-conf.patch delete mode 100644 package/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch delete mode 100644 package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch delete mode 100644 package/binutils/2.27/0300-ld-makefile.patch delete mode 100644 package/binutils/2.27/0301-check-ldrunpath-length.patch delete mode 100644 package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch delete mode 100644 package/binutils/2.27/0600-poison-system-directories.patch delete mode 100644 package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch delete mode 100644 package/binutils/2.27/0906-microblaze-pr21180.patch delete mode 100644 package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch diff --git a/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch b/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch deleted file mode 100644 index c6b0e7efe8..0000000000 --- a/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -bfd/ChangeLog -2016-08-23 Nick Clifton - - * elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if - there is no arm data associated with the section. - -[Thomas: taken from https://lists.gnu.org/archive/html/bug-binutils/2016-08/msg00165.html.] -Signed-off-by: Thomas Petazzoni - -diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c -index 1eba21b..4478238 100644 ---- a/bfd/elf32-arm.c -+++ b/bfd/elf32-arm.c -@@ -18688,7 +18688,7 @@ elf32_arm_count_additional_relocs (asection *sec) - { - struct _arm_elf_section_data *arm_data; - arm_data = get_arm_elf_section_data (sec); -- return arm_data->additional_reloc_count; -+ return arm_data == NULL ? 0 : arm_data->additional_reloc_count; - } - - /* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which diff --git a/package/binutils/2.27/0120-sh-conf.patch b/package/binutils/2.27/0120-sh-conf.patch deleted file mode 100644 index cc14ef4029..0000000000 --- a/package/binutils/2.27/0120-sh-conf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 34b66f7..905bc7b 100755 ---- a/configure -+++ b/configure -@@ -3939,7 +3939,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 4977d97..1e69ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1276,7 +1276,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.4.3 - diff --git a/package/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch b/package/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch deleted file mode 100644 index 7973607884..0000000000 --- a/package/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 78fb7e37eb8bb08ae537d6c487996ff17c810332 Mon Sep 17 00:00:00 2001 -From: Trevor Saunders -Date: Mon, 26 Sep 2016 12:42:11 -0400 -Subject: [PATCH] tc-xtensa.c: fixup xg_reverse_shift_count typo - -gas/ChangeLog: - -2016-09-26 Trevor Saunders - - * config/tc-xtensa.c (xg_reverse_shift_count): Pass cnt_arg instead of - cnt_argp to concat. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index d062044..ca261ae 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp) - cnt_arg = *cnt_argp; - - /* replace the argument with "31-(argument)" */ -- new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL); -+ new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL); - - free (cnt_arg); - *cnt_argp = new_arg; --- -2.1.4 - diff --git a/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch deleted file mode 100644 index 30103ee05e..0000000000 --- a/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Aug 2017 00:36:05 -0700 -Subject: [PATCH] xtensa: fix memory corruption by broken sysregs - -In some xtensa configurations there may be system/user registers in -xtensa-modules with negative index. ISA initialization for such config -may clobber heap and result in program termination. -Don't update lookup table entries for register with negative indices. -They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this -change should not affect processing of valid assembly/binary code. - -bfd/ -2017-08-02 Max Filippov - - * xtensa-isa.c (xtensa_isa_init): Don't update lookup table - entries for sysregs with negative indices. - -Signed-off-by: Max Filippov ---- -Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a - - bfd/xtensa-isa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c -index 8da75bea8109..8c6ee88fdeae 100644 ---- a/bfd/xtensa-isa.c -+++ b/bfd/xtensa-isa.c -@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) - xtensa_sysreg_internal *sreg = &isa->sysregs[n]; - is_user = sreg->is_user; - -- isa->sysreg_table[is_user][sreg->number] = n; -+ if (sreg->number >= 0) -+ isa->sysreg_table[is_user][sreg->number] = n; - } - - /* Set up the interface lookup table. */ --- -2.1.4 - diff --git a/package/binutils/2.27/0300-ld-makefile.patch b/package/binutils/2.27/0300-ld-makefile.patch deleted file mode 100644 index 73cc098024..0000000000 --- a/package/binutils/2.27/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/package/binutils/2.27/0301-check-ldrunpath-length.patch b/package/binutils/2.27/0301-check-ldrunpath-length.patch deleted file mode 100644 index 3b4c204c7f..0000000000 --- a/package/binutils/2.27/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1242,6 +1242,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index f67a43efdf..0000000000 --- a/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 96f9ecc..1439309 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.4.3 - diff --git a/package/binutils/2.27/0600-poison-system-directories.patch b/package/binutils/2.27/0600-poison-system-directories.patch deleted file mode 100644 index d16994ec0c..0000000000 --- a/package/binutils/2.27/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -14,6 +14,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -786,6 +786,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1442,6 +1443,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15491,7 +15494,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -164,6 +164,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -144,6 +144,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -257,6 +257,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch b/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch deleted file mode 100644 index f1ec259988..0000000000 --- a/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c646b02fdcae5f37bd88f33a0c4683ef13ad5c82 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Mon, 31 Oct 2016 12:46:38 +1030 -Subject: [PATCH] Revert part "Set dynamic tag VMA and size from dynamic - section when possible" - - PR 20748 - * elf32-microblaze.c (microblaze_elf_finish_dynamic_sections): Revert - 2016-05-13 change. - -Signed-off-by: Alan Modra -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c -index 477e7b3..5c66808 100644 ---- a/bfd/elf32-microblaze.c -+++ b/bfd/elf32-microblaze.c -@@ -3396,13 +3396,13 @@ microblaze_elf_finish_dynamic_sections (bfd *output_bfd, - { - asection *s; - -- s = bfd_get_linker_section (dynobj, name); -+ s = bfd_get_section_by_name (output_bfd, name); - if (s == NULL) - dyn.d_un.d_val = 0; - else - { - if (! size) -- dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; -+ dyn.d_un.d_ptr = s->vma; - else - dyn.d_un.d_val = s->size; - } --- -2.1.4 - diff --git a/package/binutils/2.27/0906-microblaze-pr21180.patch b/package/binutils/2.27/0906-microblaze-pr21180.patch deleted file mode 100644 index 48e5e14b45..0000000000 --- a/package/binutils/2.27/0906-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c ---- binutils-2.27.orig/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200 -+++ binutils-2.27/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100 -@@ -3297,13 +3297,20 @@ - || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch b/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch deleted file mode 100644 index 3b7fcfc959..0000000000 --- a/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 29a4659015ca7044c2d425d32a0b828e0fbb5ac1 Mon Sep 17 00:00:00 2001 -From: Richard Earnshaw -Date: Wed, 7 Sep 2016 17:14:54 +0100 -Subject: [PATCH] Automatically enable CRC instructions on supported ARMv8-A - CPUs. - -2016-09-07 Richard Earnshaw - - * opcode/arm.h (ARM_ARCH_V8A_CRC): New architecture. - -2016-09-07 Richard Earnshaw - - * config/tc-arm.c ((arm_cpus): Use ARM_ARCH_V8A_CRC for all - ARMv8-A CPUs except xgene1. - -Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=27e5a270962fb92c07e7d476966ba380fa3bb68e -Signed-off-by: Peter Seiderer ---- - gas/config/tc-arm.c | 18 +++++++++--------- - include/opcode/arm.h | 2 ++ - 2 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c -index 73d05316..7c86184d 100644 ---- a/gas/config/tc-arm.c -+++ b/gas/config/tc-arm.c -@@ -25332,17 +25332,17 @@ static const struct arm_cpu_option_table arm_cpus[] = - "Cortex-A15"), - ARM_CPU_OPT ("cortex-a17", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, - "Cortex-A17"), -- ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A32"), -- ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A35"), -- ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A53"), -- ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A57"), -- ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A72"), -- ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Cortex-A73"), - ARM_CPU_OPT ("cortex-r4", ARM_ARCH_V7R, FPU_NONE, "Cortex-R4"), - ARM_CPU_OPT ("cortex-r4f", ARM_ARCH_V7R, FPU_ARCH_VFP_V3D16, -@@ -25361,10 +25361,10 @@ static const struct arm_cpu_option_table arm_cpus[] = - ARM_CPU_OPT ("cortex-m1", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M1"), - ARM_CPU_OPT ("cortex-m0", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0"), - ARM_CPU_OPT ("cortex-m0plus", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0+"), -- ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Samsung " \ - "Exynos M1"), -- ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "Qualcomm " - "QDF24XX"), - -@@ -25389,7 +25389,7 @@ static const struct arm_cpu_option_table arm_cpus[] = - /* APM X-Gene family. */ - ARM_CPU_OPT ("xgene1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "APM X-Gene 1"), -- ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, -+ ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, - "APM X-Gene 2"), - - { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE, NULL } -diff --git a/include/opcode/arm.h b/include/opcode/arm.h -index 60715cf8..feace5cd 100644 ---- a/include/opcode/arm.h -+++ b/include/opcode/arm.h -@@ -263,6 +263,8 @@ - #define ARM_ARCH_V7M ARM_FEATURE_CORE (ARM_AEXT_V7M, ARM_EXT2_V6T2_V8M) - #define ARM_ARCH_V7EM ARM_FEATURE_CORE (ARM_AEXT_V7EM, ARM_EXT2_V6T2_V8M) - #define ARM_ARCH_V8A ARM_FEATURE_CORE (ARM_AEXT_V8A, ARM_AEXT2_V8A) -+#define ARM_ARCH_V8A_CRC ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8A, \ -+ CRC_EXT_ARMV8) - #define ARM_ARCH_V8_1A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_1A, \ - CRC_EXT_ARMV8 | FPU_NEON_EXT_RDMA) - #define ARM_ARCH_V8_2A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_2A, \ --- -2.11.0 - From 303038983978eecaf9d3130efb94c8cd5c5c796b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 9 Oct 2018 10:06:59 +0200 Subject: [PATCH 2591/2640] ljlinenoise: fix upstream URL in Config.in The current URL no longer exists, as detected by the new pkg-stats. Signed-off-by: Thomas Petazzoni (cherry picked from commit 05200ad01434ce297a166c6e1bebc8196c18f7dc) Signed-off-by: Peter Korsgaard --- package/ljlinenoise/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ljlinenoise/Config.in b/package/ljlinenoise/Config.in index 61c80df0d1..e6b587e65d 100644 --- a/package/ljlinenoise/Config.in +++ b/package/ljlinenoise/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LJLINENOISE ljlinenoise is a pure LuaJIT port of linenoise, a small alternative to readline and libedit. - http://fperrad.github.io/ljlinenoise/ + https://fperrad.frama.io/ljlinenoise/ comment "ljlinenoise needs LuaJIT" depends on !BR2_PACKAGE_LUAJIT From 5ce7cfade2f56718c2eb4044767d51d23ebe8a12 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 9 Oct 2018 10:39:59 +0200 Subject: [PATCH 2592/2640] tinc: security bump to version 1.0.35 Fixes the following security issues: CVE-2018-16758: Michael Yonli discovered that tinc 1.0.34 and earlier allow a man-in-the-middle attack that, even if the MITM cannot decrypt the traffic sent between the two endpoints, when the MITM can correctly predict when an ephemeral key exchange message is sent in a TCP connection between two nodes, allows the MITM to force one node to send UDP packets in plaintext. The tinc 1.1pre versions are not affected by this. CVE-2018-16738: Michael Yonli discoverd that tinc versions 1.0.30 to 1.0.34 allow an oracle attack, similar to CVE-2018-16737, but due to the mitigations put in place for the Sweet32 attack in tinc 1.0.30, it now requires a timing attack that has only a limited time to complete. Tinc 1.1pre16 and earlier are also affected if there are nodes on the same VPN that still use the legacy protocol from tinc version 1.0.x. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit d0758184c03f6bb7928cb957faa649be68a145c5) Signed-off-by: Peter Korsgaard --- package/tinc/tinc.hash | 2 +- package/tinc/tinc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash index 09d2867b16..0daeb324e9 100644 --- a/package/tinc/tinc.hash +++ b/package/tinc/tinc.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 c03a9b61dedd452116dd9a8db231545ba08a7c96bce011e0cbd3cfd2c56dcfda tinc-1.0.34.tar.gz +sha256 18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e tinc-1.0.35.tar.gz sha256 3a112fd37b47d624e89b130d0e158bb8d14ec5bc9ecf5f18b448d2c07626e43d COPYING sha256 9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk index 85dccdc34e..ae7ce97bfa 100644 --- a/package/tinc/tinc.mk +++ b/package/tinc/tinc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINC_VERSION = 1.0.34 +TINC_VERSION = 1.0.35 TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPL-2.0+ with OpenSSL exception From 1c6d87e8a8fdec319b43fab7c5909f40b7269f03 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 28 Sep 2018 15:04:34 -0500 Subject: [PATCH 2593/2640] package/python-enum34: enable host build This is initially used by the setools package to do offline policy analysis using host tools. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 3ec98f0564dfa68d55b52b2815f8017455993ea9) Signed-off-by: Peter Korsgaard --- package/python-enum34/python-enum34.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk index c612cb65e2..09d1143ab9 100644 --- a/package/python-enum34/python-enum34.mk +++ b/package/python-enum34/python-enum34.mk @@ -12,3 +12,4 @@ PYTHON_ENUM34_LICENSE = BSD-3-Clause PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) From 519edb3a798c201e67611510574c0492e323f4a7 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 28 Sep 2018 15:04:35 -0500 Subject: [PATCH 2594/2640] package/setools: host variant needs host-python-enum34 The enum34 dependency is required for python2.7 for both the host and target builds. This patch adds the host dependency to match what is already in place for the target. The host build is used by the setools package seinfo tool offline for host based policy analysis. The analysis is easiest performed offline as the policy is checked for path/reachability, which is something that occurs by taking the policy file and using debug libraries to perform test cases. Fixes the following runtime error: $ ./output/host/bin/sesearch Traceback (most recent call last): [...] File "/home/test/buildroot/output/host/lib/python2.7/site-packages/setools-4.1.1-py2.7-linux-x86_64.egg/setools/policyrep/util.py", line 21, in from enum import Enum ImportError: No module named enum Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit a5e4eddb84d11ad0e4ee5c7d5298f6267e0e7f87) Signed-off-by: Peter Korsgaard --- package/setools/setools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 1ed7e976d6..63ca3651e8 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -18,6 +18,7 @@ SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else SETOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR) SETOOLS_DEPENDENCIES += python-enum34 +HOST_SETOOLS_DEPENDENCIES += host-python-enum34 endif define SETOOLS_FIX_SETUP From d89859866f31ec7a3fa32237a2049c5a11ccff32 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 10 Oct 2018 10:22:14 +0200 Subject: [PATCH 2595/2640] poco: disable fpenvironment for soft floating point configuration Many platforms don't provide all FPU features needed by Poco when configured for soft floating point in their fenv.h header. So disable fpenvironment for this configuration to avoid build breakage. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit c735f39881cf49bc58ad1b8375fd630e8284ad21) Signed-off-by: Peter Korsgaard --- package/poco/poco.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 018344d5c7..aa96d5127b 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -42,6 +42,11 @@ ifeq ($(BR2_sh4a)$(BR2_nios2),y) POCO_CONF_OPTS += --no-fpenvironment endif +# disable fpenvironment for soft floating point configuration +ifeq ($(BR2_SOFT_FLOAT),y) +POCO_CONF_OPTS += --no-fpenvironment +endif + ifeq ($(BR2_STATIC_LIBS),y) POCO_MAKE_TARGET = static_release else ifeq ($(BR2_SHARED_LIBS),y) From 2f42003b3fb108ed420789ba2407b90bf26809d5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 1 Sep 2018 00:48:45 +0200 Subject: [PATCH 2596/2640] ptpd2: fix build failures due to EVP_MD_CTX conflict and U64 missing In src/dep/ntpengine/ntp_isc_md5.*, the typedef of EVP_MD_CTX conflicts with a definition of the same type done by OpenSSL. This issue is referenced at https://github.com/ptpd/ptpd/issues/54, and has been fixed upstream in commit https://github.com/ptpd/ptpd/commit/838b985510c360e651d18134e64f258f2f4c6e7c. In src/dep/snmp.c, U64 can be missing or conflicts with new perl as reported at https://github.com/ptpd/ptpd/issues/25. This issue has been fixed upstream in commit https://github.com/ptpd/ptpd/commit/1886522b50fe44e5c0dedd01d13ac456b941f744. This commit is adapted to apply on the current version of ptpd2 we have in Buildroot. Fixes: http://autobuild.buildroot.net/results/47b99a6de256bfc0f5a8ae1484bb34e93b407237/ http://autobuild.buildroot.net/results/08365fc559dda74640b9750358c82e84600a68ea/ http://autobuild.buildroot.net/results/9b41c513500c63a9890973a0f17ffdb84d44d580/ http://autobuild.buildroot.net/results/2ed79d01635c9a5e1018229dc6f4b7240a995b87/ http://autobuild.buildroot.net/results/6d1b7e191f573334115684b85165f2bc27d75d8f/ http://autobuild.buildroot.net/results/f54c6fd841b3ea77dc12048c81f3f2991b679252/ http://autobuild.buildroot.net/results/332bc77bcde0bef1b2fd7b9993409dd051c27cd6/ http://autobuild.buildroot.net/results/4b416edaec9528d75a82c9570b8f8297718ca62d/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 5b7bc560a5859d4b9f0c2a14c10e83c18fbd6bca) Signed-off-by: Peter Korsgaard --- ...name-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch | 46 +++++++++++++++++++ ...emoving-type-U64-from-net-snmp-relat.patch | 28 +++++++++++ 2 files changed, 74 insertions(+) create mode 100644 package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch create mode 100644 package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch diff --git a/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch new file mode 100644 index 0000000000..9a9beacf90 --- /dev/null +++ b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch @@ -0,0 +1,46 @@ +From 838b985510c360e651d18134e64f258f2f4c6e7c Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Fri, 31 Aug 2018 18:46:56 +0200 +Subject: [PATCH] ntp_isc_md5: rename EVP_MD_CTX into PTPD_EVP_MD_CTX + +EVP_MD_CTX can conflict with openssl that defines a completely different +typedef with same name. + +Since this typedef is used only twice in the entire ptpd, +substitute EVP_MD_CTX with PTPD_EVP_MD_CTX. + +Signed-off-by: Giulio Benetti +--- + src/dep/ntpengine/ntp_isc_md5.c | 2 +- + src/dep/ntpengine/ntp_isc_md5.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dep/ntpengine/ntp_isc_md5.c b/src/dep/ntpengine/ntp_isc_md5.c +index 7d04467..e4e34ac 100644 +--- a/src/dep/ntpengine/ntp_isc_md5.c ++++ b/src/dep/ntpengine/ntp_isc_md5.c +@@ -262,7 +262,7 @@ MD5authencrypt( + { + u_char digest[64]; + u_int len; +- EVP_MD_CTX ctx; ++ PTPD_EVP_MD_CTX ctx; + pkt[length / 4] = htonl(keyid); + EVP_DigestInit(&ctx); + EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key)); +diff --git a/src/dep/ntpengine/ntp_isc_md5.h b/src/dep/ntpengine/ntp_isc_md5.h +index fa6e2ee..236c0e4 100644 +--- a/src/dep/ntpengine/ntp_isc_md5.h ++++ b/src/dep/ntpengine/ntp_isc_md5.h +@@ -80,7 +80,7 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest); + # define MD5Init(c) isc_md5_init(c) + # define MD5Update(c, p, s) isc_md5_update(c, p, s) + # define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */ +- typedef MD5_CTX EVP_MD_CTX; ++ typedef MD5_CTX PTPD_EVP_MD_CTX; + # define EVP_DigestInit(c) MD5Init(c) + # define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s) + # define EVP_DigestFinal(c, d, pdl) \ +-- +2.17.1 + diff --git a/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch b/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch new file mode 100644 index 0000000000..f952755d36 --- /dev/null +++ b/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch @@ -0,0 +1,28 @@ +From 84157b11e8f27318f7291823c657f6313c3b60af Mon Sep 17 00:00:00 2001 +From: Jan Breuer +Date: Tue, 12 Jul 2016 18:07:08 +0200 +Subject: [PATCH] Solve issue #25 - Removing type U64 from net-snmp related + code + +[Thomas: Backport to 2.3.1.] +Signed-off-by: Thomas Petazzoni +--- + src/dep/snmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dep/snmp.c b/src/dep/snmp.c +index 5c08aaa..3086c86 100644 +--- a/src/dep/snmp.c ++++ b/src/dep/snmp.c +@@ -221,7 +221,7 @@ snmpHeaderIndexBest(struct snmpHeaderIndex *idx) + + #define SNMP_LOCAL_VARIABLES \ + static unsigned long long_ret; \ +- static U64 counter64_ret; \ ++ static struct counter64 counter64_ret; \ + static uint32_t ipaddr; \ + Integer64 bigint; \ + struct snmpHeaderIndex idx; \ +-- +2.14.4 + From cdeb3300c079f2683cf3ade7149e9d72869db83c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Oct 2018 22:22:18 +0200 Subject: [PATCH 2597/2640] ptpd2: fix patch 0002 so that it applies properly The patch 0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch added in commit 5b7bc560a5859d4b9f0c2a14c10e83c18fbd6bca ("ptpd2: fix build failures due to EVP_MD_CTX conflict and U64 missing") was broken and did not apply correctly. This commit fixes the patch so that it applies properly. Fixes: http://autobuild.buildroot.net/results/ffa28ee2cecc77d66d934fdb03e1f2014189e45b/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d60973af00c5ad7dc15049597cf03bd1ad538041) Signed-off-by: Peter Korsgaard --- ...p_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch index 9a9beacf90..e655ff3354 100644 --- a/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch +++ b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch @@ -1,4 +1,4 @@ -From 838b985510c360e651d18134e64f258f2f4c6e7c Mon Sep 17 00:00:00 2001 +From af1d16d90ff273413a57cd02689f4fb005403609 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 31 Aug 2018 18:46:56 +0200 Subject: [PATCH] ntp_isc_md5: rename EVP_MD_CTX into PTPD_EVP_MD_CTX @@ -16,7 +16,7 @@ Signed-off-by: Giulio Benetti 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dep/ntpengine/ntp_isc_md5.c b/src/dep/ntpengine/ntp_isc_md5.c -index 7d04467..e4e34ac 100644 +index 850d004..3216de8 100644 --- a/src/dep/ntpengine/ntp_isc_md5.c +++ b/src/dep/ntpengine/ntp_isc_md5.c @@ -262,7 +262,7 @@ MD5authencrypt( @@ -25,7 +25,7 @@ index 7d04467..e4e34ac 100644 u_int len; - EVP_MD_CTX ctx; + PTPD_EVP_MD_CTX ctx; - pkt[length / 4] = htonl(keyid); + pkt[length / 4] = htonl(keyid); EVP_DigestInit(&ctx); EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key)); diff --git a/src/dep/ntpengine/ntp_isc_md5.h b/src/dep/ntpengine/ntp_isc_md5.h @@ -42,5 +42,5 @@ index fa6e2ee..236c0e4 100644 # define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s) # define EVP_DigestFinal(c, d, pdl) \ -- -2.17.1 +2.14.4 From b62302f778e66975e0aceeb0344ca64f6313a18b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Oct 2018 22:16:51 +0200 Subject: [PATCH 2598/2640] jasper: update license Add hash for license file and use SPDX short term identifier Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ab666003e276e2e0624c70a4c4105f668f20b330) Signed-off-by: Peter Korsgaard --- package/jasper/jasper.hash | 1 + package/jasper/jasper.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index b2b82178eb..8c4f2453ad 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24 jasper-version-2.0.13.tar.gz +sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 2aa3f9d554..9dc46b18d6 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -7,7 +7,7 @@ JASPER_VERSION = version-2.0.13 JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES -JASPER_LICENSE = JasPer License Version 2.0 +JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ From 2e846a6e47b21c66702f96ac3775945d01d3a0fc Mon Sep 17 00:00:00 2001 From: Artyom Panfilov Date: Wed, 10 Oct 2018 09:03:05 +0000 Subject: [PATCH 2599/2640] package/ntp: security bump to version 4.2.8p12 Release notes: https://www.nwtime.org/network-time-foundation-publishes-ntp-4-2-8p12 Fixed security issues: CVE-2016-1549 / CVE-2018-7170: Sybil vulnerability: ephemeral association attack CVE-2018-12327: The openhost() function used during command-line hostname processing by ntpq and ntpdc can write beyond its buffer limit Signed-off-by: Artem Panfilov Signed-off-by: Thomas Petazzoni (cherry picked from commit cf9344c45e85ed274cf783271344f4c03138971d) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.hash | 2 +- package/ntp/ntp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index ea86c1586f..02dbaffcba 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,5 +1,5 @@ # From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz.md5 md5 00950ca2855579541896513e78295361 ntp-4.2.8p11.tar.gz # Calculated based on the hash above -sha256 f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e ntp-4.2.8p11.tar.gz +sha256 709b222b5013d77d26bfff532b5ea470a8039497ef29d09363931c036cb30454 ntp-4.2.8p12.tar.gz sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 674c368395..af3c1aad9f 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p11 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p12 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP From 92b391c9df1908274d414089bbde63d853dab54a Mon Sep 17 00:00:00 2001 From: Artyom Panfilov Date: Wed, 10 Oct 2018 21:01:45 +0000 Subject: [PATCH 2600/2640] package/ntp: fix md5sum. Signed-off-by: Artem Panfilov Signed-off-by: Thomas Petazzoni (cherry picked from commit f3c6452729e89e546d58adfc3b288ddfae5876e2) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index 02dbaffcba..2fd8a8322b 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,5 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz.md5 -md5 00950ca2855579541896513e78295361 ntp-4.2.8p11.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz.md5 +md5 1522d66574bae14abb2622746dad2bdc ntp-4.2.8p12.tar.gz # Calculated based on the hash above sha256 709b222b5013d77d26bfff532b5ea470a8039497ef29d09363931c036cb30454 ntp-4.2.8p12.tar.gz sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1 COPYRIGHT From 7f825acb35c2a65a3fd8f40f5114e43f711fca0f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 12 Oct 2018 12:17:58 +0300 Subject: [PATCH 2601/2640] ntp: fix build for no-MMU Code rearrange in the latest ntp version exposed code that used to be hidden behind HAVE_WORKING_FORK. Put this code back where it belongs. Fixes: http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/ http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/ http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/ Cc: Artem Panfilov Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 87d759ced52cb461a4460f4c513f2f6993292bc2) Signed-off-by: Peter Korsgaard --- package/ntp/0003-fix-nommu.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/ntp/0003-fix-nommu.patch diff --git a/package/ntp/0003-fix-nommu.patch b/package/ntp/0003-fix-nommu.patch new file mode 100644 index 0000000000..53bf4dfcf3 --- /dev/null +++ b/package/ntp/0003-fix-nommu.patch @@ -0,0 +1,22 @@ +Fix no-MMU build + +The detach_from_terminal() is unused for no-MMU, but it depends on symbols +that are not defined for no-MMU. Don't define detach_from_terminal() when +HAVE_WORKING_FORK is not defined. + +Signed-off-by: Baruch Siach +--- +Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538 + +diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c +--- ntp-4.2.8p12.orig/ntpd/ntpd.c 2018-08-14 14:51:30.000000000 +0300 ++++ ntp-4.2.8p12/ntpd/ntpd.c 2018-10-12 08:19:01.291781773 +0300 +@@ -529,7 +529,7 @@ + } + #endif /* !SIM */ + +-#if !defined(SIM) && !defined(SYS_WINNT) ++#if !defined(SIM) && !defined(SYS_WINNT) && defined(HAVE_WORKING_FORK) + /* + * Detach from terminal (much like daemon()) + * Nothe that this function calls exit() From 36b53c985116248e412d5bbd60173e399a8cfc89 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 13 Oct 2018 21:51:00 +0300 Subject: [PATCH 2602/2640] ntp: fix build for no-MMU with libcap Commit 87d759ced5 (ntp: fix build for no-MMU) added a patch to make MMU dependent code hidden behind HAVE_WORKING_FORK. It turns out that the patch covers too much code. When libcap is enabled we pass --enable-linuxcaps, which in turn enables HAVE_DROPROOT. This adds calls to code that is covered by HAVE_WORKING_FORK. Update the no-MMU fix so that HAVE_WORKING_FORK only covers the no-MMU incompatible routine. Fixes: http://autobuild.buildroot.net/results/c5c/c5cf28bb969fec7c07864cdd094dedfa4d5439d2/ Cc: Artem Panfilov Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 7cf152852dd0b4bf30659e3e62d891171f1e4aa5) Signed-off-by: Peter Korsgaard --- package/ntp/0003-fix-nommu.patch | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package/ntp/0003-fix-nommu.patch b/package/ntp/0003-fix-nommu.patch index 53bf4dfcf3..0959fa0ba5 100644 --- a/package/ntp/0003-fix-nommu.patch +++ b/package/ntp/0003-fix-nommu.patch @@ -10,13 +10,20 @@ Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538 diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c --- ntp-4.2.8p12.orig/ntpd/ntpd.c 2018-08-14 14:51:30.000000000 +0300 -+++ ntp-4.2.8p12/ntpd/ntpd.c 2018-10-12 08:19:01.291781773 +0300 -@@ -529,7 +529,7 @@ - } - #endif /* !SIM */ - --#if !defined(SIM) && !defined(SYS_WINNT) -+#if !defined(SIM) && !defined(SYS_WINNT) && defined(HAVE_WORKING_FORK) - /* ++++ ntp-4.2.8p12/ntpd/ntpd.c 2018-10-13 21:25:25.858261249 +0300 +@@ -534,6 +534,7 @@ * Detach from terminal (much like daemon()) * Nothe that this function calls exit() + */ ++# ifdef HAVE_WORKING_FORK + static void + detach_from_terminal( + int pipe_fds[2], +@@ -617,6 +618,7 @@ + + return; + } ++# endif /* HAVE_WORKING_FORK */ + + #ifdef HAVE_DROPROOT + /* From eb10a0ca4145c2e68a6c28f80e9205aceea28623 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 15 Oct 2018 21:38:28 +0300 Subject: [PATCH 2603/2640] ntp: fix build without libcap and no threads When threads support is missing the ntp build system builds the work_fork code. This code added call to set_user_group_ids() that is under HAVE_DROPROOT, which is disabled when libcap is not built. Add a patch fixing that. Fixes: http://autobuild.buildroot.net/results/ab9/ab9ceff1151b8b5e6b9fa77d39c0f9b0cac1a080/ Cc: Artyom Panfilov Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 13dcc69a39da97f615627553e88113ba455875ea) Signed-off-by: Peter Korsgaard --- .../0004-fix-work-fork-without-droproot.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/ntp/0004-fix-work-fork-without-droproot.patch diff --git a/package/ntp/0004-fix-work-fork-without-droproot.patch b/package/ntp/0004-fix-work-fork-without-droproot.patch new file mode 100644 index 0000000000..cb6fec0125 --- /dev/null +++ b/package/ntp/0004-fix-work-fork-without-droproot.patch @@ -0,0 +1,26 @@ +Fix work_fork build when droproot is disabled + +The set_user_group_ids() depends on HAVE_DROPROOT. When HAVE_DROPROOT is not +enabled, work_fork.c code causes a link failure: + +../libntp/libntp.a(work_fork.o): In function `send_blocking_req_internal': +work_fork.c:(.text+0x498): undefined reference to `set_user_group_ids' + +Make the set_user_group_ids() call depend on HAVE_DROPROOT. + +Signed-off-by: Baruch Siach +--- +Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3539 + +--- ntp-4.2.8p12.orig/libntp/work_fork.c 2018-08-14 14:51:06.000000000 +0300 ++++ ntp-4.2.8p12/libntp/work_fork.c 2018-10-15 21:10:54.580917962 +0300 +@@ -594,7 +594,9 @@ + init_logging("ntp_intres", 0, FALSE); + setup_logfile(NULL); + ++#if defined(HAVE_DROPROOT) + (void) set_user_group_ids(); ++#endif + + /* + * And now back to the portable code From c178e735f39857ad03d8c5530b6b9276bf826d68 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 11 Oct 2018 07:54:11 +0200 Subject: [PATCH 2604/2640] scanpypi: improve BSD licence handling When used without spdx_lookup the BSD licence cannot be detected correctly because many Python packages just specify BSD without the exact version in their metadata. So add a special message warning the user instead of the licence id. Bonus: fix typo. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit d05e41eb1a934b2358799588bb305073d6df8e52) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 12c96b842e..6511fc14ae 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -395,7 +395,7 @@ class BuildrootPackage(): """ Try to determine the related license name. - There are two possibilities. Either the scripts tries to + There are two possibilities. Either the script tries to get license name from package's metadata or, if spdx_lookup package is available, the script compares license files with SPDX database. @@ -404,7 +404,7 @@ class BuildrootPackage(): if liclookup is None: license_dict = { 'Apache Software License': 'Apache-2.0', - 'BSD License': 'BSD', + 'BSD License': 'FIXME: please specify the exact BSD version', 'European Union Public Licence 1.0': 'EUPL-1.0', 'European Union Public Licence 1.1': 'EUPL-1.1', "GNU General Public License": "GPL", From 06dd8b36956441bcaec5f87ce2a9a2cfeec5477a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Oct 2018 19:22:17 +0200 Subject: [PATCH 2605/2640] nmap: use system liblinear Use system liblinear instead of using included liblinear. liblinear in buildroot is at version 2.20 released on December 2017 whereas liblinear in nmap has not been updated since 7 years (except for liblinear.vcxproj which has been updated 2 years ago) Do not use --with-liblinear option as otherwise nmap will forget to add -llinear to LIBS due to the following line in configure.ac: if test $have_liblinear != yes; then AC_CHECK_HEADERS([linear.h], AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm]) ) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c0d9ba562c5522096d4ed70827c599c9a0e9aa7c) Signed-off-by: Peter Korsgaard --- package/nmap/Config.in | 1 + package/nmap/nmap.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nmap/Config.in b/package/nmap/Config.in index c1aafeceb9..51dd3423ea 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_NMAP depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBLINEAR select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_NMAP_NMAP \ if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 8809d4c037..761df3ffa8 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -7,9 +7,9 @@ NMAP_VERSION = 7.70 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 -NMAP_DEPENDENCIES = libpcap +NMAP_DEPENDENCIES = liblinear libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ - --with-libdnet=included --with-liblinear=included + --with-libdnet=included NMAP_LICENSE = nmap license NMAP_LICENSE_FILES = COPYING From f8d6c8b8eb3649e81f15eb2e429a1edc4f25fd64 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 3 Oct 2018 15:40:01 +0200 Subject: [PATCH 2606/2640] freetype: drop calling autogen, no longer needed In commit a31a66802a7a1af76a629b0ba7120424ed547646 ("freetype: security bump to version 2.5.3"), the freetype package was changed to call ./autogen.sh to regenerate the autotools stuff, because the ltmain.sh provided by upstream freetype was not compatible with Buildroot libtool-patching logic. Since then, freetype has been bumped several times, and the current version packaged in Buildroot has an ltmain.sh that is compatible with our libtool-patching logic. Therefore, this commit drops the no longer needed autogen stuff. This autogen stuff was badly breaking per-package host/target directory, because the autogen happened at the post-patch hook step, at which point the host-automake/host-autoconf/host-libtool dependencies have not yet been copied into this package host directory. Signed-off-by: Thomas Petazzoni (cherry picked from commit 88c6329521a634a6550f50900f4334b1d2e3473a) Signed-off-by: Peter Korsgaard --- package/freetype/freetype.mk | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 05e9498c69..1b3a9d1755 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -17,19 +17,6 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png -# Regen required because the tarball ships with an experimental ltmain.sh -# that can't be patched by our infra. -# autogen.sh is because autotools stuff lives in other directories and -# even AUTORECONF with _OPTS doesn't do it properly. -# POST_PATCH is because we still need to patch libtool after the regen. -define FREETYPE_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN -HOST_FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN -FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool -HOST_FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool - ifeq ($(BR2_PACKAGE_ZLIB),y) FREETYPE_DEPENDENCIES += zlib FREETYPE_CONF_OPTS += --with-zlib @@ -72,8 +59,3 @@ FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS $(eval $(autotools-package)) $(eval $(host-autotools-package)) - -# freetype-patch and host-freetype-patch use autogen.sh so add -# host-automake as a order-only-prerequisite because it is a phony -# target. -$(FREETYPE_TARGET_PATCH) $(HOST_FREETYPE_TARGET_PATCH): | host-automake From c894af75fd91c8a16bee0caba97b320d97058a6f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Oct 2018 20:20:13 +0200 Subject: [PATCH 2607/2640] open-plc-utils: fix build with static musl Pass TARGET_LDFLAGS to EXTRA_LDFLAGS to fix following issue: /home/buildroot/autobuild/run/instance-3/output/build/host-gcc-final-7.3.0/build/arm-buildroot-linux-musleabihf/libgcc/../../../libgcc/config/arm/lib1funcs.S:1545: undefined reference to `raise' Also pass TARGET_CFLAGS to EXTRA_CFLAGS and TARGET_CXXFLAGS to EXTRA_CXXFLAGS and move all these variables to OPEN_PLC_UTILS_MAKE_OPTS for readability Fixes: - http://autobuild.buildroot.org/results/67bc5e7ac8ae1c49c035b022a394d2f746705cf2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d8738d3b97a1ec1b356143269b293d55c91de860) Signed-off-by: Peter Korsgaard --- package/open-plc-utils/open-plc-utils.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/open-plc-utils/open-plc-utils.mk b/package/open-plc-utils/open-plc-utils.mk index d45bb9d4f5..e1e66bf7e0 100644 --- a/package/open-plc-utils/open-plc-utils.mk +++ b/package/open-plc-utils/open-plc-utils.mk @@ -15,8 +15,14 @@ OPEN_PLC_UTILS_LICENSE_FILES = LICENSE # Yes, we're passing __UCLIBC__ in EXTRA_CFLAGS, as it fixes a build # issue for non-uClibc toolchains. It is the very crappy solution # suggested at https://github.com/qca/open-plc-utils/issues/36. +OPEN_PLC_UTILS_MAKE_OPTS = \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -D__UCLIBC__" \ + EXTRA_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" + define OPEN_PLC_UTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS=$(TARGET_CROSS) EXTRA_CFLAGS="-D__UCLIBC__" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CROSS=$(TARGET_CROSS) \ + $(OPEN_PLC_UTILS_MAKE_OPTS) -C $(@D) endef define OPEN_PLC_UTILS_INSTALL_TARGET_CMDS From 55fe7b202b77a9ad086c167a8dd3273fd5b8ed3b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 11:37:59 +0200 Subject: [PATCH 2608/2640] package/libssh: bump version to 0.8.1 Fixed broken _SITE, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 23430a63a789dccd635d58d699bfa6416340da8a) Signed-off-by: Peter Korsgaard --- package/libssh/libssh.hash | 8 +++----- package/libssh/libssh.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 009a335e3b..7220c337cf 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,3 @@ -# from https://red.libssh.org/projects/libssh/files/ -md5 d3fc864208bf607ad87cdee836894feb libssh-0.7.5.tar.xz -# Locally calculated after checking signature on uncompressed libssh-0.7.5.tar -# https://red.libssh.org/attachments/download/217/libssh-0.7.5.tar.asc -sha256 54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095 libssh-0.7.5.tar.xz +# Locally calculated after checking pgp signature +sha256 d17f1267b4a5e46c0fbe66d39a3e702b8cefe788928f2eb6e339a18bb00b1924 libssh-0.8.1.tar.xz +sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625 COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 902865d73b..4295aa42ee 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSSH_VERSION_MAJOR = 0.7 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 +LIBSSH_VERSION_MAJOR = 0.8 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From 5c4eb517e184e11a14c8f7baa49c3ff85d643a07 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 23 Aug 2018 00:58:30 +0300 Subject: [PATCH 2609/2640] libssh: fix cross compile with older cmake Old version of cmake break cross-compilation when FindThreads is used because of a try_run call. Add a workaround that avoids try_run. cmake bug report: https://gitlab.kitware.com/cmake/cmake/issues/16920 Should fix: http://autobuild.buildroot.net/results/8aa/8aa2bd894416a4508ca7140f8947ff46243f8b78/ http://autobuild.buildroot.net/results/f2c/f2cc965bb134bf4fd9e625eb267b67c949c202fc/ Cc: Scott Fan Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit f34f33baa6f94137a78f15cafe0ee0e4ece59f97) Signed-off-by: Peter Korsgaard --- package/libssh/libssh.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 4295aa42ee..635d72ad98 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -17,6 +17,9 @@ LIBSSH_CONF_OPTS = \ -DWITH_SERVER=OFF \ -DWITH_EXAMPLES=OFF +# cmake older than 3.10 require this to avoid try_run() in FindThreads +LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON LIBSSH_DEPENDENCIES += zlib From dc27fae5c2a8941fd7a44de2a79474eeaaf77e36 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 14 Sep 2018 16:59:21 +0300 Subject: [PATCH 2610/2640] libssh: fix build with musl libc libssh uses GNU extensions to the glob() API. Update the cmake test to take that into account so that glob() is not used with musl libc. Fixes: http://autobuild.buildroot.net/results/0c2/0c2d17316fd6bd2bf1359e23a2a1273fa349cf2a/ http://autobuild.buildroot.net/results/936/936abac5362b33980fd1efe8b830409ee2f86f6b/ http://autobuild.buildroot.net/results/51b/51b1b136ab4209ee443c1b450a932341b2ff81b7/ Cc: Scott Fan Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 81e33bc77ce659cb0f42e801a449bfdfa6af491a) Signed-off-by: Peter Korsgaard --- ...heck-for-GNU-compatible-glob-support.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch diff --git a/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch b/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch new file mode 100644 index 0000000000..139879b86c --- /dev/null +++ b/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch @@ -0,0 +1,44 @@ +From 3bb8b5e4517a720d178dbe5c53b4a444d718bcf1 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 14 Sep 2018 15:19:48 +0300 +Subject: [PATCH] cmake: check for GNU compatible glob support + +The GLOB_TILDE flag is a GNU extension. musl libc does not implement +this extension, which leads to build failure: + +.../libssh-0.8.1/src/config.c: In function 'local_parse_glob': +/home/buildroot/autobuild/run/instance-1/output/build/libssh-0.8.1/src/config.c:329:10: error: 'glob_t {aka struct }' has no member named 'gl_flags'; did you mean 'gl_offs'? + .gl_flags = 0, + ^~~~~~~~ + gl_offs +.../libssh-0.8.1/src/config.c:334:25: error: 'GLOB_TILDE' undeclared (first use in this function); did you mean '_IO_FILE'? + rt = glob(fileglob, GLOB_TILDE, NULL, &globbuf); + ^~~~~~~~~~ + _IO_FILE + +Check for GLOB_TILDE directly to make sure the libc provides the +required extension. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://www.libssh.org/archive/libssh/2018-09/0000020.html + + ConfigureChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index f91bd038f5a3..dac61bcf678e 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -156,7 +156,7 @@ check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO) + check_function_exists(memset_s HAVE_MEMSET_S) + + if (HAVE_GLOB_H) +- check_function_exists(glob HAVE_GLOB) ++ check_symbol_exists(GLOB_TILDE "glob.h" HAVE_GLOB) + endif (HAVE_GLOB_H) + + if (NOT WIN32) +-- +2.18.0 + From c26f59e1a68f838deef11968f6473198b520c15d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 11 Oct 2018 21:46:40 +0300 Subject: [PATCH 2611/2640] libssh: bump to version 0.8.3 Drop GNU glob detection patch; issue fixed upstream. Add upstream patch that completes the build fix when GNU glob is not present. Cc: Scott Fan Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 540e37bf7457fe41ffb6270ad23bea2fc8a706a4) Signed-off-by: Peter Korsgaard --- ...heck-for-GNU-compatible-glob-support.patch | 44 ------------------- ...ix-building-without-globbing-support.patch | 30 +++++++++++++ package/libssh/libssh.hash | 4 +- package/libssh/libssh.mk | 2 +- 4 files changed, 34 insertions(+), 46 deletions(-) delete mode 100644 package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch create mode 100644 package/libssh/0001-config-Fix-building-without-globbing-support.patch diff --git a/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch b/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch deleted file mode 100644 index 139879b86c..0000000000 --- a/package/libssh/0001-cmake-check-for-GNU-compatible-glob-support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3bb8b5e4517a720d178dbe5c53b4a444d718bcf1 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 14 Sep 2018 15:19:48 +0300 -Subject: [PATCH] cmake: check for GNU compatible glob support - -The GLOB_TILDE flag is a GNU extension. musl libc does not implement -this extension, which leads to build failure: - -.../libssh-0.8.1/src/config.c: In function 'local_parse_glob': -/home/buildroot/autobuild/run/instance-1/output/build/libssh-0.8.1/src/config.c:329:10: error: 'glob_t {aka struct }' has no member named 'gl_flags'; did you mean 'gl_offs'? - .gl_flags = 0, - ^~~~~~~~ - gl_offs -.../libssh-0.8.1/src/config.c:334:25: error: 'GLOB_TILDE' undeclared (first use in this function); did you mean '_IO_FILE'? - rt = glob(fileglob, GLOB_TILDE, NULL, &globbuf); - ^~~~~~~~~~ - _IO_FILE - -Check for GLOB_TILDE directly to make sure the libc provides the -required extension. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://www.libssh.org/archive/libssh/2018-09/0000020.html - - ConfigureChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index f91bd038f5a3..dac61bcf678e 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -156,7 +156,7 @@ check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO) - check_function_exists(memset_s HAVE_MEMSET_S) - - if (HAVE_GLOB_H) -- check_function_exists(glob HAVE_GLOB) -+ check_symbol_exists(GLOB_TILDE "glob.h" HAVE_GLOB) - endif (HAVE_GLOB_H) - - if (NOT WIN32) --- -2.18.0 - diff --git a/package/libssh/0001-config-Fix-building-without-globbing-support.patch b/package/libssh/0001-config-Fix-building-without-globbing-support.patch new file mode 100644 index 0000000000..81585db49f --- /dev/null +++ b/package/libssh/0001-config-Fix-building-without-globbing-support.patch @@ -0,0 +1,30 @@ +From 97b2a61d74edebad43ad09612c92a0341090f165 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Tue, 25 Sep 2018 14:35:43 +0200 +Subject: [PATCH] config: Fix building without globbing support + +Signed-off-by: Andreas Schneider +(cherry picked from commit f709c3ac585f7b47317758b8693a6d104b30f951) +Signed-off-by: Baruch Siach +--- +Upstream status: commit 97b2a61d74 (stable-0.8 branch) + + src/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/config.c b/src/config.c +index df6b48bf6d5e..3d87a1780a58 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -462,7 +462,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line, + + p = ssh_config_get_str_tok(&s, NULL); + if (p && *parsing) { +-#ifdef HAVE_GLOB ++#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER) + local_parse_glob(session, p, parsing, seen); + #else + local_parse_file(session, p, parsing, seen); +-- +2.19.1 + diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 7220c337cf..1810545daa 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,3 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d17f1267b4a5e46c0fbe66d39a3e702b8cefe788928f2eb6e339a18bb00b1924 libssh-0.8.1.tar.xz +# https://www.libssh.org/files/0.8/libssh-0.8.3.tar.xz.asc +# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D +sha256 302f31f606f2368cd3ce77d7a69f7464c18eae176e73e59102e0524401bd29d0 libssh-0.8.3.tar.xz sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625 COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 635d72ad98..42dcdc48e0 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.8 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From 706ebc2e4c8333ea7f5167a128677ca1665e1d7d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 16 Oct 2018 15:31:08 +0300 Subject: [PATCH 2612/2640] libssh: security bump to version 0.8.4 Fixes CVE-2018-10933: authentication bypass vulnerability in the server code. By presenting the server an SSH2_MSG_USERAUTH_SUCCESS message in place of the SSH2_MSG_USERAUTH_REQUEST message which the server would expect to initiate authentication, the attacker could successfully authenticate without any credentials. https://www.libssh.org/security/advisories/CVE-2018-10933.txt Drop an upstream patch. Cc: Scott Fan Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit de24e47d90f64f546978b6ec12f769dc4fd89587) Signed-off-by: Peter Korsgaard --- ...ix-building-without-globbing-support.patch | 30 ------------------- package/libssh/libssh.hash | 4 +-- package/libssh/libssh.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/libssh/0001-config-Fix-building-without-globbing-support.patch diff --git a/package/libssh/0001-config-Fix-building-without-globbing-support.patch b/package/libssh/0001-config-Fix-building-without-globbing-support.patch deleted file mode 100644 index 81585db49f..0000000000 --- a/package/libssh/0001-config-Fix-building-without-globbing-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 97b2a61d74edebad43ad09612c92a0341090f165 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 25 Sep 2018 14:35:43 +0200 -Subject: [PATCH] config: Fix building without globbing support - -Signed-off-by: Andreas Schneider -(cherry picked from commit f709c3ac585f7b47317758b8693a6d104b30f951) -Signed-off-by: Baruch Siach ---- -Upstream status: commit 97b2a61d74 (stable-0.8 branch) - - src/config.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/config.c b/src/config.c -index df6b48bf6d5e..3d87a1780a58 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -462,7 +462,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line, - - p = ssh_config_get_str_tok(&s, NULL); - if (p && *parsing) { --#ifdef HAVE_GLOB -+#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER) - local_parse_glob(session, p, parsing, seen); - #else - local_parse_file(session, p, parsing, seen); --- -2.19.1 - diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 1810545daa..257b93cb61 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.8/libssh-0.8.3.tar.xz.asc +# https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 302f31f606f2368cd3ce77d7a69f7464c18eae176e73e59102e0524401bd29d0 libssh-0.8.3.tar.xz +sha256 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b libssh-0.8.4.tar.xz sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625 COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 42dcdc48e0..1ef09b3a21 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.8 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From 40efc14bffde4e9aff474d8863bcb55758e178f8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Oct 2018 22:11:35 +0200 Subject: [PATCH 2613/2640] ustr: remove source code from target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason, ustr installs its own source code, which means we end up with 448 KB of source code in /usr/share in the target filesystem: $ tree output/target/usr/share/ output/target/usr/share/ └── ustr-1.0.4 ├── malloc-check.h ├── ustr-b-code.h ├── ustr-b-dbg-code.c ├── ustr-b-opt-code.c ├── ustr-cmp-code.h ├── ustr-cmp-dbg-code.c ├── ustr-cmp-internal.h ├── ustr-cmp-opt-code.c ├── ustr-cntl-code.h ├── ustr-fmt-code.h ├── ustr-fmt-dbg-code.c ├── ustr-fmt-internal.h [...] $ du -sh output/target/usr/share/ustr-1.0.4/ 448K output/target/usr/share/ustr-1.0.4/ So let's drop this source code in a post-install target hook. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit c27484b2efe0b1df57549f48f39e4d08e26c8200) Signed-off-by: Peter Korsgaard --- package/ustr/ustr.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk index 8346adbcf2..c99ada5276 100644 --- a/package/ustr/ustr.mk +++ b/package/ustr/ustr.mk @@ -28,5 +28,12 @@ USTR_MAKE_OPTS = all all-shared USTR_CONF_OPTS += LDCONFIG=/bin/true HOST_USTR_CONF_OPTS += LDCONFIG=/bin/true +# for some reason, ustr finds it useful to install its source code in +# /usr/share, which is totally useless on the target +define USTR_REMOVE_SOURCE_CODE + $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) +endef +USTR_POST_INSTALL_TARGET_HOOKS += USTR_REMOVE_SOURCE_CODE + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 7a4a5a9afa88c9316da550ec27b889e4517293e1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Oct 2018 17:06:06 +0200 Subject: [PATCH 2614/2640] gvfs: fix activation of http/dav backend Since gvfs version 1.2.3, http/dav backend needs libxml2: https://gitlab.gnome.org/GNOME/gvfs/commit/2ef5b4192f95f9205204215aec33787641608e58 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a78848202b6bb5af178509e0514d5a42b9c4430c) Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 7110e39083..e272d5c1dc 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -95,8 +95,8 @@ else GVFS_CONF_OPTS += --disable-nfs endif -ifeq ($(BR2_PACKAGE_LIBSOUP),y) -GVFS_DEPENDENCIES += libsoup +ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy) +GVFS_DEPENDENCIES += libsoup libxml2 GVFS_CONF_OPTS += --enable-http else GVFS_CONF_OPTS += --disable-http From d7749ec247c7865b20ac4dd8bf63cc8e0902750f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Oct 2018 21:11:58 +0200 Subject: [PATCH 2615/2640] boot/uboot: fix environment image generation on big endian systems As reported by Jeff Wittrock in bug #11396, the U-Boot environment image checksum is invalid for big endian targets, because the test on the BR2_ENDIAN Config.in option doesn't take into account that it is double quoted. The fix was provided by Jeff himself on bugzilla. Fixes bug #11396. Reported-by: Jeff Wittrock Signed-off-by: Thomas Petazzoni (cherry picked from commit d6fcf044a747284df4eddaf106082ebb571976b3) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 451f8c5d72..ae50a64c81 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -263,7 +263,7 @@ define UBOOT_GENERATE_ENV_IMAGE >$(@D)/buildroot-env.txt $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ - $(if $(filter BIG,$(BR2_ENDIAN)),-b) \ + $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ -o $(BINARIES_DIR)/uboot-env.bin \ $(@D)/buildroot-env.txt endef From 138a12ae8230be9ea91d5b4254c6a8f5723ee9df Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Fri, 12 Oct 2018 10:11:49 -0400 Subject: [PATCH 2616/2640] erlang: always use Buildroot's zlib While Erlang includes a version of zlib, it's intended for Windows and there's an expectation that non-Windows platforms provide it. It's also not as regularly updated as the one in Buildroot. This change makes Erlang always use a Buildroot-provided zlib. Fixes this compile error: CC /home/buildroot/autobuild/run/instance-0/output/build/erlang-21.0/erts/emulator/zlib/obj/x86_64-buildroot-linux-musl/opt/adler32.o In file included from zlib/adler32.c:11:0: zlib/zutil.h:172:39: error: "_LFS64_LARGEFILE" is not defined [-Werror=undef] (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) ^~~~~~~~~~~~~~~~ See http://autobuild.buildroot.net/results/fc633f80c7c36a90e641487f5a888fbb767c2a54/. Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard (cherry picked from commit ec5378038f80f444ce7f5106283c7cccb8faae16) Signed-off-by: Peter Korsgaard --- package/erlang/Config.in | 1 + package/erlang/erlang.mk | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang/Config.in b/package/erlang/Config.in index 75ba17086a..ab87eab6ff 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -23,6 +23,7 @@ config BR2_PACKAGE_ERLANG depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS + select BR2_PACKAGE_ZLIB help Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 2ac903ffea..ca0aa0b770 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -64,10 +64,9 @@ else ERLANG_CONF_OPTS += --without-odbc endif -ifeq ($(BR2_PACKAGE_ZLIB),y) +# Always use Buildroot's zlib ERLANG_CONF_OPTS += --enable-shared-zlib ERLANG_DEPENDENCIES += zlib -endif # Remove source, example, gs and wx files from staging and target. ERLANG_REMOVE_PACKAGES = gs wx From 12138dea11eeeaef631fd9d4309ae14fe6893004 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 14 Oct 2018 21:55:59 +0200 Subject: [PATCH 2617/2640] wireshark: security bump to version 2.2.17 Fixes the following security issues: CVE-2018-16058: Bluetooth AVDTP dissector crash: https://www.wireshark.org/security/wnpa-sec-2018-44.html CVE-2018-16056: Bluetooth Attribute Protocol dissector crash: https://www.wireshark.org/security/wnpa-sec-2018-45.html CVE-2018-16057: Radiotap dissector crash: https://www.wireshark.org/security/wnpa-sec-2018-46.html Signed-off-by: Peter Korsgaard (cherry picked from commit 11f4562cc5fc67679148832448fdd65459054011) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 30b00b4dd0..8b2d7bc985 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.16.txt -sha256 7dcc4e9f29ad8dd75849aa3b6f70b6ec82ab6899cb168096572775a6d97ced8a wireshark-2.2.16.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.17.txt +sha256 923d39ff9c6df83b9594868542061da33bf330e12526778a8cb3adcf912eebb0 wireshark-2.2.17.tar.bz2 # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 3d729ae090..fb90f2b940 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.16 +WIRESHARK_VERSION = 2.2.17 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 10d637e0454be0da0b50a262972b7919e9855b5e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 Oct 2018 17:05:58 +0200 Subject: [PATCH 2618/2640] package/nodejs: use per-build cache directories When two Buildroot builds run in parallel, and they both happen to call npm at roughly the same time, the two npm instances may conflict when accessing the npm cache, which is by default ~/.npm Although npm is supposed to lock access to the cache, it seems it does sometimes fail to do so properly, bailling out in error, when it would never ever crash at all when not running in parallel. We suspect that the sequence leading to such failures are something like: npm-1 npm-2 lock(retry=few, sleep=short) . does-stuff() . . lock(retry=few, sleep=short) . # can't lock local cache . download-module() . # can't download . exit(1) unlock() As per the docs [0], few = 10, short = 10. So if the first npm (npm-1) takes more than 100s (which can happen behind slow links and/or big modules that contain native code that is compiled), then the second npm (npm-2) will bail out (the download would fail if there is no network access, for example, and only local modules are used). Point npm to use a per-build cache directory, so they no longer compete across builds. That would still need some care when we do top-level parallel builds, though. Note also that the conflicts are not totally eliminated: two or more npm instances may still compete for some other resource that has not yet been identified. But, at least, the conflict window has been drastically shortened now, to the point where it now seldom occurs. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 4a16182d5f9f78e7d817f68a6d28449ce9c32e59) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index e2c94ba8db..3c5e40a4d6 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -154,6 +154,7 @@ NPM = $(TARGET_CONFIGURE_OPTS) \ npm_config_build_from_source=true \ npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \ npm_config_prefix=$(TARGET_DIR)/usr \ + npm_config_cache=$(BUILD_DIR)/.npm-cache \ $(HOST_DIR)/bin/npm # From 3345d40679de2457d1c3293980f7d5a7b99fda57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Oct 2018 21:49:47 +0200 Subject: [PATCH 2619/2640] {linux, linux-headers}: bump 4.{4, 9, 14, 18}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 0064c7b25125a47d0f83075a142a24a92a05faa2) [Peter: drop 4.18.x, linux.hash] Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e9b3a9b339..2cee8e09b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -266,13 +266,13 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.158" if BR2_KERNEL_HEADERS_4_4 - default "4.9.129" if BR2_KERNEL_HEADERS_4_9 + default "4.4.161" if BR2_KERNEL_HEADERS_4_4 + default "4.9.133" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 - default "4.14.72" if BR2_KERNEL_HEADERS_4_14 + default "4.14.76" if BR2_KERNEL_HEADERS_4_14 default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 default "4.17.19" if BR2_KERNEL_HEADERS_4_17 From b6591bb1b92ddae61a8bca4add1e5c56be658bb9 Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Mon, 8 Oct 2018 13:51:46 +0200 Subject: [PATCH 2620/2640] package/dtc: fix include guards for older kernel/u-boot U-Boot has a copy of dtc in-tree. However, it has a bug in its build system which could result in both one of the in-tree dtc include files and the same host-installed include file to be #included. Normally, that wouldn't be a problem, because (a) the two include files are compatible, so it doesn't matter which one you include, and (b) the include guards are the same in both, so only one of them really does get included. However, upstream dtc has changed the include guards, removing the leading underscore. Therefore, now the header file does get included twice, which leads to multiple definitions like: /builds/buildroot.org/buildroot/output/host/include/libfdt.h:1790:19: error: redefinition of 'fdt_appendprop_cell' static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, ^~~~~~~~~~~~~~~~~~~ In file included from tools/fdt_host.h:11:0, from tools/imagetool.h:24, from tools/atmelimage.c:8: tools/../include/libfdt.h:1656:19: note: previous definition of 'fdt_appendprop_cell' was here static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, ^~~~~~~~~~~~~~~~~~~ To fix this, patch (host) dtc to accept the old include guard as well, which restores the old behaviour. This patch is probably not upstreamable, since it's really a hack to work around an issue in U-Boot. Note that it has been fixed upstream, but Buildroot supports building older versions of U-Boot as well. Note that the problem may still occur if you have libdtc-dev installed on the host. However, now there is a simple workaround: enable BR2_TARGET_UBOOT_NEEDS_DTC. Note that a similar problem also occurs with the beaglebone fork of the kernel. It's not clear if it has been fixed there. Signed-off-by: Lothar Felten [Arnout: rewrite commit message, rewrap patch commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c7ffd8a75d55e24d793106eabbb80964ab91081f) Signed-off-by: Peter Korsgaard --- ...ards-for-older-kernel-u-boot-sources.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch diff --git a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch new file mode 100644 index 0000000000..e4e49bf6e4 --- /dev/null +++ b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch @@ -0,0 +1,46 @@ +From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001 +From: Lothar Felten +Date: Mon, 8 Oct 2018 13:29:44 +0200 +Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources + +Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt +include guards with leading underscores. + +Those have been removed in dtc-1.4.7. + +This patch handles both include guard types and allows the compilation +of older Linux kernel and u-boot sources. + +Signed-off-by: Lothar Felten +--- + libfdt/libfdt.h | 4 ++++ + libfdt/libfdt_env.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h +index 830b77e..bef4566 100644 +--- a/libfdt/libfdt.h ++++ b/libfdt/libfdt.h +@@ -1,3 +1,7 @@ ++#ifdef _LIBFDT_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_H ++#endif + #ifndef LIBFDT_H + #define LIBFDT_H + /* +diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h +index eb20538..6a61e6a 100644 +--- a/libfdt/libfdt_env.h ++++ b/libfdt/libfdt_env.h +@@ -1,3 +1,7 @@ ++#ifdef _LIBFDT_ENV_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_ENV_H ++#endif + #ifndef LIBFDT_ENV_H + #define LIBFDT_ENV_H + /* +-- +2.11.0 + From eed32a87b35c32e80402741305dd08bdab869850 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 19 Oct 2018 08:20:05 +0300 Subject: [PATCH 2621/2640] libarchive: security bump to version 3.3.3 Fixes CVE-2017-14501: An out-of-bounds read flaw exists in parse_file_info in archive_read_support_format_iso9660.c in libarchive 3.3.2 when extracting a specially crafted iso9660 iso file, related to archive_read_format_iso9660_read_header. Drop upstream patches. Use upstream provided tarball hash. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 946f136fe174efc4560116940c93a84d456c7cfe) Signed-off-by: Peter Korsgaard --- ...sible-for-empty-strings-to-make-fuzz.patch | 42 ---------- ...660-validate-directory-record-length.patch | 78 ------------------- ...-by-one-error-for-UTF16-names-in-RAR.patch | 34 -------- ...A-archive-entries-with-negative-size.patch | 32 -------- package/libarchive/libarchive.hash | 3 +- package/libarchive/libarchive.mk | 2 +- 6 files changed, 3 insertions(+), 188 deletions(-) delete mode 100644 package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch delete mode 100644 package/libarchive/0002-iso9660-validate-directory-record-length.patch delete mode 100644 package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch delete mode 100644 package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch diff --git a/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch b/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch deleted file mode 100644 index 1d1d80d708..0000000000 --- a/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Tue, 5 Sep 2017 18:12:19 +0200 -Subject: [PATCH] Do something sensible for empty strings to make fuzzers - happy. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit fa7438a0ff - - libarchive/archive_read_support_format_xar.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c -index 7a22beb9d8e4..93eeacc5e6eb 100644 ---- a/libarchive/archive_read_support_format_xar.c -+++ b/libarchive/archive_read_support_format_xar.c -@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) - uint64_t l; - int digit; - -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - digit = *p - '0'; - while (digit >= 0 && digit < 10 && char_cnt-- > 0) { -@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) - { - int64_t l; - int digit; -- -+ -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - while (char_cnt-- > 0) { - if (*p >= '0' && *p <= '7') --- -2.14.1 - diff --git a/package/libarchive/0002-iso9660-validate-directory-record-length.patch b/package/libarchive/0002-iso9660-validate-directory-record-length.patch deleted file mode 100644 index 8a0c34f257..0000000000 --- a/package/libarchive/0002-iso9660-validate-directory-record-length.patch +++ /dev/null @@ -1,78 +0,0 @@ -From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001 -From: John Starks -Date: Wed, 25 Jul 2018 12:16:34 -0700 -Subject: [PATCH] iso9660: validate directory record length - -Signed-off-by: Baruch Siach ---- -Upstream status: commit f9569c086ff - - .../archive_read_support_format_iso9660.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c -index f01d37bf682e..089bb7236cd1 100644 ---- a/libarchive/archive_read_support_format_iso9660.c -+++ b/libarchive/archive_read_support_format_iso9660.c -@@ -409,7 +409,8 @@ static int next_entry_seek(struct archive_read *, struct iso9660 *, - struct file_info **); - static struct file_info * - parse_file_info(struct archive_read *a, -- struct file_info *parent, const unsigned char *isodirrec); -+ struct file_info *parent, const unsigned char *isodirrec, -+ size_t reclen); - static int parse_rockridge(struct archive_read *a, - struct file_info *file, const unsigned char *start, - const unsigned char *end); -@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent) - if (*(p + DR_name_len_offset) == 1 - && *(p + DR_name_offset) == '\001') - continue; -- child = parse_file_info(a, parent, p); -+ child = parse_file_info(a, parent, p, b - p); - if (child == NULL) { - __archive_read_consume(a, skip_size); - return (ARCHIVE_FATAL); -@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660) - */ - seenJoliet = iso9660->seenJoliet;/* Save flag. */ - iso9660->seenJoliet = 0; -- file = parse_file_info(a, NULL, block); -+ file = parse_file_info(a, NULL, block, vd->size); - if (file == NULL) - return (ARCHIVE_FATAL); - iso9660->seenJoliet = seenJoliet; -@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660) - return (ARCHIVE_FATAL); - } - iso9660->seenJoliet = 0; -- file = parse_file_info(a, NULL, block); -+ file = parse_file_info(a, NULL, block, vd->size); - if (file == NULL) - return (ARCHIVE_FATAL); - iso9660->seenJoliet = seenJoliet; -@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a) - */ - static struct file_info * - parse_file_info(struct archive_read *a, struct file_info *parent, -- const unsigned char *isodirrec) -+ const unsigned char *isodirrec, size_t reclen) - { - struct iso9660 *iso9660; - struct file_info *file, *filep; -@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent, - - iso9660 = (struct iso9660 *)(a->format->data); - -- dr_len = (size_t)isodirrec[DR_length_offset]; -+ if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, -+ "Invalid directory record length"); -+ return (NULL); -+ } - name_len = (size_t)isodirrec[DR_name_len_offset]; - location = archive_le32dec(isodirrec + DR_extent_offset); - fsize = toi(isodirrec + DR_size_offset, DR_size_size); --- -2.18.0 - diff --git a/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch b/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch deleted file mode 100644 index 13a80d1fb3..0000000000 --- a/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Sat, 9 Sep 2017 17:47:32 +0200 -Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR - archives. - -Reported-By: OSS-Fuzz issue 573 -Signed-off-by: Baruch Siach ---- -Upstream status: commit 5562545b5562 - - libarchive/archive_read_support_format_rar.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index cbb14c32dc3b..751de6979ba5 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, - return (ARCHIVE_FATAL); - } - filename[filename_size++] = '\0'; -- filename[filename_size++] = '\0'; -+ /* -+ * Do not increment filename_size here as the computations below -+ * add the space for the terminating NUL explicitly. -+ */ -+ filename[filename_size] = '\0'; - - /* Decoded unicode form is UTF-16BE, so we have to update a string - * conversion object for it. */ --- -2.18.0 - diff --git a/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch b/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch deleted file mode 100644 index 628e74aed4..0000000000 --- a/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2c8c83b9731ff822fad6cc8c670ea5519c366a14 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Thu, 19 Jul 2018 21:14:53 +0200 -Subject: [PATCH] Reject LHA archive entries with negative size. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 2c8c83b9731 - - libarchive/archive_read_support_format_lha.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c -index b8ef4ae10ece..95c99bb1f31e 100644 ---- a/libarchive/archive_read_support_format_lha.c -+++ b/libarchive/archive_read_support_format_lha.c -@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_read *a, - * Prepare variables used to read a file content. - */ - lha->entry_bytes_remaining = lha->compsize; -+ if (lha->entry_bytes_remaining < 0) { -+ archive_set_error(&a->archive, -+ ARCHIVE_ERRNO_FILE_FORMAT, -+ "Invalid LHa entry size"); -+ return (ARCHIVE_FATAL); -+ } - lha->entry_offset = 0; - lha->entry_crc_calculated = 0; - --- -2.18.0 - diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 60ea0d1602..cde48c8423 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,3 +1,4 @@ +# From http://www.libarchive.org/downloads/libarchive-3.3.3.sha512.txt +sha512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 libarchive-3.3.3.tar.gz # Locally computed: -sha256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce libarchive-3.3.2.tar.gz sha256 ae6f35cc1979beb316e4d6431fc34c6fc59f0dd126b425c8552bb41c86e4825d COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 1c8391bda9..b7619b03db 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.3.2 +LIBARCHIVE_VERSION = 3.3.3 LIBARCHIVE_SITE = http://www.libarchive.org/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause From a5c200b9a645e24a9422cbdaa9f2a4f1430cdb4c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 16 Oct 2018 19:07:13 +0300 Subject: [PATCH 2622/2640] psmisc: correct license The license heading in source files includes the "or any later" language. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit cfa3447a7829aed59ce673b22212f5c82f83fc61) Signed-off-by: Peter Korsgaard --- package/psmisc/psmisc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 3916e34b08..ee441f582d 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -7,7 +7,7 @@ PSMISC_VERSION = 23.1 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz -PSMISC_LICENSE = GPL-2.0 +PSMISC_LICENSE = GPL-2.0+ PSMISC_LICENSE_FILES = COPYING PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) # Patching Makefile.am From f814dbf52270d50693bb9bbbcbfb700754efc771 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 2 Oct 2018 18:02:20 -0500 Subject: [PATCH 2623/2640] fs/common: allow custom user table to override package-defined users Currently, when a custom user table and a package define the same user, the settings from the package takes precedence over the ones from the custom user table. However, it makes sense to allow the settings from the custom user table take precedence. For example, it would allow redirecting the user's home directory to an alternate location (e.g. away from tmp and into a partition that is persistent). The support/scripts/mkusers script will only retain settings from the latest definition it finds. Thus, by passing the custom user table after the package defined users, it is possible to override the package provided user definitions. Acked-by: "Yann E. MORIN" Signed-off-by: Matthew Weber Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c3edec0018c22814233838b4e6c11c577993923d) Signed-off-by: Peter Korsgaard --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index abf35418cb..453da6010a 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -75,10 +75,11 @@ $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) echo "set -e" >> $(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) + + $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) ifneq ($(ROOTFS_USERS_TABLES),) cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE) endif - $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT) ifneq ($(ROOTFS_DEVICE_TABLES),) cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE) From 530e6f6827b31e75f2500de5200dab669ceca864 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Oct 2018 11:45:18 +0200 Subject: [PATCH 2624/2640] spice-protocol: bump version to 0.12.14 Needed by spice 0.14.x Signed-off-by: Peter Korsgaard (cherry picked from commit de8a4b747fb82f4a260d7d0451eaf99dfc745bc4) Signed-off-by: Peter Korsgaard --- package/spice-protocol/spice-protocol.hash | 2 +- package/spice-protocol/spice-protocol.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spice-protocol/spice-protocol.hash b/package/spice-protocol/spice-protocol.hash index c75c095cbf..e72bb2d712 100644 --- a/package/spice-protocol/spice-protocol.hash +++ b/package/spice-protocol/spice-protocol.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb spice-protocol-0.12.10.tar.bz2 +sha256 20350bc4309039fdf0d29ee4fd0033cde27bccf33501e13b3c1befafde9d0c9c spice-protocol-0.12.14.tar.bz2 diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk index dcc6feeb13..7392e9533d 100644 --- a/package/spice-protocol/spice-protocol.mk +++ b/package/spice-protocol/spice-protocol.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_PROTOCOL_VERSION = 0.12.10 +SPICE_PROTOCOL_VERSION = 0.12.14 SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2 SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases SPICE_PROTOCOL_LICENSE = BSD-3-Clause From 025ba3e580f63a157306a8be5a16156dbbe6bbb6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Oct 2018 11:45:19 +0200 Subject: [PATCH 2625/2640] spice: security bump to version 0.14.1 Fixes CVE-2018-10873: A vulnerability was discovered in SPICE before version 0.14.1 where the generated code used for demarshalling messages lacked sufficient bounds checks. A malicious client or server, after authentication, could send specially crafted messages to its peer which would result in a crash or, potentially, other impacts. Drop patches as they are now upstream. Add host-pkgconf as the configure script uses pkg-config. Drop removed --disable-automated-tests configure flag. Add optional opus support, as that is now supported and needs to be explicitly disabled to not use. Explicitly disable optional gstreamer support for now as the dependency tree is fairly complicated. Signed-off-by: Peter Korsgaard (cherry picked from commit f33f7a4f6407f624edb4b4ffe54cb09e029a49b2) Signed-off-by: Peter Korsgaard --- ...-DoS-attempts-during-protocol-handsh.patch | 60 --------------- ...teger-overflows-in-capability-checks.patch | 43 ----------- ...vent-overflow-reading-messages-from-.patch | 33 -------- ...when-receiving-overly-big-ClientMoni.patch | 75 ------------------- ...er-overflows-handling-monitor-config.patch | 31 -------- ...r-overflows-handling-monitor-configu.patch | 48 ------------ package/spice/spice.hash | 2 +- package/spice/spice.mk | 14 +++- 8 files changed, 12 insertions(+), 294 deletions(-) delete mode 100644 package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch delete mode 100644 package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch delete mode 100644 package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch delete mode 100644 package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch delete mode 100644 package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch delete mode 100644 package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch diff --git a/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch b/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch deleted file mode 100644 index 57a64d96b7..0000000000 --- a/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1c6517973095a67c8cb57f3550fc1298404ab556 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Tue, 13 Dec 2016 14:39:48 +0000 -Subject: [PATCH] Prevent possible DoS attempts during protocol handshake - -The limit for link message is specified using a 32 bit unsigned integer. -This could cause possible DoS due to excessive memory allocations and -some possible crashes. -For instance a value >= 2^31 causes a spice_assert to be triggered in -async_read_handler (reds-stream.c) due to an integer overflow at this -line: - - int n = async->end - async->now; - -This could be easily triggered with a program like - - #!/usr/bin/env python - - import socket - import time - from struct import pack - - server = '127.0.0.1' - port = 5900 - - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((server, port)) - data = pack('<4sIII', 'REDQ', 2, 2, 0xaaaaaaaa) - s.send(data) - - time.sleep(1) - -without requiring any authentication (the same can be done -with TLS). - -[Peter: fixes CVE-2016-9578] -Signed-off-by: Frediano Ziglio -Acked-by: Christophe Fergeau -Signed-off-by: Peter Korsgaard ---- - server/reds.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/server/reds.c b/server/reds.c -index f40b65c1..86a33d53 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -2202,7 +2202,8 @@ static void reds_handle_read_header_done(void *opaque) - - reds->peer_minor_version = header->minor_version; - -- if (header->size < sizeof(SpiceLinkMess)) { -+ /* the check for 4096 is to avoid clients to cause arbitrary big memory allocations */ -+ if (header->size < sizeof(SpiceLinkMess) || header->size > 4096) { - reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); - spice_warning("bad size %u", header->size); - reds_link_free(link); --- -2.11.0 - diff --git a/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch b/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch deleted file mode 100644 index 5bf9b89d17..0000000000 --- a/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f66dc643635518e53dfbe5262f814a64eec54e4a Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Tue, 13 Dec 2016 14:40:10 +0000 -Subject: [PATCH] Prevent integer overflows in capability checks - -The limits for capabilities are specified using 32 bit unsigned integers. -This could cause possible integer overflows causing buffer overflows. -For instance the sum of num_common_caps and num_caps can be 0 avoiding -additional checks. -As the link message is now capped to 4096 and the capabilities are -contained in the link message limit the capabilities to 1024 -(capabilities are expressed in number of uint32_t items). - -[Peter: fixes CVE-2016-9578] -Signed-off-by: Frediano Ziglio -Acked-by: Christophe Fergeau -Signed-off-by: Peter Korsgaard ---- - server/reds.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/server/reds.c b/server/reds.c -index 86a33d53..91504544 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -2110,6 +2110,14 @@ static void reds_handle_read_link_done(void *opaque) - link_mess->num_channel_caps = GUINT32_FROM_LE(link_mess->num_channel_caps); - link_mess->num_common_caps = GUINT32_FROM_LE(link_mess->num_common_caps); - -+ /* Prevent DoS. Currently we defined only 13 capabilities, -+ * I expect 1024 to be valid for quite a lot time */ -+ if (link_mess->num_channel_caps > 1024 || link_mess->num_common_caps > 1024) { -+ reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); -+ reds_link_free(link); -+ return; -+ } -+ - num_caps = link_mess->num_common_caps + link_mess->num_channel_caps; - caps = (uint32_t *)((uint8_t *)link_mess + link_mess->caps_offset); - --- -2.11.0 - diff --git a/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch b/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch deleted file mode 100644 index f602d5f3b1..0000000000 --- a/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5f96b596353d73bdf4bb3cd2de61e48a7fd5b4c3 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Tue, 29 Nov 2016 16:46:56 +0000 -Subject: [PATCH] main-channel: Prevent overflow reading messages from client - -Caller is supposed the function return a buffer able to store -size bytes. - -[Peter: fixes CVE-2016-9577] -Signed-off-by: Frediano Ziglio -Acked-by: Christophe Fergeau -Signed-off-by: Peter Korsgaard ---- - server/main_channel.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/server/main_channel.c b/server/main_channel.c -index 0ecc9df8..1fc39155 100644 ---- a/server/main_channel.c -+++ b/server/main_channel.c -@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, - - if (type == SPICE_MSGC_MAIN_AGENT_DATA) { - return reds_get_agent_data_buffer(mcc, size); -+ } else if (size > sizeof(main_chan->recv_buf)) { -+ /* message too large, caller will log a message and close the connection */ -+ return NULL; - } else { - return main_chan->recv_buf; - } --- -2.11.0 - diff --git a/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch b/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch deleted file mode 100644 index 070259f2bb..0000000000 --- a/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f1e7ec03e26ab6b8ca9b7ec060846a5b706a963d Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Mon, 15 May 2017 15:57:28 +0100 -Subject: [PATCH] reds: Disconnect when receiving overly big - ClientMonitorsConfig - -Total message size received from the client was unlimited. There is -a 2kiB size check on individual agent messages, but the MonitorsConfig -message can be split in multiple chunks, and the size of the -non-chunked MonitorsConfig message was never checked. This could easily -lead to memory exhaustion on the host. - -Signed-off-by: Frediano Ziglio -Signed-off-by: Peter Korsgaard ---- - server/reds.c | 25 +++++++++++++++++++++++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - -diff --git a/server/reds.c b/server/reds.c -index f439a366..7be85fdf 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -993,19 +993,34 @@ static void reds_client_monitors_config_cleanup(void) - static void reds_on_main_agent_monitors_config( - MainChannelClient *mcc, void *message, size_t size) - { -+ const unsigned int MAX_MONITORS = 256; -+ const unsigned int MAX_MONITOR_CONFIG_SIZE = -+ sizeof(VDAgentMonitorsConfig) + MAX_MONITORS * sizeof(VDAgentMonConfig); -+ - VDAgentMessage *msg_header; - VDAgentMonitorsConfig *monitors_config; - RedsClientMonitorsConfig *cmc = &reds->client_monitors_config; - -+ // limit size of message sent by the client as this can cause a DoS through -+ // memory exhaustion, or potentially some integer overflows -+ if (sizeof(VDAgentMessage) + MAX_MONITOR_CONFIG_SIZE - cmc->buffer_size < size) { -+ goto overflow; -+ } - cmc->buffer_size += size; - cmc->buffer = realloc(cmc->buffer, cmc->buffer_size); - spice_assert(cmc->buffer); - cmc->mcc = mcc; - memcpy(cmc->buffer + cmc->buffer_pos, message, size); - cmc->buffer_pos += size; -+ if (sizeof(VDAgentMessage) > cmc->buffer_size) { -+ spice_debug("not enough data yet. %d", cmc->buffer_size); -+ return; -+ } - msg_header = (VDAgentMessage *)cmc->buffer; -- if (sizeof(VDAgentMessage) > cmc->buffer_size || -- msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) { -+ if (msg_header->size > MAX_MONITOR_CONFIG_SIZE) { -+ goto overflow; -+ } -+ if (msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) { - spice_debug("not enough data yet. %d", cmc->buffer_size); - return; - } -@@ -1013,6 +1028,12 @@ static void reds_on_main_agent_monitors_config( - spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); - red_dispatcher_client_monitors_config(monitors_config); - reds_client_monitors_config_cleanup(); -+ return; -+ -+overflow: -+ spice_warning("received invalid MonitorsConfig request from client, disconnecting"); -+ red_channel_client_disconnect(main_channel_client_get_base(mcc)); -+ reds_client_monitors_config_cleanup(); - } - - void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size) --- -2.11.0 - diff --git a/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch b/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch deleted file mode 100644 index 98740520c1..0000000000 --- a/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec6229c79abe05d731953df5f7e9a05ec9f6df79 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Mon, 15 May 2017 15:57:28 +0100 -Subject: [PATCH] reds: Avoid integer overflows handling monitor - configuration - -Avoid VDAgentMessage::size integer overflows. - -Signed-off-by: Frediano Ziglio -Signed-off-by: Peter Korsgaard ---- - server/reds.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/server/reds.c b/server/reds.c -index 7be85fdf..e1c8c108 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -1024,6 +1024,9 @@ static void reds_on_main_agent_monitors_config( - spice_debug("not enough data yet. %d", cmc->buffer_size); - return; - } -+ if (msg_header->size < sizeof(VDAgentMonitorsConfig)) { -+ goto overflow; -+ } - monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header)); - spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); - red_dispatcher_client_monitors_config(monitors_config); --- -2.11.0 - diff --git a/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch b/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch deleted file mode 100644 index 212645b44f..0000000000 --- a/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a957a90baf2c62d31f3547e56bba7d0e812d2331 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Mon, 15 May 2017 15:57:28 +0100 -Subject: [PATCH] reds: Avoid buffer overflows handling monitor - configuration - -It was also possible for a malicious client to set -VDAgentMonitorsConfig::num_of_monitors to a number larger -than the actual size of VDAgentMOnitorsConfig::monitors. -This would lead to buffer overflows, which could allow the guest to -read part of the host memory. This might cause write overflows in the -host as well, but controlling the content of such buffers seems -complicated. - -Signed-off-by: Frediano Ziglio -Signed-off-by: Peter Korsgaard ---- - server/reds.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/server/reds.c b/server/reds.c -index e1c8c108..3a42c375 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -1000,6 +1000,7 @@ static void reds_on_main_agent_monitors_config( - VDAgentMessage *msg_header; - VDAgentMonitorsConfig *monitors_config; - RedsClientMonitorsConfig *cmc = &reds->client_monitors_config; -+ uint32_t max_monitors; - - // limit size of message sent by the client as this can cause a DoS through - // memory exhaustion, or potentially some integer overflows -@@ -1028,6 +1029,12 @@ static void reds_on_main_agent_monitors_config( - goto overflow; - } - monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header)); -+ // limit the monitor number to avoid buffer overflows -+ max_monitors = (msg_header->size - sizeof(VDAgentMonitorsConfig)) / -+ sizeof(VDAgentMonConfig); -+ if (monitors_config->num_of_monitors > max_monitors) { -+ goto overflow; -+ } - spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); - red_dispatcher_client_monitors_config(monitors_config); - reds_client_monitors_config_cleanup(); --- -2.11.0 - diff --git a/package/spice/spice.hash b/package/spice/spice.hash index c9b591f41d..1a25926ab2 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f901a5c5873d61acac84642f9eea5c4d6386fc3e525c2b68792322794e1c407d spice-0.12.8.tar.bz2 +sha256 1ead5de63d06eededed4017db37240f07bef0abffbaf621899647e7e685a1519 spice-0.14.1.tar.bz2 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 7b09f39fe7..16e57441a8 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,13 +4,14 @@ # ################################################################################ -SPICE_VERSION = 0.12.8 +SPICE_VERSION = 0.14.1 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 -SPICE_SITE = http://www.spice-space.org/download/releases +SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ + host-pkgconf \ jpeg \ libglib2 \ openssl \ @@ -20,9 +21,9 @@ SPICE_DEPENDENCIES = \ # We disable everything for now, because the dependency tree can become # quite deep if we try to enable some features, and I have not tested that. SPICE_CONF_OPTS = \ + --disable-gstreamer \ --disable-opengl \ --disable-smartcard \ - --disable-automated-tests \ --without-sasl \ --disable-manual @@ -42,6 +43,13 @@ else SPICE_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_OPUS),y) +SPICE_CONF_OPTS += --enable-opus +SPICE_DEPENDENCIES += opus +else +SPICE_CONF_OPTS += --disable-opus +endif + # no enable/disable, detected using pkg-config ifeq ($(BR2_PACKAGE_OPUS),y) SPICE_DEPENDENCIES += opus From 73ea45a608f560d261da66b6e9ab9cba7add3e22 Mon Sep 17 00:00:00 2001 From: Francois Gerin Date: Tue, 16 Oct 2018 14:31:08 +0200 Subject: [PATCH 2626/2640] qt download site update The download link was broken, former qt versions are stored into a distinct location. Signed-off-by: Francois Gerin Signed-off-by: Peter Korsgaard (cherry picked from commit 2e6cd5c2d622eb1d092c1639b129a24e79c84367) Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 921ff13d29..23cb94c11f 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -7,7 +7,7 @@ QT_VERSION_MAJOR = 4.8 QT_VERSION = $(QT_VERSION_MAJOR).7 QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz -QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION) +QT_SITE = http://download.qt.io/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION) QT_DEPENDENCIES = host-pkgconf QT_INSTALL_STAGING = YES From 8a645fb03b443728e5d2aa52bbabaeab825f8c43 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 20 Aug 2018 22:49:53 +0200 Subject: [PATCH 2627/2640] core: detect and reject build paths which contain an '@' gcc does not build when the srcdir path contains a '@', because that path is then substitued in a texi file as argument to an @include directive. But then, the '@' in the path will start a command evaluation of its own, thus breaking the build. For example, with a $(O) path set to /home/ymorin/dev/buildroot/O/to@ti : perl ../../gcc/../contrib/texi2pod.pl ../../gcc/doc/invoke.texi > gcc.pod ../../gcc/doc/invoke.texi:1678: unknown command `ti' ../../gcc/doc/invoke.texi:1678: @include: could not find /home/ymorin/dev/buildroot/O/to/build/host-gcc-initial-7.3.0/build/gcc/../../gcc/../libiberty/at-file.texi [Peter: use findstring instead of subst/compare] Reported-by: c32 on IRC Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 7007dc2bc99ad191c418c468707cdc3980273cda) Signed-off-by: Peter Korsgaard --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 31569472a7..8a65b180e4 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,11 @@ override O := $(patsubst %/,%,$(patsubst %.,%,$(O))) # avoid empty CANONICAL_O in case on non-existing entry. CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) +# gcc fails to build when the srcdir contains a '@' +ifneq ($(findstring @,$(CANONICAL_O)),) +$(error The build directory can not contain a '@') +endif + CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 From c9bb8015f459021718abc353629abf46ee42e0d1 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 16 Jun 2018 23:05:59 +0100 Subject: [PATCH 2628/2640] package/ca-certificates: don't hash certificates.crt c_rehash looks at all files in /etc/ssl/certs, generates the hash for the certificates in them, and makes a symlink from the hash to the certificate file. However, ca-certificates.crt is also installed in /etc/ssl/certs and it contains all the certificates. c_rehash will take one of them (the first?) and create a symlink from that hash to ca-certificates.crt. Usually, this results in an error like: WARNING: Skipping duplicate certificate ca-certificates.crt and all is well. However, depending on filesystem order, ca-certificates.crt may come first, and the actual certificate is not symlinked. To fix this install certificates.crt to /etc/ssl/certs *after* we run c_rehash to prevent it getting hashed by mistake. Note: $(TARGET_DIR)/etc/ssl/certs/ is already removed during install so this fix also works for rebuilds. Signed-off-by: Martin Bark Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d07ddd8e4ed576dbce4c33ab006f342e24d3bd6b) Signed-off-by: Peter Korsgaard --- package/ca-certificates/ca-certificates.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index c19d37788b..9685d0e6f0 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -33,11 +33,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS cd $(TARGET_DIR) ;\ for i in `find usr/share/ca-certificates -name "*.crt"` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ - cat $$i >>etc/ssl/certs/ca-certificates.crt ;\ - done + cat $$i ;\ + done >$(@D)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs + + # Install the certificates bundle + $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef $(eval $(generic-package)) From b557259ab4348dbdb88a05fc24f46d288a812209 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 16 Jun 2018 23:06:00 +0100 Subject: [PATCH 2629/2640] package/ca-certificates: fix rebuilds Rebuilding ca-certificates using make ca-certificates-rebuild caused duplicate certificates to be installed in the target. Its build system is broken: it doesn't detect that the output file already exists, and instead of overwriting it, a duplicate is generated under a different name. The net effect is that all certificates are installed twice after rebuild. Fix this by cleaning the build directory before building the package. Signed-off-by: Martin Bark Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 42b10634c628918c753bfb1aad4f950fa5d41299) Signed-off-by: Peter Korsgaard --- package/ca-certificates/ca-certificates.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 9685d0e6f0..1df9543e03 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -16,7 +16,7 @@ CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright define CA_CERTIFICATES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean all endef define CA_CERTIFICATES_INSTALL_TARGET_CMDS From 1a33cfffc458aa5fc0145e9203d29c23a021ca1d Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 16 Jun 2018 23:06:01 +0100 Subject: [PATCH 2630/2640] package/ca-certificates: create ca-certificates.crt reproducibly Sort the certificates into alphabetical order so the contents of ca-certificates.crt can be built reproducibly. Note: The certificates are sorted uppercase then lowercase filenames so the contents of ca-certificates.crt matches the source debian package. Signed-off-by: Martin Bark Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c61b49e5b5c83237c8895d8caf76a9c448c41241) Signed-off-by: Peter Korsgaard --- package/ca-certificates/ca-certificates.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 1df9543e03..5c259aa3ab 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -31,7 +31,7 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle cd $(TARGET_DIR) ;\ - for i in `find usr/share/ca-certificates -name "*.crt"` ; do \ + for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ done >$(@D)/ca-certificates.crt From d7ed6c7ce7bcb410c2e930906afa437c05d9609e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 21 Oct 2018 13:54:13 +0200 Subject: [PATCH 2631/2640] package/gcc: disable libcilkrts when there is no thread support The libcilkrts configure script errors out with "Pthreads are required to build libcilkrts" if the C library doesn't have thread support. To fix that, we disable libcilkrts when thread support is not available. This issue was not noticed until now, because we only regularly build a no-thread toolchain for ARM, and libcilkrts was enabled on ARM only starting in gcc 7.x. This fixes the build of no-thread toolchains on architectures where libcilkrts is supported, i.e x86/x86-64, ARM and Sparc. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 076fd27da721971f44f681d5a06f68496371d96a) Signed-off-by: Peter Korsgaard --- package/gcc/gcc-final/gcc-final.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 9897d18682..1be0b9bfc9 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -81,6 +81,11 @@ ifeq ($(BR2_sparc),y) HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts endif +# Pthreads are required to build libcilkrts +ifeq ($(BR2_PTHREADS_NONE),y) +HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts +endif + # Disable shared libs like libstdc++ if we do static since it confuses linking # In that case also disable libcilkrts as there is no static version ifeq ($(BR2_STATIC_LIBS),y) From 5ab4c1649939ba4ff163023af26e834366a44d98 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 21 Oct 2018 17:44:09 +0200 Subject: [PATCH 2632/2640] package/mongoose: add security patch fixing CVE-2018-10945 Signed-off-by: Thomas Petazzoni (cherry picked from commit dea3ab68400503bebf4152277d63813508f43424) Signed-off-by: Peter Korsgaard --- ...-length-calculation-in-mg_handle_cgi.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/mongoose/0001-Fix-body-length-calculation-in-mg_handle_cgi.patch diff --git a/package/mongoose/0001-Fix-body-length-calculation-in-mg_handle_cgi.patch b/package/mongoose/0001-Fix-body-length-calculation-in-mg_handle_cgi.patch new file mode 100644 index 0000000000..a696042436 --- /dev/null +++ b/package/mongoose/0001-Fix-body-length-calculation-in-mg_handle_cgi.patch @@ -0,0 +1,46 @@ +From 9e93f71556f8d5ba62fccec46ee5689e385d6d37 Mon Sep 17 00:00:00 2001 +From: Deomid Ryabkov +Date: Mon, 13 Aug 2018 15:50:01 +0300 +Subject: [PATCH] Fix body length calculation in mg_handle_cgi + +Fixes https://nvd.nist.gov/vuln/detail/CVE-2018-10945 + +CL: mg: Fix body length calculation in mg_handle_cgi + +PUBLISHED_FROM=0c30cf36fdb67c75f6148468701e23d6ee72d953 + +[Thomas: backported from upstream commit +f33d3a4e0225d6e009b90193402141025e9ea74d, dropping the changes in +src/mg_http_cgi.c, because back in 6.7, the initial mongoose sources +were not in the tree, only the amalgamated version.] +Signed-off-by: Thomas Petazzoni +--- + mongoose.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/mongoose.c b/mongoose.c +index 7e55896..f5b0177 100644 +--- a/mongoose.c ++++ b/mongoose.c +@@ -8308,7 +8308,6 @@ MG_INTERNAL void mg_handle_cgi(struct mg_connection *nc, const char *prog, + + if (mg_start_process(opts->cgi_interpreter, prog, blk.buf, blk.vars, dir, + fds[1]) != 0) { +- size_t n = nc->recv_mbuf.len - (hm->message.len - hm->body.len); + struct mg_connection *cgi_nc = + mg_add_sock(nc->mgr, fds[0], mg_cgi_ev_handler); + struct mg_http_proto_data *cgi_pd = mg_http_get_proto_data(cgi_nc); +@@ -8316,8 +8315,8 @@ MG_INTERNAL void mg_handle_cgi(struct mg_connection *nc, const char *prog, + cgi_pd->cgi.cgi_nc->user_data = nc; + nc->flags |= MG_F_USER_1; + /* Push POST data to the CGI */ +- if (n > 0 && n < nc->recv_mbuf.len) { +- mg_send(cgi_pd->cgi.cgi_nc, hm->body.p, n); ++ if (hm->body.len > 0) { ++ mg_send(cgi_pd->cgi.cgi_nc, hm->body.p, hm->body.len); + } + mbuf_remove(&nc->recv_mbuf, nc->recv_mbuf.len); + } else { +-- +2.14.4 + From 3c722f34d1076a8b7e7ae829a50fbbc8f3d9fd9d Mon Sep 17 00:00:00 2001 From: Marcel Patzlaff Date: Sun, 21 Oct 2018 17:21:10 +0100 Subject: [PATCH 2633/2640] utils/diffconfig: remove BR2_* prefix restriction The utils/diffconfig script works only on variables with the BR2_ prefix. This is OK for Buildroot [def]configs since this is the prefix for all user-facing variables, but it prevents using the same script to compare configs from kconfig-based packages. Remove the BR2_ restriction, allowing usage such as: ./utils/diffconfig \ board/qemu/xtensa-lx60/linux.config \ board/qemu/xtensa-lx60/linux-nommu.config Signed-off-by: Marcel Patzlaff Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli Reviewed-by: Matt Weber Signed-off-by: Peter Korsgaard (cherry picked from commit bf9ccfc37b6594c41163eb235384abb4771a6a1c) Signed-off-by: Peter Korsgaard --- utils/diffconfig | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/utils/diffconfig b/utils/diffconfig index 5862a62f25..f1af23cfce 100755 --- a/utils/diffconfig +++ b/utils/diffconfig @@ -28,14 +28,14 @@ If no config files are specified, .config and .config.old are used. Example usage: $ diffconfig .config config-with-some-changes --LINUX_KERNEL_INTREE_DTS_NAME "vexpress-v2p-ca9" - LINUX_KERNEL_DTS_SUPPORT y -> n - LINUX_KERNEL_USE_INTREE_DTS y -> n - PACKAGE_DFU_UTIL n -> y - PACKAGE_LIBUSB n -> y - TARGET_GENERIC_HOSTNAME "buildroot" -> "Tuxie" - TARGET_GENERIC_ISSUE "Welcome to Buildroot" -> "Welcome to CustomBoard" -+PACKAGE_LIBUSB_COMPAT n +-BR2_LINUX_KERNEL_INTREE_DTS_NAME "vexpress-v2p-ca9" + BR2_LINUX_KERNEL_DTS_SUPPORT y -> n + BR2_LINUX_KERNEL_USE_INTREE_DTS y -> n + BR2_PACKAGE_DFU_UTIL n -> y + BR2_PACKAGE_LIBUSB n -> y + BR2_TARGET_GENERIC_HOSTNAME "buildroot" -> "Tuxie" + BR2_TARGET_GENERIC_ISSUE "Welcome to Buildroot" -> "Welcome to CustomBoard" ++BR2_PACKAGE_LIBUSB_COMPAT n """) sys.exit(0) @@ -44,12 +44,14 @@ Example usage: def readconfig(config_file): d = {} for line in config_file: - line = line[:-1] - if line[:4] == "BR2_": - name, val = line[4:].split("=", 1) - d[name] = val + line = line.strip() + if len(line) == 0: + continue if line[-11:] == " is not set": - d[line[6:-11]] = "n" + d[line[2:-11]] = "n" + elif line[0] != "#": + name, val = line.split("=", 1) + d[name] = val return d def print_config(op, config, value, new_value): @@ -58,9 +60,9 @@ def print_config(op, config, value, new_value): if merge_style: if new_value: if new_value=="n": - print("# BR2_%s is not set" % config) + print("# %s is not set" % config) else: - print("BR2_%s=%s" % (config, new_value)) + print("%s=%s" % (config, new_value)) else: if op=="-": print("-%s %s" % (config, value)) From a8b91b25d027b6fcf85ff8c99282c04130550ac4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 18 Oct 2018 20:59:20 +0200 Subject: [PATCH 2634/2640] package/mariadb: add option to disable build of embedded server Size of output/target/usr: with embedded: 1,7G without embedded: 648M This config option saves space on the target if the embedded server is not used by any other package: https://mariadb.com/kb/en/library/embedded-mariadb-interface/ Signed-off-by: Bernd Kuhls Tested-by: Ryan Coe [Peter: make Config.in option depend on _MARIADB_SERVER] Signed-off-by: Peter Korsgaard (cherry picked from commit 19df27ed03b33cd86c971afb355091161972851f) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 4 ++++ package/mysql/Config.in | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 23822187c3..e8ccf7a2a9 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -48,8 +48,12 @@ MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 MARIADB_CONF_OPTS += -DENABLE_DTRACE=0 ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) +ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y) MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON else +MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=OFF +endif +else MARIADB_CONF_OPTS += -DWITHOUT_SERVER=ON endif diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 2abf5daecb..66bd0faa57 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -54,6 +54,12 @@ config BR2_PACKAGE_MARIADB_SERVER help Install the mariadb server on the target. +config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED + depends on BR2_PACKAGE_MARIADB_SERVER + bool "mariadb embedded server" + help + Install the mariadb embedded server on the target. + endif if BR2_PACKAGE_ORACLE_MYSQL From 9eb45c226c813ff8b9886e704b5e57f26884a26f Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Tue, 13 Feb 2018 09:46:06 -0700 Subject: [PATCH 2635/2640] qt5base: Qt KMS support does not depend on opengl Qt KMS support should not explicitly depend on the availability of opengl. Don't explicitly disable KMS if opengl is not available and fallback to detecting if libdrm is available before disabling kms. The scenario where this is necessary involves using the Qt linuxfb backend "dumb buffer" support via the DRM API. This is new in Qt 5.9 [1] and only requires KMS, but not opengl. Although on Qt 5.6, only eglfs actually uses libdrm/kms, it doesn't hurt to add the dependency and the -kms option there as well, and doing so keeps the logic in the .mk file simple. [1] http://doc.qt.io/qt-5/embedded-linux.html#linuxfb Cc: Peter Seiderer Cc: Julien Corjon Signed-off-by: Joshua Henderson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f91ea94a6f4d1387b062f9f09c98badf0766127f) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ab2b883fc4..2b6fd39267 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -35,14 +35,21 @@ endif QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) -# Uses libgbm from mesa3d -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_CONFIGURE_OPTS += -kms -gbm -QT5BASE_DEPENDENCIES += mesa3d +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT5BASE_CONFIGURE_OPTS += -kms +QT5BASE_DEPENDENCIES += libdrm else QT5BASE_CONFIGURE_OPTS += -no-kms endif +# Uses libgbm from mesa3d +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += mesa3d +else +QT5BASE_CONFIGURE_OPTS += -no-gbm +endif + ifeq ($(BR2_ENABLE_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug else From d538f8c411cb9c75e0c1cca8468eee944f80d5d1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Oct 2018 11:08:40 +0200 Subject: [PATCH 2636/2640] core: support host gcc of the future When we do a release, we know only of a set of gcc versions that the host may have. But in the future, distributions with newer gcc versions may show up. Currently, we do not recognise those versions, and thus we do as if they were older than the oldest we know of. This means that a set of packages become unselectable, when they should be. We fix that by capping the detected version to the highest we know of. Reported-by: gargar_ on IRC Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard (cherry picked from commit 3950e69dad925b684aaf7462713e50aab882de28) Signed-off-by: Peter Korsgaard --- Config.in | 3 +++ Makefile | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 6b5b2b043c..42cdf7a3eb 100644 --- a/Config.in +++ b/Config.in @@ -67,6 +67,9 @@ config BR2_HOST_GCC_AT_LEAST_8 default y if BR2_HOST_GCC_VERSION = "8" select BR2_HOST_GCC_AT_LEAST_7 +# When adding new entries above, be sure to update +# the HOSTCC_MAX_VERSION variable in the Makefile. + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/Makefile b/Makefile index 8a65b180e4..d193a9ae10 100644 --- a/Makefile +++ b/Makefile @@ -351,8 +351,14 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \ -e 's/macppc/powerpc/' \ -e 's/sh.*/sh/' ) -HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \ - sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p') +# When adding a new host gcc version in Config.in, +# update the HOSTCC_MAX_VERSION variable: +HOSTCC_MAX_VERSION := 8 + +HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \ + sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \ + [ "$${V%% *}" -le $(HOSTCC_MAX_VERSION) ] || V=$(HOSTCC_MAX_VERSION); \ + printf "%s" "$${V}") # For gcc >= 5.x, we only need the major version. ifneq ($(firstword $(HOSTCC_VERSION)),4) From 058d6a0e942c7040f573a2b57e6a95ce58ddcad2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 20:22:56 +0200 Subject: [PATCH 2637/2640] package/live555: Add a pkg-config file for the shared libraries Needed for vlc to fix linking issue. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 13f7959e8d99468ab6718f037210c972120ea775) Signed-off-by: Peter Korsgaard --- ...config-file-for-the-shared-libraries.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch diff --git a/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch new file mode 100644 index 0000000000..a2ae1c183a --- /dev/null +++ b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch @@ -0,0 +1,66 @@ +From: Benjamin Drung +Date: Sat, 16 Sep 2017 11:22:03 +0200 +Subject: Add a pkg-config file for the shared libraries + +This patch was downloaded from Debian +https://sources.debian.org/src/liblivemedia/2018.08.05-1/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch/ + +The local/ part of PREXIX and LIBDIR was removed to fit into buildroot. + +A similar version of this patch is part of the vlc source repo: +http://git.videolan.org/?p=vlc.git;a=blob;f=contrib/src/live555/add-pkgconfig-file.patch;hb=HEAD + +Upstream status: Rejected +http://lists.live555.com/pipermail/live-devel/2013-January/016374.html +http://lists.live555.com/pipermail/live-devel/2013-January/016375.html + +Signed-off-by: Bernd Kuhls +--- + Makefile.head | 3 +++ + Makefile.tail | 7 ++++++- + live555.pc.in | 9 +++++++++ + 3 files changed, 18 insertions(+), 1 deletion(-) + create mode 100644 live555.pc.in + +diff --git a/Makefile.head b/Makefile.head +index 458c54c..1571037 100644 +--- a/Makefile.head ++++ b/Makefile.head +@@ -1 +1,4 @@ ++PREFIX = /usr ++LIBDIR = /usr/lib ++VERSION = $(shell grep LIVEMEDIA_LIBRARY_VERSION_STRING liveMedia/include/liveMedia_version.hh | sed 's/.*"\([^"]*\)".*/\1/') + ##### Change the following for your environment: +diff --git a/Makefile.tail b/Makefile.tail +index fc594ea..a20a527 100644 +--- a/Makefile.tail ++++ b/Makefile.tail +@@ -22,7 +22,12 @@ all: + @echo + @echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html" + +-install: ++install_shared_libraries: ++ install -d $(DESTDIR)$(LIBDIR)/pkgconfig ++ sed "s#@PREFIX@#$(PREFIX)#;s#@LIBDIR@#$(LIBDIR)#;s#@VERSION@#$(VERSION)#" live555.pc.in > $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc ++ chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc ++ ++install: $(INSTALL2) + cd $(LIVEMEDIA_DIR) ; $(MAKE) install + cd $(GROUPSOCK_DIR) ; $(MAKE) install + cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install +diff --git a/live555.pc.in b/live555.pc.in +new file mode 100644 +index 0000000..3736944 +--- /dev/null ++++ b/live555.pc.in +@@ -0,0 +1,9 @@ ++prefix=@PREFIX@ ++libdir=@LIBDIR@ ++includedir=${prefix}/include ++ ++Name: live555 ++Description: multimedia RTSP streaming library ++Version: @VERSION@ ++Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment ++Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment From 4b910d13e7678208e479180b961576c46adccbfb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 18 Aug 2018 20:22:58 +0200 Subject: [PATCH 2638/2640] package/live555: bump version to 2018.08.05 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e305ae1c1b7b2b68f28842eaf8aed7a81d07a90a) Signed-off-by: Peter Korsgaard --- package/live555/live555.hash | 4 ++-- package/live555/live555.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/live555/live555.hash b/package/live555/live555.hash index 66a7b7d74c..d74d674c7a 100644 --- a/package/live555/live555.hash +++ b/package/live555/live555.hash @@ -1,5 +1,5 @@ # From http://live555.com/liveMedia/public/live555-latest-md5.txt -md5 a5acd14c4fa7b50f7270304d3b4a70ae live.2017.10.28.tar.gz +md5 93c65b0f55f37835c727bbf65c1b61b4 live.2018.08.05.tar.gz # Locally generated -sha256 d8eaec9ded34321aa655d3c9007217dd447218c54cb48c97827e58ecd5edb338 live.2017.10.28.tar.gz +sha256 c309fb6d499557250b4db8371243715b9ee2cdaa7ccacaf254bcc62e97566ae4 live.2018.08.05.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/live555/live555.mk b/package/live555/live555.mk index 0507ee9b1b..a5479d6d7c 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIVE555_VERSION = 2017.10.28 +LIVE555_VERSION = 2018.08.05 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz LIVE555_SITE = http://www.live555.com/liveMedia/public LIVE555_LICENSE = LGPL-2.1+ From 8c3758288af9ff92f1f290a3b2d75a15d8a07259 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 22 Oct 2018 21:30:50 +0200 Subject: [PATCH 2639/2640] package/live555: security bump to version 2018.10.17 Changelog: http://www.live555.com/liveMedia/public/changelog.txt Fixes CVE-2018-4013: https://security-tracker.debian.org/tracker/CVE-2018-4013 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 01d7686c907eab026781d700999ba09dec29b48e) Signed-off-by: Peter Korsgaard --- package/live555/live555.hash | 4 ++-- package/live555/live555.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/live555/live555.hash b/package/live555/live555.hash index d74d674c7a..024dcac124 100644 --- a/package/live555/live555.hash +++ b/package/live555/live555.hash @@ -1,5 +1,5 @@ # From http://live555.com/liveMedia/public/live555-latest-md5.txt -md5 93c65b0f55f37835c727bbf65c1b61b4 live.2018.08.05.tar.gz +md5 3383dea853735b7a73eda6ddb52b6372 live.2018.10.17.tar.gz # Locally generated -sha256 c309fb6d499557250b4db8371243715b9ee2cdaa7ccacaf254bcc62e97566ae4 live.2018.08.05.tar.gz +sha256 7c68d9c95b39acd309a2b6a4fc14c3837544a9be3f64062ed38d1ad6f68dc9e8 live.2018.10.17.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/live555/live555.mk b/package/live555/live555.mk index a5479d6d7c..6a6d353650 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIVE555_VERSION = 2018.08.05 +LIVE555_VERSION = 2018.10.17 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz LIVE555_SITE = http://www.live555.com/liveMedia/public LIVE555_LICENSE = LGPL-2.1+ From 507020139190aaf44793c3c901321d23ba476c13 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 25 Oct 2018 14:40:48 +0200 Subject: [PATCH 2640/2640] Update for 2018.08.2 Signed-off-by: Peter Korsgaard --- CHANGES | 30 ++++++++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index aa5c2ad047..303ff8f7f4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,33 @@ +2018.08.2, Released October 25th, 2018 + + Important / security related fixes. + + Workaround added for incompatibility issues between host-dtc + and older U-Boot and Linux kernel versions. + + Detect and reject build paths containing '@', as this confuses + a number of packages, including GCC. + + utils/get-developers: Add -e option for use with git + send-email. + + utils/diffconfig: Make it work for (non-Buildroot) config + files not using the BR2_ prefix. + + u-boot: Fix for environment image handling on big endian + systems. + + Updated/fixed packages: binutils, ca-certificates, + cups-filters, dtc, erlang, file, freetype, gcc, git, gvfs, + jasper, leveldb, libarchive, libssh, live555, ljlinenoise, + mariadb, mongoose, netsnmp, nmap, nodejs, ntp, open-plc-utils, + poco, psmisc, ptpd2, python-enum34, qemu, qt, qt5base, + setools, spice, spice-protocol, tinc, ustr, wireshark, + + Issues resolved (http://bugs.uclibc.org): + + #11396: uboot environment image checksum invalid if target is big endian + 2018.08.1, Released October 7th, 2018 Important / security related fixes. diff --git a/Makefile b/Makefile index d193a9ae10..3179ee759b 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.08.1 +export BR2_VERSION := 2018.08.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1538904000 +BR2_VERSION_EPOCH = 1540470000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION)