From 70c77467b9fe3033ee3670763594a4d50237d6d5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 10 Feb 2018 20:27:46 +0100 Subject: libupnp: bump to version 1.6.25 Fixes segmentation fault in upmpdcli. Closes #10766 [Peter: add bugzilla reference] Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 18f33eee21d3ca947cf8a6b5c150bb29e8f711dc) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From ac771f06b046270bc19b741e8d0ca9037bbf6dfb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 22:45:17 +0100 Subject: 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 (cherry picked from commit 6030986311434d554635761925925bfd351b836b) Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++++ support/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 -- cgit v1.2.3 From 07a9d75ec14c03805d8ba5ba21d6835818f3e801 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 22:46:59 +0100 Subject: 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 (cherry picked from commit 14fdb63804f1548b5d1ab9598100c7f103d4512d) Signed-off-by: Peter Korsgaard --- support/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 -- cgit v1.2.3 From 354eb7fb8934e3f1d11904999349647697c55080 Mon Sep 17 00:00:00 2001 From: Jan Kundrát Date: Thu, 8 Feb 2018 10:27:47 +0100 Subject: 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 (cherry picked from commit ab863898812a926f0ee687269c2e2ed61bc7adc7) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From bdf1952b3d8a53a84b6d8ef63c0fce73ed350eca Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Feb 2018 14:27:49 +0200 Subject: 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 (cherry picked from commit b99ca5ce3243cf06c45917bd07872aaf00d25e0a) Signed-off-by: Peter Korsgaard --- ...nal-uapi-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 + -- cgit v1.2.3 From c3f7138f137af747ca443c0b88ceb946b8ba9883 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Feb 2018 14:27:50 +0200 Subject: 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 (cherry picked from commit 6afee03e3cc3b9afa4861cc0a9bbc6be03a16be8) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From b9baac21beb95c4e045c783288ebdbfbbcde820d Mon Sep 17 00:00:00 2001 From: Simon van der Veldt Date: Wed, 21 Feb 2018 20:53:16 +0100 Subject: 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) (cherry picked from commit 382fe9f9261812682eab2d35e47aa94dc554380e) Signed-off-by: Peter Korsgaard --- 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 5afd620d98..bc6cd1b5f7 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 5300b9cfc5..a14a07a485 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)) -- cgit v1.2.3 From fe8c2831239eae57dc2fb9223fed6158c581979c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 26 Feb 2018 18:47:21 +0100 Subject: 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 (cherry picked from commit f142f23ecf9ee69326fd6a4387133443513afdd2) 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 bc6cd1b5f7..7aed6f8075 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 a14a07a485..f24255747f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -118,17 +118,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)) -- cgit v1.2.3 From 36718c0f99be2709ee8cc52f24dcafed4f5cc36a Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Thu, 22 Feb 2018 17:49:04 -0500 Subject: 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 (cherry picked from commit cc526b428bb6f1e35ce9165f94e6f2fd306a37c7) Signed-off-by: Peter Korsgaard --- 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@ "$@" -- cgit v1.2.3 From 872eaf541009e5b56fa70542f39450539acddca9 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Thu, 22 Feb 2018 17:49:05 -0500 Subject: 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 (cherry picked from commit cc2f3a2a5924934b14a078d914ad3c4d731f3e8a) Signed-off-by: Peter Korsgaard --- 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@ "$@" -- cgit v1.2.3 From 02f91fd0337fa619769f01ecafea778c6470112f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 23:00:39 +0100 Subject: 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 (cherry picked from commit f08dd9f4cbba2b88fe62e68c37e49fba4e3895c9) 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 f76e53b565..c8dd3d4a81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,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" -- cgit v1.2.3 From 70929c555b9f316c743cadd39d11d5ddee68988d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Mar 2018 09:25:15 +0100 Subject: 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 (cherry picked from commit 49d2638276e2d464e016effa1f95a15545cf9208) 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 c8dd3d4a81..25b1649df6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,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" -- cgit v1.2.3 From 7c1e61cc6f6ad567d065598626d3aae6c58899fd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Mar 2018 08:51:04 +0100 Subject: 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 (cherry picked from commit b0fd706c2fe77157ec9d157568acf535d7d8daca) 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 25b1649df6..0a520ad710 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,8 +109,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 -- cgit v1.2.3 From b7f89c0c9516f2a6f0441815475fb87e9b9f679d Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Sun, 4 Mar 2018 20:47:00 -0600 Subject: 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 (cherry picked from commit 9f13f8c2374e8240c1b85c702257341df80bd797) 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 0a520ad710..b9545e4e08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,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" -- cgit v1.2.3 From 52e3da46e47cd36305b180bc489f89581a76ffed Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:17 +0100 Subject: 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 (cherry picked from commit dde090c299b0357fdb1a4ec44ad8d332ac57f65e) 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 f24255747f..2be2403570 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)" \ -- cgit v1.2.3 From cec73346519d9da80bc0a52534b643c15987b4a5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:15 +0100 Subject: 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 (cherry picked from commit 93a7edf4bc9bfcf821f608815870d06198eb2adf) 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 7aed6f8075..e91bdb99c7 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -391,6 +391,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 2be2403570..359f21c75c 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) -- cgit v1.2.3 From 803f16c9671b503a265a39d7b94fba0acd2b3c4c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:16 +0100 Subject: 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 (cherry picked from commit f7cd72b3d4e2b1d993c293e355e350bedbed4eab) 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 e91bdb99c7..9024f73f53 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -404,6 +404,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 359f21c75c..8ef2b03445 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) -- cgit v1.2.3 From 092c773dc7d51b7c05b66964bdae1e4c550d1af6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:18 +0100 Subject: 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 (cherry picked from commit 248161d6faedc928a49391dccf9f4e39838ef73e) 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 -- cgit v1.2.3 From 12c9d22517deacf4f7b7eda723c813c51e4785e6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:19 +0100 Subject: 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 (cherry picked from commit 5c5f1b07434a1d17cace941ffcec791f3633b5ea) 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 -- cgit v1.2.3 From c38cbb1e25df99dce76a8ed30277c04f2188ebd9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:20 +0100 Subject: 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 (cherry picked from commit a645de1362a16e89430b39f6a31049a3fdbc9f57) 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 -- cgit v1.2.3 From 8c911751d5bf8fc1deaa8803ff0e0e30e3f3c2e7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:21 +0100 Subject: 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 (cherry picked from commit 661c81b2fe8e349b83c05c60b1489eacbd47f212) 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 -- cgit v1.2.3 From 67c4f45bf2ddc2a7ae87a34aebf0be9d9bc2f15d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:22 +0100 Subject: 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 (cherry picked from commit bc575cf9de36750f76a232493508f63c3c18979e) 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 -- cgit v1.2.3 From 4515f0580f06814a522ac3553f682f43b75306b1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:23 +0100 Subject: 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 (cherry picked from commit 53f0ffe34a05394e4135c81ca2622be5b8741c79) 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 -- cgit v1.2.3 From daa228e1228ae127d475170c4965116741c68e9b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:24 +0100 Subject: 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 (cherry picked from commit da9678f426e6664b6839e180dcc374dae2830f34) 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 -- cgit v1.2.3 From 1230b03632f09bcda6c1d3d07a2633a38566dd91 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 4 Mar 2018 21:21:30 -0300 Subject: 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 (cherry picked from commit 8cffa8163cd5b275eb962cf435507c1a8bc512a1) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 41e1b54d99..de78c51d08 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -600,11 +600,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 -- cgit v1.2.3 From 78414d1c1fd45457e2867a1c7f3ab02a828eafb9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:25 +0100 Subject: 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 (cherry picked from commit 5dac3b9b8d72ea2b4aa264bfaa54e41f32595009) 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 -- cgit v1.2.3 From abe9c16a6f677d2b174d29491d5613febce1b924 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:26 +0100 Subject: 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 (cherry picked from commit e929742b84651ffee8a81a1bfe014a0c9772ebf4) 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 -- cgit v1.2.3 From 8c22be4afd42998571b029f80fc6011729509740 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:27 +0100 Subject: 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 (cherry picked from commit ddbfee735e9bf13ebe6bec28790d18579ec37837) 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 -- cgit v1.2.3 From cff26cc9f81fc3c91e34fa23c74a8425a2fa7616 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:28 +0100 Subject: 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 (cherry picked from commit 11f07c20081fdbac6b56f81b7d03b717184fda30) 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 -- cgit v1.2.3 From 11cb4976b0f30b05d50af9749443ba1c16b221ce Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:29 +0100 Subject: 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 (cherry picked from commit d329ec701e1c78171528139c0c6757cdca18e94d) 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 -- cgit v1.2.3 From 60c40e84e2b4e1e3e23e379e776eff8de4641e6f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:30 +0100 Subject: 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 (cherry picked from commit 3982d28cfbdcaf34a844fdce63ef68634adcf79f) 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 -- cgit v1.2.3 From ea63e98581b6b8562af7251d36a2353f894d93ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:31 +0100 Subject: 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 (cherry picked from commit 3575f84c4e53964fc0ffb53ec7eca362c1c3973e) 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 -- cgit v1.2.3 From 11ca1bcbf4c94ef33f98ad88dc45deeed78d78cb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:32 +0100 Subject: 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 (cherry picked from commit 770a75600ccfa0be6ec783340c2cd6cc9cfa3a72) 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 -- cgit v1.2.3 From d0f2883c8effc7761b6c3e47234a29335de29d85 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:33 +0100 Subject: 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 (cherry picked from commit 63bab546562bf69add47f01ea9c6f361d7b8f041) 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 -- cgit v1.2.3 From d499346b079db85b2708ce77a722630eb868372d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:34 +0100 Subject: 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 (cherry picked from commit e9151fd0be5369302933c9f0f26f97008786552d) 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 -- cgit v1.2.3 From 9568eb493cb5fc599fac649d224ca7016599c4cc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:35 +0100 Subject: 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 (cherry picked from commit b732fed265203a6c112007982c1ea601892f900f) 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 -- cgit v1.2.3 From d52be979ded7a95028a0b9a169c963de9c177a9d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:36 +0100 Subject: 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 (cherry picked from commit 41dca854e641044a01402897a34518c4cab5095a) 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 -- cgit v1.2.3 From a0743c2446b9cfe118a0b12d4b4a5aec97804f35 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Mar 2018 22:31:37 +0100 Subject: 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 (cherry picked from commit a3f2e977cdda32ceea9b6e445066fc9d1ab2bdd2) 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" -- cgit v1.2.3 From 6fae0a55e62994e25c04b90844d6c2e1f552c9b7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 6 Mar 2018 19:00:47 +0200 Subject: 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 (cherry picked from commit da05d748057a98254a9c4fbd6afbc8ebf7e08afd) 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) -- cgit v1.2.3 From 7cb200323b4338b5072e84a4c4fad3a85fa5fd48 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 7 Mar 2018 08:59:41 +0200 Subject: 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 (cherry picked from commit 5766b6fb34a897092092f7d76d6b4f2bc8c48571) 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) -- cgit v1.2.3 From 36c973353e06ce2f90e628a62a7ea015ac9f1746 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Mar 2018 16:46:51 +0100 Subject: linux: Config.in: correct typo in kernel compression format help text s/build/built/. Signed-off-by: Peter Korsgaard (cherry picked from commit d233cc72c4b901f1ea0ae4ce895ff665bd0b78d9) 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 9024f73f53..3447290a69 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. -- cgit v1.2.3 From 2aa5a4dd46308cdce993e0c37c614c06910453d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 20:34:39 +0100 Subject: libminiupnpc: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 452339abd6f8cbaebd00840ff4464f6f16182601) 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 -- cgit v1.2.3 From b407d9d3b6255112259e6686188205afa3320b33 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 20:31:08 +0100 Subject: 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 (cherry picked from commit c0451e4bb1ebf01ed025751d3c68548b11c832cd) 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 -- cgit v1.2.3 From faa870b5f265611f3b930fb650e445d8c9aa38c3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 21:00:59 +0100 Subject: upmpdcli: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8ee1a786ccd9561214ce78cb8410824a80fdc2bc) 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 -- cgit v1.2.3 From e6467dd3378f6c7a72ed1c53064cc4c869e86607 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Mar 2018 21:53:23 +0100 Subject: 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 (cherry picked from commit 13fb1c49128d4c039fc23fcf32317008862f8b4b) 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 --------- ...02-watchdog-add-at91sam9-watchdog-support.patch | 237 --------------------- ...0003-at91sam9260-9g20-add-wathdog-support.patch | 36 ---- ...0004-at91sam9260-9g20-fix-wathdog-support.patch | 26 --- .../linux/0001-kernel-add-support-for-gcc-5.patch | 97 --------- ...LLVMLinux-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 b9545e4e08..520aac640f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,7 +226,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" -- cgit v1.2.3 From 086b43f698108b5d88d69e400aa9784353873429 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 7 Mar 2018 22:51:23 +0100 Subject: 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 (cherry picked from commit 01d90f0d093ff16ab3c1a9466430cee6fb7842d8) 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. -- cgit v1.2.3 From ac076f59de92cbea22bc26e5c83bbbdf75e9c70f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 7 Mar 2018 22:51:24 +0100 Subject: 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 (cherry picked from commit 1b9a57442d0a234b03585235f516d755372f29b3) 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 -- cgit v1.2.3 From 513a319f1718e6af2a1dd638caa29362a14ea81b Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 7 Mar 2018 19:41:27 -0300 Subject: DEVELOPERS: Add myself to Ci20 Signed-off-by: Ezequiel Garcia Signed-off-by: Peter Korsgaard (cherry picked from commit 95e0751ab42f71aaf1a833e912d618915d9251cc) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index de78c51d08..dfb3203882 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -587,6 +587,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/ -- cgit v1.2.3 From 6a9816f668db013fa20ff2235fa1de3e2176397c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:00 +0100 Subject: rapidjson: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit daa534f48cc19b7510309eda9956ac358a736c60) 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 -- cgit v1.2.3 From 0228f09242be2b2757766e6fa2e0dae352fa6e72 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:15 +0100 Subject: libcoap: add licenses hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ae8f5b0d440d3cb7b37b69cfe03c26af52111172) 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 -- cgit v1.2.3 From 1f725943e3a454a9f1e1e690a8ccec851e2f3e9b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 7 Mar 2018 23:56:29 +0100 Subject: gtest: add license hash Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8eee2fbf09e56f7a3db86302a8d693391ef04630) 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 -- cgit v1.2.3 From cd0318b020b2d747747e2b9806ce6ebd6fb77d48 Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 09:22:05 +0200 Subject: 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 (cherry picked from commit 5be0b3440e81aa364fb337b5e981f3396bdf8e02) 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"); + } -- cgit v1.2.3 From 7298952ec3a378cbe7a7d05f342d1a2d38fd5d25 Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 10:28:37 +0200 Subject: 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 (cherry picked from commit 8ea3dd2d6258cabecaa5796d58bce31d94abe056) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index dfb3203882..240f52ecac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -466,7 +466,6 @@ F: package/log4cpp/ N: Daniel Nyström F: package/e2tools/ -F: package/fbgrab/ N: Daniel Price F: package/nodejs/ @@ -1800,6 +1799,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/ -- cgit v1.2.3 From 8c7454bb8e8265d220ffa97ec451cf9d7eed4952 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 9 Mar 2018 16:55:31 -0300 Subject: linux: bump default to version 4.15.8 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 22508657e5616062946550ab31233cdf7287ba48) 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 -- cgit v1.2.3 From 3b76f2b3dd27fb7f6421adc69497e5b461303be9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 9 Mar 2018 16:55:32 -0300 Subject: linux-headers: bump 4.{14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 324cc39ba13a3cbdd1f146cf59d0f145661830bc) 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 -- cgit v1.2.3 From 4f98b6dcec9374bd5e9c4b0622b7413840150f27 Mon Sep 17 00:00:00 2001 From: Timo Ketola Date: Thu, 8 Mar 2018 12:42:33 +0200 Subject: 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 (cherry picked from commit 1a0b4b2be2c76b836f4461fcf59f5e95dcd8549b) 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 -- cgit v1.2.3 From 6a8a67a5611cc43adf7a28a97f21ef1a45a3458d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Mar 2018 21:30:48 +0100 Subject: 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 (cherry picked from commit f124c2f0765b1098f86cca71f2df18d1788cba57) Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 1 - board/embest/riotboard/readme.txt | 46 ---------------------- .../rootfs_overlay/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 520aac640f..6edd2fbfd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,7 +212,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 -- cgit v1.2.3 From 444201fd1c286f722cbd1182a17bc090d8532222 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:38 +0000 Subject: 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 (cherry picked from commit df33aae5f59eaaf40e800acdfefc83e57216ffe8) 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 \ -- cgit v1.2.3 From 2a18954aaaffc0e0eb4a55abe07016ba88ce5dc6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:16:59 +0100 Subject: 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 (cherry picked from commit 146b8d31ea9d96212eb2e6458b3bc69b5a391e73) 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 240f52ecac..d1a4483940 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1368,6 +1368,7 @@ F: package/mosquitto/ F: package/python-alsaaudio/ 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 9cd5d9c087..bd2f30852b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -775,6 +775,7 @@ menu "External python modules" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/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)) -- cgit v1.2.3 From 5d57f1405efed1f5395f1291a56350cc58f163fb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 20:17:00 +0100 Subject: 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 (cherry picked from commit dab4285f853889ab85fc130831f91187b4ad3242) 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. -- cgit v1.2.3 From 6c9215822205408e7cc76d1e42843877a7b74af9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Mar 2018 10:58:45 +0100 Subject: 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 (cherry picked from commit bf733342324b414a1142b57781504111f81c97ea) 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) \ -- cgit v1.2.3 From 1186da11d8f9775e959579abc92e647937537bfe Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Mar 2018 10:58:46 +0100 Subject: 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 (cherry picked from commit 1cbfc94c5a0ac4120925aa8c7337eb7957dc4678) Signed-off-by: Peter Korsgaard --- ...de-U-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 + -- cgit v1.2.3 From 66c14b5429e9ac71ef9de692231823c6e1e1ce58 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:03 -0500 Subject: 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 (cherry picked from commit 6461d76992ec2ceffabd7a5ccb59bb707ea2cb0a) Signed-off-by: Peter Korsgaard --- board/technologic/ts5x00/linux-3.17.config | 113 ----------------------------- board/technologic/ts5x00/linux-4.14.config | 111 ++++++++++++++++++++++++++++ configs/ts5x00_defconfig | 8 +- 3 files changed, 115 insertions(+), 117 deletions(-) delete mode 100644 board/technologic/ts5x00/linux-3.17.config create mode 100644 board/technologic/ts5x00/linux-4.14.config diff --git a/board/technologic/ts5x00/linux-3.17.config b/board/technologic/ts5x00/linux-3.17.config deleted file mode 100644 index 60cd8a0fe3..0000000000 --- a/board/technologic/ts5x00/linux-3.17.config +++ /dev/null @@ -1,113 +0,0 @@ -CONFIG_PARTITION_ADVANCED=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_MELAN=y -CONFIG_X86_GENERIC=y -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 -CONFIG_CPU_IDLE=y -CONFIG_TS5500=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -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 -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_BLK_DEV is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -# CONFIG_ATA_VERBOSE_ERROR is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_GENERIC=y -CONFIG_PATA_LEGACY=y -CONFIG_NETDEVICES=y -# CONFIG_NET_CORE is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_ADAPTEC is not set -# CONFIG_NET_VENDOR_ALTEON is not set -# CONFIG_NET_VENDOR_AMD is not set -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_ATHEROS is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_TULIP=y -CONFIG_DM9102=y -# CONFIG_NET_VENDOR_DLINK is not set -# CONFIG_NET_VENDOR_EMULEX is not set -# CONFIG_NET_VENDOR_EXAR is not set -# CONFIG_NET_VENDOR_HP is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MELLANOX is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MYRI is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_NVIDIA is not set -# CONFIG_NET_VENDOR_OKI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_REALTEK is not set -# CONFIG_NET_VENDOR_RDC is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SILAN is not set -# CONFIG_NET_VENDOR_SIS is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_SUN is not set -# CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -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 -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_TS5500=y -CONFIG_SENSORS_MAX197=y -CONFIG_WATCHDOG=y -CONFIG_SC520_WDT=y -CONFIG_USB=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -# CONFIG_X86_PLATFORM_DEVICES is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_DMIID is not set -CONFIG_EXT4_FS=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_VIRTUALIZATION is not set -CONFIG_XZ_DEC=y diff --git a/board/technologic/ts5x00/linux-4.14.config b/board/technologic/ts5x00/linux-4.14.config new file mode 100644 index 0000000000..eb81596e25 --- /dev/null +++ b/board/technologic/ts5x00/linux-4.14.config @@ -0,0 +1,111 @@ +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_MELAN=y +CONFIG_X86_GENERIC=y +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_NOHIGHMEM=y +# CONFIG_COMPACTION is not set +# CONFIG_BOUNCE is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_SUSPEND is not set +# CONFIG_ACPI is not set +CONFIG_CPU_IDLE=y +CONFIG_TS5500=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +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_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_BLK_DEV is not set +CONFIG_BLK_DEV_SD=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_SATA_PMP is not set +CONFIG_ATA_GENERIC=y +CONFIG_PATA_LEGACY=y +CONFIG_NETDEVICES=y +# CONFIG_NET_CORE is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +CONFIG_NET_TULIP=y +CONFIG_DM9102=y +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_TS5500=y +CONFIG_SENSORS_MAX197=y +CONFIG_WATCHDOG=y +CONFIG_SC520_WDT=y +CONFIG_USB=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y +# CONFIG_X86_PLATFORM_DEVICES is not set +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_DMIID is not set +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y +# CONFIG_VIRTUALIZATION is not set +CONFIG_XZ_DEC=y 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 -- cgit v1.2.3 From 497b75717d8b5d3e7b7b23b71e0a68d8fcb5e69b Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:04 -0500 Subject: 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 (cherry picked from commit 9f17540b170395d5c29eb111bfcacdb2540a2fb0) Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 2 +- .../ts5500/fs-overlay/boot/syslinux/syslinux.cfg | 9 ++ board/technologic/ts5500/linux-4.14.config | 111 +++++++++++++++++++++ board/technologic/ts5500/readme.txt | 52 ++++++++++ .../ts5x00/fs-overlay/boot/syslinux/syslinux.cfg | 9 -- board/technologic/ts5x00/linux-4.14.config | 111 --------------------- board/technologic/ts5x00/readme.txt | 52 ---------- configs/ts5500_defconfig | 26 +++++ configs/ts5x00_defconfig | 26 ----- 9 files changed, 199 insertions(+), 199 deletions(-) create mode 100644 board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg create mode 100644 board/technologic/ts5500/linux-4.14.config create mode 100644 board/technologic/ts5500/readme.txt delete mode 100644 board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg delete mode 100644 board/technologic/ts5x00/linux-4.14.config delete mode 100644 board/technologic/ts5x00/readme.txt create mode 100644 configs/ts5500_defconfig delete mode 100644 configs/ts5x00_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6edd2fbfd3..027c1c6053 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,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/ts5500/fs-overlay/boot/syslinux/syslinux.cfg b/board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg new file mode 100644 index 0000000000..64f8187733 --- /dev/null +++ b/board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg @@ -0,0 +1,9 @@ +SERIAL 1 115200 +CONSOLE 0 + +DEFAULT linux + +LABEL linux + SAY Now booting the kernel from SYSLINUX... + LINUX /boot/bzImage + APPEND console=ttyS1,115200n8 root=/dev/sda1 rootfstype=ext4 rw diff --git a/board/technologic/ts5500/linux-4.14.config b/board/technologic/ts5500/linux-4.14.config new file mode 100644 index 0000000000..eb81596e25 --- /dev/null +++ b/board/technologic/ts5500/linux-4.14.config @@ -0,0 +1,111 @@ +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_MELAN=y +CONFIG_X86_GENERIC=y +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_NOHIGHMEM=y +# CONFIG_COMPACTION is not set +# CONFIG_BOUNCE is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_SUSPEND is not set +# CONFIG_ACPI is not set +CONFIG_CPU_IDLE=y +CONFIG_TS5500=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +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_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_BLK_DEV is not set +CONFIG_BLK_DEV_SD=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_SATA_PMP is not set +CONFIG_ATA_GENERIC=y +CONFIG_PATA_LEGACY=y +CONFIG_NETDEVICES=y +# CONFIG_NET_CORE is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +CONFIG_NET_TULIP=y +CONFIG_DM9102=y +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_TS5500=y +CONFIG_SENSORS_MAX197=y +CONFIG_WATCHDOG=y +CONFIG_SC520_WDT=y +CONFIG_USB=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y +# CONFIG_X86_PLATFORM_DEVICES is not set +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_DMIID is not set +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y +# CONFIG_VIRTUALIZATION is not set +CONFIG_XZ_DEC=y diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt new file mode 100644 index 0000000000..1e73ab3ea1 --- /dev/null +++ b/board/technologic/ts5500/readme.txt @@ -0,0 +1,52 @@ +Technologic Systems TS-5x00 SBCs +================================ + +This document explains how to set up a basic Buildroot system for the +Technologic Systems TS-5x00 serie of x86-based Single Board Computers. + +TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more +information please have a look at http://wiki.embeddedarm.com/wiki/#AMD + +The kernel configuration works for any AMD Elan520-based SBCs, but the support +is enhanced for the TS-5500 and TS-5400 models (on-board devices registration +and additional sysfs attributes under /sys/devices/platform/). + +To build the default configuration you only have to: + + $ make ts5500_defconfig + $ make + +You will need a Compact Flash card of sufficient size and the first or only +partition configured as Linux type, with the bootable flag. + +You can transfer the system on the partition then optionally resize it with: + + # dd if=output/images/rootfs.ext4 of=/dev/sdX1 + # resize2fs /dev/sdX1 + +Or you can just extract the root filesystem to the partition with: + + # mount /dev/sdX1 /mnt + # tar -pxf output/images/rootfs.tar -C /mnt + # umount /mnt + +To install the bootloader, you will need to copy the MBR: + + # cat output/images/syslinux/mbr.bin > /dev/sdX + +Then install SYSLINUX in the mounted partition: + + # mount /dev/sdX1 /mnt + # output/host/sbin/extlinux --install /mnt/boot/syslinux + # umount /mnt + +IMPORTANT: In order for the board to boot the Compact Flash with a recent +config, the BIOS must use Logical Block Addressing (LBA). You can do it by +choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS +Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') +flag on partition 1. For details about the CMOS setup, please see: +http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens + +Connect a terminal program to the rs232 connector marked "COM2" +with baudrate set to 115200, insert the Compact Flash card into the socket, +power up the board, and enjoy. diff --git a/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg b/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg deleted file mode 100644 index 64f8187733..0000000000 --- a/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg +++ /dev/null @@ -1,9 +0,0 @@ -SERIAL 1 115200 -CONSOLE 0 - -DEFAULT linux - -LABEL linux - SAY Now booting the kernel from SYSLINUX... - LINUX /boot/bzImage - APPEND console=ttyS1,115200n8 root=/dev/sda1 rootfstype=ext4 rw diff --git a/board/technologic/ts5x00/linux-4.14.config b/board/technologic/ts5x00/linux-4.14.config deleted file mode 100644 index eb81596e25..0000000000 --- a/board/technologic/ts5x00/linux-4.14.config +++ /dev/null @@ -1,111 +0,0 @@ -# CONFIG_CROSS_MEMORY_ATTACH is not set -CONFIG_PARTITION_ADVANCED=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_MELAN=y -CONFIG_X86_GENERIC=y -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_NOHIGHMEM=y -# CONFIG_COMPACTION is not set -# CONFIG_BOUNCE is not set -# CONFIG_RELOCATABLE is not set -# CONFIG_SUSPEND is not set -# CONFIG_ACPI is not set -CONFIG_CPU_IDLE=y -CONFIG_TS5500=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -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_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_BLK_DEV is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -# CONFIG_ATA_VERBOSE_ERROR is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_GENERIC=y -CONFIG_PATA_LEGACY=y -CONFIG_NETDEVICES=y -# CONFIG_NET_CORE is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_ADAPTEC is not set -# CONFIG_NET_VENDOR_ALTEON is not set -# CONFIG_NET_VENDOR_AMD is not set -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_ATHEROS is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_TULIP=y -CONFIG_DM9102=y -# CONFIG_NET_VENDOR_DLINK is not set -# CONFIG_NET_VENDOR_EMULEX is not set -# CONFIG_NET_VENDOR_EXAR is not set -# CONFIG_NET_VENDOR_HP is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MELLANOX is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MYRI is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_NVIDIA is not set -# CONFIG_NET_VENDOR_OKI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_REALTEK is not set -# CONFIG_NET_VENDOR_RDC is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SILAN is not set -# CONFIG_NET_VENDOR_SIS is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_SUN is not set -# CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_PHYLIB=y -CONFIG_DAVICOM_PHY=y -# CONFIG_WLAN is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_TS5500=y -CONFIG_SENSORS_MAX197=y -CONFIG_WATCHDOG=y -CONFIG_SC520_WDT=y -CONFIG_USB=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -# CONFIG_X86_PLATFORM_DEVICES is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_DMIID is not set -CONFIG_EXT4_FS=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_VIRTUALIZATION is not set -CONFIG_XZ_DEC=y diff --git a/board/technologic/ts5x00/readme.txt b/board/technologic/ts5x00/readme.txt deleted file mode 100644 index 1e50682980..0000000000 --- a/board/technologic/ts5x00/readme.txt +++ /dev/null @@ -1,52 +0,0 @@ -Technologic Systems TS-5x00 SBCs -================================ - -This document explains how to set up a basic Buildroot system for the -Technologic Systems TS-5x00 serie of x86-based Single Board Computers. - -TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD - -The kernel configuration works for any AMD Elan520-based SBCs, but the support -is enhanced for the TS-5500 and TS-5400 models (on-board devices registration -and additional sysfs attributes under /sys/devices/platform/). - -To build the default configuration you only have to: - - $ make ts5x00_defconfig - $ make - -You will need a Compact Flash card of sufficient size and the first or only -partition configured as Linux type, with the bootable flag. - -You can transfer the system on the partition then optionally resize it with: - - # dd if=output/images/rootfs.ext4 of=/dev/sdX1 - # resize2fs /dev/sdX1 - -Or you can just extract the root filesystem to the partition with: - - # mount /dev/sdX1 /mnt - # tar -pxf output/images/rootfs.tar -C /mnt - # umount /mnt - -To install the bootloader, you will need to copy the MBR: - - # cat output/images/syslinux/mbr.bin > /dev/sdX - -Then install SYSLINUX in the mounted partition: - - # mount /dev/sdX1 /mnt - # output/host/sbin/extlinux --install /mnt/boot/syslinux - # umount /mnt - -IMPORTANT: In order for the board to boot the Compact Flash with a recent -config, the BIOS must use Logical Block Addressing (LBA). You can do it by -choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS -Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') -flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens - -Connect a terminal program to the rs232 connector marked "COM2" -with baudrate set to 115200, insert the Compact Flash card into the socket, -power up the board, and enjoy. diff --git a/configs/ts5500_defconfig b/configs/ts5500_defconfig new file mode 100644 index 0000000000..871c02e95f --- /dev/null +++ b/configs/ts5500_defconfig @@ -0,0 +1,26 @@ +# architecture +BR2_i386=y +BR2_x86_i586=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" +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/ts5500/linux-4.14.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# bootloader +BR2_TARGET_SYSLINUX=y +BR2_TARGET_SYSLINUX_MBR=y diff --git a/configs/ts5x00_defconfig b/configs/ts5x00_defconfig deleted file mode 100644 index 19259260b7..0000000000 --- a/configs/ts5x00_defconfig +++ /dev/null @@ -1,26 +0,0 @@ -# architecture -BR2_i386=y -BR2_x86_i586=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" -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="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_INSTALL_TARGET=y - -# rootfs -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# bootloader -BR2_TARGET_SYSLINUX=y -BR2_TARGET_SYSLINUX_MBR=y -- cgit v1.2.3 From 1d51cb1fbdecdd83380c1284b4d63c746903118f Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 5 Mar 2018 12:15:05 -0500 Subject: 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 (cherry picked from commit 79586d2ed5c47a59a3142678e9c414c74589194f) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d1a4483940..f570d3ecab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1831,6 +1831,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/ -- cgit v1.2.3 From b8ee32d841634aefa26f215ff89be28a35b9e026 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 3 Mar 2018 19:43:42 -0500 Subject: 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 (cherry picked from commit 81750410033ab5ebeec8257d80297f05e9534f36) 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 f570d3ecab..4b6c6274f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -419,6 +419,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 bd2f30852b..189909dbdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1946,6 +1946,7 @@ menu "System tools" source "package/debianutils/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)) -- cgit v1.2.3 From 16a52502ae9f327745d0fe65ab1b3d4f0bd6a6e5 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 3 Mar 2018 19:43:43 -0500 Subject: 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 (cherry picked from commit 8d125cd9f646420467aa1426ebb45078eb815ef7) 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 -- cgit v1.2.3 From 6e5767560e1d7e5a2255926cbf3a2d4d25a90ea9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Mar 2018 23:30:26 -0300 Subject: linux: bump default to version 4.15.9 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit b076e05950fcd1efad46e2ffebf378f8973dde0a) 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 -- cgit v1.2.3 From 0bf367666c8d69eb20c1ebb87443bc044bf6445e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Mar 2018 23:30:27 -0300 Subject: linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 03b5b444f155ead9c73c2ed2596948de671c5fb9) 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 -- cgit v1.2.3 From ef2811e13d2c6a04164b55afdc344fb54937d33f Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 12 Mar 2018 14:34:09 +0200 Subject: 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 (cherry picked from commit f437bf547ca44849db4578c31707afdd96b85018) 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 -- cgit v1.2.3 From 49b2178f70b814a29690fa00455d8d0d67cd69e8 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:39 +0000 Subject: package/libuv: bump version to 1.19.2 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard (cherry picked from commit 2d2dbca68b32ec040ecd00728f3e2b9bfc484222) 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 -- cgit v1.2.3 From f363a9a73882c7942fb742c0782226726b970444 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:40 +0000 Subject: package/c-ares: bump version to 1.14.0 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard (cherry picked from commit 103855a2e0ef04851cd460176c31393589ceb1de) 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 -- cgit v1.2.3 From eae2c250f21574791b679d19398ffa59413f3df7 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 8 Mar 2018 16:16:41 +0000 Subject: package/libhttpparser: bump version to 2.8.0 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard (cherry picked from commit 4a646da62850a6e4e38d422988e1c5bd123943cd) Signed-off-by: Peter Korsgaard --- ...-f-option-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 -- cgit v1.2.3 From 2e11d0ef9bc2b3bde948844fbe1331f9caef97ee Mon Sep 17 00:00:00 2001 From: Jan Kundrát Date: Mon, 12 Mar 2018 19:41:00 +0100 Subject: 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 (cherry picked from commit 7d43534625ac06ae01987113e912ffaf1aec2302) 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)" \ -- cgit v1.2.3 From f5b39f81d44992cbeefb35e22bd6b3f4e698f642 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 14:54:01 +0200 Subject: 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 (cherry picked from commit 02940d8ccf0503fb5fff83da4ed48fbafa00911d) Signed-off-by: Peter Korsgaard --- ...scall6-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 + -- cgit v1.2.3 From e5383981e5456a6742f7ca2deb0a253142016e18 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 13 Mar 2018 19:30:59 +0200 Subject: 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 (cherry picked from commit 40275643432c974dca8d4b6ba1886bba19fe6317) 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 -- cgit v1.2.3 From b611ce24711d02d640899b648508078c9be6a141 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 12 Mar 2018 04:44:44 -0400 Subject: 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 (cherry picked from commit ed0d9d6f36dfc3e99ee70cc34de0c380925e871f) 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 -- cgit v1.2.3 From 11b209c5a3bb204a5086c56f88e97981519817ae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Mar 2018 23:36:03 +0100 Subject: 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 (cherry picked from commit 32d2de2a6fb823a8eacb02d203b260c729522837) 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 -- cgit v1.2.3 From 6f2d5ed2befbb895aca7d9be2304f7124846c434 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Mar 2018 20:06:19 +0200 Subject: 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 (cherry picked from commit bf3476e5b1527ac91c0a12949be7da5253ea66c1) 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 \ -- cgit v1.2.3 From b1c0a50460c006c4a6db7000936a5cf6df450c25 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Mar 2018 23:03:47 +0100 Subject: intel-microcode: bump to version 20180312 Signed-off-by: Peter Korsgaard (cherry picked from commit b67b65b3bab01f8dc3b06a3af69bdc8537b55ed8) 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 -- cgit v1.2.3 From 2218b1807d87c1d534f4fc66af0bab3cac9014e9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 16 Mar 2018 11:57:05 -0300 Subject: linux: bump default to version 4.15.10 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 2f55ca3a952c33267b6b13340b30da0ae4555eaa) 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 -- cgit v1.2.3 From 513cd51490768cd241b9adaa8e8ea2c16be76e13 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 16 Mar 2018 11:57:06 -0300 Subject: linux-headers: bump 4.{14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 81c28e83ce2364512ef8741dc3a8dd39fe0f3fa9) 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 -- cgit v1.2.3 From b6f7a0e38bb1f15e1553b9cdaf5ad979051e2d15 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 15 Mar 2018 23:50:08 +0100 Subject: 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 (cherry picked from commit b582d137a121a456635d29735a27a0144a18b75e) 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 -- cgit v1.2.3 From 1f11463b3d8ef55ff5baf2ebd6d599529e9ee6fb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Mar 2018 22:35:29 +0100 Subject: 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 (cherry picked from commit eca03d677448000f9c5387e8359c116508e03f79) Signed-off-by: Peter Korsgaard --- ...633-Don-t-allow-for-more-than-256-channel.patch | 36 -------------- ...632-vorbis_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 -- cgit v1.2.3 From 5b582bf191a759b83a95764b3b0acf6c1b2c28c8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 15 Mar 2018 21:35:08 +0100 Subject: 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 (cherry picked from commit 7fb6e782542fc440c2da226ec4525236d0508b77) 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 -- cgit v1.2.3 From dbfe123f104c028723d1eb1b5d8d2fdccf727eac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Mar 2018 15:40:08 +0100 Subject: 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 (cherry picked from commit 181ef8a1d01ddfa2be0b59ea85eb8902b0ce12c0) 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. -- cgit v1.2.3 From df2b54974ebacc501c8d7999e802203a80eb7c88 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Mar 2018 21:14:49 +0100 Subject: linux-headers: bump 4.{4,9}.x series Signed-off-by: Peter Korsgaard (cherry picked from commit 50cd46b39f4af495a4c9d15f0e5d3df272e33c7c) 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 -- cgit v1.2.3 From 416371a7f1ffc2ef8a54f30e012f22e8b891e664 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Mar 2018 07:57:29 -0300 Subject: linux: bump default to version 4.15.11 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit ce2875e1cfc7898aaf71cd9f49828fbf8c5134a1) 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 -- cgit v1.2.3 From f2fe1b57ef7ce845761950e42eb826de9e4d89dc Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Mar 2018 07:57:30 -0300 Subject: linux-headers: bump 3.2.x and 4.{1, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit cd0fd093523b558cdcf282c1d1497bc2a494f4e0) 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 -- cgit v1.2.3 From 1c83518cd65de98baed5c4733b93f876df0a34ae Mon Sep 17 00:00:00 2001 From: Jörg Krause Date: Wed, 14 Mar 2018 21:18:35 +0100 Subject: 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 (cherry picked from commit f7479b538a3e1548172ba256001ebd96f1e7076c) 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 -- cgit v1.2.3 From e1a6f840f1ebc44d3d60e32c443ba9eef8dfa9bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Mar 2018 22:40:05 +0100 Subject: 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 (cherry picked from commit 80266c95052024381898cada4c51d44207fddd80) 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 -- cgit v1.2.3 From 5e63590fe2e36816e947fee781b99aa6ffba7787 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 21 Mar 2018 13:00:08 +1030 Subject: powerpc-utils: Update URL to new upstream powerpc-utils changed upstream git repositories again. Signed-off-by: Joel Stanley Signed-off-by: Peter Korsgaard (cherry picked from commit 1b383e4bf4151b9232b2e66f0d6ae822546576a5) 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 -- cgit v1.2.3 From 086ddf1de2149257e4077322f568e2e01142e819 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Mar 2018 19:06:31 +0100 Subject: linux: bump default to version 4.15.12 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit c2fe7b6bc88e89ae26d8ec37a5d190c9359de54b) 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 -- cgit v1.2.3 From 116a501e7bfbc010e995c05c277320f58fd94343 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Mar 2018 19:06:32 +0100 Subject: linux-headers: bump 3.2.x and 4.{14, 15}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b83a4d3d69d5daa871812bd4c4803acef789e318) 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 -- cgit v1.2.3 From 711a52835d2608cce46c92e935b0d3c8b8e58e92 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Mar 2018 20:15:07 -0300 Subject: linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 21070fb9aec363aa435dc48145eff3aad55032cb) 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 -- cgit v1.2.3 From f840f80b3ade9b8faf9727410cbf4ccd553b040f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 08:57:39 +0100 Subject: 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 (cherry picked from commit 31086ea1de511b57e8377d9fa6b0fe7350b1e753) 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 -- cgit v1.2.3 From 1775f53f83e3bf121783f890fe93017312d30fe3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Mar 2018 09:37:16 +0100 Subject: 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 (cherry picked from commit 65193bf3c93ec6922979907ce87fc82a73b25268) 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 -- cgit v1.2.3 From 4f8ef1371de1fa0329c38f5698e00e05cff6f68b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 10 Mar 2018 19:45:37 -0300 Subject: 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 (cherry picked from commit 0c4bccf9e882ffead426051cfe76764dd2ecaf83) Signed-off-by: Peter Korsgaard --- ...emove-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 + -- cgit v1.2.3 From 14f18ecaaa3476d5fb46f89662edd61a3ca4fc8c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 17:56:57 +0200 Subject: 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 (cherry picked from commit 1d10e9dc8c96f37cf79e54bc250df88559789c63) Signed-off-by: Peter Korsgaard --- package/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 + -- cgit v1.2.3 From 2c4fbb7a642bc3e96523d58f12bda21963c1dedd Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 20:46:35 +0200 Subject: 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 (cherry picked from commit ebbf8746243ee4fa6b51a5a6afa8b14459b4178f) Signed-off-by: Peter Korsgaard --- .../0002-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 + -- cgit v1.2.3 From 176a2d048f595532c69557a758638401eda6c191 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 20 Mar 2018 20:46:36 +0200 Subject: 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 (cherry picked from commit d769377a41e172e1963351c168c97a1212561133) 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 -- cgit v1.2.3 From 0d1a82b7506b4bc99ce101c2ac0b3facb22d2472 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 25 Mar 2018 10:23:31 -0300 Subject: linux: bump default to version 4.15.13 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 988e4c827c0f3d33a018c7309e675b139980a4e5) 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 -- cgit v1.2.3 From f0ec71f4d3671d1bc32ac29557a00e4dfecfdaee Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 25 Mar 2018 10:23:32 -0300 Subject: linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit d9534c816383ac45e75ae042b7c668406d9e8b1f) 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 -- cgit v1.2.3 From 7c118173cc3145a53c64ad6f03bb029d5187ace9 Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 22 Mar 2018 09:20:01 -0700 Subject: 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 (cherry picked from commit cbe725d755006e41a71180b5786fa9f52104f518) 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 -- cgit v1.2.3 From 54dd5d2ec6b8d19e0b59ec71dde21f6fa44b9d93 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Mar 2018 22:03:51 +0200 Subject: package/libss7: propagate dependency from dahdi-tools Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit 76e6837cd670449740f21015a406d722e089a084) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From eab772d3aad74df3178cffd84818ef132b230f1a Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 22 Mar 2018 09:24:26 -0700 Subject: 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 (cherry picked from commit b3b5608b47525799b0601d45939d3bae545fd124) Signed-off-by: Peter Korsgaard --- 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)) -- cgit v1.2.3 From 92b066b7cea8ac6fa3f8232cfe4cf36cf6a0d7f0 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 25 Mar 2018 00:59:52 -0300 Subject: 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 (cherry picked from commit c8680956819fae8776d7bd6d1f0e67a7b6436672) Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 2 +- .../toolchain-external/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 -- cgit v1.2.3 From 462d5d5244909760d348020e3d4cf0433ad953f3 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Mon, 26 Mar 2018 09:18:44 +0200 Subject: 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 (cherry picked from commit b13d9ab380704ba4faf1e0295885797cb3341336) 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 -- cgit v1.2.3 From cf92451acbaf8adfa8b01763713b6403394a60c8 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 26 Mar 2018 14:00:06 +0200 Subject: 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 (cherry picked from commit 0876b023663377bc3a24c80399f447c1f2afe0c1) 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 d0bbd3fd6e..f17c20bf54 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 -- cgit v1.2.3 From 7bc97aa935631fca0e4d0c3b53648516ea577c79 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 8 Mar 2018 16:25:09 +0200 Subject: 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 (cherry picked from commit 183d2097ffef5d8d7e1ac07d3b613ecacdd8c876) 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 8c22c08dd1..3bc322cd51 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 \ -- cgit v1.2.3 From 74f9b181a6784f9c095f1907352011f3398e5cd5 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 26 Mar 2018 20:19:33 +0300 Subject: 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 (cherry picked from commit ef3304dabc1aef5c1035359211b1c3ca5d07eb3b) Signed-off-by: Peter Korsgaard --- ...-dont-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" -- cgit v1.2.3 From 1d780f2514ff194d0f6bed12f1b92a6fc69ba7c0 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 15 Mar 2018 14:47:33 -0700 Subject: 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 (cherry picked from commit ad980ccc3639baa2e517c4d36e836b71ab9f5b8f) Signed-off-by: Peter Korsgaard --- Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Config.in b/Config.in index 0002df5176..25f24b9d20 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" -- cgit v1.2.3 From 0b601f4c8f1d56577ce5032f70fd7d67026a5aeb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 26 Mar 2018 23:23:02 +0300 Subject: 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 (cherry picked from commit 142c8cc8d525f687ce199cc0163d48892e8a81f7) 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); + -- cgit v1.2.3 From 093b70262721625cef7dfc7abae5cf46badc2241 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Mar 2018 08:30:59 -0300 Subject: linux: bump default to version 4.15.14 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 02c40b31813e07d4e48c7a9c7dbce259d2c95a58) 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 -- cgit v1.2.3 From 380e9599de34f28607c73b73bb9fad2eb1406863 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Mar 2018 08:31:00 -0300 Subject: linux-headers: bump 4.{1, 4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 9ef8f6b061b552012b767b83c7b21e5e3fb9fff7) 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 -- cgit v1.2.3 From 8c8f9fda90fd59c3120e1076f8507b16871ae4ed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Mar 2018 17:27:05 +0200 Subject: 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 (cherry picked from commit 19e983a9540aa948d64423e63167aba2aff9fe41) Signed-off-by: Peter Korsgaard --- ...08-ext-sockets-make-AI_IDN-usage-optional.patch | 55 ------------------- ...i.c-build-empty-php_load_zend_extension_c.patch | 62 ++++++++++++++++++++++ ...i.c-build-empty-php_load_zend_extension_c.patch | 62 ---------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 5 files changed, 64 insertions(+), 119 deletions(-) delete mode 100644 package/php/0008-ext-sockets-make-AI_IDN-usage-optional.patch create mode 100644 package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch delete mode 100644 package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch 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/0008-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 new file mode 100644 index 0000000000..bc5149d1d6 --- /dev/null +++ b/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch @@ -0,0 +1,62 @@ +From b7bbdfbcb0869b5c068143d4e27bab9eac4ae72b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 26 Feb 2018 19:30:55 +0100 +Subject: [PATCH] main/php_ini.c: build empty php_load_zend_extension_cb() when + !HAVE_LIBDL + +Commit 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866 +extension_dir = "./ext" now use current directory for base") modified +the php_load_zend_extension_cb() function to use php_load_shlib(), and +pass a handle to the newly introduced zend_load_extension_handle() +function instead of passing the extension path to +zend_load_extension(). + +While doing so, it introduced a call to php_load_shlib() from code +that is built even when HAVE_LIBDL is not defined. However, +php_load_shlib() is not implemented when HAVE_LIBDL is not defined, +for obvious reasons. + +It turns out that zend_load_extension_handle() anyway doesn't do +anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and +ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined +(Zend/zend_portability.h). + +Fixes the following build failure when building on a system that +doesn't have libdl: + +main/php_ini.o: In function `php_load_zend_extension_cb': +php_ini.c:(.text+0x478): undefined reference to `php_load_shlib' +php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib' +collect2: error: ld returned 1 exit status + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/php/php-src/pull/3161 +--- + main/php_ini.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/main/php_ini.c b/main/php_ini.c +index ba58eb1180..fca263e5f0 100644 +--- a/main/php_ini.c ++++ b/main/php_ini.c +@@ -350,6 +350,7 @@ static void php_load_php_extension_cb(void *arg) + + /* {{{ php_load_zend_extension_cb + */ ++#ifdef HAVE_LIBDL + static void php_load_zend_extension_cb(void *arg) + { + char *filename = *((char **) arg); +@@ -409,6 +410,9 @@ static void php_load_zend_extension_cb(void *arg) + efree(libpath); + } + } ++#else ++static void php_load_zend_extension_cb(void *arg) { } ++#endif + /* }}} */ + + /* {{{ php_init_config +-- +2.14.3 + diff --git a/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch deleted file mode 100644 index bc5149d1d6..0000000000 --- a/package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b7bbdfbcb0869b5c068143d4e27bab9eac4ae72b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 26 Feb 2018 19:30:55 +0100 -Subject: [PATCH] main/php_ini.c: build empty php_load_zend_extension_cb() when - !HAVE_LIBDL - -Commit 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866 -extension_dir = "./ext" now use current directory for base") modified -the php_load_zend_extension_cb() function to use php_load_shlib(), and -pass a handle to the newly introduced zend_load_extension_handle() -function instead of passing the extension path to -zend_load_extension(). - -While doing so, it introduced a call to php_load_shlib() from code -that is built even when HAVE_LIBDL is not defined. However, -php_load_shlib() is not implemented when HAVE_LIBDL is not defined, -for obvious reasons. - -It turns out that zend_load_extension_handle() anyway doesn't do -anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and -ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined -(Zend/zend_portability.h). - -Fixes the following build failure when building on a system that -doesn't have libdl: - -main/php_ini.o: In function `php_load_zend_extension_cb': -php_ini.c:(.text+0x478): undefined reference to `php_load_shlib' -php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib' -collect2: error: ld returned 1 exit status - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/php/php-src/pull/3161 ---- - main/php_ini.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/main/php_ini.c b/main/php_ini.c -index ba58eb1180..fca263e5f0 100644 ---- a/main/php_ini.c -+++ b/main/php_ini.c -@@ -350,6 +350,7 @@ static void php_load_php_extension_cb(void *arg) - - /* {{{ php_load_zend_extension_cb - */ -+#ifdef HAVE_LIBDL - static void php_load_zend_extension_cb(void *arg) - { - char *filename = *((char **) arg); -@@ -409,6 +410,9 @@ static void php_load_zend_extension_cb(void *arg) - efree(libpath); - } - } -+#else -+static void php_load_zend_extension_cb(void *arg) { } -+#endif - /* }}} */ - - /* {{{ php_init_config --- -2.14.3 - 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 -- cgit v1.2.3 From d56fdb17f0a81e8e8e30c93cc038736363d1b3c0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 15:58:14 +0200 Subject: 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 (cherry picked from commit ae7d59eaae1c55d707b2a70437a84c280f598572) 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 7442cef529..93a0c3f13e 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 -- cgit v1.2.3 From 48d789970e20bd16583d4f455d0efd4b60ad31d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Mar 2018 16:52:09 +0200 Subject: 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 (cherry picked from commit 6938c219d80e2267f8e25f3fc37f955ab723cc55) 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 -- cgit v1.2.3 From ae854d015e4005592c9de05182285a2847d8b546 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 27 Mar 2018 13:00:22 +0200 Subject: 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 (cherry picked from commit 4cd1ab15886a408b897104709ff87f15cc88ba16) 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 e387ce67fe..57fb47ea2e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -409,8 +409,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) -- cgit v1.2.3 From fcfc10141a1b06445d731348028cfac086348193 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 00:29:15 +0530 Subject: 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 -- cgit v1.2.3 From 97aefd6657e0a8db044d6172a69a77020bff80ce Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 31 Mar 2018 01:02:08 +0530 Subject: 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 (cherry picked from commit 9b2f6548f8d2cad52fd3a5f81febf4818ee66304) 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) -- cgit v1.2.3 From abbaecf5d8ae8945f5604b96043fa3e40c249643 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 08:47:09 +0200 Subject: 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 (cherry picked from commit 0e4de0f2db5f7a252d4b8a4cac752fac9ca2deb3) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 536618b4e13c854fbd7295f5ab756074b7f434ab Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 09:20:19 +0200 Subject: 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 (cherry picked from commit 9feb6d982d7a5e3b61cc19ad9733dd3e737bf6a0) 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) \ -- cgit v1.2.3 From 0787fee6947bcf374464ab1d0d48feda3d0106ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 09:20:20 +0200 Subject: 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 (cherry picked from commit 5966e2dc54dfb19c5fde3a09d72f3abc6125c202) 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 \ -- cgit v1.2.3 From 5b6c090749e31701bab7254d7ebb3cd121ef3d34 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 31 Mar 2018 14:52:50 +0200 Subject: 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) (cherry picked from commit 5563a1c6a48716debe2983869ddb757318094dce) Signed-off-by: Peter Korsgaard --- 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__": -- cgit v1.2.3 From 560b1d374e15046567ed7c866aa1aebbaf3d6e7e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 08:11:55 +0200 Subject: 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 (cherry picked from commit 7f02604553bc3c8449d6a112818f038e99abbdaf) 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 \ -- cgit v1.2.3 From 4a1a806d486402323e7b3ce6c1b457183d71bb4a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2017 23:29:38 +0200 Subject: 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) (cherry picked from commit 0866a280e40a7a2c7d7d50cc7e87c3f4652aff0a) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 0d08570bc5..8a6bdb6a0c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -347,6 +347,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") -- cgit v1.2.3 From 17e3b9adb81fd8b9b506dcbe6ac7e27b51cb918e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 31 Mar 2018 15:34:57 -0300 Subject: linux: bump default to version 4.15.15 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 03cdfea134bb74e32795b3cbc9689e70a78d61a8) 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 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 -- cgit v1.2.3 From 8f06aed143e886cc44850a09b1032f11239afc95 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 31 Mar 2018 15:34:58 -0300 Subject: linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e17a16dc728845bcfad48230b8db9c375acd31e) 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 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 -- cgit v1.2.3 From 33e21c6c9e1100282b0cd1ca0b5a8c413abc5d0d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 Mar 2018 12:27:11 +0200 Subject: 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 (cherry picked from commit 8a612c9ed9d7fde40a4e5bfe851e9a8ee7228bf2) 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 -- cgit v1.2.3 From 32bd96b7acc9c9b374f54df749a59fb2a71c4b64 Mon Sep 17 00:00:00 2001 From: Valentin Korenblit Date: Tue, 27 Mar 2018 09:44:34 +0200 Subject: 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 (cherry picked from commit 6d0316dc7b14f6cd2d44e92c6ab581a6ab385234) Signed-off-by: Peter Korsgaard --- 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 \ -- cgit v1.2.3 From b86b227fda97ef439a3cc0da03da0ebcad5c203a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 4 Mar 2018 16:06:05 +0100 Subject: 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 (cherry picked from commit e42a65bdcd76018dbe2d4fd4459a7ca216e99e32) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From fc3aca9ea363d0b14bf317a641687fbbb6c86863 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 4 Mar 2018 16:06:06 +0100 Subject: 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 (cherry picked from commit 878716830bfbdf76b69f69a18b53ae56fdbf8365) Signed-off-by: Peter Korsgaard --- 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) -- cgit v1.2.3 From cc688dc132a1ce869e42e6676ae6478996580bb4 Mon Sep 17 00:00:00 2001 From: Sasha Shyrokov Date: Tue, 6 Mar 2018 10:58:10 -0500 Subject: 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 (cherry picked from commit 8ba80282c3bb580c6a45ea114e70acac98fe1690) Signed-off-by: Peter Korsgaard --- 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 += \ -- cgit v1.2.3 From 8a596e0d38c1586991be4b0ac9edd0e8942df8ac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 1 Apr 2018 10:46:41 +0200 Subject: 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 (cherry picked from commit 5e6fa93483caac317ab8844feb2ae9c07078a6c8) 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 -- cgit v1.2.3 From d13986a0ea1cd254932a69c5f1be41680362e157 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Apr 2018 13:53:59 +0200 Subject: 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 (cherry picked from commit 083716cdfbc42ac5cd53d3d10ac76a57427c11af) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 277072758a9c0de9919b1c5d17665cd9bdcb93d3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 6 Feb 2018 13:59:23 +0100 Subject: 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 (cherry picked from commit 83d2644b1197564358b6cd87b2f221d79671b5cc) 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 5edb4b0838..3706834a5e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -426,10 +426,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 @@ -458,7 +458,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 @@ -532,7 +532,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 @@ -838,9 +838,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) -- cgit v1.2.3 From 66238cb41351c9393fa2c68120bcb8218d90705a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Mar 2018 19:54:20 +0200 Subject: 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 (cherry picked from commit 5e58509bfe497c5e85db58f8213b0a44ac79dd3f) Signed-off-by: Peter Korsgaard --- 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 7f72a0cade..6e95545ebf 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -28,8 +28,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)"' -- cgit v1.2.3 From 885496dae99ca664b542741c707ebaa5a1f1008e Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Fri, 2 Mar 2018 11:28:12 -0500 Subject: 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) (cherry picked from commit cea7aa873aa1b6034c3ac93aec21d74d9901b270) Signed-off-by: Peter Korsgaard --- .../0005-Detect-32-bits-armv8-a-architecture.patch | 48 ++++++++++++++++++++++ .../0003-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 + -- cgit v1.2.3 From fc5077516409cdf69e5d72819a75877a4e3230ae Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Thu, 8 Mar 2018 06:15:36 -0800 Subject: 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 (cherry picked from commit b773c33bf18d82e4cf7d0712dfe88a0bae61c865) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 78748907a7bf51dccbecedd562e5d2ffd7f58dc4 Mon Sep 17 00:00:00 2001 From: Christopher McCrory Date: Fri, 2 Mar 2018 10:07:55 -0800 Subject: 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 (cherry picked from commit f03cf639cfba961ca4cbfb73435f23b951941685) Signed-off-by: Peter Korsgaard --- 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' -- cgit v1.2.3 From 22bcdafc4267539a56a96c57d8eb982c90a104d6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 2 Apr 2018 11:48:08 +0200 Subject: 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 (cherry picked from commit cdac332d20d2d1326dee0111e188fa214549122b) 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 -- cgit v1.2.3 From 0651acdd1dab879d59c841101b22e9d64f53e2fd Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 2 Apr 2018 16:14:46 +0200 Subject: 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) (cherry picked from commit d9ec8526bb68ea50a8e9b9847ab119c6248c66fd) Signed-off-by: Peter Korsgaard --- 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) -- cgit v1.2.3 From 8bf5ce60c100afc7eead2839b416b39884c0ad41 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 3 Apr 2018 09:11:38 +0300 Subject: package/systemd: add upstream build fix #8456 Signed-off-by: Stefan Becker Tested-by: Joseph Kogut Signed-off-by: Peter Korsgaard (cherry picked from commit 794d16fcacfc5c8e041452da67ee12aaab36f441) 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); + } -- cgit v1.2.3 From 20703bd010329195263544a4bbbbdbb30750d308 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 17:51:31 +0200 Subject: 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 (cherry picked from commit 543b0d50fbbb552296749d0cf18443aacfc6e58d) Signed-off-by: Peter Korsgaard --- 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. -- cgit v1.2.3 From dec4e2d0e8416533343284366e816fa418b33d94 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Apr 2018 17:51:32 +0200 Subject: 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 (cherry picked from commit ce559162fca39c273583bea0dbed643229769d8c) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 9a095026c17a10e3e474d94674f6501afd54c5eb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 5 Apr 2018 08:42:15 +0200 Subject: 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 (cherry picked from commit 01320bb9ff297bac38a4c9bc32ae505ac79d600f) 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 -- cgit v1.2.3 From 2ebb06c8ee752f4052f588087826e5aa8a9972dc Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 13 Nov 2017 19:41:54 +0100 Subject: 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) (cherry picked from commit 81fb33af2a6e4f4d379da3372b2a607b7ae1a21f) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qmake.conf | 28 ---------------------------- package/qt5/qt5base/qmake.conf.in | 30 ++++++++++++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 9 ++++----- 3 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 package/qt5/qt5base/qmake.conf create mode 100644 package/qt5/qt5base/qmake.conf.in diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf deleted file mode 100644 index 8b6debe583..0000000000 --- a/package/qt5/qt5base/qmake.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Qt5 has a mechanism to support "device" profiles, so that people can -# specify the compiler, compiler flags and so on for a specific device. - -# We leverage this mechanism in the Buildroot packaging of qt5 to -# simplify cross-compilation: we have our own "device" definition, which -# allows us to easily pass the cross-compiler paths and flags from our -# qt5.mk. - -include(../common/linux_device_pre.conf) - -# modifications to g++-unix.conf -QMAKE_CC = $${CROSS_COMPILE}gcc -QMAKE_CXX = $${CROSS_COMPILE}g++ - -# modifications to gcc-base.conf -QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} -QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} -QMAKE_CXXFLAGS_RELEASE += -O3 -CONFIG += nostrip - -QMAKE_LIBS += -lrt -lpthread -ldl -QMAKE_CFLAGS_ISYSTEM = - -# Architecturespecific configuration -include(arch.conf) - -include(../common/linux_device_post.conf) -load(qt_config) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in new file mode 100644 index 0000000000..d62ee7cebe --- /dev/null +++ b/package/qt5/qt5base/qmake.conf.in @@ -0,0 +1,30 @@ +# Qt5 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt5 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt5.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +QMAKE_CXXFLAGS_RELEASE += -O3 +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +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 b3f9c799cb..957cdf57b7 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 \ -- cgit v1.2.3 From a22cbc2371f5d602fa00ac9302f4fa562fff575b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Apr 2018 09:34:35 +0200 Subject: 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 (cherry picked from commit 9fec3eb9131dba46cbf8474a7def05a076990079) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From ce8dd8eec7979658e1b07f6f7e38231595579a3c Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 5 Apr 2018 23:43:24 +0530 Subject: docs/manual: use SPDX short identifier for license Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard (cherry picked from commit 08bbbe73af0d60ffac4f4476d0583764b81fdfac) 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: -- cgit v1.2.3 From 50f01475aaa9115cbe91d0bbdd5e81be0be5e22e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 6 Apr 2018 10:54:03 +0200 Subject: 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 (cherry picked from commit 9850612ea5e9fc9c377d11ec9c2930bfd812754a) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 1128385dc9dbefc347ff98472b43dd530489be2e Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Thu, 5 Apr 2018 14:34:41 -0700 Subject: 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 (cherry picked from commit e1452fe8434c4613d1727034db525c0a9bbc6dfd) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 3ffe4ab54ea1c405b67af7aa42583a57e0322d3e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Apr 2018 11:00:51 -0300 Subject: linux-headers: bump 4.{4, 9, 14, 15}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 2661d47425f866cf56617d2928b6b96566db8de4) 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 -- cgit v1.2.3 From 186489f7fe70b1d7b3e5fbfb2cc38a1a0283267a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 8 Apr 2018 11:04:04 -0300 Subject: linux: bump default to version 4.15.16 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit bbbcfa57f80d239f94669586cadad4e14f073a5f) 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 934142c535..142d42e10c 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 -- cgit v1.2.3 From dd730312e509ab40c3ebcc18a121a2aa637be184 Mon Sep 17 00:00:00 2001 From: André Hentschel Date: Sat, 7 Apr 2018 14:59:03 +0200 Subject: 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 (cherry picked from commit c5c87c2bb61efb31421b345bdbf6931b882ff6a9) 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 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 -- cgit v1.2.3 From d44357175bd7c711c54fd6c2df5637a181c1d03b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Apr 2018 23:06:22 +0200 Subject: 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 (cherry picked from commit fc4b66dbc1b71e871129ce14b289fcda6eb3ea10) Signed-off-by: Peter Korsgaard --- ...-expat_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 + -- cgit v1.2.3 From 34b8a1c5bcb7523f7f125f3b558d8cb1872cdf66 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Apr 2018 10:11:51 +0200 Subject: 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 (cherry picked from commit dac25351e6453b35ded611ff367b95bb4b10a9cf) Signed-off-by: Peter Korsgaard --- 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 -- cgit v1.2.3 From 014dbd4855fa0d52a32d2e2d15b425c64b2e7c95 Mon Sep 17 00:00:00 2001 From: Rafal Susz Date: Tue, 13 Mar 2018 19:00:05 +0100 Subject: 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 (cherry picked from commit 54157c6c2d9fba5ad230294ae1c7dfc0032b1ede) 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 8ef2b03445..8d14f41c6b 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -367,8 +367,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 ; \ @@ -479,9 +480,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 -- cgit v1.2.3 From c3e1d9849a72495f799b007260bbcdc61fc78da3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 9 Apr 2018 19:20:36 +0300 Subject: 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 (cherry picked from commit f4a4df2084b923f29eca2130976ca10a7aa6b719) Signed-off-by: Peter Korsgaard --- ...-files-to-be-missing-for-ed-style-patches.patch | 37 +++++ ...ry-command-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 -- cgit v1.2.3 From 9565a37e0d2aa3c5fb9a4148760c490f2e5226d4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Apr 2018 23:51:05 +0200 Subject: Update for 2018.02.1 Signed-off-by: Peter Korsgaard --- CHANGES | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 65 insertions(+), 2 deletions(-) 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. diff --git a/Makefile b/Makefile index 957ba6634a..8004cc2925 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.02 +export BR2_VERSION := 2018.02.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1520198000 +BR2_VERSION_EPOCH = 1523310000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) -- cgit v1.2.3