From 76fad70ebe914ee3556ca942f8b1efcc5283458c Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 2 Dec 2018 16:25:21 +0100 Subject: [PATCH] Update buildroot 2018.11 (#274) --- .../0010-Revert-glibc-2.27-57.patch | 24 +-- buildroot/CHANGES | 117 +++++++++++ buildroot/Makefile | 4 +- ...nct-pre-processed-mkimage-config-fil.patch | 89 +++++++++ ...-failure-when-no-IVT-offset-is-found.patch | 55 ------ buildroot/board/pc/linux.config | 1 + buildroot/configs/armadeus_apf27_defconfig | 5 +- buildroot/configs/cubieboard2_defconfig | 1 + buildroot/configs/imx6-sabresd_qt5_defconfig | 1 + ...olimex_a20_olinuxino_lime_legacy_defconfig | 3 + .../configs/orangepi_zero_plus2_defconfig | 2 + buildroot/configs/pc_x86_64_bios_defconfig | 1 + buildroot/configs/pc_x86_64_efi_defconfig | 1 + buildroot/configs/riotboard_defconfig | 1 + buildroot/docs/manual/manual.html | 20 +- buildroot/docs/manual/manual.pdf | Bin 533769 -> 533767 bytes buildroot/docs/manual/manual.text | 6 +- buildroot/docs/website/download.html | 58 +++--- buildroot/docs/website/news.html | 78 ++++++++ buildroot/linux/Config.in | 6 +- buildroot/linux/linux.hash | 8 +- buildroot/linux/linux.mk | 4 +- buildroot/package/alsa-utils/alsa-utils.mk | 3 +- buildroot/package/botan/botan.mk | 4 +- buildroot/package/c-ares/c-ares.hash | 3 + buildroot/package/c-ares/c-ares.mk | 3 +- buildroot/package/dante/dante.mk | 6 +- ...-fix-build-with-python-and-cmake-3.7.patch | 40 ++++ ...rds-for-older-kernel-u-boot-sources.patch} | 0 ...s-fix-simple-bus-compatible-matching.patch | 120 ++++++++++++ buildroot/package/freetype/freetype.hash | 8 +- buildroot/package/freetype/freetype.mk | 6 +- buildroot/package/fwts/Config.in | 2 +- .../package/gauche/0004-rfc-needs-srfi.patch | 35 ++++ ...TRANT-for-RISC-V-when-pthread-is-pas.patch | 30 +++ buildroot/package/gdb/Config.in | 3 + buildroot/package/gdb/Config.in.host | 1 + .../package/ghostscript/ghostscript.hash | 4 +- buildroot/package/ghostscript/ghostscript.mk | 4 +- buildroot/package/go/Config.in.host | 1 + ....h-fix-build-with-gcc-older-than-4.8.patch | 47 ----- .../imx-usb-loader/imx-usb-loader.hash | 2 +- .../package/imx-usb-loader/imx-usb-loader.mk | 3 +- buildroot/package/libbsd/Config.in | 3 + .../0001-configure-automake-foreign.patch | 16 ++ buildroot/package/libid3tag/libid3tag.mk | 5 +- buildroot/package/libkrb5/libkrb5.mk | 9 +- .../package/libmicrohttpd/libmicrohttpd.mk | 7 - buildroot/package/libopenssl/libopenssl.hash | 8 +- buildroot/package/libopenssl/libopenssl.mk | 2 +- ...0001-soxr.pc.in-add-avutil-libraries.patch | 33 ++++ buildroot/package/libsoxr/libsoxr.mk | 4 + .../package/linux-headers/Config.in.host | 8 +- buildroot/package/minizip/Config.in | 2 + .../0001-fix-static-linking-with-webp.patch | 32 ++++ buildroot/package/msgpack/msgpack.mk | 2 +- buildroot/package/perl-net-ssleay/Config.in | 1 + buildroot/package/php/Config.ext | 5 +- buildroot/package/pkg-golang.mk | 6 +- .../popt/0004-add-libiconv-to-popt.pc.patch | 19 ++ .../package/python-numpy/python-numpy.mk | 2 + ...gtexture-fix-debug-build-with-uclibc.patch | 45 +++++ buildroot/package/quagga/quagga.mk | 2 +- buildroot/package/samba4/samba4.hash | 4 +- buildroot/package/samba4/samba4.mk | 13 +- .../shadowsocks-libev/shadowsocks-libev.mk | 7 - ...re.ac-use-pkg-config-to-find-libxml2.patch | 79 ++++++++ buildroot/package/squid/squid.mk | 3 +- ...link-proc-fix-build-with-kernel-v3.9.patch | 0 ...build-fix-detection-of-Werror-shadow.patch | 34 ++++ buildroot/package/systemd/Config.in | 3 - buildroot/package/systemd/systemd.mk | 11 +- .../package/usb_modeswitch/usb_modeswitch.mk | 2 + ...disable-gcc-march-mips64r2-detection.patch | 49 +++++ buildroot/package/valgrind/Config.in | 4 +- buildroot/package/valgrind/valgrind.mk | 3 + buildroot/package/webkitgtk/webkitgtk.hash | 8 +- buildroot/package/webkitgtk/webkitgtk.mk | 2 +- ...ix-compilation-against-FreeRDP-2.0.0.patch | 181 ++++++++++++++++++ buildroot/package/weston/weston.mk | 3 + buildroot/package/xfsprogs/xfsprogs.mk | 2 +- buildroot/support/misc/Vagrantfile | 2 +- buildroot/support/scripts/graph-depends | 5 +- buildroot/system/Config.in | 11 +- buildroot/toolchain/Config.in | 5 + .../Config.in | 1 + 86 files changed, 1185 insertions(+), 268 deletions(-) create mode 100644 buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch delete mode 100644 buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch create mode 100644 buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch rename buildroot/package/dtc/{0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch => 0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch} (100%) create mode 100644 buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch create mode 100644 buildroot/package/gauche/0004-rfc-needs-srfi.patch create mode 100644 buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch delete mode 100644 buildroot/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch create mode 100644 buildroot/package/libid3tag/0001-configure-automake-foreign.patch create mode 100644 buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch create mode 100644 buildroot/package/motion/0001-fix-static-linking-with-webp.patch create mode 100644 buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch create mode 100644 buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch create mode 100644 buildroot/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch delete mode 100644 buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch create mode 100644 buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch create mode 100644 buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch create mode 100644 buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch diff --git a/buildroot-patches/0010-Revert-glibc-2.27-57.patch b/buildroot-patches/0010-Revert-glibc-2.27-57.patch index 40c42480d..478612aa7 100644 --- a/buildroot-patches/0010-Revert-glibc-2.27-57.patch +++ b/buildroot-patches/0010-Revert-glibc-2.27-57.patch @@ -1,6 +1,6 @@ -From 2ed396acbaba0d84dbef108f816832334e7ccb62 Mon Sep 17 00:00:00 2001 +From 3c8816cba476e4203a146e92e28a4f002012cbb1 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli -Date: Sun, 25 Nov 2018 23:27:55 +0000 +Date: Sun, 2 Dec 2018 14:57:30 +0000 Subject: [PATCH 1/1] Revert glibc 2.27-57 Signed-off-by: Pascal Vizeli @@ -13,8 +13,8 @@ Signed-off-by: Pascal Vizeli package/glibc/glibc.mk | 25 ++---- 6 files changed, 15 insertions(+), 127 deletions(-) delete mode 100644 package/glibc/arc-2018.03-release/glibc.hash - delete mode 100644 package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch - delete mode 100644 package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/glibc.hash + delete mode 100644 package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch + delete mode 100644 package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 7821251..57a2e83 100644 @@ -43,10 +43,10 @@ index f3b10d9..0000000 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431 LICENSES -diff --git a/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch b/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch +diff --git a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch b/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch deleted file mode 100644 index febcd36..0000000 ---- a/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch +--- a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4a06ceea33ecc220bbfe264d8f1e74de2f04e90d Mon Sep 17 00:00:00 2001 @@ -137,14 +137,14 @@ index febcd36..0000000 --- -2.17.0 - -diff --git a/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/glibc.hash b/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/glibc.hash +diff --git a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash b/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash deleted file mode 100644 -index a95c990..0000000 ---- a/package/glibc/glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab/glibc.hash +index 7429ab3..0000000 +--- a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) --sha256 6e88cea4002efa7f78d86ea5e98eb92ed423d5a35068751517c4f00f56b8666c glibc-glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab.tar.gz +-sha256 b070f746f932cfce107bb9be2d59ded5b44b25ddafb480c9110c52b88cc2dec1 glibc-glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING @@ -166,14 +166,14 @@ index 5316f03..81dd5ad 100644 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431 LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk -index 762c040..d34b42b 100644 +index 88178d7..d34b42b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master --GLIBC_VERSION = glibc-2.28-18-g2339d6a55eb7a7e040ae888e906adc49eeb59eab +-GLIBC_VERSION = glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa +GLIBC_VERSION = glibc-2.27-57-g6c99e37f6fb640a50a3113b2dbee5d5389843c1e # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, diff --git a/buildroot/CHANGES b/buildroot/CHANGES index dedd2755a..edefd4bab 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,27 @@ +2018.11, Released December 1st, 2018 + + Minor fixes. + + Updated/fixed packages: c-ares, quagga, squid + +2018.11-rc3, released November 30th, 2018 + + Fixes all over the tree. + + Defconfigs: Fixes for Armadeus APF27, imx6sabre, Olimex A20 + olinuxino lime legacy, Orangepi zero plus 2, PC, Riotboard. + + graph-depends: Fix for package names starting with a non-alpha + character. + + Updated/fixed packages: alsa-utils, botan, dante, domoticz, + dtc, freetype, gauche, gcc, gdb, ghostscript, glibc, + imx-usb-loader, libbsd, libid3tag, libkrb5, libmicrohttpd, + libopenssl, libsoxr, linux, motion, msgpack, mtd, + perl-net-ssleay, php, popt, python-numpy, qt5declarative, + samba4, shadowsocks-libev, stress-ng, systemd, usb_modeswitch, + webkitgtk, valgrind, weston, xfsprogs + 2018.11-rc2, released November 21th, 2018 Fixes all over the tree. @@ -137,6 +161,52 @@ #11451: Can't find libmpfr.so.4 when using external toolchain on ubuntu.. #11481: Docs: Is external.desc required? +2018.08.3, Released November 26th, 2018 + + Important / security related fixes. + + fs: Drop intermediate tarball from the filesystem handling to + fix an issue with xattrs handling related to fakeroot. Ensure + tarball target includes xattrs. + + download: Fix confusion in git submodule handling if dl/ is a + symlink. + + toolchain: Only allow enabling stack protection on + architectures with control flow integrity (CFI) support. Only + allow FORTIFY_SOURCE support on gcc >= 6. + + genrandconfig: Fix missing newline in BR2_WGET handling, + causing the following line to be ignored. This would affect + BR2_ENABLE_DEBUG, BR2_INIT_BUSYBOX, BR2_INIT_SYSTEMD, + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV, BR2_STATIC_LIBS or + BR2_PACKAGE_PYTHON_PY_ONLY depending on the randomization. + + show-build-order: Also include the dependencies of + rootfs-common. + + Defconfigs: Fixes for Armadeus APF27, imx6sabre, Olimex A20 + olinuxino lime legacy, Orangepi zero plus 2. + + graph-depends: Fix for package names starting with a non-alpha + character. + + Updated/fixed packages: attr, audit, bind, brotli, busybox, + dtc, easydbus, elfutils, flare-engine, flatcc, gauche, gcc, + giflib, gpsd, lcdproc, libcurl, libiscsi, libkcapi, libnfs, + libnspr, libnss, libsemanage, liburiparser, lighttpd, + lua-curl, mariadb, mmc, mosquitto, mysql, ncmpc, neardal, + netplug, network-manager, nfs-utils, nginx, openocd, openswan, + p11-kit, postgresql, prosody, qemu, qt, rpm, ruby, samba4, + squid, supertuxkart, systemd, tar, trace-cmd, traceroute, + twolame, uclibc, usb_modeswitch, vtun, webkitgtk, weston, + xdriver_xf86-video-geode, xlib_libfontenc, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #11086: download/git submodule breaks on symlinked dl folder + #11481: Docs: Is external.desc required? + 2018.08.2, Released October 25th, 2018 Important / security related fixes. @@ -629,6 +699,53 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.8, Released November 26th, 2018 + + Important / security related fixes. + + fs: Drop intermediate tarball from the filesystem handling to + fix an issue with xattrs handling related to fakeroot. Ensure + tarball target includes xattrs. + + download: Fix confusion in git submodule handling if dl/ is a + symlink. + + toolchain: Only allow enabling stack protection on + architectures with control flow integrity (CFI) support. Only + allow FORTIFY_SOURCE support on gcc >= 6. + + genrandconfig: Fix missing newline in BR2_WGET handling, + causing the following line to be ignored. This would affect + BR2_ENABLE_DEBUG, BR2_INIT_BUSYBOX, BR2_INIT_SYSTEMD, + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV, BR2_STATIC_LIBS or + BR2_PACKAGE_PYTHON_PY_ONLY depending on the randomization. + + show-build-order: Also include the dependencies of + rootfs-common. + + Defconfigs: Fixes for Armadeus APF27, imx6sabre. + + graph-depends: Fix for package names starting with a non-alpha + character. + + Updated/fixed packages: attr, audit, bind, brotli, easydbus, + elfutils, gauche, gcc, giflib, gpsd, lcdproc, libcurl, + libiscsi, libnfs, libnspr, libnss, libkcapi, libsemanage, + liburiparser, lighttpd, linux, lua-curl, mariadb, mmc-utils, + mosquitto, mysql, neardal, netplug, network-manager, + nfs-utils, nginx, openocd, openswan, p11-kit, postgresql, + prosody, qemu, qt, rpm, ruby, samba4, squid, supertuxkart, + systemd, tar, trace-cmd, traceroute, twolame, uclibc, + usb_modeswitch, vtun, webkitgtk, xdriver_xf86-video-geode, + xlib_libfontenc, xproto_inputproto, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #11086: download/git submodule breaks on symlinked dl folder + #11251: Util scanpypi failes when package change - to _ in.. + #11476: stdio2.h error invalid use of __builtin_va_arg_pack + #11481: Docs: Is external.desc required? + 2018.02.7, Released October 25th, 2018 Important / security related fixes. diff --git a/buildroot/Makefile b/buildroot/Makefile index 69cbd7868..c4c34b0ff 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.11-rc2 +export BR2_VERSION := 2018.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1542786000 +BR2_VERSION_EPOCH = 1543701000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch new file mode 100644 index 000000000..b8989cb96 --- /dev/null +++ b/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch @@ -0,0 +1,89 @@ +From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 +From: Trent Piepho +Date: Fri, 6 Apr 2018 17:11:27 -0700 +Subject: [PATCH] imx: Create distinct pre-processed mkimage config files + +Each imx image is created by a separate sub-make and during this process +the mkimage config file is run though cpp. + +The cpp output is to the same file no matter what imx image is being +created. + +This means if two imx images are generated in parallel they will attempt +to independently produce the same pre-processed mkimage config file at +the same time. + +Avoid the problem by making the pre-processed config file name unique +based on the imx image it will be used in. This way each image will +create a unique config file and they won't clobber each other when run +in parallel. + +This should fixed the build bug referenced in b5b0e4e3 ("imximage: +Remove failure when no IVT offset is found"). + +Cc: Breno Lima +Cc: Thomas Petazzoni +Cc: Fabio Estevam +Signed-off-by: Trent Piepho +Tested-by: Fabio Estevam +[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] +Signed-off-by: Fabio Estevam +--- + arch/arm/imx-common/Makefile | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile +index d862258..f1bae8d 100644 +--- a/arch/arm/imx-common/Makefile ++++ b/arch/arm/imx-common/Makefile +@@ -69,9 +69,11 @@ endif + quiet_cmd_cpp_cfg = CFGS $@ + cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< + +-IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp ++# mkimage source config file ++IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) + +-$(IMX_CONFIG): %.cfgtmp: % FORCE ++# How to create a cpp processed config file, they all use the same source ++%.cfgout: $(IMX_CONFIG) FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,cpp_cfg) + +@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim + -e $(CONFIG_SYS_TEXT_BASE) + u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log + +-u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + + ifeq ($(CONFIG_OF_SEPARATE),y) +@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i + -e $(CONFIG_SYS_TEXT_BASE) + u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log + +-u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + endif + + MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ + -e $(CONFIG_SPL_TEXT_BASE) +- + SPL: MKIMAGEOUTPUT = SPL.log + +-SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + + MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ +@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ + spl/u-boot-nand-spl.imx: SPL FORCE + $(call if_changed,u-boot-nand-spl_imx) + +-targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) ++targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) +-- +2.7.4 + diff --git a/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch b/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch deleted file mode 100644 index 92eff7574..000000000 --- a/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - diff --git a/buildroot/board/pc/linux.config b/buildroot/board/pc/linux.config index 0fff11708..f86352e1e 100644 --- a/buildroot/board/pc/linux.config +++ b/buildroot/board/pc/linux.config @@ -82,3 +82,4 @@ CONFIG_EXT4_FS=y CONFIG_FUSE_FS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_SQUASHFS=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/buildroot/configs/armadeus_apf27_defconfig b/buildroot/configs/armadeus_apf27_defconfig index 6f78b74d3..457a14b02 100644 --- a/buildroot/configs/armadeus_apf27_defconfig +++ b/buildroot/configs/armadeus_apf27_defconfig @@ -28,4 +28,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev" # U-boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="apf27" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="apf27" diff --git a/buildroot/configs/cubieboard2_defconfig b/buildroot/configs/cubieboard2_defconfig index fa86be362..fd50742d0 100644 --- a/buildroot/configs/cubieboard2_defconfig +++ b/buildroot/configs/cubieboard2_defconfig @@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_BOOT_SCRIPT=y diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 7457af313..2534d5cb8 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -43,6 +43,7 @@ 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_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # GL driver BR2_PACKAGE_MESA3D=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig index c14c2ca99..2c33f05e5 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig @@ -3,6 +3,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y +# The old 3.4 kernel doesn't build with gcc >= 7.x +BR2_GCC_VERSION_6_X=y + # Linux headers same as kernel, a 3.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y diff --git a/buildroot/configs/orangepi_zero_plus2_defconfig b/buildroot/configs/orangepi_zero_plus2_defconfig index 8c83b3acd..917aa851d 100644 --- a/buildroot/configs/orangepi_zero_plus2_defconfig +++ b/buildroot/configs/orangepi_zero_plus2_defconfig @@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -37,6 +38,7 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/buildroot/configs/pc_x86_64_bios_defconfig b/buildroot/configs/pc_x86_64_bios_defconfig index 1cfc0e424..6e9220bb3 100644 --- a/buildroot/configs/pc_x86_64_bios_defconfig +++ b/buildroot/configs/pc_x86_64_bios_defconfig @@ -32,6 +32,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/buildroot/configs/pc_x86_64_efi_defconfig b/buildroot/configs/pc_x86_64_efi_defconfig index bc99ca755..2a76f403d 100644 --- a/buildroot/configs/pc_x86_64_efi_defconfig +++ b/buildroot/configs/pc_x86_64_efi_defconfig @@ -35,6 +35,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/buildroot/configs/riotboard_defconfig b/buildroot/configs/riotboard_defconfig index 04d52eb4f..3efcd8859 100644 --- a/buildroot/configs/riotboard_defconfig +++ b/buildroot/configs/riotboard_defconfig @@ -27,6 +27,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-riotboard" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 9db4a2dea..f41b4c429 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2018.11-rc2 manual generated on 2018-11-21 -07:47:43 UTC from git revision bc89c1a834

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2018.11 manual generated on 2018-12-01 +22:08:55 UTC from git revision 9089a9ff30

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © 2004-2018 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

Buildroot supports numerous processors and their variants; it also comes with default configurations for several boards available off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP [1] or -SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the +or develop their BSP [1] or +SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -272,7 +272,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

The compilation toolchain is provided by your distribution, and +system" [3].

The compilation toolchain is provided by your distribution, and Buildroot has nothing to do with it (other than using it to build a cross-compilation toolchain and other tools that are run on the development host).

As said above, the compilation toolchain that comes with your system @@ -547,7 +547,7 @@ The third solution is systemd. http://www.freedesktop.org/wiki/Software/systemd.

The solution recommended by Buildroot developers is to use the BusyBox init as it is sufficient for most embedded -systems. systemd can be used for more complex situations.


[3] This terminology differs from what is used by GNU +systems. systemd can be used for more complex situations.


[3] This terminology differs from what is used by GNU configure, where the host is the machine on which the application will run (which is usually the same as target)

Chapter 7. Configuration of other components

Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -2653,7 +2653,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed -from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

Example 17.1. Config script: divine package

Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

So its fixup would be:

DIVINE_CONFIG_SCRIPTS = divine-config

Example 17.2. Config script: imagemagick package:

Package imagemagick installs the following scripts: +from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

Example 17.1. Config script: divine package

Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

So its fixup would be:

DIVINE_CONFIG_SCRIPTS = divine-config

Example 17.2. Config script: imagemagick package:

Package imagemagick installs the following scripts: $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config

So it’s fixup would be:

IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

On line 14, we specify the list of dependencies this package relies @@ -4916,7 +4916,7 @@ large number of commits in the series;

  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -4998,7 +4998,7 @@ pastebin service. Note that not all available pastebin services will preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https://gist.github.com/ -- http://code.bulix.org/


    • [4] RFC: (Request for comments) change proposal

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +- http://code.bulix.org/


    [4] RFC: (Request for comments) change proposal

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developer tool allows to:

    -

    Latest long term support release: 2018.02.7

    +

    Latest long term support release: 2018.02.8

    - +
    - +
    -

    buildroot-2018.02.7.tar.gz

    -

    PGP signature

    +

    buildroot-2018.02.8.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2018.02.7.tar.bz2

    -

    PGP signature

    +

    buildroot-2018.02.8.tar.bz2

    +

    PGP signature

    -

    Latest stable release: 2018.08.2

    +

    Latest stable release: 2018.11

    - +
    - +
    -

    buildroot-2018.08.2.tar.gz

    -

    PGP signature

    +

    buildroot-2018.11.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2018.08.2.tar.bz2

    -

    PGP signature

    +

    buildroot-2018.11.tar.bz2

    +

    PGP signature

    - -

    Latest release candidate: 2018.11-rc2

    +
    Source code
    diff --git a/buildroot/docs/website/news.html b/buildroot/docs/website/news.html index 78037421b..dc495e8d8 100644 --- a/buildroot/docs/website/news.html +++ b/buildroot/docs/website/news.html @@ -9,6 +9,84 @@

    News

      +
    • +
      +
      +
      +

      2018.11 released

      +

      1 December 2018

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2018.11-rc3 released

      +

      30 November 2018

      +
      +
      +

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

      + +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2018.02.8 released

      +

      26 November 2018

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2018.08.3 released

      +

      26 November 2018

      +
      +
      +

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

      +
      +
      +
      • +
    • diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index c782dc2ae..efce31c7e 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -33,7 +33,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (4.18)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.138-cip25)" + bool "Latest CIP SLTS version (v4.4.154-cip28)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -120,8 +120,8 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.18.18" if BR2_LINUX_KERNEL_LATEST_VERSION - default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "4.18.20" if BR2_LINUX_KERNEL_LATEST_VERSION + default "v4.4.154-cip28" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 8c85b18cd..12da19e04 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 34b361f815ad501268b6289dbb9b835dca1b1b470ad51cb8bc0f7c105588033d linux-4.18.18.tar.xz +sha256 68ac319e0fb7edd6b6051541d9cf112cd4f77a29e16a69ae1e133ff51117f653 linux-4.18.20.tar.xz sha256 41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021 linux-4.16.18.tar.xz -sha256 9ddc7bc11cbea6475ac5abf18e01a143d7d506bece591e0dcb15c9452d3ed7d2 linux-4.14.80.tar.xz -sha256 d39531e2df13cec1f998a5273d86f10db977409a778c0c7e56ef3d50c7262ec8 linux-4.9.136.tar.xz -sha256 61b3d63a960a55046a7324d5724c262831952b223fe9ca02be0607f26d8f2ef4 linux-4.4.163.tar.xz +sha256 701728de924e0ec4a6b7cf59252011f8268a1b70aaf02b8487c1b2190feb3f20 linux-4.14.83.tar.xz +sha256 f888aef58c2c4d82c81511ad6a4528ee9a8241bb96c05c65e71224988782f943 linux-4.9.140.tar.xz +sha256 9bb4a1757e67dbd0923dbdf7e7e0baa9baa53ac942471d8fbb8d35dd5b313c10 linux-4.4.164.tar.xz sha256 6ad9389e55e0ea57768eae173747058a4487fa3630e10a7999cfec9f945e559c linux-4.1.52.tar.xz # From https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc sha256 ad96d797571496c969aa71bf5d08e9d2a8c84458090d29a120f1b2981185a99e linux-3.2.102.tar.xz diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk index 476ff1632..864fa772b 100644 --- a/buildroot/linux/linux.mk +++ b/buildroot/linux/linux.mk @@ -461,9 +461,7 @@ define LINUX_INSTALL_HOST_TOOLS # Installing dtc (device tree compiler) as host tool, if selected if grep -q "CONFIG_DTC=y" $(@D)/.config; then \ $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ; \ - if [ ! -e $(HOST_DIR)/bin/dtc ]; then \ - ln -sf linux-dtc $(HOST_DIR)/bin/dtc ; \ - fi \ + $(if $(BR2_PACKAGE_HOST_DTC),,ln -sf linux-dtc $(HOST_DIR)/bin/dtc;) \ fi endef diff --git a/buildroot/package/alsa-utils/alsa-utils.mk b/buildroot/package/alsa-utils/alsa-utils.mk index 0c65082a1..986a74539 100644 --- a/buildroot/package/alsa-utils/alsa-utils.mk +++ b/buildroot/package/alsa-utils/alsa-utils.mk @@ -82,7 +82,8 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi endef -ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL),y) +ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL)$(BR2_INIT_SYSTEMD),yy) +ALSA_UTILS_DEPENDENCIES += systemd define ALSA_UTILS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-restore.service \ $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index 7f0bbb66c..e07b786c8 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -92,11 +92,11 @@ define BOTAN_BUILD_CMDS endef define BOTAN_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install endef define BOTAN_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) diff --git a/buildroot/package/c-ares/c-ares.hash b/buildroot/package/c-ares/c-ares.hash index 832c4dfcf..0c665574d 100644 --- a/buildroot/package/c-ares/c-ares.hash +++ b/buildroot/package/c-ares/c-ares.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz + +# Hash for license file +sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/buildroot/package/c-ares/c-ares.mk b/buildroot/package/c-ares/c-ares.mk index 67254244a..16536137a 100644 --- a/buildroot/package/c-ares/c-ares.mk +++ b/buildroot/package/c-ares/c-ares.mk @@ -11,7 +11,6 @@ C_ARES_CONF_OPTS = --with-random=/dev/urandom # Rebuild configure to avoid XC_CHECK_USER_CFLAGS C_ARES_AUTORECONF = YES C_ARES_LICENSE = MIT -# No standalone, use some source file -C_ARES_LICENSE_FILES = ares_mkquery.c +C_ARES_LICENSE_FILES = LICENSE.md $(eval $(autotools-package)) diff --git a/buildroot/package/dante/dante.mk b/buildroot/package/dante/dante.mk index 687567e10..9471acc69 100644 --- a/buildroot/package/dante/dante.mk +++ b/buildroot/package/dante/dante.mk @@ -9,10 +9,10 @@ DANTE_SITE = http://www.inet.no/dante/files DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE -# Dante uses a *VERY* old configure.ac -DANTE_LIBTOOL_PATCH = NO +# 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file +DANTE_AUTORECONF = YES -DANTE_CONF_OPTS += --disable-client --disable-preload +DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam define DANTE_INSTALL_CONFIG_FILE $(INSTALL) -D -m 644 $(@D)/example/sockd.conf \ diff --git a/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch b/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch new file mode 100644 index 000000000..a0adbdfed --- /dev/null +++ b/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch @@ -0,0 +1,40 @@ +From 4b77662232c806b8aba7680405144ad51ac3671b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 29 Nov 2018 00:36:00 +0100 +Subject: [PATCH] CMakeLists.txt: fix build with python and cmake <= 3.7 + +domoticz will fail to build with python and older cmake +Indeed, find_package(PythonLibs 3.4) will not recognize python 3.7 until +cmake 3.7 and the following commit: +https://github.com/Kitware/CMake/commit/c31573b9641e0f1bc7a34149506db51f3494323b + +To fix this, add a call to find_package(PythonInterp 3.4). Indeed, if +FindPythonInterp has already found the major and minor version, that +version will be inserted between the user supplied versions and the +stock version list since cmake in version 3.1 and +https://github.com/Kitware/CMake/commit/3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3 + +Fixes: + - http://autobuild.buildroot.org/results/8e82501a7b49da628ec026132ffca44c0c813040 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/domoticz/domoticz/pull/2889] +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4e38b88..41003a0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,6 +125,7 @@ ENDIF(USE_BUILTIN_SQLITE) + + option(USE_PYTHON "Use Python for Plugins and Event-Scripts" YES) + IF(USE_PYTHON) ++ find_package(PythonInterp 3.4) + find_package(PythonLibs 3.4) + IF(PYTHONLIBS_FOUND) + MESSAGE(STATUS "Python3 includes found at: ${PYTHON_INCLUDE_PATH}") +-- +2.14.1 + diff --git a/buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch similarity index 100% rename from buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch rename to buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch diff --git a/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch b/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch new file mode 100644 index 000000000..ab95214a5 --- /dev/null +++ b/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch @@ -0,0 +1,120 @@ +From 5277449e5fd13a2f3778ed3380ba157cb9d4ea55 Mon Sep 17 00:00:00 2001 +From: Rob Herring +Date: Thu, 20 Sep 2018 14:30:03 -0700 +Subject: [PATCH] checks: fix simple-bus compatible matching + +Since commit 7975f6422260 ("Fix widespread incorrect use of strneq(), +replace with new strprefixeq()") simple-bus checks have been silently +skipped. The problem was 'end - str' is one more than the string length +and the strnlen in strprefixeq fails. This can't be fixed simply by +subtracting one as it is possible to have multiple '\0' at the end of +the property. Fix this by making the 'compatible' property string list +check a dependency, and then we can assume the property is null +terminated and we can just use streq() for comparisons. + +Add some tests so the problem doesn't happen again. + +Fixes: 7975f6422260 ("Fix widespread incorrect use of strneq(), replace with new strprefixeq()") +Reported-by: Kumar Gala +Signed-off-by: Rob Herring +Signed-off-by: David Gibson +[Backport from upstream commit e84742aa7b934cd6603e3a64f8c0966f683c5711] +Signed-off-by: Thomas Petazzoni +--- + checks.c | 5 +++-- + tests/run_tests.sh | 4 ++++ + tests/unit-addr-simple-bus-compatible.dts | 18 ++++++++++++++++++ + tests/unit-addr-simple-bus-reg-mismatch.dts | 18 ++++++++++++++++++ + 4 files changed, 43 insertions(+), 2 deletions(-) + create mode 100644 tests/unit-addr-simple-bus-compatible.dts + create mode 100644 tests/unit-addr-simple-bus-reg-mismatch.dts + +diff --git a/checks.c b/checks.c +index a2cc103..acf91c3 100644 +--- a/checks.c ++++ b/checks.c +@@ -910,7 +910,7 @@ static bool node_is_compatible(struct node *node, const char *compat) + + for (str = prop->val.val, end = str + prop->val.len; str < end; + str += strnlen(str, end - str) + 1) { +- if (strprefixeq(str, end - str, compat)) ++ if (streq(str, compat)) + return true; + } + return false; +@@ -921,7 +921,8 @@ static void check_simple_bus_bridge(struct check *c, struct dt_info *dti, struct + if (node_is_compatible(node, "simple-bus")) + node->bus = &simple_bus; + } +-WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, &addr_size_cells); ++WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, ++ &addr_size_cells, &compatible_is_string_list); + + static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct node *node) + { +diff --git a/tests/run_tests.sh b/tests/run_tests.sh +index 7348c9c..c4354d2 100755 +--- a/tests/run_tests.sh ++++ b/tests/run_tests.sh +@@ -652,6 +652,10 @@ dtc_tests () { + check_tests pci-bridge-bad1.dts pci_bridge + check_tests pci-bridge-bad2.dts pci_bridge + ++ check_tests unit-addr-simple-bus-reg-mismatch.dts simple_bus_reg ++ check_tests unit-addr-simple-bus-compatible.dts simple_bus_reg ++ ++ + # Check warning options + run_sh_test dtc-checkfails.sh address_cells_is_cell interrupt_cells_is_cell -n size_cells_is_cell -- -Wno_size_cells_is_cell -I dts -O dtb bad-ncells.dts + run_sh_test dtc-fails.sh -n test-warn-output.test.dtb -I dts -O dtb bad-ncells.dts +diff --git a/tests/unit-addr-simple-bus-compatible.dts b/tests/unit-addr-simple-bus-compatible.dts +new file mode 100644 +index 0000000..c8f9341 +--- /dev/null ++++ b/tests/unit-addr-simple-bus-compatible.dts +@@ -0,0 +1,18 @@ ++/dts-v1/; ++ ++/ { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ bus@10000000 { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ compatible = "foo-bus", "simple-bus"; ++ ranges = <0x0 0x10000000 0x10000>; ++ ++ node@100 { ++ reg = <0x1000 1>; ++ }; ++ }; ++ ++}; +diff --git a/tests/unit-addr-simple-bus-reg-mismatch.dts b/tests/unit-addr-simple-bus-reg-mismatch.dts +new file mode 100644 +index 0000000..2823377 +--- /dev/null ++++ b/tests/unit-addr-simple-bus-reg-mismatch.dts +@@ -0,0 +1,18 @@ ++/dts-v1/; ++ ++/ { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ bus@10000000 { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ compatible = "simple-bus"; ++ ranges = <0x0 0x10000000 0x10000>; ++ ++ node@100 { ++ reg = <0x1000 1>; ++ }; ++ }; ++ ++}; +-- +2.19.1 + diff --git a/buildroot/package/freetype/freetype.hash b/buildroot/package/freetype/freetype.hash index 806375c05..c98674c7c 100644 --- a/buildroot/package/freetype/freetype.hash +++ b/buildroot/package/freetype/freetype.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.9/ -md5 513c403c110016fdc7e537216a642b1d freetype-2.9.tar.bz2 -sha1 94c4399b1a55c5892812e732843fcb4a7c2fe657 freetype-2.9.tar.bz2 +# From https://sourceforge.net/projects/freetype/files/freetype2/2.9.1/ +md5 60ef7d8160cd4bf8cb118ee9d65367ca freetype-2.9.1.tar.bz2 +sha1 220c82062171c513e4017c523d196933c9de4a7d freetype-2.9.1.tar.bz2 # Locally calculated -sha256 e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a freetype-2.9.tar.bz2 +sha256 db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d freetype-2.9.1.tar.bz2 sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/buildroot/package/freetype/freetype.mk b/buildroot/package/freetype/freetype.mk index 1b3a9d175..716706156 100644 --- a/buildroot/package/freetype/freetype.mk +++ b/buildroot/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.9 +FREETYPE_VERSION = 2.9.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES @@ -17,6 +17,10 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png +# since 2.9.1 needed for freetype-config install +FREETYPE_CONF_OPTS += --enable-freetype-config +HOST_FREETYPE_CONF_OPTS += --enable-freetype-config + ifeq ($(BR2_PACKAGE_ZLIB),y) FREETYPE_DEPENDENCIES += zlib FREETYPE_CONF_OPTS += --with-zlib diff --git a/buildroot/package/fwts/Config.in b/buildroot/package/fwts/Config.in index 269f065fd..94ac60636 100644 --- a/buildroot/package/fwts/Config.in +++ b/buildroot/package/fwts/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_FWTS depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_MMU # libglib2, libbsd depends on BR2_USE_WCHAR # libglib2, libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h diff --git a/buildroot/package/gauche/0004-rfc-needs-srfi.patch b/buildroot/package/gauche/0004-rfc-needs-srfi.patch new file mode 100644 index 000000000..8b83b7872 --- /dev/null +++ b/buildroot/package/gauche/0004-rfc-needs-srfi.patch @@ -0,0 +1,35 @@ +From 33ba5e73ec09f1308f897128334e955debd9ea43 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 21 Nov 2018 08:58:25 +0100 +Subject: [PATCH] rfc: needs srfi + +ext/rfc needs srfi-19 since version 0.9.5 and +https://github.com/shirok/Gauche/commit/bd22bc82361c5eeb5d3b58c3836236566746bb96 + +So add a dependency on srfi for rfc target in Makefile.in + +Fixes: + - http://autobuild.buildroot.org/results/f4935e29ce6aaebdaa47d46c56120b7e97145d1b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/shirok/Gauche/pull/397] +--- + ext/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/Makefile.in b/ext/Makefile.in +index 57ddf457e..de8d59a4d 100644 +--- a/ext/Makefile.in ++++ b/ext/Makefile.in +@@ -54,7 +54,7 @@ bcrypt: mt-random + + dbm : threads + +-rfc: gauche util ++rfc: gauche srfi util + + test : check + +-- +2.14.1 + diff --git a/buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch new file mode 100644 index 000000000..1d4f8c015 --- /dev/null +++ b/buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch @@ -0,0 +1,30 @@ +From 6ea832d09415cd82b744d0cf168cdd728c43df47 Mon Sep 17 00:00:00 2001 +From: Mark Corbin +Date: Thu, 22 Nov 2018 12:19:11 +0000 +Subject: [PATCH] gcc: define _REENTRANT for RISC-V when -pthread is passed + +The detection of pthread support fails on RISC-V unless _REENTRANT +is defined. Added the CPP_SPEC definition from gcc 8.1.0 to correct +this. + +Signed-off-by: Mark Corbin +--- + gcc/config/riscv/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 4b2f7b6e1fd..b00d23ddfa0 100644 +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -47,6 +47,8 @@ along with GCC; see the file COPYING3. If not see + + #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #define LINK_SPEC "\ + -melf" XLEN_SPEC "lriscv \ + %{shared} \ +-- +2.19.1 + diff --git a/buildroot/package/gdb/Config.in b/buildroot/package/gdb/Config.in index 55c1b194c..0c3465d14 100644 --- a/buildroot/package/gdb/Config.in +++ b/buildroot/package/gdb/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_PACKAGE_GDB_NEEDS_CXX11 depends on BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_GDB_NEEDS_CXX11 + # no gdbserver on riscv + select BR2_PACKAGE_GDB_DEBUGGER if BR2_riscv # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. @@ -46,6 +48,7 @@ if BR2_PACKAGE_GDB config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY + depends on !BR2_riscv help Build the gdbserver stub to run on the target. A full gdb is needed to debug the progam. diff --git a/buildroot/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host index df8817d91..ade2371d5 100644 --- a/buildroot/package/gdb/Config.in.host +++ b/buildroot/package/gdb/Config.in.host @@ -7,6 +7,7 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS depends on !BR2_microblaze depends on !BR2_nios2 depends on !BR2_or1k + depends on !BR2_riscv comment "Host GDB Options" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY diff --git a/buildroot/package/ghostscript/ghostscript.hash b/buildroot/package/ghostscript/ghostscript.hash index f8ca6c8d4..15ef95e77 100644 --- a/buildroot/package/ghostscript/ghostscript.hash +++ b/buildroot/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/SHA512SUMS -sha512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651 ghostscript-9.25.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/SHA512SUMS +sha512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e ghostscript-9.26.tar.xz # Hash for license file: sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk index b1f5e1edb..357fd08c3 100644 --- a/buildroot/package/ghostscript/ghostscript.mk +++ b/buildroot/package/ghostscript/ghostscript.mk @@ -4,8 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.25 -GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925 +GHOSTSCRIPT_VERSION = 9.26 +GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/go/Config.in.host b/buildroot/package/go/Config.in.host index c871ac419..f619ca007 100644 --- a/buildroot/package/go/Config.in.host +++ b/buildroot/package/go/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS bool default y + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ diff --git a/buildroot/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch b/buildroot/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch deleted file mode 100644 index 902b94d19..000000000 --- a/buildroot/package/imx-usb-loader/0001-portable.h-fix-build-with-gcc-older-than-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b9cb60a911c35650c26995c7e6f7051fdf702d22 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 19 Jun 2018 15:31:52 +0300 -Subject: [PATCH] portable.h: fix build with gcc older than 4.8 - -__builtin_bswap16 is available in all gcc architectures only since -version 4.8. Older gcc versions fail to build: - -imx_sdp.o: In function `perform_dcd': -.../imx_sdp.c:1138: undefined reference to `__builtin_bswap16' -imx_sdp.o: In function `write_dcd_table_ivt': -.../imx_sdp.c:457: undefined reference to `__builtin_bswap16' -imx_sdp.o: In function `write_dcd': -.../imx_sdp.c:410: undefined reference to `__builtin_bswap16' -imx_sdp.o: In function `init_header': -.../imx_sdp.c:1075: undefined reference to `__builtin_bswap16' - -Use a local implementation instead. The implementation suggested by -Arnout Vandecappelle on the Buildroot mailing list. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/boundarydevices/imx_usb_loader/pull/82 - - portable.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/portable.h b/portable.h -index 364fe47b212a..b8a302bae400 100644 ---- a/portable.h -+++ b/portable.h -@@ -58,7 +58,11 @@ extern int debugmode; - #ifdef __GNUC__ - #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define BE32(x) __builtin_bswap32(x) --#define BE16(x) __builtin_bswap16(x) -+#define BE16(x) \ -+({ \ -+ typeof(x) __x = (x); \ -+ (__x<<8 | __x>>8); \ -+}) - #else - #define BE32(x) x - #define BE16(x) x --- -2.17.1 - diff --git a/buildroot/package/imx-usb-loader/imx-usb-loader.hash b/buildroot/package/imx-usb-loader/imx-usb-loader.hash index 8f59a3888..149be676d 100644 --- a/buildroot/package/imx-usb-loader/imx-usb-loader.hash +++ b/buildroot/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,2 @@ # locally computed -sha256 263dba6331206816890eaed0de7b0aa748c6e5300982fe6f31dcfe0df383ad62 imx-usb-loader-e5394615dd413c3823d5bd1de340933e16a8c07c.tar.gz +sha256 5a17886042c09f0f16093031183a287a2a7ae0fa9cd8bdfa31e7b31cb92510d9 imx-usb-loader-4aa9809099dcece9a9225776321f3b4b5b896d78.tar.gz diff --git a/buildroot/package/imx-usb-loader/imx-usb-loader.mk b/buildroot/package/imx-usb-loader/imx-usb-loader.mk index f0db57faa..594bbb9ca 100644 --- a/buildroot/package/imx-usb-loader/imx-usb-loader.mk +++ b/buildroot/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,8 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = e5394615dd413c3823d5bd1de340933e16a8c07c +IMX_USB_LOADER_VERSION = 4aa9809099dcece9a9225776321f3b4b5b896d78 + IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING diff --git a/buildroot/package/libbsd/Config.in b/buildroot/package/libbsd/Config.in index a163ce9b6..ba5e5cbcf 100644 --- a/buildroot/package/libbsd/Config.in +++ b/buildroot/package/libbsd/Config.in @@ -9,6 +9,8 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS config BR2_PACKAGE_LIBBSD bool "libbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + # uClibc on noMMU doesn't provide __register_atfork() + depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR help @@ -22,4 +24,5 @@ config BR2_PACKAGE_LIBBSD comment "libbsd needs a toolchain w/ threads, wchar" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/libid3tag/0001-configure-automake-foreign.patch b/buildroot/package/libid3tag/0001-configure-automake-foreign.patch new file mode 100644 index 000000000..8521d559f --- /dev/null +++ b/buildroot/package/libid3tag/0001-configure-automake-foreign.patch @@ -0,0 +1,16 @@ +configure: don't require GNU-specific files when running automake + +Signed-off-by: "Yann E. MORIN" + +diff -durN libid3tag-0.15.1b.orig/configure.ac libid3tag-0.15.1b/configure.ac +--- libid3tag-0.15.1b.orig/configure.ac 2004-01-24 00:22:46.000000000 +0100 ++++ libid3tag-0.15.1b/configure.ac 2018-11-25 15:31:04.184342212 +0100 +@@ -26,7 +26,7 @@ + + AC_CONFIG_SRCDIR([id3tag.h]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER([config.h]) + diff --git a/buildroot/package/libid3tag/libid3tag.mk b/buildroot/package/libid3tag/libid3tag.mk index 951ae09c7..402e154ae 100644 --- a/buildroot/package/libid3tag/libid3tag.mk +++ b/buildroot/package/libid3tag/libid3tag.mk @@ -10,6 +10,9 @@ LIBID3TAG_LICENSE = GPL-2.0+ LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT LIBID3TAG_INSTALL_STAGING = YES LIBID3TAG_DEPENDENCIES = zlib -LIBID3TAG_LIBTOOL_PATCH = NO + +# Force autoreconf to be able to use a more recent libtool script, that +# is able to properly behave in the face of a missing C++ compiler. +LIBID3TAG_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk index 6534c069e..d9d7160ae 100644 --- a/buildroot/package/libkrb5/libkrb5.mk +++ b/buildroot/package/libkrb5/libkrb5.mk @@ -52,14 +52,7 @@ else LIBKRB5_CONF_OPTS += --without-readline endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -# gcc on riscv doesn't define _REENTRANT when -pthread is passed while -# it should. Compensate this deficiency here otherwise libkrb5 configure -# script doesn't find that thread support is enabled. -ifeq ($(BR2_riscv),y) -LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_REENTRANT" -endif -else +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBKRB5_CONF_OPTS += --disable-thread-support endif diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index c22ad0847..d5c6366d8 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -11,13 +11,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -# gcc on arc and riscv doesn't define _REENTRANT when -pthread is passed while -# it should. Compensate this deficiency here otherwise libmicrohttpd -# configure script doesn't find that thread support is enabled. -ifeq ($(BR2_arc)$(BR2_riscv),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index 2b1e04875..83fb8bd51 100644 --- a/buildroot/package/libopenssl/libopenssl.hash +++ b/buildroot/package/libopenssl/libopenssl.hash @@ -1,7 +1,7 @@ -# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha256 -sha256 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 openssl-1.0.2p.tar.gz -# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha1 -sha1 f34b5322e92415755c7d58bf5d0d5cf37666382c openssl-1.0.2p.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2q.tar.gz.sha256 +sha256 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 openssl-1.0.2q.tar.gz +# From https://www.openssl.org/source/openssl-1.0.2q.tar.gz.sha1 +sha1 692f5f2f1b114f8adaadaa3e7be8cce1907f38c5 openssl-1.0.2q.tar.gz # Locally computed sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index d8e3dd8b5..ca0521b22 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.0.2p +LIBOPENSSL_VERSION = 1.0.2q LIBOPENSSL_SITE = http://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch b/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch new file mode 100644 index 000000000..c36988a77 --- /dev/null +++ b/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch @@ -0,0 +1,33 @@ +From 8c1edfc22f8b714062b149e3d80ab4357a1a4e49 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 22 Nov 2018 19:10:03 +0100 +Subject: [PATCH] soxr.pc.in: add avutil libraries + +Add ${AVUTIL_LIBRARIES} to soxr.pc.in so applications such as +shairport-sync will know that they must link with -lavutil when +building statically + +Fixes: + - http://autobuild.buildroot.org/results/839c0ce6475accc1de7e8a180d4358edb6750c64 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/soxr/code/merge-requests/2] +[Thomas: move to Libs.private.] +Signed-off-by: Thomas Petazzoni +--- + src/soxr.pc.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/soxr.pc.in b/src/soxr.pc.in +index 69d225b..ed212a8 100644 +--- a/src/soxr.pc.in ++++ b/src/soxr.pc.in +@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME} + Description: ${DESCRIPTION_SUMMARY} + Version: ${PROJECT_VERSION} + Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME} ++Libs.private: ${AVUTIL_LIBRARIES} + Cflags: -I${INCLUDE_INSTALL_DIR} +-- +2.19.1 + diff --git a/buildroot/package/libsoxr/libsoxr.mk b/buildroot/package/libsoxr/libsoxr.mk index 5291f9474..b34962c4a 100644 --- a/buildroot/package/libsoxr/libsoxr.mk +++ b/buildroot/package/libsoxr/libsoxr.mk @@ -18,4 +18,8 @@ else LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG),y) +LIBSOXR_DEPENDENCIES += ffmpeg +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 93eb54f73..756fe81a5 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -290,11 +290,11 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.163" if BR2_KERNEL_HEADERS_4_4 - default "4.9.136" if BR2_KERNEL_HEADERS_4_9 - default "4.14.80" if BR2_KERNEL_HEADERS_4_14 + default "4.4.164" if BR2_KERNEL_HEADERS_4_4 + default "4.9.140" if BR2_KERNEL_HEADERS_4_9 + default "4.14.83" if BR2_KERNEL_HEADERS_4_14 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.18.18" if BR2_KERNEL_HEADERS_4_18 + default "4.18.20" if BR2_KERNEL_HEADERS_4_18 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/minizip/Config.in b/buildroot/package/minizip/Config.in index 68fa1d711..4bc12a0d7 100644 --- a/buildroot/package/minizip/Config.in +++ b/buildroot/package/minizip/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MINIZIP bool "minizip" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) # libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd depends on BR2_USE_WCHAR # libbsd select BR2_PACKAGE_LIBBSD @@ -19,4 +20,5 @@ config BR2_PACKAGE_MINIZIP_DEMOS comment "minizip needs a toolchain w/ threads, wchar" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/motion/0001-fix-static-linking-with-webp.patch b/buildroot/package/motion/0001-fix-static-linking-with-webp.patch new file mode 100644 index 000000000..201ef3d8a --- /dev/null +++ b/buildroot/package/motion/0001-fix-static-linking-with-webp.patch @@ -0,0 +1,32 @@ +From 3e59613c286316e963d98ea99ded35ded4361c48 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 21 Nov 2018 18:55:31 +0100 +Subject: [PATCH] fix static linking with webp + +Static build with webp fails because webp is put before webpmux + +Fixes: + - http://autobuild.buildroot.org/results/4d4e72808300ba1ff79ca794930112b554eb2533 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Motion-Project/motion/pull/850] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 89179e5..60147fb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -276,7 +276,7 @@ if test "${WEBP}" = "yes"; then + AC_MSG_RESULT(found) + AC_DEFINE([HAVE_WEBP], 1, [Define to 1 if WEBP is around]) + HAVE_WEBP="yes" +- TEMP_LIBS="$TEMP_LIBS -lwebp -lwebpmux" ++ TEMP_LIBS="$TEMP_LIBS -lwebpmux -lwebp" + else + AC_MSG_RESULT(not found) + fi +-- +2.14.1 + diff --git a/buildroot/package/msgpack/msgpack.mk b/buildroot/package/msgpack/msgpack.mk index 38df8f53a..abb6e2e21 100644 --- a/buildroot/package/msgpack/msgpack.mk +++ b/buildroot/package/msgpack/msgpack.mk @@ -9,7 +9,7 @@ MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION)) MSGPACK_LICENSE = BSL-1.0 MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt MSGPACK_INSTALL_STAGING = YES -MSGPACK_CONF_OPTS = -DMSGPACK_BUILD_EXAMPLES=OFF +MSGPACK_CONF_OPTS = -DMSGPACK_BUILD_EXAMPLES=OFF -DMSGPACK_BUILD_TESTS=OFF ifeq ($(BR2_STATIC_LIBS),y) MSGPACK_CONF_OPTS += -DMSGPACK_ENABLE_SHARED=OFF diff --git a/buildroot/package/perl-net-ssleay/Config.in b/buildroot/package/perl-net-ssleay/Config.in index 16b18c45d..6998553ef 100644 --- a/buildroot/package/perl-net-ssleay/Config.in +++ b/buildroot/package/perl-net-ssleay/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PERL_NET_SSLEAY bool "perl-net-ssleay" depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_OPENSSL help Perl extension for using OpenSSL. diff --git a/buildroot/package/php/Config.ext b/buildroot/package/php/Config.ext index 3082462b4..7e6b3e0e2 100644 --- a/buildroot/package/php/Config.ext +++ b/buildroot/package/php/Config.ext @@ -201,14 +201,15 @@ config BR2_PACKAGE_PHP_EXT_INTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_TOOLCHAIN_HAS_THREADS # icu + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ICU help Internationalization support -comment "intl support needs a toolchain w/ C++, wchar, threads, gcc >= 4.8, host gcc >= 4.8" +comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_HOST_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/pkg-golang.mk b/buildroot/package/pkg-golang.mk index 6eacd1418..4f2c7e77e 100644 --- a/buildroot/package/pkg-golang.mk +++ b/buildroot/package/pkg-golang.mk @@ -55,8 +55,10 @@ ifeq ($(BR2_STATIC_LIBS),y) $(2)_LDFLAGS += -extldflags '-static' endif -$(2)_BUILD_OPTS += -ldflags "$$($(2)_LDFLAGS)" -$(2)_BUILD_OPTS += -tags "$$($(2)_TAGS)" +$(2)_BUILD_OPTS += \ + -ldflags "$$($(2)_LDFLAGS)" \ + -tags "$$($(2)_TAGS)" \ + -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. $(2)_DEPENDENCIES += host-go diff --git a/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch b/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch new file mode 100644 index 000000000..087a30bb7 --- /dev/null +++ b/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch @@ -0,0 +1,19 @@ +Add LTLIBICONV to popt.pc.in + +Add ${LTLIBICONV} to popt.pc.in so applications such as shairport-sync +will know that they must link with -liconv when building statically + +Fixes: + - http://autobuild.buildroot.org/results/c5b0d1d2867e49c022a2ad971dd9f358ff0f3865 + +Signed-off-by: Fabrice Fontaine + +diff -Naurp popt-1.16-vanilla/popt.pc.in popt-1.16/popt.pc.in +--- popt-1.16-vanilla/popt.pc.in 2018-11-22 20:26:55.735211662 +0100 ++++ popt-1.16/popt.pc.in 2018-11-22 20:34:11.371303724 +0100 +@@ -7,4 +7,5 @@ Name: popt + Version: @VERSION@ + Description: popt library. + Libs: @POPT_PKGCONFIG_LIBS@ ++Libs.private: @LTLIBICONV@ + Cflags: -I${includedir} diff --git a/buildroot/package/python-numpy/python-numpy.mk b/buildroot/package/python-numpy/python-numpy.mk index c45488828..26a10c377 100644 --- a/buildroot/package/python-numpy/python-numpy.mk +++ b/buildroot/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_SETUP_TYPE = setuptools ifeq ($(BR2_PACKAGE_CLAPACK),y) PYTHON_NUMPY_DEPENDENCIES += clapack PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack +else +PYTHON_NUMPY_ENV += BLAS=None LAPACK=None endif PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None diff --git a/buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch new file mode 100644 index 000000000..1c0f6eccc --- /dev/null +++ b/buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch @@ -0,0 +1,45 @@ +From 2a5711651bee9d021733da19126a71aeda45e646 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 29 Nov 2018 23:33:10 +0100 +Subject: [PATCH] qsgtexture: fix debug build with uclibc + +Debug build of gsgtexture fails on uclibc since version 5.11 and +https://github.com/qt/qtdeclarative/commit/7c507eaac3f848f92f2ebdafe8ded4a064d68351: + +scenegraph/util/qsgtexture.cpp:69:22: fatal error: execinfo.h: No such file or directory + #include + +Indeed, !defined(__UCLIBC__) has been replaced by defined(__GBLIBC__) to +fix build on musl but as a result, build fails on uclibc because uclibc +also defines __GLIBC__ (and it does not have execinfo like musl) + +This error is raised only when building in debug mode because +CAN_BACKTRACE_EXECINFO is undefined if QT_NO_DEBUG is set + +So keep defined(__GLIBC__), but put back !defined(__UCLIBC__) + +Fixes: + - http://autobuild.buildroot.org/results/6fce0ce5aea943e097532efbbc8d1e28f41e5866 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/qt/qtdeclarative/pull/4] +--- + src/quick/scenegraph/util/qsgtexture.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp +index fea92a512..a26191006 100644 +--- a/src/quick/scenegraph/util/qsgtexture.cpp ++++ b/src/quick/scenegraph/util/qsgtexture.cpp +@@ -53,7 +53,7 @@ + #endif + #include + +-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) ++#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__) + #define CAN_BACKTRACE_EXECINFO + #endif + +-- +2.14.1 + diff --git a/buildroot/package/quagga/quagga.mk b/buildroot/package/quagga/quagga.mk index b2b4e2a1f..8c2b80631 100644 --- a/buildroot/package/quagga/quagga.mk +++ b/buildroot/package/quagga/quagga.mk @@ -45,7 +45,7 @@ QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_PIMD),--enable-pimd,--disable-pimd QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga) QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd) QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra) +QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),--enable-tcp-zebra,--disable-tcp-zebra) define QUAGGA_USERS quagga -1 quagga -1 * - - - Quagga priv drop user diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 4d210ca36..41c670059 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.9.2.tar.asc -sha256 349c17b7bf1bf667167843470533da89ff1b2ca4a768b529aaacf5197af1efa2 samba-4.9.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.asc +sha256 cf8fd8707e9ad7bce7832006aac5644155165745ba371170661b3004fa2135cf samba-4.9.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index d95b4edfa..89e39dab5 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.9.2 +SAMBA4_VERSION = 4.9.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -161,13 +161,12 @@ define SAMBA4_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S91smb endef +ifeq ($(BR2_INIT_SYSTEMD),y) +SAMBA4_CONF_OPTS += --systemd-install-services +SAMBA4_DEPENDENCIES += systemd +endif + define SAMBA4_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/nmb.service \ - $(TARGET_DIR)/usr/lib/systemd/system/nmb.service - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/smb.service \ - $(TARGET_DIR)/usr/lib/systemd/system/smb.service - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/winbind.service \ - $(TARGET_DIR)/usr/lib/systemd/system/winbind.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ln -sf ../../../../usr/lib/systemd/system/nmb.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk index 7fdcd3f77..caae2176b 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk @@ -14,11 +14,4 @@ SHADOWSOCKS_LIBEV_CONF_OPTS = \ --with-pcre=$(STAGING_DIR)/usr \ --disable-ssp -# gcc on riscv doesn't define _REENTRANT when -pthread is passed while -# it should. Compensate this deficiency here otherwise shadowsocks-libev -# configure script doesn't find that thread support is enabled. -ifeq ($(BR2_riscv),y) -SHADOWSOCKS_LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_REENTRANT" -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch b/buildroot/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch new file mode 100644 index 000000000..cc1a9f058 --- /dev/null +++ b/buildroot/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch @@ -0,0 +1,79 @@ +From 39edb8ef08f51ea6a454d286091d78a4514c89e0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Dec 2018 18:21:55 +0100 +Subject: [PATCH] configure.ac: use pkg-config to find libxml2 + +Fix static build of squid with libxml2 by using pkg-config to find +libxml2 dependencies like -lz or -liconv + +Fixes: + - http://autobuild.buildroot.org/results/7f23eb98c311b294c7f0e165279fa26909a5ff93 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/squid-cache/squid/pull/338] +--- + configure.ac | 43 +++++++++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f30d824aa..47553db46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -900,29 +900,36 @@ fi + + AC_ARG_WITH(libxml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect])) + if test "x$squid_opt_use_esi" != "xno" -a "x$with_libxml2" != "xno" ; then +- AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1]) +- dnl Find the main header and include path... +- AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ +- AC_CHECK_HEADERS([libxml/parser.h], [], [ +- AC_MSG_NOTICE([Testing in /usr/include/libxml2]) +- SAVED_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" +- unset ac_cv_header_libxml_parser_h +- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ +- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) +- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" ++ PKG_CHECK_MODULES([LIBXML2],[libxml-2.0],[ ++ CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS"; ++ SQUID_CXXFLAGS="$SQUID_CXXFLAGS $LIBXML2_CFLAGS"; ++ XMLLIB="$LIBXML2_LIBS"; ++ HAVE_LIBXML2=1 ++ ],[ ++ AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1]) ++ dnl Find the main header and include path... ++ AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ ++ AC_CHECK_HEADERS([libxml/parser.h], [], [ ++ AC_MSG_NOTICE([Testing in /usr/include/libxml2]) ++ SAVED_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" + unset ac_cv_header_libxml_parser_h +- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ +- AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) ++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ ++ AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) ++ CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" ++ unset ac_cv_header_libxml_parser_h ++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ ++ AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) ++ ]) + ]) ++ CPPFLAGS="$SAVED_CPPFLAGS" + ]) +- CPPFLAGS="$SAVED_CPPFLAGS" + ]) ++ if test "x$ac_cv_libxml2_include" != "x"; then ++ SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS" ++ CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS" ++ fi + ]) +- if test "x$ac_cv_libxml2_include" != "x"; then +- SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS" +- CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS" +- fi + dnl Now that we know where to look find the headers... + AC_CHECK_HEADERS(libxml/parser.h libxml/HTMLparser.h libxml/HTMLtree.h) + AC_DEFINE_UNQUOTED(HAVE_LIBXML2, $HAVE_LIBXML2, [Define to 1 if you have the libxml2 library]) +-- +2.17.1 + diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index b661d5d13..d6f186d97 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -9,6 +9,8 @@ SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING +# We're patching configure.ac +SQUID_AUTORECONF = YES SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \ @@ -18,7 +20,6 @@ SQUID_CONF_ENV = \ ac_cv_func___va_copy=yes \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ - ac_cv_libxml2_include="-I$(STAGING_DIR)/usr/include/libxml2" \ BUILDCXX="$(HOSTCXX)" \ BUILDCXXFLAGS="$(HOST_CXXFLAGS)" SQUID_CONF_OPTS = \ diff --git a/buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch b/buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch deleted file mode 100644 index e69de29bb..000000000 diff --git a/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch b/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch new file mode 100644 index 000000000..0aa318920 --- /dev/null +++ b/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch @@ -0,0 +1,34 @@ +From 7bd6e6db3dbb980c099b444c61d9aff7fcc636cf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 29 Nov 2018 13:22:08 +0100 +Subject: [PATCH] meson.build: fix detection of -Werror=shadow + +Pass -Werror=shadow in args of cc.compiles otherwise test will always +succeed +This fix a build failure with gcc 4.7.3 + +Fixes: + - http://autobuild.buildroot.org/results/ffd71c473d3b29618c18cd2e04705370266696f2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/systemd/systemd/pull/10993] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 37ae27b4a..980150ac8 100644 +--- a/meson.build ++++ b/meson.build +@@ -396,7 +396,7 @@ if cc.compiles(''' + struct timespec now; + return 0; + } +-''', name : '-Werror=shadow with local shadowing') ++''', args: '-Werror=shadow', name : '-Werror=shadow with local shadowing') + add_project_arguments('-Werror=shadow', language : 'c') + endif + +-- +2.14.1 + diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in index c858d89c0..25f322e8f 100644 --- a/buildroot/package/systemd/Config.in +++ b/buildroot/package/systemd/Config.in @@ -192,7 +192,6 @@ config BR2_PACKAGE_SYSTEMD_MACHINED config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" default y - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h help nss-myhostname is a plug-in module for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc), @@ -252,7 +251,6 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED config BR2_PACKAGE_SYSTEMD_RESOLVED bool "enable resolve daemon" default y - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h help systemd-resolved is a system service that provides network name resolution to local applications. It implements a @@ -285,7 +283,6 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs gshadow.h help systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index ecbf7e97f..e53f0b699 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -40,18 +40,9 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dmount-path=/usr/bin/mount \ -Dumount-path=/usr/bin/umount \ - -Dnobody-group=nogroup - -# disable unsupported features for non-glibc toolchains -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) -SYSTEMD_CONF_OPTS += \ + -Dnobody-group=nogroup \ -Didn=true \ -Dnss-systemd=true -else -SYSTEMD_CONF_OPTS += \ - -Didn=false \ - -Dnss-systemd=false -endif ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.mk b/buildroot/package/usb_modeswitch/usb_modeswitch.mk index d0c33cc18..bb0d6ab1b 100644 --- a/buildroot/package/usb_modeswitch/usb_modeswitch.mk +++ b/buildroot/package/usb_modeswitch/usb_modeswitch.mk @@ -10,6 +10,8 @@ USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb USB_MODESWITCH_LICENSE = GPL-2.0+ USB_MODESWITCH_LICENSE_FILES = COPYING +# Package does not build in parallel due to improper make rules +USB_MODESWITCH_MAKE = $(MAKE1) USB_MODESWITCH_BUILD_TARGETS = static USB_MODESWITCH_INSTALL_TARGETS = install-static diff --git a/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch b/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch new file mode 100644 index 000000000..a5573d518 --- /dev/null +++ b/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch @@ -0,0 +1,49 @@ +From 1fd5a3d2adf04bad6ae6e9eef9caead7d46d9307 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 8 Nov 2018 23:55:30 +0100 +Subject: [PATCH] configure.ac: disable gcc march mips64r2 detection + +Disable gcc march mips64r2 detection, compile flags already +set by buildroot, fixes [1]: + + error: '-mips64r2' conflicts with the other architecture options, which specify a mips64 processor + +[1] http://autobuild.buildroot.net/results/34f6e2352f1559f98c724fe5394db0035b42ddb1 + +Signed-off-by: Peter Seiderer +[Thomas: remove code instead of commenting it] +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 289514ff1..18cf97ffe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1768,22 +1768,7 @@ case "${host_cpu}" in + AC_SUBST(FLAG_M32) + + +- # does this compiler support -march=mips64r2 (mips64r2 default) ? +- AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64]) +- +- safe_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -march=mips64r2 -mabi=64 -Werror" +- +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ +- return 0; +- ]])], [ +- FLAG_M64="-march=mips64r2 -mabi=64" +- AC_MSG_RESULT([yes]) +- ], [ + FLAG_M64="" +- AC_MSG_RESULT([no]) +- ]) +- CFLAGS=$safe_CFLAGS + + AC_SUBST(FLAG_M64) + ;; +-- +2.19.1 + diff --git a/buildroot/package/valgrind/Config.in b/buildroot/package/valgrind/Config.in index 8fe7080cd..c09be8629 100644 --- a/buildroot/package/valgrind/Config.in +++ b/buildroot/package/valgrind/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_ARM_CPU_ARMV7A - default y if BR2_mips || BR2_mipsel + # MIPS32 R6 is unsupported + default y if BR2_mips && !BR2_mips_32r6 + default y if BR2_mipsel && !BR2_mips_32r6 # MIPS64 R6 is unsupported default y if BR2_mips64 && !BR2_mips_64r6 default y if BR2_mips64el && !BR2_mips_64r6 diff --git a/buildroot/package/valgrind/valgrind.mk b/buildroot/package/valgrind/valgrind.mk index 459de4907..cae14f79b 100644 --- a/buildroot/package/valgrind/valgrind.mk +++ b/buildroot/package/valgrind/valgrind.mk @@ -13,6 +13,9 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES +# Patch 0003-configure.ac-disable-gcc-march-mips64r2-detection.patch +# touches configure.ac +VALGRIND_AUTORECONF = YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index 19f0c487d..15b1b5668 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.22.3.tar.xz.sums -md5 6dae6837c884a25413fb1d4527c9894a webkitgtk-2.22.3.tar.xz -sha1 c16129f4098b35597457255e63e60126ff3e6daa webkitgtk-2.22.3.tar.xz -sha256 9dfd542902953be9af8ff32bd37fe662ca3d75f7348514ebac15c6252a6ccd72 webkitgtk-2.22.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.22.4.tar.xz.sums +md5 9f08d09cfc21c761a431a545549f301a webkitgtk-2.22.4.tar.xz +sha1 adf857c8a8b8fb79ba9b01bbe4b454956e633952 webkitgtk-2.22.4.tar.xz +sha256 fab5be2883802352ae0e735dd1eff4bc18abaff7ac78689cec72eb2f611943b8 webkitgtk-2.22.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 16644f0e9..4cfddd1eb 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.22.3 +WEBKITGTK_VERSION = 2.22.4 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES diff --git a/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch b/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch new file mode 100644 index 000000000..1d02e0c0d --- /dev/null +++ b/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch @@ -0,0 +1,181 @@ +From 029583e56e6eaad4139e39b4cf908158ab8cc91a Mon Sep 17 00:00:00 2001 +From: David Fort +Date: Sun, 27 May 2018 23:56:43 +0200 +Subject: [PATCH] rdp-compositor: fix compilation against FreeRDP 2.0.0 rc2 + +The SURFACE_BITS_COMMAND struct has changed and some members have been moved in the +bmp field. + +Reviewed-by: Pekka Paalanen +Tested-by: Pekka Paalanen +[yann.morin.1998@free.fr: backported from upstream] +Signed-off-by: "Yann E. MORIN" +--- + configure.ac | 9 +++++- + libweston/compositor-rdp.c | 69 +++++++++++++++++++++++++++++----------------- + 2 files changed, 52 insertions(+), 26 deletions(-) + +diff --git a/configure.ac b/configure.ac +index da3f7342..1dce05fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -264,10 +264,17 @@ if test x$enable_rdp_compositor = xyes; then + [], + [PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0],[])] + ) +- + SAVED_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS" ++ + AC_CHECK_HEADERS([freerdp/version.h]) ++ AC_CHECK_MEMBER([SURFACE_BITS_COMMAND.bmp], ++ [AC_DEFINE([HAVE_SURFACE_BITS_BMP], [1], [SURFACE_BITS_CMD has bmp field])], ++ [], ++ [[#include ]] ++ ) ++ ++ + CPPFLAGS="$SAVED_CPPFLAGS" + fi + +diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c +index fd0651af..134e7298 100644 +--- a/libweston/compositor-rdp.c ++++ b/libweston/compositor-rdp.c +@@ -66,6 +66,22 @@ + #define FREERDP_CB_RETURN(V) return TRUE + #endif + ++#ifdef HAVE_SURFACE_BITS_BMP ++#define SURFACE_BPP(cmd) cmd->bmp.bpp ++#define SURFACE_CODECID(cmd) cmd->bmp.codecID ++#define SURFACE_WIDTH(cmd) cmd->bmp.width ++#define SURFACE_HEIGHT(cmd) cmd->bmp.height ++#define SURFACE_BITMAP_DATA(cmd) cmd->bmp.bitmapData ++#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bmp.bitmapDataLength ++#else ++#define SURFACE_BPP(cmd) cmd->bpp ++#define SURFACE_CODECID(cmd) cmd->codecID ++#define SURFACE_WIDTH(cmd) cmd->width ++#define SURFACE_HEIGHT(cmd) cmd->height ++#define SURFACE_BITMAP_DATA(cmd) cmd->bitmapData ++#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bitmapDataLength ++#endif ++ + #include + #include + #include +@@ -200,10 +216,10 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p + cmd->destTop = damage->extents.y1; + cmd->destRight = damage->extents.x2; + cmd->destBottom = damage->extents.y2; +- cmd->bpp = 32; +- cmd->codecID = peer->settings->RemoteFxCodecId; +- cmd->width = width; +- cmd->height = height; ++ SURFACE_BPP(cmd) = 32; ++ SURFACE_CODECID(cmd) = peer->settings->RemoteFxCodecId; ++ SURFACE_WIDTH(cmd) = width; ++ SURFACE_HEIGHT(cmd) = height; + + ptr = pixman_image_get_data(image) + damage->extents.x1 + + damage->extents.y1 * (pixman_image_get_stride(image) / sizeof(uint32_t)); +@@ -226,8 +242,8 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p + pixman_image_get_stride(image) + ); + +- cmd->bitmapDataLength = Stream_GetPosition(context->encode_stream); +- cmd->bitmapData = Stream_Buffer(context->encode_stream); ++ SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream); ++ SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream); + + update->SurfaceBits(update->context, cmd); + } +@@ -253,23 +269,26 @@ rdp_peer_refresh_nsc(pixman_region32_t *damage, pixman_image_t *image, freerdp_p + #else + memset(cmd, 0, sizeof(*cmd)); + #endif ++ + cmd->destLeft = damage->extents.x1; + cmd->destTop = damage->extents.y1; + cmd->destRight = damage->extents.x2; + cmd->destBottom = damage->extents.y2; +- cmd->bpp = 32; +- cmd->codecID = peer->settings->NSCodecId; +- cmd->width = width; +- cmd->height = height; ++ SURFACE_BPP(cmd) = 32; ++ SURFACE_CODECID(cmd) = peer->settings->NSCodecId; ++ SURFACE_WIDTH(cmd) = width; ++ SURFACE_HEIGHT(cmd) = height; + + ptr = pixman_image_get_data(image) + damage->extents.x1 + + damage->extents.y1 * (pixman_image_get_stride(image) / sizeof(uint32_t)); + + nsc_compose_message(context->nsc_context, context->encode_stream, (BYTE *)ptr, +- cmd->width, cmd->height, ++ width, height, + pixman_image_get_stride(image)); +- cmd->bitmapDataLength = Stream_GetPosition(context->encode_stream); +- cmd->bitmapData = Stream_Buffer(context->encode_stream); ++ ++ SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream); ++ SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream); ++ + update->SurfaceBits(update->context, cmd); + } + +@@ -306,16 +325,16 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p + update->SurfaceFrameMarker(peer->context, marker); + + memset(cmd, 0, sizeof(*cmd)); +- cmd->bpp = 32; +- cmd->codecID = 0; ++ SURFACE_BPP(cmd) = 32; ++ SURFACE_CODECID(cmd) = 0; + + for (i = 0; i < nrects; i++, rect++) { + /*weston_log("rect(%d,%d, %d,%d)\n", rect->x1, rect->y1, rect->x2, rect->y2);*/ + cmd->destLeft = rect->x1; + cmd->destRight = rect->x2; +- cmd->width = rect->x2 - rect->x1; ++ SURFACE_WIDTH(cmd) = rect->x2 - rect->x1; + +- heightIncrement = peer->settings->MultifragMaxRequestSize / (16 + cmd->width * 4); ++ heightIncrement = peer->settings->MultifragMaxRequestSize / (16 + SURFACE_WIDTH(cmd) * 4); + remainingHeight = rect->y2 - rect->y1; + top = rect->y1; + +@@ -323,21 +342,21 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p + subrect.x2 = rect->x2; + + while (remainingHeight) { +- cmd->height = (remainingHeight > heightIncrement) ? heightIncrement : remainingHeight; ++ SURFACE_HEIGHT(cmd) = (remainingHeight > heightIncrement) ? heightIncrement : remainingHeight; + cmd->destTop = top; +- cmd->destBottom = top + cmd->height; +- cmd->bitmapDataLength = cmd->width * cmd->height * 4; +- cmd->bitmapData = (BYTE *)realloc(cmd->bitmapData, cmd->bitmapDataLength); ++ cmd->destBottom = top + SURFACE_HEIGHT(cmd); ++ SURFACE_BITMAP_DATA_LEN(cmd) = SURFACE_WIDTH(cmd) * SURFACE_HEIGHT(cmd) * 4; ++ SURFACE_BITMAP_DATA(cmd) = (BYTE *)realloc(SURFACE_BITMAP_DATA(cmd), SURFACE_BITMAP_DATA_LEN(cmd)); + + subrect.y1 = top; +- subrect.y2 = top + cmd->height; +- pixman_image_flipped_subrect(&subrect, image, cmd->bitmapData); ++ subrect.y2 = top + SURFACE_HEIGHT(cmd); ++ pixman_image_flipped_subrect(&subrect, image, SURFACE_BITMAP_DATA(cmd)); + + /*weston_log("* sending (%d,%d, %d,%d)\n", subrect.x1, subrect.y1, subrect.x2, subrect.y2); */ + update->SurfaceBits(peer->context, cmd); + +- remainingHeight -= cmd->height; +- top += cmd->height; ++ remainingHeight -= SURFACE_HEIGHT(cmd); ++ top += SURFACE_HEIGHT(cmd); + } + } + +-- +2.14.1 + diff --git a/buildroot/package/weston/weston.mk b/buildroot/package/weston/weston.mk index 57d6df4b2..71211fe5e 100644 --- a/buildroot/package/weston/weston.mk +++ b/buildroot/package/weston/weston.mk @@ -10,6 +10,9 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING +# 0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch +WESTON_AUTORECONF = YES + WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ $(if $(BR2_PACKAGE_WEBP),webp) diff --git a/buildroot/package/xfsprogs/xfsprogs.mk b/buildroot/package/xfsprogs/xfsprogs.mk index b5975d29e..bbb888707 100644 --- a/buildroot/package/xfsprogs/xfsprogs.mk +++ b/buildroot/package/xfsprogs/xfsprogs.mk @@ -12,7 +12,7 @@ XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 XFSPROGS_DEPENDENCIES = util-linux -XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes +XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ --enable-lib64=no \ --enable-gettext=no \ diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index 400eca0f3..1ca5edc64 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2018.08' +RELEASE='2018.11' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/scripts/graph-depends b/buildroot/support/scripts/graph-depends index 621e60327..3c091da5e 100755 --- a/buildroot/support/scripts/graph-depends +++ b/buildroot/support/scripts/graph-depends @@ -94,9 +94,10 @@ def get_all_depends(pkgs, get_depends_func): # The Graphviz "dot" utility doesn't like dashes in node names. So for -# node names, we strip all dashes. +# node names, we strip all dashes. Also, nodes can't start with a number, +# so we prepend an underscore. def pkg_node_name(pkg): - return pkg.replace("-", "") + return "_" + pkg.replace("-", "") TARGET_EXCEPTIONS = [ diff --git a/buildroot/system/Config.in b/buildroot/system/Config.in index f63f27b12..9e34f11b6 100644 --- a/buildroot/system/Config.in +++ b/buildroot/system/Config.in @@ -127,9 +127,7 @@ config BR2_INIT_SYSV config BR2_INIT_SYSTEMD bool "systemd" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS @@ -137,14 +135,11 @@ config BR2_INIT_SYSTEMD select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD -comment "systemd needs a glibc or uClibc toolchain w/ wchar, threads, SSP, dynamic library, headers >= 3.10" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 config BR2_INIT_NONE diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index c2192a52b..196612b8b 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -69,6 +69,11 @@ comment "Toolchain Generic Options" config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 bool +# https://sourceware.org/bugzilla/show_bug.cgi?id=20006 +# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 + bool + # Atomic types can be: # - never lock-free # - sometimes lock-free diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in index 50c5a2001..9187333b9 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in @@ -13,6 +13,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 # based-on binutils-2.26 + select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 # based-on binutils-2.26 help Sourcery CodeBench toolchain for the amd64 (x86_64) architectures, from Mentor Graphics. It uses gcc 6.2,