From 4c247a98a5d1c899d8a68d37c8742172d7914585 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 6 Nov 2017 13:16:50 +0300 Subject: [PATCH 001/160] armbian-firmware: new package This package enables access to firmware blobs from Armbian firmware repository: https://github.com/armbian/firmware That repository contains multiple firmware blobs grouped by vendor. For the sake of convenience each group can be independently selected using Kconfig options. This commit enables the following options: - firmware blobs for XR819 SDIO WiFi chip - firmware blobs for AP6212 WiFi/BT combo Armbian firmware repository does not include any specific licenses. Most part of those firmware blobs belongs to various Android/Linux SDK packages provided by board vendors. As a result, this package makes use of the following conservative approach for all the selected firmware binaries: FIRMWARE_LICENSE = PROPRIETARY FIRMWARE_REDISTRIBUTE = NO Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/armbian-firmware/Config.in | 21 ++++++++ .../armbian-firmware/armbian-firmware.hash | 2 + package/armbian-firmware/armbian-firmware.mk | 53 +++++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 package/armbian-firmware/Config.in create mode 100644 package/armbian-firmware/armbian-firmware.hash create mode 100644 package/armbian-firmware/armbian-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index c651bf26fa..d27d55f73d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1432,6 +1432,7 @@ F: package/mpir/ N: Sergey Matyukevich F: package/xr819-xradio/ +F: package/armbian-firmware/ N: Sergio Prado F: package/libgdiplus/ diff --git a/package/Config.in b/package/Config.in index fe5ccc434e..23526b4124 100644 --- a/package/Config.in +++ b/package/Config.in @@ -369,6 +369,7 @@ menu "Firmware" source "package/wilc1000-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" + source "package/armbian-firmware/Config.in" endmenu source "package/a10disp/Config.in" source "package/acpica/Config.in" diff --git a/package/armbian-firmware/Config.in b/package/armbian-firmware/Config.in new file mode 100644 index 0000000000..761c316612 --- /dev/null +++ b/package/armbian-firmware/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_ARMBIAN_FIRMWARE + bool "armbian-firmware" + help + This package enables access to various firmware + blobs from the Armbian firmware repository. + + https://github.com/armbian/firmware + +if BR2_PACKAGE_ARMBIAN_FIRMWARE + +config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819 + bool "XR819 WiFi" + help + Firmware files for XR819 WiFi SDIO chip. + +config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212 + bool "AP6212 WiFi/BT" + help + Firmware files for AP6212 WiFi/BT combo chip. + +endif diff --git a/package/armbian-firmware/armbian-firmware.hash b/package/armbian-firmware/armbian-firmware.hash new file mode 100644 index 0000000000..0f3858dedf --- /dev/null +++ b/package/armbian-firmware/armbian-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 876958ce6ba8a4a01a424f2b4455208b7a989eaba96015649c774340553f0c35 armbian-firmware-455d6b6701178dafe7fd0168eb4a4ef78a8d24a3.tar.gz diff --git a/package/armbian-firmware/armbian-firmware.mk b/package/armbian-firmware/armbian-firmware.mk new file mode 100644 index 0000000000..e77d516661 --- /dev/null +++ b/package/armbian-firmware/armbian-firmware.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# armbian-firmware +# +################################################################################ + +ARMBIAN_FIRMWARE_VERSION = 455d6b6701178dafe7fd0168eb4a4ef78a8d24a3 +ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware +ARMBIAN_FIRMWARE_SITE_METHOD = git + +# XR819 WiFi firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y) +ARMBIAN_FIRMWARE_FILES += \ + xr819/boot_xr819.bin \ + xr819/fw_xr819.bin \ + xr819/sdd_xr819.bin +endif + +# AP6212 WiFi/BT combo firmware +ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y) +ARMBIAN_FIRMWARE_DIRS += ap6212 +endif + +ifneq ($(ARMBIAN_FIRMWARE_FILES),) +define ARMBIAN_FIRMWARE_INSTALL_FILES + cd $(@D) ; \ + $(TAR) c $(sort $(ARMBIAN_FIRMWARE_FILES)) | \ + $(TAR) x -C $(TARGET_DIR)/lib/firmware +endef +endif + +ifneq ($(ARMBIAN_FIRMWARE_DIRS),) +# We need to rm -rf the destination directory to avoid copying +# into it in itself, should we re-install the package. +define ARMBIAN_FIRMWARE_INSTALL_DIRS + $(foreach d,$(ARMBIAN_FIRMWARE_DIRS), \ + rm -rf $(TARGET_DIR)/lib/firmware/$(d); \ + cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep)) +endef +endif + +ifneq ($(ARMBIAN_FIRMWARE_FILES)$(ARMBIAN_FIRMWARE_DIRS),) +ARMBIAN_FIRMWARE_LICENSE = PROPRIETARY +ARMBIAN_FIRMWARE_REDISTRIBUTE = NO +endif + +define ARMBIAN_FIRMWARE_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/lib/firmware + $(ARMBIAN_FIRMWARE_INSTALL_FILES) + $(ARMBIAN_FIRMWARE_INSTALL_DIRS) +endef + +$(eval $(generic-package)) From ce957ccd36e9bef8137c24fa8d62bdc123d78545 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 6 Nov 2017 13:16:51 +0300 Subject: [PATCH 002/160] orange-pi-zero: add xr819 firmware Make WiFi work out of the box on orange-pi-zero: - add xr819 firmware to image - add mdev for module autoloading Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ configs/orangepi_zero_defconfig | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index d27d55f73d..45e228286a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1433,6 +1433,8 @@ F: package/mpir/ N: Sergey Matyukevich F: package/xr819-xradio/ F: package/armbian-firmware/ +F: board/orangepi/orangepi-zero +F: configs/orangepi_zero_defconfig N: Sergio Prado F: package/libgdiplus/ diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index bd3862cb14..142b648fa8 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" @@ -30,8 +31,10 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y -# wireless driver +# wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y +BR2_PACKAGE_ARMBIAN_FIRMWARE=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y # wireless support BR2_PACKAGE_IW=y From 59b4fff832892948a2857229da01c3e8a0000995 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 6 Nov 2017 13:16:52 +0300 Subject: [PATCH 003/160] DEVELOPERS: add myself to several packages Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 45e228286a..1ea1b469b8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1434,7 +1434,11 @@ N: Sergey Matyukevich F: package/xr819-xradio/ F: package/armbian-firmware/ F: board/orangepi/orangepi-zero +F: board/orangepi/orangepi-one +F: board/linksprite/pcduino +F: configs/orangepi_one_defconfig F: configs/orangepi_zero_defconfig +F: configs/linksprite_pcduino_defconfig N: Sergio Prado F: package/libgdiplus/ From 1c53c5453a4aeeaa0a8877cbd5fb336e952456ce Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 6 Nov 2017 19:08:54 -0600 Subject: [PATCH 004/160] DEVELOPERS: add myself to packages Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- DEVELOPERS | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1ea1b469b8..be34f24aff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1030,32 +1030,73 @@ F: configs/ts4900_defconfig F: package/ts4900-fpga/ N: Matt Weber +F: package/argp-standalone/ +F: package/aufs/ +F: package/aufs-util/ F: package/bc/ +F: package/bridge-utils/ F: package/checkpolicy/ F: package/cgroupfs-mount/ +F: package/crda/ +F: package/devmem2/ +F: package/dnsmasq/ +F: package/dosfstools/ +F: package/eeprog/ F: package/eigen/ +F: package/ethtool/ +F: package/flashbench/ F: package/fmc/ F: package/fmlib/ +F: package/git/ +F: package/gnutls/ +F: package/hostapd/ +F: package/i2c-tools/ +F: package/ifplugd/ F: package/igmpproxy/ +F: package/iperf/ +F: package/iperf3/ F: package/iputils/ +F: package/iw/ F: package/libcsv/ +F: package/libcurl/ +F: package/libfcgi/ +F: package/libopenssl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libssh2/ F: package/libqmi/ +F: package/lighttpd/ +F: package/logrotate/ +F: package/makedevs/ +F: package/memtester/ +F: package/mii-diag/ +F: package/mrouted/ +F: package/mtd/ +F: package/mtools/ F: package/nginx-upload/ F: package/omniorb/ F: package/paxtest/ +F: package/picocom/ F: package/policycoreutils/ +F: package/proftpd/ +F: package/protobuf-c/ +F: package/protobuf/ F: package/python-ipy/ F: package/python-posix-ipc/ F: package/python-pypcap/ F: package/python-pyrex/ F: package/raptor/ +F: package/rng-tools/ +F: package/rsyslog/ F: package/setools/ F: package/smcroute/ F: package/tclap/ +F: package/uboot-tools/ +F: package/unionfs/ F: package/valijson/ +F: package/wpa_supplicant/ +F: package/wireless-tools/ N: Mauro Condarelli F: package/mc/ From 9dfb4345e01beec43d9391debc1bb83f03062f00 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 7 Nov 2017 15:47:43 -0600 Subject: [PATCH 005/160] DEVELOPERS: fix wireless_tools entry Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index be34f24aff..7a4218d9c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1096,7 +1096,7 @@ F: package/uboot-tools/ F: package/unionfs/ F: package/valijson/ F: package/wpa_supplicant/ -F: package/wireless-tools/ +F: package/wireless_tools/ N: Mauro Condarelli F: package/mc/ From 469093acb153e25260c67432d2878c275f50b5f7 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 7 Nov 2017 16:51:07 -0500 Subject: [PATCH 006/160] libressl: bump to 2.6.3 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 580701d6a7..42f3028ca4 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,2 +1,2 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4 libressl-2.5.5.tar.gz +sha256 aead6598263171b96970da0d881e616d0813b69b35ebdc5991f87ff2ea7f5c98 libressl-2.6.3.tar.gz diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index ccd236d293..0806ff6c22 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 2.5.5 +LIBRESSL_VERSION = 2.6.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From ba9e779e83acd31f88d4cf8f2a2b6907a0e4ab2f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 9 Nov 2017 15:44:40 +0100 Subject: [PATCH 007/160] webp: bump to 0.6.0 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index bf4ee8fbf9..e9b2060908 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef libwebp-0.5.2.tar.gz +sha256 c928119229d4f8f35e20113ffb61f281eda267634a8dc2285af4b0ee27cf2b40 libwebp-0.6.0.tar.gz diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 7cf3df23ca..821302777e 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 0.5.2 +WEBP_VERSION = 0.6.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause From 3fac7499d6654038d0d4312bbb88f785044b5887 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Nov 2017 18:52:47 +0100 Subject: [PATCH 008/160] package/kodi-inputstream-adaptive: bump version The git hash translates into version 2.0.19. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 0d8f39f6cc..78b48c16b6 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a214b6f47d4fcd0ceb78819447eb9ff3c5b4519233a46a245c9b558ecda0725f kodi-inputstream-adaptive-f2904b547e940c724dce7412a26744c2698cab66.tar.gz +sha256 572b2e898484a5ada74c4095539cebf43c198a3147f0f24fe350bc79db053695 kodi-inputstream-adaptive-9af21218a87572bd4ab8d8d660c11f6295144f97.tar.gz diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index cc0950346e..f7a4c66e8c 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -6,7 +6,7 @@ # This cset is on the branch 'Krypton' # When Kodi is updated, then this should be updated to the corresponding branch -KODI_INPUTSTREAM_ADAPTIVE_VERSION = f2904b547e940c724dce7412a26744c2698cab66 +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 9af21218a87572bd4ab8d8d660c11f6295144f97 KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp From f723fa7f5302df8a71254ea9db09ac310420bf34 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 11 Nov 2017 10:14:23 +0100 Subject: [PATCH 009/160] olimex_a20_olinuxino_lime2: bump versions (aligned with olimex_a20_olinuxino_lime) Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 27 +++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 611c082742..228160d464 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -1,35 +1,48 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y + +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49" +BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_BOARDS=y -BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex" + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" + +# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y From 9957d2c89decd6ad63b144df2fb10837eb43250f Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Wed, 8 Nov 2017 11:15:20 -0700 Subject: [PATCH 010/160] configs/atmel: refactor to use genimage.sh Prefer the commom genimage.sh instead of a custom post-image.sh script. Cc: Ludovic Desroches Cc: Peter Korsgaard Signed-off-by: Joshua Henderson Acked-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- board/atmel/sama5d27_som1_ek_mmc/post-image.sh | 14 -------------- board/atmel/sama5d2_xplained_mmc/post-image.sh | 14 -------------- board/atmel/sama5d3_xplained_mmc/post-image.sh | 14 -------------- board/atmel/sama5d4_xplained_mmc/post-image.sh | 14 -------------- configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 3 ++- configs/atmel_sama5d2_xplained_mmc_defconfig | 3 ++- configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 3 ++- configs/atmel_sama5d3_xplained_mmc_defconfig | 3 ++- configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 3 ++- configs/atmel_sama5d4_xplained_mmc_defconfig | 3 ++- configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 3 ++- 11 files changed, 14 insertions(+), 63 deletions(-) delete mode 100755 board/atmel/sama5d27_som1_ek_mmc/post-image.sh delete mode 100755 board/atmel/sama5d2_xplained_mmc/post-image.sh delete mode 100755 board/atmel/sama5d3_xplained_mmc/post-image.sh delete mode 100755 board/atmel/sama5d4_xplained_mmc/post-image.sh diff --git a/board/atmel/sama5d27_som1_ek_mmc/post-image.sh b/board/atmel/sama5d27_som1_ek_mmc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/atmel/sama5d27_som1_ek_mmc/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/atmel/sama5d2_xplained_mmc/post-image.sh b/board/atmel/sama5d2_xplained_mmc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/atmel/sama5d2_xplained_mmc/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/atmel/sama5d3_xplained_mmc/post-image.sh b/board/atmel/sama5d3_xplained_mmc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/atmel/sama5d3_xplained_mmc/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/atmel/sama5d4_xplained_mmc/post-image.sh b/board/atmel/sama5d4_xplained_mmc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/atmel/sama5d4_xplained_mmc/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 0dddaf55d5..3752129202 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -8,7 +8,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d27_som1_ek_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 9b65a56d94..8889978deb 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 8745bf4535..23a2582086 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 798c655e5e..4ddb17149a 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -3,7 +3,8 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index eca866494a..a3351482cf 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -17,7 +17,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index 073489f843..b8b21e777c 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index 69893c3483..c31f15a1ee 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y From eb7e90bf68379a8e82762255d7855ffcf788d99c Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Wed, 8 Nov 2017 11:15:21 -0700 Subject: [PATCH 011/160] configs/at91: refactor to use genimage.sh Prefer the commom genimage.sh instead of a custom post-image.sh script. Cc: Ludovic Desroches Cc: Peter Korsgaard Signed-off-by: Joshua Henderson Acked-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- board/atmel/at91sam9x5ek_mmc/post-image.sh | 20 -------------------- configs/at91sam9x5ek_mmc_defconfig | 3 ++- configs/at91sam9x5ek_mmc_dev_defconfig | 3 ++- 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100755 board/atmel/at91sam9x5ek_mmc/post-image.sh diff --git a/board/atmel/at91sam9x5ek_mmc/post-image.sh b/board/atmel/at91sam9x5ek_mmc/post-image.sh deleted file mode 100755 index b560fd31c4..0000000000 --- a/board/atmel/at91sam9x5ek_mmc/post-image.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -echo --rootpath "${TARGET_DIR}" -echo --tmppath "${GENIMAGE_TMP}" -echo --inputpath "${BINARIES_DIR}" -echo --outputpath "${BINARIES_DIR}" -echo --config "${GENIMAGE_CFG}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 5ccbdb9861..6964d5814e 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -6,7 +6,8 @@ BR2_arm926t=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index e84bae3b02..931cf7dec8 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -15,7 +15,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y From 91bc13cc98ca14e65fa4de6f6bb565a0a743814d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Nov 2017 13:13:48 +0100 Subject: [PATCH 012/160] package/{mesa3d, mesa3d-headers}: bump version to 17.2.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c9db3f551b..a944353642 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 17.2.4 +MESA3D_HEADERS_VERSION = 17.2.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 476e1bcb29..baadc49392 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,7 +1,7 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-October/000371.html -md5 cf0b7a297eedd0549cda5ba071d7561f mesa-17.2.4.tar.xz -sha1 2faad5bd48243a1b80f5522a26144a176f841a20 mesa-17.2.4.tar.xz -sha256 5ba408fecd6e1132e5490eec1a2f04466214e4c65c8b89b331be844768c2e550 mesa-17.2.4.tar.xz -sha512 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085 mesa-17.2.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2017-November/000374.html +md5 ba649f82a066f710aa23655254a83eb8 mesa-17.2.5.tar.xz +sha1 1509bd00f32ee42128f29b63b4aaf26bf9abb63e mesa-17.2.5.tar.xz +sha256 7f7f914b7b9ea0b15f2d9d01a4375e311b0e90e55683b8e8a67ce8691eb1070f mesa-17.2.5.tar.xz +sha512 c4b0f7f48b0b57fdf610de3d61e127774f8223e755acfde6cf2649818eec985e8f925abf8a15d530ecdb882cb8d7268fd01e5d94c8ac6934551b8a74272353c7 mesa-17.2.5.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c license.html diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9305523bdf..2667308a67 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 17.2.4 +MESA3D_VERSION = 17.2.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 20ebe2abc9c69bc025dfc80ec4d1db44442024d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Nov 2017 06:59:45 +0100 Subject: [PATCH 013/160] package/x11r7/xapp_bdftopcf: bump version to 1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash | 7 +++++-- package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash index 7bb7fd363e..65973a500f 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002509.html -sha256 38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026 bdftopcf-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-November/002821.html +md5 2a455d3c02390597feb9cefb3fe97a45 bdftopcf-1.1.tar.bz2 +sha1 48a783337a5aa49ebc102c9788ff0f43ea35c5c4 bdftopcf-1.1.tar.bz2 +sha256 4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2 bdftopcf-1.1.tar.bz2 +sha512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec bdftopcf-1.1.tar.bz2 diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk index 489bbba4be..7ee618d641 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_BDFTOPCF_VERSION = 1.0.5 +XAPP_BDFTOPCF_VERSION = 1.1 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_BDFTOPCF_LICENSE = MIT From f6a33a73e231efd7474e873f74d123e6788bf95b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Nov 2017 07:33:10 +0100 Subject: [PATCH 014/160] package/kodi: remove dependency on locale-enabled toolchain Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...cmake-iconv-is-a-required-dependency.patch | 92 +++++++++++++++++++ package/kodi/Config.in | 5 +- package/kodi/kodi.mk | 4 + 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 package/kodi/0003-cmake-iconv-is-a-required-dependency.patch diff --git a/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch b/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch new file mode 100644 index 0000000000..b95771c525 --- /dev/null +++ b/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch @@ -0,0 +1,92 @@ +From 70ab56d74aff8b2e3ac49fed6bdf3751c9b1457e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 12 Feb 2017 14:24:18 +0100 +Subject: [PATCH] [cmake] iconv is a required dependency + +This patch adds support for libiconv currently only provided by the +autoconf-based build system: +https://github.com/xbmc/xbmc/blob/Krypton/configure.ac#L1172 + +This commit fixes an error during linking with an uClibc-based +buildroot toolchain: + +[100%] Linking CXX executable kodi.bin +/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/lib/gcc/i586-buildroot-linux-uclibc/6.3.0/../../../../i586-buildroot-linux-uclibc/bin/ld: build/utils/utils.a(CharsetConverter.cpp.o): undefined reference to symbol 'libiconv_open' +/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/lib32/libiconv.so.2: error adding symbols: DSO missing from command line + +Backported to Krypton from master branch commit: +https://github.com/xbmc/xbmc/commit/9a64537543e8dc8609ca8a98181ba17f30c53493 + +Signed-off-by: Bernd Kuhls +--- + project/cmake/CMakeLists.txt | 2 +- + project/cmake/modules/FindIconv.cmake | 44 +++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 1 deletion(-) + create mode 100644 project/cmake/modules/FindIconv.cmake + +diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt +index aeb1ff47c2..07c1d1a8d3 100644 +--- a/project/cmake/CMakeLists.txt ++++ b/project/cmake/CMakeLists.txt +@@ -103,7 +103,7 @@ list(APPEND DEPLIBS ${CMAKE_THREAD_LIBS_INIT}) + + # Required dependencies + set(required_deps Sqlite3 FreeType PCRE Cpluff LibDvd +- TinyXML Python Yajl Cdio ++ TinyXML Python Yajl Cdio Iconv + Lzo2 Fribidi TagLib FFMPEG CrossGUID) + if(NOT WIN32) + list(APPEND required_deps ZLIB) +diff --git a/project/cmake/modules/FindIconv.cmake b/project/cmake/modules/FindIconv.cmake +new file mode 100644 +index 0000000000..8ee01fb6b8 +--- /dev/null ++++ b/project/cmake/modules/FindIconv.cmake +@@ -0,0 +1,44 @@ ++#.rst: ++# FindICONV ++# -------- ++# Finds the ICONV library ++# ++# This will will define the following variables:: ++# ++# ICONV_FOUND - system has ICONV ++# ICONV_INCLUDE_DIRS - the ICONV include directory ++# ICONV_LIBRARIES - the ICONV libraries ++# ++# and the following imported targets:: ++# ++# ICONV::ICONV - The ICONV library ++ ++find_path(ICONV_INCLUDE_DIR NAMES iconv.h) ++ ++find_library(ICONV_LIBRARY NAMES iconv libiconv c) ++ ++set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) ++check_function_exists(iconv HAVE_ICONV_FUNCTION) ++if(NOT HAVE_ICONV_FUNCTION) ++ check_function_exists(libiconv HAVE_LIBICONV_FUNCTION2) ++ set(HAVE_ICONV_FUNCTION ${HAVE_LIBICONV_FUNCTION2}) ++ unset(HAVE_LIBICONV_FUNCTION2) ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Iconv ++ REQUIRED_VARS ICONV_LIBRARY ICONV_INCLUDE_DIR HAVE_ICONV_FUNCTION) ++ ++if(ICONV_FOUND) ++ set(ICONV_LIBRARIES ${ICONV_LIBRARY}) ++ set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR}) ++ ++ if(NOT TARGET ICONV::ICONV) ++ add_library(ICONV::ICONV UNKNOWN IMPORTED) ++ set_target_properties(ICONV::ICONV PROPERTIES ++ IMPORTED_LOCATION "${ICONV_LIBRARY}" ++ INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIR}") ++ endif() ++endif() ++ ++mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARY HAVE_ICONV_FUNCTION) +-- +2.11.0 + diff --git a/package/kodi/Config.in b/package/kodi/Config.in index eed4c15182..071c03d640 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -5,11 +5,10 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) depends on BR2_USE_MMU # libcdio, and others -comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, locale, threads, wchar, dynamic library, gcc >= 4.8, host gcc >= 4.6" +comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8, host gcc >= 4.6" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_ENABLE_LOCALE \ || !BR2_HOST_GCC_AT_LEAST_4_6 \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_TOOLCHAIN_USES_MUSL \ @@ -34,7 +33,6 @@ comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend" menuconfig BR2_PACKAGE_KODI bool "kodi" - depends on BR2_ENABLE_LOCALE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOST_GCC_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -61,6 +59,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL_EGL + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LZO diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 7da2595ee3..da11839c03 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -73,6 +73,10 @@ KODI_CONF_OPTS += \ -DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz +ifeq ($(BR2_ENABLE_LOCALE),) +KODI_DEPENDENCIES += libiconv +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi KODI_DEPENDENCIES += rpi-userland From a035bdca6bb11047cabb68c159c159cb03f3c640 Mon Sep 17 00:00:00 2001 From: Alexandre Esse Date: Fri, 10 Nov 2017 20:43:20 +0100 Subject: [PATCH 015/160] gst1-imx: bump version to 0.13.0 Changelog: ==== version 0.13.0 (2017-11-01) ==== * New imxv4l2videosink element Currently only supports input physically contiguous memory blocks as input (so, for example, no videotestsrc) * New Pango-based overlay elements using G2D for rendering * gstimxcommon library is now public Necessary when implementing external sinks to retrieve the mapped physical memory address from gstreamer buffers (NOTE: ABI may change in the next few releases until this is stabilized) * New optional ability to use GstPhysMemory from gst-plugins-bad * imxv4l2videosrc: * Fix compile prior to Gstreamer 1.3.1 * v4l2_buffer_pool: Add special case for tw6869 driver The tw6869 driver requires a different physical address to allow DMA'able buffers for decreasing latency between chip and display * v4l2src: add fractional "fps" property (obsoletes the "fps-n" property) * Add GstImxV4l2Meta init function This avoids the g_assert() that was caused by the missing init function * Add num-additional-buffers property This can be useful if capturing video isn't smooth; it sets the number of internal additional buffers, so if downstream consumes too many buffers, imxv4l2videosrc might end up doing a blocking wait until buffers are returned * imxv4l2src plugin is now called imxv4l2video, because it also contains imxv4l2videosink Also, the v4l2 elements can be enabled/disabled in the build configuration individually now * compositor: * Only copy compositor input buffers to DMA memory once If a single input frame is used for multiple output frames, we would otherwise copy multiple times which can easily go to the limit of the memory bandwidth * vpu: * Handle releasing of buffers without assigned framebuffer This can happen if the buffer is released before it was actually used, e.g. when renegotiating at the very beginning; prevents a crash that would otherwise occur * Add parameter check to avoid encoder crash on flush * g2d: * Add build configuration switches to explicitely specify G2D include and library paths * Disable cacheable memory allocation Several issues were reported with cacheable DMA memory, so it is turned off, at least for now * blitter: * Add property to clear screen to black in blitter sinks * Add output-rotation property to videotransform base class * audio: * Fix reference counting for caps * Mark static codec caps as may be leaked This gets rid of the false positive in the leak tracer Signed-off-by: Alexandre Esse Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-imx/gst1-imx.hash | 2 +- package/gstreamer1/gst1-imx/gst1-imx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index e2e3971a2a..58ff4be225 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 999c093e38768e51d14abbe7836c09b666bcb89f03f34dd3697a6e5b5e4a4086 gst1-imx-0.12.3.tar.gz +sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026 gst1-imx-0.13.0.tar.gz diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index a21e2829be..c621c360f4 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_IMX_VERSION = 0.12.3 +GST1_IMX_VERSION = 0.13.0 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) GST1_IMX_LICENSE = LGPL-2.0+ From 8624afbb83984cdcb0b0179e9b4a4711c1e56f07 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Sun, 12 Nov 2017 01:40:02 +0100 Subject: [PATCH 016/160] tslib: update to 1.14 As usual, https://github.com/kergoth/tslib/releases has the changelog summary. This release includes a new plugin "lowpass" that is being built by default; so we add that to the list of statically compiled in plugins for static builds. Signed-off-by: Martin Kepplinger Signed-off-by: Peter Korsgaard --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index cca74fc827..8184143bec 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/kergoth/tslib/releases/download/1.13/tslib-1.13.tar.xz.sha256 -sha256 b381279f2d6ad6acb80cfc4852860853b7bcd1a9440821e9fe920c33f4e4f8da tslib-1.13.tar.xz +# https://github.com/kergoth/tslib/releases/download/1.14/tslib-1.14.tar.xz.sha256 +sha256 56ce7adfb896442001938470a7f946cc029bfb03ed74e7f62db92d9c9ba83df4 tslib-1.14.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 06f887a151..7a6379cc48 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.13 +TSLIB_VERSION = 1.14 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -26,7 +26,8 @@ TSLIB_CONF_OPTS += \ --enable-iir=static \ --enable-dejitter=static \ --enable-debounce=static \ - --enable-skip=static + --enable-skip=static \ + --enable-lowpass=static endif $(eval $(autotools-package)) From e57335cec2afe1aac395018c988e8946f8c76207 Mon Sep 17 00:00:00 2001 From: Andrey Yurovsky Date: Sat, 11 Nov 2017 20:38:10 -0800 Subject: [PATCH 017/160] imx-usb-loader: bump to latest commit Latest commit is from Oct 5, 2017. This adds support for the i.MX7 family. Signed-off-by: Andrey Yurovsky Signed-off-by: Peter Korsgaard --- package/imx-usb-loader/imx-usb-loader.hash | 2 +- package/imx-usb-loader/imx-usb-loader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash index 6cb581147f..e246ff85f2 100644 --- a/package/imx-usb-loader/imx-usb-loader.hash +++ b/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,2 @@ # locally computed -sha256 5232292cb1ad853905357de59ed251b57060562dc8d7f1cce0bb6c0c8d280dae imx-usb-loader-f04f225ebc1c38e81eb24745333c8622deda6b49.tar.gz +sha256 717b64cec31f7e1167d4a31e4f511eea97ab80039dd435b7b183c6f41352213a imx-usb-loader-7e77787c83288a421080a9bf2f67063931f561be.tar.gz diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index 7593e3ce7a..946a1f3d55 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = f04f225ebc1c38e81eb24745333c8622deda6b49 +IMX_USB_LOADER_VERSION = 7e77787c83288a421080a9bf2f67063931f561be IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING From bf91e4bd77280fa1b24c15b51a79ef6a8917baf2 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 12 Nov 2017 20:47:06 -0200 Subject: [PATCH 018/160] toolchain: add 4.14.x choice for headers Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- toolchain/toolchain-common.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index d87d4d7657..15553772fd 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -253,10 +253,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a28534080d..b9e7c2078a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -93,6 +93,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14 + bool "4.14.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13 bool "4.13.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 From 65e72a4668b0b7f7a962cd000ac79c32669c95f5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 12 Nov 2017 20:47:07 -0200 Subject: [PATCH 019/160] linux-headers: bump to 4.14 kernel version Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 82a27f84f3..1a5630ae3e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_13 + default BR2_KERNEL_HEADERS_4_14 help Select the kernel version to get headers from. @@ -74,6 +74,10 @@ config BR2_KERNEL_HEADERS_4_13 bool "Linux 4.13.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 +config BR2_KERNEL_HEADERS_4_14 + bool "Linux 4.14.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -96,6 +100,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14 + bool "4.14.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13 bool "4.13.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 @@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.12" if BR2_KERNEL_HEADERS_4_13 + default "4.14" if BR2_KERNEL_HEADERS_4_14 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 37e1e641465196f791f5256842bd23dcb4c17ed8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 12 Nov 2017 20:47:08 -0200 Subject: [PATCH 020/160] linux: bump default to version 4.14 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e90ab6bfeb..a4977d1fe5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.13)" + bool "Latest version (4.14)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (v4.4.83-cip8)" @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.13.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.83-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 332310b40339f916b358dc2093e64cdbe002bc4d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 12 Nov 2017 20:47:09 -0200 Subject: [PATCH 021/160] configs/imx6-sabresd: Bump to kernel 4.14 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/imx6-sabresd_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 18dfe27945..5b2b014db1 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From 75ec86e7a196423201f7bf8ffe6790a4d1cf616f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 12 Nov 2017 20:47:10 -0200 Subject: [PATCH 022/160] configs/imx6-sabresd_qt5: Bump to kernel 4.14 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/imx6-sabresd_qt5_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index e20266e736..d805456dad 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From 325e60767da45efe507ea13fc304866257421334 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Wed, 15 Nov 2017 13:14:35 -0500 Subject: [PATCH 023/160] genimage: change upstream URL Pengutronix is now hosting the official genimage repository and release tarballs on Github. This patch updates the official URL from the package description and its download website described in GENIMAGE_SITE. Signed-off-by: Vivien Didelot Signed-off-by: Thomas Petazzoni --- package/genimage/Config.in.host | 2 +- package/genimage/genimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/genimage/Config.in.host b/package/genimage/Config.in.host index 5c5a8a8a2c..cf831a143c 100644 --- a/package/genimage/Config.in.host +++ b/package/genimage/Config.in.host @@ -10,4 +10,4 @@ config BR2_PACKAGE_HOST_GENIMAGE environment variables, the config file or commandline switches. - http://www.pengutronix.de/software/genimage/ + https://github.com/pengutronix/genimage diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 2e7aad20c6..8d11c66a25 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -6,7 +6,7 @@ GENIMAGE_VERSION = 9 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz -GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download +GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse GENIMAGE_LICENSE = GPL-2.0 GENIMAGE_LICENSE_FILES = COPYING From 5847ab8b184bb65c4e2cd42b1ac5d79c04acf0aa Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 14 Nov 2017 20:27:37 +0200 Subject: [PATCH 024/160] iproute2: bump to version 4.14.1 Remove uClibc build fix; current uClibc version defines the required macro. Remove static link fix; fixed upstream. Rebase the musl libc-compat.h workaround to adapt to upstream headers location change. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...workaround-to-the-libc-compat.h-copy.patch | 16 +-- .../0002-Fix-build-with-uClibc-ng.patch | 38 ------- ...-lib-fix-multiple-strlcpy-definition.patch | 103 ------------------ package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 5 files changed, 10 insertions(+), 151 deletions(-) delete mode 100644 package/iproute2/0002-Fix-build-with-uClibc-ng.patch delete mode 100644 package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch diff --git a/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch b/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch index c7c6e15596..ff362c97c2 100644 --- a/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch +++ b/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch @@ -1,4 +1,4 @@ -From b4edb4eebbfd35934b8bc6d7ee0e00e76a01596c Mon Sep 17 00:00:00 2001 +From 909a6f10157114e09936d2dd545175d7ed84c0fb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] Add the musl workaround to the libc-compat.h copy @@ -12,14 +12,14 @@ Signed-off-by: Baruch Siach Upstream status: libc-compat.h is a local copy of a kernel headers. A proper musl fix must go to the kernel first. --- - include/linux/libc-compat.h | 4 +++- + include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h -index f38571dabd8d..30f0b67c7a12 100644 ---- a/include/linux/libc-compat.h -+++ b/include/linux/libc-compat.h -@@ -49,10 +49,12 @@ +diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h +index 9ab3ace08e2b..e768459d89f9 100644 +--- a/include/uapi/linux/libc-compat.h ++++ b/include/uapi/linux/libc-compat.h +@@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ @@ -34,5 +34,5 @@ index f38571dabd8d..30f0b67c7a12 100644 /* GLIBC headers included first so don't define anything * that would already be defined. */ -- -2.11.0 +2.15.0 diff --git a/package/iproute2/0002-Fix-build-with-uClibc-ng.patch b/package/iproute2/0002-Fix-build-with-uClibc-ng.patch deleted file mode 100644 index 48cae70143..0000000000 --- a/package/iproute2/0002-Fix-build-with-uClibc-ng.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 18 Jul 2017 14:09:06 +0300 -Subject: [PATCH] Fix build with uClibc-ng - -Add a local definition for IPPROTO_MH to fix build with uClibc-ng. As of -version 1.0.25, the uClibc-ng netinet/in.h header does not provide this -definition. The kernel provided definition is masked by libc-compat.h. Add -this local fix until uClibc-ng syncs netinet/in.h with glibc. - -This partially reverts upstream commit a9ae195a2169 (xfrm: get #define's from -linux includes) - -Signed-off-by: Baruch Siach ---- -Upstream status: non upstreamable; local uClibc-ng compatibility fix ---- - ip/xfrm.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ip/xfrm.h b/ip/xfrm.h -index 54d80ce5e949..50b85550fb45 100644 ---- a/ip/xfrm.h -+++ b/ip/xfrm.h -@@ -30,6 +30,10 @@ - #include - #include - -+#ifndef IPPROTO_MH -+# define IPPROTO_MH 135 -+#endif -+ - #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info)))) - #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info)) - --- -2.13.2 - diff --git a/package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch b/package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch deleted file mode 100644 index 05e9c38084..0000000000 --- a/package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 5b55bbe48a29cf6a72cef9f424835f6244e66351 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 26 Sep 2017 13:45:21 +0300 -Subject: [PATCH] lib: fix multiple strlcpy definition - -Some C libraries, like uClibc and musl, provide BSD compatible -strlcpy(). Add check_strlcpy() to configure, and avoid defining strlcpy -and strlcat when the C library provides them. - -This fixes the following static link error: - -.../sysroot/usr/lib/libc.a(strlcpy.os): In function `strlcpy': -strlcpy.c:(.text+0x0): multiple definition of `strlcpy' -../lib/libutil.a(utils.o):utils.c:(.text+0x1ddc): first defined here -collect2: error: ld returned 1 exit status - -[baruch: backported from upstream submission to 4.13] -Signed-off-by: Baruch Siach ---- -Upstream status: https://patchwork.ozlabs.org/patch/819705/ ---- - configure | 24 ++++++++++++++++++++++++ - lib/Makefile | 4 ++++ - lib/utils.c | 2 ++ - 3 files changed, 30 insertions(+) - -diff --git a/configure b/configure -index 88cbdb825689..4964b998059e 100755 ---- a/configure -+++ b/configure -@@ -325,6 +325,27 @@ EOF - rm -f $TMPDIR/dbtest.c $TMPDIR/dbtest - } - -+check_strlcpy() -+{ -+ cat >$TMPDIR/strtest.c < -+int main(int argc, char **argv) { -+ char dst[10]; -+ strlcpy(dst, "test", sizeof(dst)); -+ return 0; -+} -+EOF -+ $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1 -+ if [ $? -eq 0 ] -+ then -+ echo "no" -+ else -+ echo "NEED_STRLCPY:=y" >>Config -+ echo "yes" -+ fi -+ rm -f $TMPDIR/strtest.c $TMPDIR/strtest -+} -+ - quiet_config() - { - cat < Date: Tue, 14 Nov 2017 20:29:43 +0100 Subject: [PATCH 025/160] configs/olimex_imx233_olinuxino: bump Linux and U-Boot versions Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_imx233_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 8ee89ffabd..89ab5952cb 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino" BR2_TARGET_UBOOT_FORMAT_SD=y From e5a830922b1b39fb938e3f6037dce5e8cd1001e1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 14 Nov 2017 20:29:44 +0100 Subject: [PATCH 026/160] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot versions Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 8 ++++---- configs/olimex_a20_olinuxino_lime_defconfig | 8 ++++---- configs/olimex_a20_olinuxino_lime_mali_defconfig | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 228160d464..74f74684b7 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 8a939b5cc5..41f26a1511 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.49" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index b8699c3c23..15f787d6fe 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -41,7 +41,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 99dac7545f81204bad57e9ccf86a8c3c8af56cfc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 Nov 2017 21:39:24 +0100 Subject: [PATCH 027/160] package/kodi: bump version to 17.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 3bb67d88a1..fcf4888a9c 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 17.5-Krypton +KODI_JSONSCHEMABUILDER_VERSION = 17.6-Krypton KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0 diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 77a9e3be4e..31e3580aed 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 17.5-Krypton +KODI_TEXTUREPACKER_VERSION = 17.6-Krypton KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_LICENSE = GPL-2.0 diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index ed3aea0255..23a11ca494 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2 kodi-17.5-Krypton.tar.gz +sha256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d kodi-17.6-Krypton.tar.gz # Locally computed - libdvdcss sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz # Locally computed - libdvdnav diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index da11839c03..93f4dd4b31 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 17.5-Krypton +KODI_VERSION = 17.6-Krypton KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.GPL From 60b616a1a7f45c8c40fa46a0b43e1778a3cb2824 Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Tue, 14 Nov 2017 20:29:40 -0200 Subject: [PATCH 028/160] libgdiplus: bump to version 5.4 Also, enable giflib if selected by the user and remove patch already applied upstream. Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- ...x-compile-error-when-cross-compiling.patch | 35 ------------------- package/libgdiplus/libgdiplus.hash | 2 +- package/libgdiplus/libgdiplus.mk | 11 +++--- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch diff --git a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch b/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch deleted file mode 100644 index db67d467df..0000000000 --- a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From daf96b07c02734dceaf3c3b78c10e4e758b74d9e Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Fri, 18 Dec 2015 15:08:58 -0200 -Subject: [PATCH 1/1] Fix compile error when cross-compiling. - -When cross-compiling with libjpeg enabled, we can get errors like the -following when linking: - -sh-linux-gnu-gcc: ERROR: unsafe header/library path used in -cross-compilation: '/lib' - -That's because there is an error in the configure script that are not -generating ldflags correctly, and are trying to link with -L/lib. - -Signed-off-by: Sergio Prado ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 772d5fc9d87a..58d55ade48e3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -223,7 +223,7 @@ AC_ARG_WITH([libjpeg], - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) - if test "$jpeg_ok" = yes; then -- JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg' -+ JPEG='jpeg'; LIBJPEG="-L${libjpeg_prefix}/lib -ljpeg" - else - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***) - fi --- -1.9.1 - diff --git a/package/libgdiplus/libgdiplus.hash b/package/libgdiplus/libgdiplus.hash index f7fdcb58a4..740fefd986 100644 --- a/package/libgdiplus/libgdiplus.hash +++ b/package/libgdiplus/libgdiplus.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 98f8a8e58ed22e136c4ac6eaafbc860757f5a97901ecc0ea357e2b6e4cfa2be5 libgdiplus-4.2.tar.gz +sha256 ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58 libgdiplus-5.4.tar.gz diff --git a/package/libgdiplus/libgdiplus.mk b/package/libgdiplus/libgdiplus.mk index 7d564b6cd9..eb1858574d 100644 --- a/package/libgdiplus/libgdiplus.mk +++ b/package/libgdiplus/libgdiplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGDIPLUS_VERSION = 4.2 +LIBGDIPLUS_VERSION = 5.4 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION)) # Although there is a LICENSE file thas specifies LGPL or MPL-1.1, @@ -21,9 +21,12 @@ LIBGDIPLUS_AUTORECONF = YES LIBGDIPLUS_DEPENDENCIES = xlib_libXft libglib2 cairo libpng host-pkgconf -# API changes in recent versions of libgif makes it incompatible with -# this version of libgdiplus, so we are disabling it for now. -LIBGDIPLUS_CONF_OPTS = --without-libgif +ifeq ($(BR2_PACKAGE_GIFLIB),y) +LIBGDIPLUS_CONF_OPTS += --with-libgif +LIBGDIPLUS_DEPENDENCIES += giflib +else +LIBGDIPLUS_CONF_OPTS += --without-libgif +endif # there is a bug in the configure script that enables pango support # when passing --without-pango, so let's just not use it From 3fa1087587f67db10b7351c4c0c94b9809e9892d Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 14 Nov 2017 14:22:41 +0100 Subject: [PATCH 029/160] python-treq: bump version to 17.8.0 Add new runtime dependencies and add licence file checksum. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-treq/Config.in | 6 ++++-- package/python-treq/python-treq.hash | 5 +++-- package/python-treq/python-treq.mk | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 2047cc0dc7..3a121ea71a 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,14 +1,16 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime help treq is an HTTP library inspired by requests but written on - top of Twisted's Agents. It provides a simple, higher level + top of Twisted's Agents. It provides a simple, higher level API for making HTTP requests when using Twisted. https://github.com/twisted/treq diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index a961b809ae..14f39460fa 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,3 +1,4 @@ # md5 from https://pypi.python.org/pypi/treq/json, sha256 locally computed -md5 421dea5bc8294c14aa24d64628a2eaea treq-16.12.0.tar.gz -sha256 b008edc81157969ad2bf23bece083adedb0adf249368a3896bb5ac9a871b91a9 treq-16.12.0.tar.gz +md5 7e1f5079b85ec104d4759fc0fb89071e treq-17.8.0.tar.gz +sha256 ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16 treq-17.8.0.tar.gz +sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 051b8ffaaf..73c47152a8 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 16.12.0 +PYTHON_TREQ_VERSION = 17.8.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://pypi.python.org/packages/26/4b/303880fb5bab1111654df2df0f201f4ba038221bdc52f5a395f0abfc0cb1 +PYTHON_TREQ_SITE = https://pypi.python.org/packages/11/3e/1014f26bfd4d07db015ad48384446b3bdc4de4bbdd2eba3be7fbb149cc44 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools From 999d0214cf15d774f057f87a1a60cca3551d69d9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 14 Nov 2017 20:54:53 -0200 Subject: [PATCH 030/160] configs/mx6cubox: Bump U-Boot and kernel versions Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index 5a4e9341bf..5cb44fd45b 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh" @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard" From 3af2a3437f19babfcda5377d4e1b16a894af7a86 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 14 Nov 2017 07:58:35 -0500 Subject: [PATCH 031/160] libpjsip: remove deprecated config options disable-small-filter and disable-large-filter have been deprecated as of 2.7, causing messages during compile time complaining about how they are deprecated and have no effect. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libpjsip/libpjsip.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 6f3f9e3f1a..c772d4117a 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -38,8 +38,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-opus \ --disable-oss \ --disable-ext-sound \ - --disable-small-filter \ - --disable-large-filter \ --disable-g711-codec \ --disable-l16-codec \ --disable-g722-codec \ From 58ebc2629ba7c74c5620de240f8a7e66765a1782 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 14 Nov 2017 14:36:45 +0200 Subject: [PATCH 032/160] libnl: bump to version 3.4.0 Drop static build fix patch; upstream fixed static build in a different way (https://github.com/thom311/libnl/pull/141). Following the patch removal, autoreconf is not needed anymore. Add license hash. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ild-enable-building-cli-during-tests.patch | 115 ------------------ package/libnl/libnl.hash | 6 +- package/libnl/libnl.mk | 4 +- 3 files changed, 5 insertions(+), 120 deletions(-) delete mode 100644 package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch diff --git a/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch b/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch deleted file mode 100644 index f715bb83f9..0000000000 --- a/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 68f8393bd356a3d0598cf77e1044b7e8b98aa4d8 Mon Sep 17 00:00:00 2001 -Message-Id: <68f8393bd356a3d0598cf77e1044b7e8b98aa4d8.1493920165.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Thu, 4 May 2017 15:56:14 +0300 -Subject: [PATCH] Revert "build: enable building cli during tests" - -This reverts commit 3cb28534d34392ceec4adead0cfa97039796ccb7. - -Contrary to what 3cb28534d commit log claims, the cli programs depend on -dynamic libraries support of the toolchain. Enabling cli programs -unconditionally breaks static build as follows: - -In file included from lib/cli/cls/basic.c:12:0: -./include/netlink/cli/utils.h:25:19: fatal error: dlfcn.h: No such file or directory -compilation terminated. -Makefile:3666: recipe for target 'lib/cli/cls/lib_cli_cls_basic_la-basic.lo' failed -make[1]: *** [lib/cli/cls/lib_cli_cls_basic_la-basic.lo] Error 1 - -Revert that commit to restore the ability of static only build of libnl, and -its dependencies. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/thom311/libnl/pull/141 - - Makefile.am | 21 ++++++--------------- - 1 file changed, 6 insertions(+), 15 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1b95a559304f..279548394650 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,8 +3,6 @@ - ACLOCAL_AMFLAGS = -I m4 - - lib_LTLIBRARIES = --noinst_LTLIBRARIES = --check_LTLIBRARIES = - - check_PROGRAMS = - check_programs = -@@ -500,6 +498,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES = \ - lib_libnl_xfrm_3_la_LIBADD = \ - lib/libnl-3.la - -+if ENABLE_CLI -+ - lib_cli_ltlibraries_cls = \ - lib/cli/cls/basic.la \ - lib/cli/cls/cgroup.la -@@ -513,15 +513,11 @@ lib_cli_ltlibraries_qdisc = \ - lib/cli/qdisc/pfifo.la \ - lib/cli/qdisc/plug.la - --if ENABLE_CLI - pkglib_clsdir = $(pkglibdir)/cli/cls - pkglib_qdiscdir = $(pkglibdir)/cli/qdisc - pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls) - pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc) --else --noinst_LTLIBRARIES += \ -- $(lib_cli_ltlibraries_cls) \ -- $(lib_cli_ltlibraries_qdisc) -+ - endif - - lib_cli_ldflags = \ -@@ -550,13 +546,8 @@ lib_cli_qdisc_plug_la_LDFLAGS = $(lib_cli_ldflags) - - ############################################################################### - --src_lib_ldflags = -- - if ENABLE_CLI - lib_LTLIBRARIES += src/lib/libnl-cli-3.la --src_lib_ldflags += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) --else --check_LTLIBRARIES += src/lib/libnl-cli-3.la - endif - - src_lib_libnl_cli_3_la_SOURCES = \ -@@ -583,7 +574,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \ - -I$(srcdir)/include \ - -I$(builddir)/include - src_lib_libnl_cli_3_la_LDFLAGS = \ -- $(src_lib_ldflags) \ -+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -Wl,--version-script=$(srcdir)/libnl-cli-3.sym - src_lib_libnl_cli_3_la_LIBADD = \ - lib/libnl-3.la \ -@@ -668,8 +659,6 @@ else - noinst_PROGRAMS += $(cli_programs) - endif - endif --else --check_PROGRAMS += $(cli_programs) - endif - - src_genl_ctrl_list_CPPFLAGS = $(src_cppflags) -@@ -847,10 +836,12 @@ tests_test_complex_HTB_with_hash_filters_LDADD = $(tests_ldadd) - tests_test_u32_filter_with_actions_CPPFLAGS = $(tests_cppflags) - tests_test_u32_filter_with_actions_LDADD = $(tests_ldadd) - -+if ENABLE_CLI - check_PROGRAMS += \ - tests/test-cache-mngr \ - tests/test-genl \ - tests/test-nf-cache-mngr -+endif - - tests_cli_ldadd = \ - $(tests_ldadd) \ --- -2.11.0 - diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index ae502c2cf8..b9c626043d 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,2 +1,4 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_3_0/libnl-3.3.0.tar.gz.sha256sum -sha256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 libnl-3.3.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz.sha256sum +sha256 b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf libnl-3.4.0.tar.gz +# Locally calculated +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index e1a37aabfe..397910c4a7 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBNL_VERSION = 3.3.0 +LIBNL_VERSION = 3.4.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf -# Patching Makefile.am -LIBNL_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) LIBNL_CONF_OPTS += --enable-cli From b75d54d18e139d8c1af527ef6e63c5b8fde30ed4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 14 Nov 2017 10:52:43 -0200 Subject: [PATCH 033/160] uboot: bump to version 2017.11 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 8215912339..14caafa3cd 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2017.09" + bool "2017.11" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2017.09" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2017.11" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 82efc79d56..db15efb22d 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744 u-boot-2017.09.tar.bz2 +sha256 6a018fd3caf58f3dcfa23ee989a82bd35df03af71872b9dca8c6d758a0d26c05 u-boot-2017.11.tar.bz2 From 1a515b56c725654b166f0940d9ea61a8b5b23508 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 14 Nov 2017 10:52:44 -0200 Subject: [PATCH 034/160] uboot-tools: bump to version 2017.11 Drop patch 0005 as it has already been applied upstream. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- ...attempt-to-use-the-systemwide-libfdt.patch | 56 ------------------- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch diff --git a/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch b/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch deleted file mode 100644 index abeef65929..0000000000 --- a/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 477ecb8d9ffa7b90d8bec0d8317b7e464e906f7c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= -Date: Fri, 3 Nov 2017 03:06:35 +0100 -Subject: [PATCH] Do not attempt to use the systemwide libfdt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to -include it . This breaks the build for me when I have dtc -fully installed in my host -- as happened earlier tonight with -Buildroot, for example. - -There are several other occurrences throughout the code where ' include style is being used -- IMHO wrongly. - -Signed-off-by: Jan Kundrát ---- - include/fdt.h | 2 +- - include/libfdt.h | 2 +- - tools/fdtgrep.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/fdt.h b/include/fdt.h -index 7ead62e..f40b56c 100644 ---- a/include/fdt.h -+++ b/include/fdt.h -@@ -1 +1 @@ --#include <../lib/libfdt/fdt.h> -+#include "../lib/libfdt/fdt.h" -diff --git a/include/libfdt.h b/include/libfdt.h -index 10296a2..7ba13e6 100644 ---- a/include/libfdt.h -+++ b/include/libfdt.h -@@ -1 +1 @@ --#include <../lib/libfdt/libfdt.h> -+#include "../lib/libfdt/libfdt.h" -diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c -index f51f5f1..5897b6d 100644 ---- a/tools/fdtgrep.c -+++ b/tools/fdtgrep.c -@@ -16,8 +16,8 @@ - #include - #include - --#include <../include/libfdt.h> --#include -+#include "../include/libfdt.h" -+#include "libfdt_internal.h" - - /* Define DEBUG to get some debugging output on stderr */ - #ifdef DEBUG --- -2.14.2 - diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 82efc79d56..db15efb22d 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744 u-boot-2017.09.tar.bz2 +sha256 6a018fd3caf58f3dcfa23ee989a82bd35df03af71872b9dca8c6d758a0d26c05 u-boot-2017.11.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index c93657548b..04b526883f 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2017.09 +UBOOT_TOOLS_VERSION = 2017.11 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ From f9891309b70b06a17ec04c0f0ae031ccbc1a4b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 14 Nov 2017 10:51:43 +0100 Subject: [PATCH 035/160] libogg: bump to version 1.3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/libogg/libogg.hash | 2 +- package/libogg/libogg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libogg/libogg.hash b/package/libogg/libogg.hash index 393ebee2a3..0c65b8e1a9 100644 --- a/package/libogg/libogg.hash +++ b/package/libogg/libogg.hash @@ -1,2 +1,2 @@ # From: http://www.xiph.org/downloads/ -sha256 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b libogg-1.3.2.tar.xz +sha256 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 libogg-1.3.3.tar.xz diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk index 28b55a888f..4c97e9a913 100644 --- a/package/libogg/libogg.mk +++ b/package/libogg/libogg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOGG_VERSION = 1.3.2 +LIBOGG_VERSION = 1.3.3 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg LIBOGG_LICENSE = BSD-3-Clause From 4f50d30a944b1e39c7f3983fcebbd9e7ae8e587f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 17 Nov 2017 19:19:34 -0500 Subject: [PATCH 036/160] netcat-openbsd: bump to 1.178-3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- package/netcat-openbsd/netcat-openbsd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index e1a6fee574..a758714eef 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.105-7 +NETCAT_OPENBSD_VERSION = debian/1.178-3 NETCAT_OPENBSD_SITE = git://anonscm.debian.org/collab-maint/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause NETCAT_OPENBSD_LICENSE_FILES = debian/copyright From 599b3af68aac15969b0909d99bf0ba23ba305ac2 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 21 Nov 2017 16:27:06 +0100 Subject: [PATCH 037/160] gst1-imx: fix v4l2 plugins disable options Latest bump to v0.13.0 didn't take care of the following upstream commit: 7bfbf71 v4l2: Rename to v4l2video and add switches to enable/disable sink/source To address that, this commit: - Uses the new name of the v4l2 source configure script option - Introduce a new Config.in option to control the build of the v4l2 sink support Fixes: http://autobuild.buildroot.net/results/5c404a2a28a4052056e5c9a7edda40641fe55f9e Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-imx/Config.in | 6 ++++++ package/gstreamer1/gst1-imx/gst1-imx.mk | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index 9f792d1c82..9b977bdde8 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -84,4 +84,10 @@ config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC help Elements for V4L2 capture +config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK + bool "imxv4l2videosink" + select BR2_PACKAGE_GST1_PLUGINS_BAD + help + Elements for V4L2 output + endif diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index c621c360f4..a8fe6fe041 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -83,10 +83,17 @@ GST1_IMX_CONF_OPTS += --disable-vpu endif ifeq ($(BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC),y) -# There's no --enable-v4l2src option +# There's no --enable-imxv4l2videosrc option GST1_IMX_DEPENDENCIES += gst1-plugins-bad else -GST1_IMX_CONF_OPTS += --disable-v4l2src +GST1_IMX_CONF_OPTS += --disable-imxv4l2videosrc +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK),y) +# There's no --enable-imxv4l2videosink option +GST1_IMX_DEPENDENCIES += gst1-plugins-bad +else +GST1_IMX_CONF_OPTS += --disable-imxv4l2videosink endif $(eval $(waf-package)) From 39640c94a8f266d620fc25df83b6a6392eedee17 Mon Sep 17 00:00:00 2001 From: Patryk Duda Date: Wed, 22 Nov 2017 16:06:04 +1030 Subject: [PATCH 038/160] kexec-lite: Bump version >From this version kexec-lite gained support for FreeBSD kernel loading. Signed-off-by: Patryk Duda Signed-off-by: Joel Stanley Signed-off-by: Thomas Petazzoni --- package/kexec-lite/kexec-lite.hash | 2 +- package/kexec-lite/kexec-lite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec-lite/kexec-lite.hash b/package/kexec-lite/kexec-lite.hash index 0f212241da..d71e8d00a4 100644 --- a/package/kexec-lite/kexec-lite.hash +++ b/package/kexec-lite/kexec-lite.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5786ddc0c94ead4fd4a1fded44bb1da0c9bc91af08049fed373ea161603e1e1f kexec-lite-86e45a47e8cc1f598ccfa9b873a23067f4ecc36f.tar.gz +sha256 2e9b131324cec9d27840179daa35e3159a4032ff78b74e301850faa007567d0e kexec-lite-87d044a895b1c004320a2676099a54a5a2a74f2e.tar.gz diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk index 76b6819dfa..8e1ad8d52d 100644 --- a/package/kexec-lite/kexec-lite.mk +++ b/package/kexec-lite/kexec-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_LITE_VERSION = 86e45a47e8cc1f598ccfa9b873a23067f4ecc36f +KEXEC_LITE_VERSION = 87d044a895b1c004320a2676099a54a5a2a74f2e KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) KEXEC_LITE_LICENSE = GPL-2.0+ KEXEC_LITE_LICENSE_FILES = COPYING From f86d5e1cf68295e700c7323217fa9bb3b9e64c0e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 14 Nov 2017 11:18:11 -0200 Subject: [PATCH 039/160] configs/imx6slevk: Add new defconfig Add support for imx6slevk_defconfig that allows booting a mainline kernel and mainline U-Boot. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + board/freescale/imx6slevk/readme.txt | 14 ++++++++++++++ configs/imx6slevk_defconfig | 26 ++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 board/freescale/imx6slevk/readme.txt create mode 100644 configs/imx6slevk_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dddb22f12..5f859faa7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,6 +126,7 @@ imx23evk_defconfig: *defconfig imx6-sabreauto_defconfig: *defconfig imx6-sabresd_defconfig: *defconfig imx6-sabresd_qt5_defconfig: *defconfig +imx6slevk_defconfig: *defconfig imx6ulpico_defconfig: *defconfig imx7dpico_defconfig: *defconfig lego_ev3_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 37b7dfe815..ad481f2409 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -577,6 +577,7 @@ N: Fabio Estevam F: board/warp7/ F: configs/freescale_imx* F: configs/imx6-sabresd* +F: configs/imx6slevk_defconfig F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig F: configs/mx6sx_udoo_neo_defconfig diff --git a/board/freescale/imx6slevk/readme.txt b/board/freescale/imx6slevk/readme.txt new file mode 100644 index 0000000000..424380e31f --- /dev/null +++ b/board/freescale/imx6slevk/readme.txt @@ -0,0 +1,14 @@ +NXP i.MX6SL EVK board +--------------------- + +To build a minimal support for this board: + +$ make imx6slevk_defconfig +$ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be flashed into the SD card: + +$ sudo dd if=output/images/sdcard.img of=/dev/; sync + +Then insert the SD card into the SD2 slot and boot the board. diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig new file mode 100644 index 0000000000..be4b42e88e --- /dev/null +++ b/configs/imx6slevk_defconfig @@ -0,0 +1,26 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 459e3320dc234f96b93661bed1a753e477aeab17 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 22 Nov 2017 11:21:12 -0200 Subject: [PATCH 040/160] configs/imx6sx-sdb: Add new defconfig Add support for imx6sx-sdb_defconfig that allows booting a mainline kernel and mainline U-Boot. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + board/freescale/imx6sxsdb/readme.txt | 14 ++++++++++++++ configs/imx6sx-sdb_defconfig | 26 ++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 board/freescale/imx6sxsdb/readme.txt create mode 100644 configs/imx6sx-sdb_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f859faa7e..a7a486551e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,6 +127,7 @@ imx6-sabreauto_defconfig: *defconfig imx6-sabresd_defconfig: *defconfig imx6-sabresd_qt5_defconfig: *defconfig imx6slevk_defconfig: *defconfig +imx6sxsdb_defconfig: *defconfig imx6ulpico_defconfig: *defconfig imx7dpico_defconfig: *defconfig lego_ev3_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ad481f2409..df61a0138c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -578,6 +578,7 @@ F: board/warp7/ F: configs/freescale_imx* F: configs/imx6-sabresd* F: configs/imx6slevk_defconfig +F: configs/imx6sxsdb_defconfig F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig F: configs/mx6sx_udoo_neo_defconfig diff --git a/board/freescale/imx6sxsdb/readme.txt b/board/freescale/imx6sxsdb/readme.txt new file mode 100644 index 0000000000..2779075f0b --- /dev/null +++ b/board/freescale/imx6sxsdb/readme.txt @@ -0,0 +1,14 @@ +NXP i.MX6SX SDB board +--------------------- + +To build a minimal support for this board: + +$ make imx6sx-sdb_defconfig +$ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be flashed into the SD card: + +$ sudo dd if=output/images/sdcard.img of=/dev/; sync + +Then insert the SD card into the SD4 boot slot and boot the board. diff --git a/configs/imx6sx-sdb_defconfig b/configs/imx6sx-sdb_defconfig new file mode 100644 index 0000000000..baead34545 --- /dev/null +++ b/configs/imx6sx-sdb_defconfig @@ -0,0 +1,26 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From bd6187491976cdfb97bcddbeaddf7f8c35f8e391 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 19 Nov 2017 21:19:10 -0600 Subject: [PATCH 041/160] board/lego/ev3: update to 4.14 kernel and 2017.11 U-Boot This updates the LEGO MINDSTORMS EV3 board to Linux kernel 4.14 and U-Boot 2017.11. * Kernel patches are dropped because they are in mainline now. * This caused the kernel image to be >3M so some adjustments to the image sizes/layout needed to be made in U-Boot. * Updated U-Boot version bumped since we are touching this config anyway Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- board/lego/ev3/genimage.cfg | 6 +- board/lego/ev3/linux.fragment | 6 ++ .../linux/0001-adc-device-tree-node.patch | 56 ------------ .../linux/0002-sound-device-tree-node.patch | 85 ------------------- ...s-legoev3-increase-flash-image-sizes.patch | 31 +++++++ configs/lego_ev3_defconfig | 8 +- 6 files changed, 44 insertions(+), 148 deletions(-) delete mode 100644 board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch delete mode 100644 board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch create mode 100644 board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch diff --git a/board/lego/ev3/genimage.cfg b/board/lego/ev3/genimage.cfg index 0ec580ca13..3da3048d8d 100644 --- a/board/lego/ev3/genimage.cfg +++ b/board/lego/ev3/genimage.cfg @@ -20,13 +20,13 @@ image flash.bin { } partition uimage { image = "uImage.da850-lego-ev3" - size = 3M + size = 4M offset = 0x50000 } partition rootfs { image = "rootfs.squashfs" - size = 9600K - offset = 0x350000 + size = 10M + offset = 0x450000 } } diff --git a/board/lego/ev3/linux.fragment b/board/lego/ev3/linux.fragment index 439cccf78d..30dea57b6c 100644 --- a/board/lego/ev3/linux.fragment +++ b/board/lego/ev3/linux.fragment @@ -54,3 +54,9 @@ CONFIG_SQUASHFS=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y +CONFIG_DRM=y +CONFIG_DRM_TILCDC=n +CONFIG_DRM_DUMB_VGA_DAC=n +CONFIG_DRM_TINYDRM=y +CONFIG_TINYDRM_ST7586=y +CONFIG_FB_DA8XX=n diff --git a/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch b/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch deleted file mode 100644 index dabda1e962..0000000000 --- a/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8a81ff173c5c9a0ab1df84fab17971dbcce8490a Mon Sep 17 00:00:00 2001 -From: David Lechner -Date: Tue, 7 Feb 2017 13:22:07 -0600 -Subject: ARM: da850-lego-ev3: Add device tree node for A/DC - -This adds a node for the TI ADS7957 analog/digital converter on LEGO -MINDSTORMS EV3 as well as a regulator node that is used by the A/DC node. - -Signed-off-by: David Lechner -Signed-off-by: Sekhar Nori ---- - arch/arm/boot/dts/da850-lego-ev3.dts | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts -index 112ec92..0309537 100644 ---- a/arch/arm/boot/dts/da850-lego-ev3.dts -+++ b/arch/arm/boot/dts/da850-lego-ev3.dts -@@ -139,6 +139,19 @@ - enable-active-high; - regulator-boot-on; - }; -+ -+ /* -+ * This is a simple voltage divider on VCC5V to provide a 2.5V -+ * reference signal to the ADC. -+ */ -+ adc_ref: regulator2 { -+ compatible = "regulator-fixed"; -+ regulator-name = "adc ref"; -+ regulator-min-microvolt = <2500000>; -+ regulator-max-microvolt = <2500000>; -+ regulator-boot-on; -+ vin-supply = <&vcc5v>; -+ }; - }; - - &pmx_core { -@@ -293,6 +306,14 @@ - }; - }; - }; -+ -+ adc: adc@3 { -+ compatible = "ti,ads7957"; -+ reg = <3>; -+ #io-channel-cells = <1>; -+ spi-max-frequency = <10000000>; -+ vref-supply = <&adc_ref>; -+ }; - }; - - &gpio { --- -cgit v1.1 - diff --git a/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch deleted file mode 100644 index a095222c2f..0000000000 --- a/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 7723d70bebd749ef24fef19db52d827c7fd7f858 Mon Sep 17 00:00:00 2001 -From: David Lechner -Date: Tue, 7 Feb 2017 13:22:09 -0600 -Subject: ARM: da850-lego-ev3: Add device tree node for sound - -This adds a device tree node for sound on LEGO MINDSTORMS EV3. The EV3 -uses one of the SoC PWMs connected to an amplifier to create sound from -a speaker. - -The PWM is passed through a low-pass filter, so it is actually possible -to do PCM playback, but there is no existing driver, so just using -pwm-beeper for now, since it is also a compatible mode of operation. - -Signed-off-by: David Lechner -Signed-off-by: Sekhar Nori ---- - arch/arm/boot/dts/da850-lego-ev3.dts | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts -index 0309537..c20580a 100644 ---- a/arch/arm/boot/dts/da850-lego-ev3.dts -+++ b/arch/arm/boot/dts/da850-lego-ev3.dts -@@ -123,6 +123,14 @@ - pinctrl-0 = <&system_power_pin>; - }; - -+ sound { -+ compatible = "pwm-beeper"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ehrpwm0b_pins>; -+ pwms = <&ehrpwm0 1 1000000 0>; -+ amp-supply = <&>; -+ }; -+ - /* - * This is a 5V current limiting regulator that is shared by USB, - * the sensor (input) ports, the motor (output) ports and the A/DC. -@@ -152,6 +160,18 @@ - regulator-boot-on; - vin-supply = <&vcc5v>; - }; -+ -+ /* -+ * This is the amplifier for the speaker. -+ */ -+ amp: regulator3 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&_pins>; -+ compatible = "regulator-fixed"; -+ regulator-name = "amp"; -+ gpio = <&gpio 111 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ }; - }; - - &pmx_core { -@@ -208,6 +228,13 @@ - 0x4c 0x00008000 0x0000f000 - >; - }; -+ -+ amp_pins: pinmux_amp_pins { -+ pinctrl-single,bits = < -+ /* GP6[15] */ -+ 0x34 0x00000008 0x0000000f -+ >; -+ }; - }; - - &pinconf { -@@ -316,6 +343,10 @@ - }; - }; - -+&ehrpwm0 { -+ status = "okay"; -+}; -+ - &gpio { - status = "okay"; - }; --- -cgit v1.1 - diff --git a/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch b/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch new file mode 100644 index 0000000000..ee0ce61603 --- /dev/null +++ b/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch @@ -0,0 +1,31 @@ +From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001 +From: David Lechner +Date: Sun, 19 Nov 2017 19:54:32 -0600 +Subject: [PATCH] configs: legoev3: increase flash image sizes + +This increases the kernel image to 4M and the rootfs image to 10M. + +It is getting hard to get a kernel image to fit in 3M and the rootfs image +size now matches the filesyssize variable. + +Signed-off-by: David Lechner +--- + include/configs/legoev3.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h +index 79fa3c4..2eeaf85 100644 +--- a/include/configs/legoev3.h ++++ b/include/configs/legoev3.h +@@ -204,7 +204,7 @@ + "mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \ + "mmcboot=bootm ${loadaddr}\0" \ + "flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \ +- "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \ ++ "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \ + "loadimage=fatload mmc 0 ${loadaddr} uImage\0" \ + "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \ + "bootscript=source ${bootscraddr}\0" \ +-- +2.7.4 + diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index dea84d90d0..0281924133 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -9,13 +9,13 @@ BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" -# Linux headers same as kernel, a 4.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="davinci_all" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000" @@ -36,7 +36,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" # host From e55d61fb976168f9d9bb9402f4262f03f8f1fcfc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Nov 2017 17:58:23 +0100 Subject: [PATCH 042/160] webp: add an option to enable webpmux Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/webp/Config.in | 7 +++++++ package/webp/webp.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/package/webp/Config.in b/package/webp/Config.in index 646eb9ef5a..e8263a95f2 100644 --- a/package/webp/Config.in +++ b/package/webp/Config.in @@ -15,4 +15,11 @@ config BR2_PACKAGE_WEBP_DEMUX of an extended format WebP file, which can have features like color profile, metadata and animation. +config BR2_PACKAGE_WEBP_MUX + bool "webpmux" + help + Mux is a part of WebPMux for creation and manipulation + of an extended format WebP file, which can have features + like color profile, metadata and animation. + endif diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 821302777e..2f3a78c1cc 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -23,6 +23,12 @@ else WEBP_CONF_OPTS += --disable-libwebpdemux endif +ifeq ($(BR2_PACKAGE_WEBP_MUX),y) +WEBP_CONF_OPTS += --enable-libwebpmux +else +WEBP_CONF_OPTS += --disable-libwebpmux +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) WEBP_DEPENDENCIES += libpng WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config From 13ff9b2fa32ebf14a9c4fdccc54692e953671f71 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Nov 2017 15:26:41 +0100 Subject: [PATCH 043/160] motion: bump to version 4.1 - Remove 0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch, it does not have been sent upstream but issue has been fixed by https://github.com/Motion-Project/motion/commit/3b7164f7f9c2b123f850f8cd1bc0a860ca51c0fe#diff-67e997bcfdac55191033d57a16d1408a - 0002-Rename-base64_encode.patch has been integrated into this version - --without-jpeg-turbo has been deleted from configure.ac - libsdl dependency has been removed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-given-CFLAGS-LIBS-for-mysqlclient-l.patch | 31 ----- .../motion/0002-Rename-base64_encode.patch | 116 ------------------ package/motion/motion.hash | 3 +- package/motion/motion.mk | 22 +--- 4 files changed, 5 insertions(+), 167 deletions(-) delete mode 100644 package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch delete mode 100644 package/motion/0002-Rename-base64_encode.patch diff --git a/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch b/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch deleted file mode 100644 index 4211fe67bd..0000000000 --- a/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5a1081d36bf2861ffc882354c583a0eb6b0ee3d5 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 25 Oct 2016 21:27:41 +0200 -Subject: [PATCH] configure.ac: use given CFLAGS/LIBS for mysqlclient library - check - -Needed for static linking of mysql with enabled libz. - -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5782fd6..aa5d9dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -618,8 +618,8 @@ else - #LDFLAGS="-L$MYSQL_LIBDIR" - saved_CFLAGS=$CFLAGS - saved_LIBS=$LIBS -- CFLAGS="-I$MYSQL_INCDIR" -- LIBS="-L$MYSQL_LIBDIR" -+ CFLAGS="-I$MYSQL_INCDIR $CFLAGS" -+ LIBS="-L$MYSQL_LIBDIR $LIBS" - AC_CHECK_LIB(mysqlclient,mysql_init,[ - TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient -lz" - TEMP_CFLAGS="$TEMP_CFLAGS -I$MYSQL_INCDIR" --- -2.8.1 - diff --git a/package/motion/0002-Rename-base64_encode.patch b/package/motion/0002-Rename-base64_encode.patch deleted file mode 100644 index 8b06309252..0000000000 --- a/package/motion/0002-Rename-base64_encode.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 0da5428bdfe67eb17ee03f22f68e66b044abdf70 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 30 Oct 2016 19:30:46 +0100 -Subject: [PATCH] Rename base64_encode - -base64_encode is already defined in gnutls so rename it as -motion_base64_encode to prevent a definition clash when linking -statically with gnutls - -Fixes: - - http://autobuild.buildroot.org/results/592672b8826f4c731c50d29725da964d876573c4 - -Applied upstream: - - https://github.com/Motion-Project/motion/commit/cc3c25527d4bada0fe98a734fa2df29f8d6cf1ad - -Signed-off-by: Fabrice Fontaine ---- - netcam.c | 4 ++-- - netcam_wget.c | 4 ++-- - netcam_wget.h | 2 +- - stream.c | 4 ++-- - webhttpd.c | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/netcam.c b/netcam.c -index a9df33a..38d4ca3 100644 ---- a/netcam.c -+++ b/netcam.c -@@ -2019,7 +2019,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url) - else - ptr = url->userpass; - -- /* base64_encode needs up to 3 additional chars. */ -+ /* motion_base64_encode needs up to 3 additional chars. */ - if (ptr) { - userpass = mymalloc(strlen(ptr) + 3); - strcpy(userpass, ptr); -@@ -2045,7 +2045,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url) - /* Allocate space for the base64-encoded string. */ - encuserpass = mymalloc(BASE64_LENGTH(strlen(userpass)) + 1); - /* Fill in the value. */ -- base64_encode(userpass, encuserpass, strlen(userpass)); -+ motion_base64_encode(userpass, encuserpass, strlen(userpass)); - /* Now create the last part (authorization) of the request. */ - request_pass = mymalloc(strlen(connect_auth_req) + - strlen(encuserpass) + 1); -diff --git a/netcam_wget.c b/netcam_wget.c -index 4491760..f5c1dc2 100644 ---- a/netcam_wget.c -+++ b/netcam_wget.c -@@ -210,13 +210,13 @@ int skip_lws(const char *string) - - - /** -- * base64_encode -+ * motion_base64_encode - * - * Encode the string S of length LENGTH to base64 format and place it - * to STORE. STORE will be 0-terminated, and must point to a writable - * buffer of at least 1+BASE64_LENGTH(length) bytes. - */ --void base64_encode(const char *s, char *store, int length) -+void motion_base64_encode(const char *s, char *store, int length) - { - /* Conversion table. */ - static const char tbl[64] = { -diff --git a/netcam_wget.h b/netcam_wget.h -index 9a091bf..e9b02b5 100644 ---- a/netcam_wget.h -+++ b/netcam_wget.h -@@ -72,7 +72,7 @@ int rbuf_read_bufferful(netcam_context_ptr); - /* How many bytes it will take to store LEN bytes in base64. */ - #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3)) - --void base64_encode(const char *, char *, int); -+void motion_base64_encode(const char *, char *, int); - char *strdupdelim(const char *, const char *); - int http_process_type(const char *, void *); - -diff --git a/stream.c b/stream.c -index 04e67ee..ca201ac 100644 ---- a/stream.c -+++ b/stream.c -@@ -211,10 +211,10 @@ static void* handle_basic_auth(void* param) - - authentication = mymalloc(BASE64_LENGTH(auth_size) + 1); - userpass = mymalloc(auth_size + 4); -- /* base64_encode can read 3 bytes after the end of the string, initialize it. */ -+ /* motion_base64_encode can read 3 bytes after the end of the string, initialize it. */ - memset(userpass, 0, auth_size + 4); - strcpy(userpass, p->conf->stream_authentication); -- base64_encode(userpass, authentication, auth_size); -+ motion_base64_encode(userpass, authentication, auth_size); - free(userpass); - - if (strcmp(auth, authentication)) { -diff --git a/webhttpd.c b/webhttpd.c -index 6df2d11..36e8beb 100644 ---- a/webhttpd.c -+++ b/webhttpd.c -@@ -2616,10 +2616,10 @@ void httpd_run(struct context **cnt) - - authentication = mymalloc(BASE64_LENGTH(auth_size) + 1); - userpass = mymalloc(auth_size + 4); -- /* base64_encode can read 3 bytes after the end of the string, initialize it */ -+ /* motion_base64_encode can read 3 bytes after the end of the string, initialize it */ - memset(userpass, 0, auth_size + 4); - strcpy(userpass, cnt[0]->conf.webcontrol_authentication); -- base64_encode(userpass, authentication, auth_size); -+ motion_base64_encode(userpass, authentication, auth_size); - free(userpass); - } - --- -2.5.0 - diff --git a/package/motion/motion.hash b/package/motion/motion.hash index e8591179ed..40cb66b7e5 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0 motion-release-4.0.1.tar.gz +sha256 277029c80df0d37deefbbea6d15c66a9067d9166fe8f76eb5f90aa6e97aa9741 motion-release-4.1.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/motion/motion.mk b/package/motion/motion.mk index ce64a9328b..dfbb70d64b 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,17 +4,15 @@ # ################################################################################ -MOTION_VERSION = release-4.0.1 +MOTION_VERSION = release-4.1 MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg -# From git and patched configure.ac +# From git MOTION_AUTORECONF = YES -# motion does not use any specific function of jpeg-turbo, so just relies on -# jpeg selection -MOTION_CONF_OPTS += --without-jpeg-turbo --without-optimizecpu +MOTION_CONF_OPTS += --without-optimizecpu ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) MOTION_DEPENDENCIES += ffmpeg @@ -29,10 +27,6 @@ MOTION_CONF_OPTS += \ --with-mysql \ --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ --with-mysql-lib=$(STAGING_DIR)/usr/lib -# static link of mysql needs -lz -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy) -MOTION_CONF_ENV += LIBS="-lz" -endif else MOTION_CONF_OPTS += --without-mysql endif @@ -47,16 +41,6 @@ else MOTION_CONF_OPTS += --without-pgsql endif -ifeq ($(BR2_PACKAGE_SDL),y) -MOTION_DEPENDENCIES += sdl -MOTION_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr -# overwrite ac_cv_path_CONFIG_SDL in case sdl development is -# installed on the host -MOTION_CONF_ENV += ac_cv_path_CONFIG_SDL=$(STAGING_DIR)/usr/bin/sdl-config -else -MOTION_CONF_OPTS += --without-sdl -endif - ifeq ($(BR2_PACKAGE_SQLITE),y) MOTION_DEPENDENCIES += sqlite MOTION_CONF_OPTS += --with-sqlite3 From 126457aaf501c14b8d3a61732bb8f53e69189dba Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 16 Nov 2017 16:29:02 -0800 Subject: [PATCH 044/160] gptfdisk: bump to version 1.0.3 This version has a new command line argument to sgdisk, -j, that lets one change the starting address of where the GPT partition table entries are stored. The iMX SoC ROM loader, and perhaps others, expects the bootloader to start at sector 2. Using this option with gptfdisk lets the table entries move to make space for the bootloader image. Signed-off-by: Trent Piepho Signed-off-by: Thomas Petazzoni --- package/gptfdisk/gptfdisk.hash | 8 ++++---- package/gptfdisk/gptfdisk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gptfdisk/gptfdisk.hash b/package/gptfdisk/gptfdisk.hash index c3a38af5f6..d55797c05a 100644 --- a/package/gptfdisk/gptfdisk.hash +++ b/package/gptfdisk/gptfdisk.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.1/ -md5 d7f3d306b083123bcc6f5941efade586 gptfdisk-1.0.1.tar.gz -sha1 ad28c511c642235815b83fffddf728c117057cba gptfdisk-1.0.1.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.3/ +md5 07b625a583b66c8c5840be5923f3e3fe gptfdisk-1.0.3.tar.gz +sha1 9a74bbe7805d562316e92417f71e4b03155308e6 gptfdisk-1.0.3.tar.gz # Locally computed -sha256 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 gptfdisk-1.0.1.tar.gz +sha256 89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c gptfdisk-1.0.3.tar.gz diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index a7bc41c89f..b669e22aa8 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.1 +GPTFDISK_VERSION = 1.0.3 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING From fa1f589c411df04d6dff0cb27d5abf4465605c73 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 16 Nov 2017 18:41:15 +0100 Subject: [PATCH 045/160] luasec: bump to version 0.6 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luasec/luasec.hash | 2 +- package/luasec/luasec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1e9f70ad6f..9d721ed485 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d2198cc39b3fa55bd5020046742b34093b6efcb619cf4032948b8c8556202a32 luasec-0.5-2.src.rock +sha256 1d04e2f70bc055348dda3cc3566d27d8408094bc944aa5c6a4ae18bffe5c0007 luasec-0.6-1.src.rock diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index b059e1c6ee..28c4b2c64b 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 0.5-2 +LUASEC_VERSION = 0.6-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From 64d3c35d98c5d59c014afc65ce8a3a5a5bf818cf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 08:52:47 -0500 Subject: [PATCH 046/160] audit: bump to 2.8.1 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 32cedc5d6b..742f94ae42 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 57b5ae5697f288b8e53286eacd1c6c2e88bd65db18df3d855332fc63b302fdae audit-2.7.8.tar.gz +sha256 1becde92ff6e81798fa8878820ab2497d867036a6596f55109504b37c8b33b6c audit-2.8.1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 6c0947715f..8778e9845c 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 2.7.8 +AUDIT_VERSION = 2.8.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB From 0a219430d797cc25c4f4b1f952831adf4dbb64b0 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 09:05:46 -0500 Subject: [PATCH 047/160] bash: bump to 4.4.12 In addition, remove upstreamed patches and add a hash for the license file. Signed-off-by: Adam Duskett [Thomas: indicate pgp signature file address in hash file, as suggested by Baruch.] Signed-off-by: Thomas Petazzoni --- package/bash/bash.hash | 6 +- package/bash/bash.mk | 2 +- package/bash/bash44-001.patch | 64 ------------- package/bash/bash44-002.patch | 73 --------------- package/bash/bash44-003.patch | 62 ------------- package/bash/bash44-004.patch | 88 ------------------ package/bash/bash44-005.patch | 51 ----------- package/bash/bash44-006.patch | 63 ------------- package/bash/bash44-007.patch | 155 -------------------------------- package/bash/bash44-008.patch | 88 ------------------ package/bash/bash44-009.patch | 111 ----------------------- package/bash/bash44-010.patch | 53 ----------- package/bash/bash44-011.patch | 54 ----------- package/bash/bash44-012.patch | 165 ---------------------------------- 14 files changed, 5 insertions(+), 1030 deletions(-) delete mode 100644 package/bash/bash44-001.patch delete mode 100644 package/bash/bash44-002.patch delete mode 100644 package/bash/bash44-003.patch delete mode 100644 package/bash/bash44-004.patch delete mode 100644 package/bash/bash44-005.patch delete mode 100644 package/bash/bash44-006.patch delete mode 100644 package/bash/bash44-007.patch delete mode 100644 package/bash/bash44-008.patch delete mode 100644 package/bash/bash44-009.patch delete mode 100644 package/bash/bash44-010.patch delete mode 100644 package/bash/bash44-011.patch delete mode 100644 package/bash/bash44-012.patch diff --git a/package/bash/bash.hash b/package/bash/bash.hash index adbd60868a..4e2e48f363 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,2 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz +# Locally calculated after checking pgp signature from +# http://ftp.gnu.org/gnu/bash/bash-4.4.12.tar.gz.sig +sha256 57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331 bash-4.4.12.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index dd7c26fc12..089d062875 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 4.4 +BASH_VERSION = 4.4.12 BASH_SITE = $(BR2_GNU_MIRROR)/bash # Build after since bash is better than busybox shells BASH_DEPENDENCIES = ncurses readline host-bison \ diff --git a/package/bash/bash44-001.patch b/package/bash/bash44-001.patch deleted file mode 100644 index 842aea4313..0000000000 --- a/package/bash/bash44-001.patch +++ /dev/null @@ -1,64 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-001 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-001 - -Bug-Reported-by: Sean Zha -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html - -Bug-Description: - -Bash-4.4 changed the way the history list is initially allocated to reduce -the number of reallocations and copies. Users who set HISTSIZE to a very -large number to essentially unlimit the size of the history list will get -memory allocation errors - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500 ---- b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400 -*************** -*** 58,61 **** ---- 58,63 ---- - #define DEFAULT_HISTORY_INITIAL_SIZE 502 - -+ #define MAX_HISTORY_INITIAL_SIZE 8192 -+ - /* The number of slots to increase the_history by. */ - #define DEFAULT_HISTORY_GROW_SIZE 50 -*************** -*** 308,312 **** - { - if (history_stifled && history_max_entries > 0) -! history_size = history_max_entries + 2; - else - history_size = DEFAULT_HISTORY_INITIAL_SIZE; ---- 310,316 ---- - { - if (history_stifled && history_max_entries > 0) -! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE) -! ? MAX_HISTORY_INITIAL_SIZE -! : history_max_entries + 2; - else - history_size = DEFAULT_HISTORY_INITIAL_SIZE; -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-002.patch b/package/bash/bash44-002.patch deleted file mode 100644 index 6f4a809fb2..0000000000 --- a/package/bash/bash44-002.patch +++ /dev/null @@ -1,73 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-002 - -Bug-Reported-by: Eric Pruitt -Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html - -Bug-Description: - -Bash-4.4 warns when discarding NUL bytes in command substitution output -instead of silently dropping them. This patch changes the warnings from -one per NUL byte encountered to one warning per command substitution. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2016-09-26 10:20:19.000000000 -0400 -*************** -*** 5932,5935 **** ---- 5933,5937 ---- - int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul; - ssize_t bufn; -+ int nullbyte; - - istring = (char *)NULL; -*************** -*** 5939,5942 **** ---- 5941,5946 ---- - skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; - -+ nullbyte = 0; -+ - /* Read the output of the command through the pipe. This may need to be - changed to understand multibyte characters in the future. */ -*************** -*** 5957,5961 **** - { - #if 1 -! internal_warning ("%s", _("command substitution: ignored null byte in input")); - #endif - continue; ---- 5961,5969 ---- - { - #if 1 -! if (nullbyte == 0) -! { -! internal_warning ("%s", _("command substitution: ignored null byte in input")); -! nullbyte = 1; -! } - #endif - continue; -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-003.patch b/package/bash/bash44-003.patch deleted file mode 100644 index cdfc206f8a..0000000000 --- a/package/bash/bash44-003.patch +++ /dev/null @@ -1,62 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-003 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-003 - -Bug-Reported-by: op7ic \x00 -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html - -Bug-Description: - -Specially-crafted input, in this case an incomplete pathname expansion -bracket expression containing an invalid collating symbol, can cause the -shell to crash. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400 ---- b/lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400 -*************** -*** 331,334 **** ---- 331,340 ---- - if (p[pc] == L('.') && p[pc+1] == L(']')) - break; -+ if (p[pc] == 0) -+ { -+ if (vp) -+ *vp = INVALID; -+ return (p + pc); -+ } - val = COLLSYM (p, pc); - if (vp) -*************** -*** 484,487 **** ---- 490,496 ---- - c = FOLD (c); - -+ if (c == L('\0')) -+ return ((test == L('[')) ? savep : (CHAR *)0); -+ - if ((flags & FNM_PATHNAME) && c == L('/')) - /* [/] can never match when matching a pathname. */ -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-004.patch b/package/bash/bash44-004.patch deleted file mode 100644 index ba6ff62689..0000000000 --- a/package/bash/bash44-004.patch +++ /dev/null @@ -1,88 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-004 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-004 - -Bug-Reported-by: Christian Weisgerber -Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html - -Bug-Description: - -There is a race condition that can result in bash referencing freed memory -when freeing data associated with the last process substitution. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400 ---- b/jobs.c 2016-11-02 18:24:45.000000000 -0400 -*************** -*** 454,457 **** ---- 454,472 ---- - } - -+ void -+ discard_last_procsub_child () -+ { -+ PROCESS *disposer; -+ sigset_t set, oset; -+ -+ BLOCK_CHILD (set, oset); -+ disposer = last_procsub_child; -+ last_procsub_child = (PROCESS *)NULL; -+ UNBLOCK_CHILD (oset); -+ -+ if (disposer) -+ discard_pipeline (disposer); -+ } -+ - struct pipeline_saver * - alloc_pipeline_saver () -*** a/bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400 ---- b/jobs.h 2016-11-02 18:25:08.000000000 -0400 -*************** -*** 191,194 **** ---- 191,195 ---- - extern void stop_making_children __P((void)); - extern void cleanup_the_pipeline __P((void)); -+ extern void discard_last_procsub_child __P((void)); - extern void save_pipeline __P((int)); - extern PROCESS *restore_pipeline __P((int)); -*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2016-11-02 18:23:24.000000000 -0400 -*************** -*** 5809,5816 **** - #if defined (JOB_CONTROL) - if (last_procsub_child) -! { -! discard_pipeline (last_procsub_child); -! last_procsub_child = (PROCESS *)NULL; -! } - last_procsub_child = restore_pipeline (0); - #endif ---- 5834,5838 ---- - #if defined (JOB_CONTROL) - if (last_procsub_child) -! discard_last_procsub_child (); - last_procsub_child = restore_pipeline (0); - #endif -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-005.patch b/package/bash/bash44-005.patch deleted file mode 100644 index 0278e31dfb..0000000000 --- a/package/bash/bash44-005.patch +++ /dev/null @@ -1,51 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-005 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-005 - -Bug-Reported-by: Dr. Werner Fink -Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html - -Bug-Description: - -Under certain circumstances, a simple command is optimized to eliminate a -fork, resulting in an EXIT trap not being executed. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400 ---- b/builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500 -*************** -*** 105,114 **** - *bash_input.location.string == '\0' && - command->type == cm_simple && -- #if 0 - signal_is_trapped (EXIT_TRAP) == 0 && - signal_is_trapped (ERROR_TRAP) == 0 && -- #else - any_signals_trapped () < 0 && -- #endif - command->redirects == 0 && command->value.Simple->redirects == 0 && - ((command->flags & CMD_TIME_PIPELINE) == 0) && ---- 105,111 ---- -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-006.patch b/package/bash/bash44-006.patch deleted file mode 100644 index ba58ed40c3..0000000000 --- a/package/bash/bash44-006.patch +++ /dev/null @@ -1,63 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-006 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-006 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -Out-of-range negative offsets to popd can cause the shell to crash attempting -to free an invalid memory block. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500 ---- b/builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400 -*************** -*** 366,370 **** - } - -! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0)) - { - pushd_error (directory_list_offset, which_word ? which_word : ""); ---- b/366,370 ---- - } - -! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0)) - { - pushd_error (directory_list_offset, which_word ? which_word : ""); -*************** -*** 388,391 **** ---- b/388,396 ---- - of the list into place. */ - i = (direction == '+') ? directory_list_offset - which : which; -+ if (i < 0 || i > directory_list_offset) -+ { -+ pushd_error (directory_list_offset, which_word ? which_word : ""); -+ return (EXECUTION_FAILURE); -+ } - free (pushd_directory_list[i]); - directory_list_offset--; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-007.patch b/package/bash/bash44-007.patch deleted file mode 100644 index 71e771d6cf..0000000000 --- a/package/bash/bash44-007.patch +++ /dev/null @@ -1,155 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-007 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-007 - -Bug-Reported-by: Jens Heyens -Bug-Reference-ID: -Bug-Reference-URL: https://savannah.gnu.org/support/?109224 - -Bug-Description: - -When performing filename completion, bash dequotes the directory name being -completed, which can result in match failures and potential unwanted -expansion. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/bashline.c 2016-08-05 21:44:05.000000000 -0400 ---- b/bashline.c 2017-01-19 13:15:51.000000000 -0500 -*************** -*** 143,147 **** - static void restore_directory_hook __P((rl_icppfunc_t)); - -! static int directory_exists __P((const char *)); - - static void cleanup_expansion_error __P((void)); ---- b/144,148 ---- - static void restore_directory_hook __P((rl_icppfunc_t)); - -! static int directory_exists __P((const char *, int)); - - static void cleanup_expansion_error __P((void)); -*************** -*** 3103,3111 **** - } - -! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash -! removed, exists. */ - static int -! directory_exists (dirname) - const char *dirname; - { - char *new_dirname; ---- b/3107,3116 ---- - } - -! /* Check whether not DIRNAME, with any trailing slash removed, exists. If -! SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */ - static int -! directory_exists (dirname, should_dequote) - const char *dirname; -+ int should_dequote; - { - char *new_dirname; -*************** -*** 3113,3118 **** - struct stat sb; - -! /* First, dequote the directory name */ -! new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character); - dirlen = STRLEN (new_dirname); - if (new_dirname[dirlen - 1] == '/') ---- b/3118,3124 ---- - struct stat sb; - -! /* We save the string and chop the trailing slash because stat/lstat behave -! inconsistently if one is present. */ -! new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname); - dirlen = STRLEN (new_dirname); - if (new_dirname[dirlen - 1] == '/') -*************** -*** 3146,3150 **** - should_expand_dirname = '`'; - -! if (should_expand_dirname && directory_exists (local_dirname)) - should_expand_dirname = 0; - ---- b/3152,3156 ---- - should_expand_dirname = '`'; - -! if (should_expand_dirname && directory_exists (local_dirname, 0)) - should_expand_dirname = 0; - -*************** -*** 3156,3160 **** - global_nounset = unbound_vars_is_error; - unbound_vars_is_error = 0; -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */ - unbound_vars_is_error = global_nounset; - if (wl) ---- b/3162,3166 ---- - global_nounset = unbound_vars_is_error; - unbound_vars_is_error = 0; -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */ - unbound_vars_is_error = global_nounset; - if (wl) -*************** -*** 3245,3249 **** - } - -! if (should_expand_dirname && directory_exists (local_dirname)) - should_expand_dirname = 0; - ---- b/3262,3266 ---- - } - -! if (should_expand_dirname && directory_exists (local_dirname, 1)) - should_expand_dirname = 0; - -*************** -*** 3251,3255 **** - { - new_dirname = savestring (local_dirname); -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */ - if (wl) - { ---- b/3268,3272 ---- - { - new_dirname = savestring (local_dirname); -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */ - if (wl) - { -*** bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2017-01-19 07:09:57.000000000 -0500 -*************** -*** 9459,9462 **** ---- b/9459,9466 ---- - if (word->flags & W_COMPLETE) - tword->flags |= W_COMPLETE; /* for command substitutions */ -+ if (word->flags & W_NOCOMSUB) -+ tword->flags |= W_NOCOMSUB; -+ if (word->flags & W_NOPROCSUB) -+ tword->flags |= W_NOPROCSUB; - - temp = (char *)NULL; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-008.patch b/package/bash/bash44-008.patch deleted file mode 100644 index 931033c5b7..0000000000 --- a/package/bash/bash44-008.patch +++ /dev/null @@ -1,88 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-008 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-008 - -Bug-Reported-by: Koichi MURASE -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html - -Bug-Description: - -Under certain circumstances, bash will evaluate arithmetic expressions as -part of reading an expression token even when evaluation is suppressed. This -happens while evaluating a conditional expression and skipping over the -failed branch of the expression. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/expr.c 2015-10-11 14:46:36.000000000 -0400 ---- b/expr.c 2016-11-08 11:55:46.000000000 -0500 -*************** -*** 579,585 **** - if (curtok == QUES) /* found conditional expr */ - { -- readtok (); -- if (curtok == 0 || curtok == COL) -- evalerror (_("expression expected")); - if (cval == 0) - { ---- b/579,582 ---- -*************** -*** 588,591 **** ---- b/585,592 ---- - } - -+ readtok (); -+ if (curtok == 0 || curtok == COL) -+ evalerror (_("expression expected")); -+ - val1 = EXP_HIGHEST (); - -*************** -*** 594,600 **** - if (curtok != COL) - evalerror (_("`:' expected for conditional expression")); -! readtok (); -! if (curtok == 0) -! evalerror (_("expression expected")); - set_noeval = 0; - if (cval) ---- b/595,599 ---- - if (curtok != COL) - evalerror (_("`:' expected for conditional expression")); -! - set_noeval = 0; - if (cval) -*************** -*** 604,608 **** ---- b/603,611 ---- - } - -+ readtok (); -+ if (curtok == 0) -+ evalerror (_("expression expected")); - val2 = expcond (); -+ - if (set_noeval) - noeval--; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-009.patch b/package/bash/bash44-009.patch deleted file mode 100644 index 3ba1b3fe0f..0000000000 --- a/package/bash/bash44-009.patch +++ /dev/null @@ -1,111 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-009 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-009 - -Bug-Reported-by: Hong Cho -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html - -Bug-Description: - -There is a race condition in add_history() that can be triggered by a fatal -signal arriving between the time the history length is updated and the time -the history list update is completed. A later attempt to reference an -invalid history entry can cause a crash. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/lib/readline/history.c 2016-11-11 13:42:49.000000000 -0500 ---- b/lib/readline/history.c 2016-12-05 10:37:51.000000000 -0500 -*************** -*** 280,283 **** ---- b/280,284 ---- - { - HIST_ENTRY *temp; -+ int new_length; - - if (history_stifled && (history_length == history_max_entries)) -*************** -*** 296,306 **** - /* Copy the rest of the entries, moving down one slot. Copy includes - trailing NULL. */ -- #if 0 -- for (i = 0; i < history_length; i++) -- the_history[i] = the_history[i + 1]; -- #else - memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); -- #endif - - history_base++; - } ---- b/297,303 ---- - /* Copy the rest of the entries, moving down one slot. Copy includes - trailing NULL. */ - memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); - -+ new_length = history_length; - history_base++; - } -*************** -*** 316,320 **** - history_size = DEFAULT_HISTORY_INITIAL_SIZE; - the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); -! history_length = 1; - } - else ---- b/313,317 ---- - history_size = DEFAULT_HISTORY_INITIAL_SIZE; - the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); -! new_length = 1; - } - else -*************** -*** 326,330 **** - xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); - } -! history_length++; - } - } ---- b/323,327 ---- - xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); - } -! new_length = history_length + 1; - } - } -*************** -*** 332,337 **** - temp = alloc_history_entry ((char *)string, hist_inittime ()); - -! the_history[history_length] = (HIST_ENTRY *)NULL; -! the_history[history_length - 1] = temp; - } - ---- b/329,335 ---- - temp = alloc_history_entry ((char *)string, hist_inittime ()); - -! the_history[new_length] = (HIST_ENTRY *)NULL; -! the_history[new_length - 1] = temp; -! history_length = new_length; - } - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-010.patch b/package/bash/bash44-010.patch deleted file mode 100644 index 8da1ec5bea..0000000000 --- a/package/bash/bash44-010.patch +++ /dev/null @@ -1,53 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-010 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-010 - -Bug-Reported-by: Clark Wang -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html - -Bug-Description: - -Depending on compiler optimizations and behavior, the `read' builtin may not -save partial input when a timeout occurs. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/builtins/read.def 2016-05-16 14:24:56.000000000 -0400 ---- b/builtins/read.def 2016-11-25 12:37:56.000000000 -0500 -*************** -*** 182,186 **** - { - register char *varname; -! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2; - int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul; - int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno; ---- b/182,187 ---- - { - register char *varname; -! int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2; -! volatile int i; - int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul; - int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno; - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-011.patch b/package/bash/bash44-011.patch deleted file mode 100644 index cca66aad26..0000000000 --- a/package/bash/bash44-011.patch +++ /dev/null @@ -1,54 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-011 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-011 - -Bug-Reported-by: Russell King -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html - -Bug-Description: - -Subshells begun to run command and process substitutions may attempt to -set the terminal's process group to an incorrect value if they receive -a fatal signal. This depends on the behavior of the process that starts -the shell. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/sig.c 2016-02-11 15:02:45.000000000 -0500 ---- b/sig.c 2017-01-04 09:09:47.000000000 -0500 -*************** -*** 586,590 **** - if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)))) - hangup_all_jobs (); -! end_job_control (); - #endif /* JOB_CONTROL */ - ---- b/571,576 ---- - if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)))) - hangup_all_jobs (); -! if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0) -! end_job_control (); - #endif /* JOB_CONTROL */ - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash44-012.patch b/package/bash/bash44-012.patch deleted file mode 100644 index ef081f9198..0000000000 --- a/package/bash/bash44-012.patch +++ /dev/null @@ -1,165 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-012 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-012 - -Bug-Reported-by: Clark Wang -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html - -Bug-Description: - -When -N is used, the input is not supposed to be split using $IFS, but -leading and trailing IFS whitespace was still removed. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/subst.c 2017-01-20 14:22:01.000000000 -0500 ---- b/subst.c 2017-01-25 13:43:22.000000000 -0500 -*************** -*** 2826,2834 **** - /* Parse a single word from STRING, using SEPARATORS to separate fields. - ENDPTR is set to the first character after the word. This is used by -! the `read' builtin. This is never called with SEPARATORS != $IFS; -! it should be simplified. - - XXX - this function is very similar to list_string; they should be - combined - XXX */ - char * - get_word_from_string (stringp, separators, endptr) ---- b/2826,2838 ---- - /* Parse a single word from STRING, using SEPARATORS to separate fields. - ENDPTR is set to the first character after the word. This is used by -! the `read' builtin. -! -! This is never called with SEPARATORS != $IFS, and takes advantage of that. - - XXX - this function is very similar to list_string; they should be - combined - XXX */ -+ -+ #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0) -+ - char * - get_word_from_string (stringp, separators, endptr) -*************** -*** 2838,2841 **** ---- b/2842,2846 ---- - char *current_word; - int sindex, sh_style_split, whitesep, xflags; -+ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */ - size_t slen; - -*************** -*** 2847,2854 **** - separators[2] == '\n' && - separators[3] == '\0'; -! for (xflags = 0, s = ifs_value; s && *s; s++) - { - if (*s == CTLESC) xflags |= SX_NOCTLESC; - if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; - } - ---- b/2852,2861 ---- - separators[2] == '\n' && - separators[3] == '\0'; -! memset (local_cmap, '\0', sizeof (local_cmap)); -! for (xflags = 0, s = separators; s && *s; s++) - { - if (*s == CTLESC) xflags |= SX_NOCTLESC; - if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; -+ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */ - } - -*************** -*** 2857,2864 **** - - /* Remove sequences of whitespace at the beginning of STRING, as -! long as those characters appear in IFS. */ -! if (sh_style_split || !separators || !*separators) - { -! for (; *s && spctabnl (*s) && isifs (*s); s++); - - /* If the string is nothing but whitespace, update it and return. */ ---- b/2864,2872 ---- - - /* Remove sequences of whitespace at the beginning of STRING, as -! long as those characters appear in SEPARATORS. This happens if -! SEPARATORS == $' \t\n' or if IFS is unset. */ -! if (sh_style_split || separators == 0) - { -! for (; *s && spctabnl (*s) && islocalsep (*s); s++); - - /* If the string is nothing but whitespace, update it and return. */ -*************** -*** 2879,2885 **** - This obeys the field splitting rules in Posix.2. */ - sindex = 0; -! /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim -! unless multibyte chars are possible. */ -! slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1; - current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags); - ---- b/2887,2893 ---- - This obeys the field splitting rules in Posix.2. */ - sindex = 0; -! /* Don't need string length in ADVANCE_CHAR unless multibyte chars are -! possible, but need it in string_extract_verbatim for bounds checking */ -! slen = STRLEN (s); - current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags); - -*************** -*** 2900,2904 **** - /* Now skip sequences of space, tab, or newline characters if they are - in the list of separators. */ -! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex])) - sindex++; - ---- b/2908,2912 ---- - /* Now skip sequences of space, tab, or newline characters if they are - in the list of separators. */ -! while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex])) - sindex++; - -*************** -*** 2907,2916 **** - delimiter, not a separate delimiter that would result in an empty field. - Look at POSIX.2, 3.6.5, (3)(b). */ -! if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex])) - { - sindex++; - /* An IFS character that is not IFS white space, along with any adjacent - IFS white space, shall delimit a field. */ -! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex])) - sindex++; - } ---- b/2915,2924 ---- - delimiter, not a separate delimiter that would result in an empty field. - Look at POSIX.2, 3.6.5, (3)(b). */ -! if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex])) - { - sindex++; - /* An IFS character that is not IFS white space, along with any adjacent - IFS white space, shall delimit a field. */ -! while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex])) - sindex++; - } -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ From f961d630208f14f808e4f2143cda7f4d1401a36a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 09:16:45 -0500 Subject: [PATCH 048/160] fftw: bump to 3.3.7 In addition, add a hash for the license file Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/fftw/fftw.hash | 7 ++++--- package/fftw/fftw.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index b00f447e06..faf4b904c9 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,4 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.6-pl2.tar.gz.md5sum -md5 927e481edbb32575397eb3d62535a856 fftw-3.3.6-pl2.tar.gz +# From http://www.fftw.org/fftw-3.3.7.tar.gz.md5sum +md5 0d5915d7d39b3253c1cc05030d79ac47 fftw-3.3.7.tar.gz # Locally computed -sha256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 fftw-3.3.6-pl2.tar.gz +sha256 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573 fftw-3.3.7.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 0f32f7958b..b3aa4b6b14 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.6-pl2 +FFTW_VERSION = 3.3.7 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ From 1d91238af83f5eecb98410a1864ce1ab1958c4fc Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 09:24:09 -0500 Subject: [PATCH 049/160] nginx: bump to 1.12.2 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 6eef1dbdc5..9936ca1dfa 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb nginx-1.12.1.tar.gz +sha256 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 nginx-1.12.2.tar.gz # License files, locally calculated sha256 75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index ceb80229d3..e5652af6df 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.12.1 +NGINX_VERSION = 1.12.2 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From b7e574146f9088f6f7a484308756c188b431fe3e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 09:32:03 -0500 Subject: [PATCH 050/160] time: bump to 1.8 In addition: - Update license to GPL-3.0+ - Add a shash for the license file. See: https://lists.gnu.org/archive/html/info-gnu/2017-11/msg00002.html for more information. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/time/time.hash | 3 ++- package/time/time.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/time/time.hash b/package/time/time.hash index 6ad8c24e54..7d395bfb6c 100644 --- a/package/time/time.hash +++ b/package/time/time.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d time-1.7.tar.gz +sha256 8a2f540155961a35ba9b84aec5e77e3ae36c74cecb4484db455960601b7a2e1b time-1.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/time/time.mk b/package/time/time.mk index 8092ea9556..c238ee6e27 100644 --- a/package/time/time.mk +++ b/package/time/time.mk @@ -4,10 +4,10 @@ # ################################################################################ -TIME_VERSION = 1.7 +TIME_VERSION = 1.8 TIME_SITE = $(BR2_GNU_MIRROR)/time TIME_CONF_ENV = ac_cv_func_wait3=yes -TIME_LICENSE = GPL-2.0+ +TIME_LICENSE = GPL-3.0+ TIME_LICENSE_FILES = COPYING # time uses an old version of automake that does not support From 5eb9f431fa29b3572971f28e687d96c15ecd8519 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 09:57:58 -0500 Subject: [PATCH 051/160] pango: bump to 1.140.14 In addition, add a hash for the license file. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/pango/pango.hash | 5 +++-- package/pango/pango.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 1b6da7d32b..6df08e9cfc 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,2 +1,3 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.12.sha256sum -sha256 75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc pango-1.40.12.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.14.sha256sum +sha256 90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3 pango-1.40.14.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 79283e885c..805d35e12f 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.40 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).12 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).14 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_AUTORECONF = YES From a54794e6525444f1031d468e2d16889df334b626 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 10:03:25 -0500 Subject: [PATCH 052/160] libxml2: bump to 2.9.7 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 217a51fc96..f7e046bff6 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 libxml2-2.9.5.tar.gz +sha256 f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c libxml2-2.9.7.tar.gz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 1b870c4cbd..a6285a6946 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.5 +LIBXML2_VERSION = 2.9.7 LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT From 40d26ab924ab5db3bfa31c126c7a8c37f300faeb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 10:07:46 -0500 Subject: [PATCH 053/160] harfbuzz: bump to 1.7.1 In addition, add a hash for the license file. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 7 +++++-- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index d44bd561ba..5f786dcb87 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,2 +1,5 @@ -# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.5.0.tar.bz2.sha256 -sha256 c088ec363be8d03f7708feb76dd22d5f102678e67d6ce63b02496ca0beb64ac1 harfbuzz-1.5.0.tar.bz2 +# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.1.tar.bz2.sha256 +sha256 9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e harfbuzz-1.7.1.tar.bz2 + +# Locally computed +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 0ee6a6b0f7..5708745fd2 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.5.0 +HARFBUZZ_VERSION = 1.7.1 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From aceb8fa982c8a54f4799b32c006c3b91bc3328f1 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 10:13:56 -0500 Subject: [PATCH 054/160] libpng: bump to 1.6.34 In addition, add a hash for the license file. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libpng/libpng.hash | 10 ++++++---- package/libpng/libpng.mk | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 074cf5fb83..0a0cebee91 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,5 +1,7 @@ -# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.32/ -md5 e01be057a9369183c959b793a685ad15 libpng-1.6.32.tar.xz -sha1 161d91d15cfd739773e0a73b41032b9f27322914 libpng-1.6.32.tar.xz +# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.34/ +md5 c05b6ca7190a5e387b78657dbe5536b2 libpng-1.6.34.tar.xz +sha1 45de4ec996ffcc3e18037e7c128abe95f4d0292a libpng-1.6.34.tar.xz + # Locally computed: -sha256 c918c3113de74a692f0a1526ce881dc26067763eb3915c57ef3a0f7b6886f59b libpng-1.6.32.tar.xz +sha256 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6 libpng-1.6.34.tar.xz +sha256 a247c24f82bacf0403fe2f3d5550493a91cdb575fe7036b764bda8cacf3efd9c LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 2aa0217121..f8594c808f 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.32 +LIBPNG_VERSION = 1.6.34 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) From 78e964bc22a8ecab1b8b11b23b30824737da218d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 10:18:40 -0500 Subject: [PATCH 055/160] expat: bump to 2.2.5 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/expat/expat.hash | 10 +++++----- package/expat/expat.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index ef01ec9948..945e102342 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.4/ -md5 6e3980aba29a224a9f478d88ac7ec207 expat-2.2.4.tar.bz2 -sha1 3394d6390c041a8f5dec1d5fe7c4af0a23ae4504 expat-2.2.4.tar.bz2 -# Calculated based on the hashes above -sha256 03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e expat-2.2.4.tar.bz2 +# From https://sourceforge.net/projects/expat/files/expat/2.2.5/ +md5 789e297f547980fc9ecc036f9a070d49 expat-2.2.5.tar.bz2 +sha1 490659abd7d6c6d4cb4e60c945a15fbf081564f6 expat-2.2.5.tar.bz2 + # Locally calculated +sha256 d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 expat-2.2.5.tar.bz2 sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index ef196ec40c..69c457da3d 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.4 +EXPAT_VERSION = 2.2.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_INSTALL_STAGING = YES From 223e5867eda125ae10b0e2b963ff9ce3ed6eaa30 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 20 Nov 2017 10:24:24 -0500 Subject: [PATCH 056/160] freetype: bump to 2.8.1 In addition, add hashes for all three license files. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/freetype/freetype.hash | 15 ++++++++++----- package/freetype/freetype.mk | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index beff85846f..3997e81992 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,5 +1,10 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.8/ -md5 2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2 -sha1 42c6b1f733fe13a3eba135f5025b22cb68450f91 freetype-2.8.tar.bz2 -# Locally calculated after checking pgp signature -sha256 a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b freetype-2.8.tar.bz2 +# From https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/ +md5 bf0a210b6fe781228fa0e4a80691a521 freetype-2.8.1.tar.bz2 +sha1 417bb3747c4ac95b6f2652024a53fad45581fa1c freetype-2.8.1.tar.bz2 + +# Locally calculated +sha256 e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 freetype-2.8.1.tar.bz2 +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 4a9a548027a2c1d37788519dea833294c9c81f1ebc280e817f41f50d0c642d78 docs/FTL.TXT +sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT + diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 9a98b4068b..1028664799 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.8 +FREETYPE_VERSION = 2.8.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 273aad9e507eedf5245a004be8f7372a7c4d5ca7 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Thu, 9 Nov 2017 09:14:17 -0800 Subject: [PATCH 057/160] python-raven: new package Changes since v2: - remove newlines from Config.in - add LICENSE hash Changes since v1: - reword commit to match upstream style - fold the DEVELOPERS modifications into the same commit - add Config selections for required python core modules - bump version to 6.3.0 Tested in a clean chroot, events are generated for exceptions, and reported to the server configured for the client. Signed-off-by: Joseph Kogut Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-raven/Config.in | 12 ++++++++++++ package/python-raven/python-raven.hash | 5 +++++ package/python-raven/python-raven.mk | 14 ++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/python-raven/Config.in create mode 100644 package/python-raven/python-raven.hash create mode 100644 package/python-raven/python-raven.mk diff --git a/DEVELOPERS b/DEVELOPERS index df61a0138c..966a30bcd2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -796,6 +796,7 @@ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig N: Joseph Kogut +F: package/python-raven/ F: package/python-websockets/ N: Johan Derycke diff --git a/package/Config.in b/package/Config.in index 23526b4124..a207de8cc4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -875,6 +875,7 @@ menu "External python modules" source "package/python-pyxb/Config.in" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" + source "package/python-raven/Config.in" source "package/python-requests/Config.in" source "package/python-requests-toolbelt/Config.in" source "package/python-rpi-gpio/Config.in" diff --git a/package/python-raven/Config.in b/package/python-raven/Config.in new file mode 100644 index 0000000000..0d4b26c054 --- /dev/null +++ b/package/python-raven/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_RAVEN + bool "python-raven" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + help + Raven is a client for Sentry (https://getsentry.com). + + https://github.com/getsentry/raven-python diff --git a/package/python-raven/python-raven.hash b/package/python-raven/python-raven.hash new file mode 100644 index 0000000000..3ed123996d --- /dev/null +++ b/package/python-raven/python-raven.hash @@ -0,0 +1,5 @@ +# md5 from https://pypi.python.org/pypi/raven/json, sha256 locally computed +md5 2efce7acbabe1a0f32d168736a654789 raven-6.3.0.tar.gz +sha256 f3e465a545dcdb6a387d1fcb199d08f786ba3732d7ce6aa681718b04da6aedf1 raven-6.3.0.tar.gz +# License file, locally calculated +sha256 5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233 LICENSE diff --git a/package/python-raven/python-raven.mk b/package/python-raven/python-raven.mk new file mode 100644 index 0000000000..c17aac4a3d --- /dev/null +++ b/package/python-raven/python-raven.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-raven +# +################################################################################ + +PYTHON_RAVEN_VERSION = 6.3.0 +PYTHON_RAVEN_SOURCE = raven-$(PYTHON_RAVEN_VERSION).tar.gz +PYTHON_RAVEN_SITE = https://pypi.python.org/packages/e8/b0/27886f69cdb4d9f6265bba1c4973bb5371b060272a5795c511d8839a6028 +PYTHON_RAVEN_SETUP_TYPE = setuptools +PYTHON_RAVEN_LICENSE = BSD-3-Clause +PYTHON_RAVEN_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 099c2ceaa8adfcdcbbaf039000e1fe26a33a6165 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 8 Nov 2017 22:05:33 -0200 Subject: [PATCH 058/160] util-linux: explicitly use /usr/{bin, sbin, lib}, with merged usr Prevent the installation from attempting to move shared libraries from ${usrlib_execdir} to ${libdir} if both paths are the same, which leads to error messages like this: mv: '$(TARGET_DIR)/usr/lib/libfoo.so.1' and '$(TARGET_DIR)/lib/libfoo.so.1' are the same file That error is not fatal but let's avoid possible future problems. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 8464288600..31a3fe47ab 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL_LINUX_DEPENDENCIES += busybox endif +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) From 6e22ed19e1a0e8367f15b10c7727cce5363fe236 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 8 Nov 2017 08:04:58 -0500 Subject: [PATCH 059/160] openntpd: update to 6.2p3 Other changes: - Remove upstream patch. - Change locally computed hash to hash from the SHA256 URL. - Add sha256sum for license file. Note that we need to keep _AUTORECONF = YES even though the patch touching the Makefile.am has been removed, because our libtool patch doesn't apply on the bundled ltmain.sh. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...rt-use-__dead-macro-from-sys-cdefs.h.patch | 91 ------------------- ...002-fix-musl.patch => 0001-fix-musl.patch} | 0 package/openntpd/openntpd.hash | 5 +- package/openntpd/openntpd.mk | 4 +- 4 files changed, 6 insertions(+), 94 deletions(-) delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%) diff --git a/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch b/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch deleted file mode 100644 index 418f7a2098..0000000000 --- a/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 17aa5d98191c4dc85d0645443fc97a12601ae8da Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 26 Sep 2017 14:55:31 +0300 -Subject: [PATCH] Revert "use __dead macro from sys/cdefs.h" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This partially reverts commit a7577667d673f49800e15461fe384817a1572eae. - -The musl C library does not use an internal cdefs.h header. As a result, -the definitions in sys/cdefs.h have no effect. This breads the build as -follows: - -In file included from adjfreq_linux.c:23:0: -../src/ntpd.h:448:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’ - __dead void fatal(const char *, ...) - ^~~~ -../src/ntpd.h:450:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’ - __dead void fatalx(const char *, ...) - ^~~~ - -Refer the related musl FAQ about cdefs.h: - - http://wiki.musl-libc.org/wiki/FAQ#Q:_I.27m_trying_to_compile_something_against_musl_and_I_get_error_messages_about_sys.2Fcdefs.h - -Keep the compiler attribute definition. - -Remove also from noinst_HEADERS. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/openntpd-portable/openntpd-portable/pull/45 - - include/Makefile.am | 1 - - include/sys/cdefs.h | 16 ---------------- - include/sys/types.h | 4 ++++ - 3 files changed, 4 insertions(+), 17 deletions(-) - delete mode 100644 include/sys/cdefs.h - -diff --git a/include/Makefile.am b/include/Makefile.am -index a552026e8f25..3a5a01620d82 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -1,6 +1,5 @@ - noinst_HEADERS = - noinst_HEADERS += machine/endian.h --noinst_HEADERS += sys/cdefs.h - noinst_HEADERS += sys/queue.h - noinst_HEADERS += sys/socket.h - noinst_HEADERS += sys/types.h -diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h -deleted file mode 100644 -index 3dec43deec28..000000000000 ---- a/include/sys/cdefs.h -+++ /dev/null -@@ -1,16 +0,0 @@ --/* -- * Public domain -- * sys/cdefs.h compatibility shim -- */ -- --#include_next -- --#ifndef LIBCOMPAT_SYS_CDEFS_H --#define LIBCOMPAT_SYS_CDEFS_H -- --#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) --#define __dead __attribute__((__noreturn__)) --#define __pure __attribute__((__const__)) --#endif -- --#endif -diff --git a/include/sys/types.h b/include/sys/types.h -index 56aef0b61af8..86821c732ec3 100644 ---- a/include/sys/types.h -+++ b/include/sys/types.h -@@ -14,6 +14,10 @@ - #include <_bsd_types.h> - #endif - -+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) -+#define __dead __attribute__((__noreturn__)) -+#endif -+ - #if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__) - # define __bounded__(x, y, z) - #endif --- -2.14.1 - diff --git a/package/openntpd/0002-fix-musl.patch b/package/openntpd/0001-fix-musl.patch similarity index 100% rename from package/openntpd/0002-fix-musl.patch rename to package/openntpd/0001-fix-musl.patch diff --git a/package/openntpd/openntpd.hash b/package/openntpd/openntpd.hash index 1a73e8dc0b..4d00b7bb9d 100644 --- a/package/openntpd/openntpd.hash +++ b/package/openntpd/openntpd.hash @@ -1,2 +1,5 @@ +# from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256 +sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a openntpd-6.2p3.tar.gz + # Locally computed -sha256 5808a4137b008a4db20907e1a482f474734b120f254e3c5feb90db15e0820fb2 openntpd-6.2p2.tar.gz +sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 308a1b1258..96d3881d21 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -4,11 +4,11 @@ # ################################################################################ -OPENNTPD_VERSION = 6.2p2 +OPENNTPD_VERSION = 6.2p3 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause OPENNTPD_LICENSE_FILES = COPYING -# Patching include/Makefile.am +# Need to autoreconf for our libtool patch to apply properly OPENNTPD_AUTORECONF = YES # openntpd uses pthread functions for arc4random emulation but forgets From 8c817edd7c207b658f5e6d93005b80c9c31f9d06 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 8 Nov 2017 08:04:59 -0500 Subject: [PATCH 060/160] openntpd: add optional dependency on LibreSSL OpenNTPD looks for a crypto library with tls_config_set_ca_mem, which is available in LibreSSL but not OpenSSL. If tls_config_set_ca_mem is found, crypto support is added to the build. Because this is not currently checked, crypto support might not be added due to the order of the build. Add a small check to see if BR2_PACKAGE_LIBRESSL is selected, and if so, add a dependency for it. Also add a note about this in the Config.in help section. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openntpd/Config.in | 3 +++ package/openntpd/openntpd.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in index 1b856c03b8..c84d0ba25b 100644 --- a/package/openntpd/Config.in +++ b/package/openntpd/Config.in @@ -9,6 +9,9 @@ config BR2_PACKAGE_OPENNTPD to remote NTP servers and can act as NTP server itself, redistributing the local clock. It just works. + Crypto support is available if the LibreSSL library is + enabled. + http://www.openntpd.org/ comment "openntpd needs a toolchain w/ NPTL" diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 96d3881d21..f5a5690479 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -11,6 +11,12 @@ OPENNTPD_LICENSE_FILES = COPYING # Need to autoreconf for our libtool patch to apply properly OPENNTPD_AUTORECONF = YES +# Openntpd searches for tls_config_set_ca_mem which is only available +# in LibreSSL +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +OPENNTPD_DEPENDENCIES += openssl +endif + # openntpd uses pthread functions for arc4random emulation but forgets # to use -pthread OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread" From f56422d7a08a819539b375f4187e9d50f0204678 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 23 Nov 2017 10:49:44 +0100 Subject: [PATCH 061/160] configs/armadeus_apf28: bump kernel version to latest 4.9 LTS As there is now a defconfig inside kernel sources for mxs platforms, use it. Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- board/armadeus/apf28/linux-4.4.config | 185 -------------------------- configs/armadeus_apf28_defconfig | 9 +- 2 files changed, 4 insertions(+), 190 deletions(-) delete mode 100644 board/armadeus/apf28/linux-4.4.config diff --git a/board/armadeus/apf28/linux-4.4.config b/board/armadeus/apf28/linux-4.4.config deleted file mode 100644 index cf389d80fa..0000000000 --- a/board/armadeus/apf28/linux-4.4.config +++ /dev/null @@ -1,185 +0,0 @@ -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EMBEDDED=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_MXS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CPU_IDLE=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_CAN=m -CONFIG_CAN_VCAN=m -CONFIG_CAN_FLEXCAN=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_MAC80211_RC_PID=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_M25P80=y -# CONFIG_M25PXX_USE_FAST_READ is not set -CONFIG_MTD_SST25L=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_GPMI_NAND=y -CONFIG_MTD_UBI=y -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_AT25=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_RTL8187=m -CONFIG_RT2X00=m -CONFIG_RT73USB=m -CONFIG_ZD1211RW=m -CONFIG_INPUT_JOYDEV=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_SERIO_SERPORT is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_MXS_AUART=y -CONFIG_TTY_PRINTK=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MXS=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=m -CONFIG_SPI_MXS=y -CONFIG_SPI_SPIDEV=m -CONFIG_GPIO_SYSFS=y -CONFIG_HWMON=m -CONFIG_WATCHDOG=y -CONFIG_STMP3XXX_RTC_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_MEDIA_SUPPORT=m -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_FB=y -CONFIG_FB_MXS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_PWM=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_ACM=y -CONFIG_USB_PRINTER=y -CONFIG_USB_WDM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_MXS_PHY=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG_FILES=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_MXS=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_STMP=y -CONFIG_DMADEVICES=y -CONFIG_MXS_DMA=y -CONFIG_STAGING=y -CONFIG_MXS_LRADC=y -CONFIG_IIO=y -CONFIG_PWM=y -CONFIG_PWM_MXS=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_AUTOFS4_FS=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_FS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_FONTS=y -CONFIG_FONT_8x8=y diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig index 31fb52897b..51e05f59f7 100644 --- a/configs/armadeus_apf28_defconfig +++ b/configs/armadeus_apf28_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # System BR2_TARGET_GENERIC_HOSTNAME="apf28" @@ -13,9 +13,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-4.4.config" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.64" +BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 475fb214c55a0207ec7546ade498aafa638476e2 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 23 Nov 2017 12:38:42 -0200 Subject: [PATCH 062/160] configs/imx6ulevk: Add new defconfig Add support for imx6ulevk_defconfig that allows booting a mainline kernel and mainline U-Boot. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + board/freescale/imx6ulevk/readme.txt | 10 ++++++++ configs/imx6ulevk_defconfig | 37 ++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 configs/imx6ulevk_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7a486551e..747977df7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,6 +128,7 @@ imx6-sabresd_defconfig: *defconfig imx6-sabresd_qt5_defconfig: *defconfig imx6slevk_defconfig: *defconfig imx6sxsdb_defconfig: *defconfig +imx6ulevk_defconfig: *defconfig imx6ulpico_defconfig: *defconfig imx7dpico_defconfig: *defconfig lego_ev3_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 966a30bcd2..442dc05199 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -579,6 +579,7 @@ F: configs/freescale_imx* F: configs/imx6-sabresd* F: configs/imx6slevk_defconfig F: configs/imx6sxsdb_defconfig +F: configs/imx6ulevk_defconfig F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig F: configs/mx6sx_udoo_neo_defconfig diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 25b95fec52..90355f354f 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -12,8 +12,18 @@ Build First, configure Buildroot for your i.MX6UL EVK board: +In order to to do so there are two supported options: + make freescale_imx6ulevk_defconfig +if you plan to use NXP provided U-Boot and kernel. + +or + + make imx6ulevk_defconfig + +if you plan to use mainline U-Boot and mainline kernel. + Build all components: make diff --git a/configs/imx6ulevk_defconfig b/configs/imx6ulevk_defconfig new file mode 100644 index 0000000000..0ae6b5308e --- /dev/null +++ b/configs/imx6ulevk_defconfig @@ -0,0 +1,37 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y + +# system +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk" + +# bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" + +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# filesystem / image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y From 85739a08046fdc708d42378f2f79532e2382101c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 23 Nov 2017 12:40:08 -0200 Subject: [PATCH 063/160] configs/imx6-sabreauto: Bump kernel and U-Boot versions Bump kernel to version 4.14 and U-Boot to 2017.11. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabreauto_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx6-sabreauto_defconfig b/configs/imx6-sabreauto_defconfig index f81964c5e0..d9a08bbe70 100644 --- a/configs/imx6-sabreauto_defconfig +++ b/configs/imx6-sabreauto_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto" From af9ef95fd9626118f111ffea8efb2a5853c9bcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 18 Nov 2017 20:54:58 -0500 Subject: [PATCH 064/160] netcat-openbsd: add source and license hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- package/netcat-openbsd/netcat-openbsd.hash | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package/netcat-openbsd/netcat-openbsd.hash diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash new file mode 100644 index 0000000000..e90a41a8a9 --- /dev/null +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f587c02139aedb0bae12fdaef94f8c00649a0b4d603b5a22612e42cb317ba7cf netcat-openbsd-debian_1.178-3.tar.gz +sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright From daa10662c02da1a0db7fb59a2e12614a2d0015fd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Nov 2017 21:24:40 +0100 Subject: [PATCH 065/160] libupnp18: new package Branch 1.8.x of libupnp is not compatible with branch 1.6.x so add a dedicated package and make it depends on !BR2_PACKAGE_LIBUPNP as suggested by Thomas Petazzoni and Arnout Vandecappelle during review of "libupnp: add 1.8.3 version" patch. Signed-off-by: Fabrice Fontaine [Thomas: fix the dependencies of the Config.in comment.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libupnp18/Config.in | 16 ++++++++++++++++ package/libupnp18/libupnp18.hash | 3 +++ package/libupnp18/libupnp18.mk | 15 +++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/libupnp18/Config.in create mode 100644 package/libupnp18/libupnp18.hash create mode 100644 package/libupnp18/libupnp18.mk diff --git a/DEVELOPERS b/DEVELOPERS index 442dc05199..f93c617cf5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -611,6 +611,7 @@ F: package/gupnp-dlna/ F: package/gupnp-tools/ F: package/hiredis/ F: package/igd2-for-linux/ +F: package/libupnp18/ F: package/minissdpd/ F: package/motion/ F: package/tinycbor/ diff --git a/package/Config.in b/package/Config.in index a207de8cc4..4a7327c70c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1383,6 +1383,7 @@ menu "Networking" source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" + source "package/libupnp18/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" source "package/libvncserver/Config.in" diff --git a/package/libupnp18/Config.in b/package/libupnp18/Config.in new file mode 100644 index 0000000000..58508e4e26 --- /dev/null +++ b/package/libupnp18/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBUPNP18 + bool "libupnp18" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_LIBUPNP + help + The portable SDK for UPnP(tm) Devices (libupnp) provides + developers with an API and open source code for building + control points, devices, and bridges that are compliant with + Version 1.0 of the Universal Plug and Play Device Architecture + Specification + + http://pupnp.sourceforge.net/ + +comment "libupnp18 needs a toolchain w/ threads" + depends on !BR2_PACKAGE_LIBUPNP + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libupnp18/libupnp18.hash b/package/libupnp18/libupnp18.hash new file mode 100644 index 0000000000..a5b5b074c9 --- /dev/null +++ b/package/libupnp18/libupnp18.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 9afa0b09faa9ebd9e8a6425ddbfe8d1d856544c49b1f86fde221219e569a308d libupnp-1.8.3.tar.bz2 +sha256 0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd LICENSE diff --git a/package/libupnp18/libupnp18.mk b/package/libupnp18/libupnp18.mk new file mode 100644 index 0000000000..a75558e92b --- /dev/null +++ b/package/libupnp18/libupnp18.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libupnp18 +# +################################################################################ + +LIBUPNP18_VERSION = 1.8.3 +LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2 +LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP18_VERSION) +LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no +LIBUPNP18_INSTALL_STAGING = YES +LIBUPNP18_LICENSE = BSD-3-Clause +LIBUPNP18_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) From 8d641674bffb3e824991247b9f2458d28fc03c1c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 14 Nov 2017 10:56:57 -0200 Subject: [PATCH 066/160] configs/mx53loco: Bump U-Boot and kernel versions Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx53loco_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 0f94aa765b..1b10518a92 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" From 746f94c282fcc2c0728b53e24d96e7553fcaa46a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 Nov 2017 07:51:50 +0100 Subject: [PATCH 067/160] package/dovecot: bump version to 2.2.33.2 Added license hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-byteorder.h-fix-uclibc-build.patch | 32 +++++++++++++++++++ package/dovecot/dovecot.hash | 5 ++- package/dovecot/dovecot.mk | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/dovecot/0001-byteorder.h-fix-uclibc-build.patch diff --git a/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch b/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch new file mode 100644 index 0000000000..b6d3ed3ec0 --- /dev/null +++ b/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch @@ -0,0 +1,32 @@ +From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001 +From: Josef 'Jeff' Sipek +Date: Tue, 14 Nov 2017 06:01:21 +0100 +Subject: [PATCH] byteorder.h: fix uclibc build + +Patch suggested on upstream mailinglist: +https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html + +Signed-off-by: Bernd Kuhls +--- + src/lib/byteorder.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h +index 2f5dc7c17..4ffe8da21 100644 +--- a/src/lib/byteorder.h ++++ b/src/lib/byteorder.h +@@ -23,6 +23,11 @@ + #ifndef BYTEORDER_H + #define BYTEORDER_H + ++#undef bswap_8 ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /* + * These prototypes exist to catch bugs in the code generating macros below. + */ +-- +2.11.0 + diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 184745b394..33163d6d8c 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,5 @@ # Locally computed after checking signature -sha256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 dovecot-2.2.31.tar.gz +sha256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 dovecot-2.2.33.2.tar.gz +sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 4cc6ae4de7..25a78b9f78 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).31 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1 From 59e59a0b660241e57000df34cdbc2a1304a4d7a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 Nov 2017 07:51:51 +0100 Subject: [PATCH 068/160] package/dovecot-pigeonhole: bump version to 0.4.21 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 3 ++- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 137870f987..a2b7eba9de 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,2 +1,3 @@ # Locally computed after checking signature -sha256 629204bfbdcd3480e1ebcdc246da438323c3ea5fea57480ab859e8b201ad8793 dovecot-2.2-pigeonhole-0.4.19.tar.gz +sha256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a dovecot-2.2-pigeonhole-0.4.21.tar.gz +sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 6b835d3b19..ea8b0077f0 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.4.19 +DOVECOT_PIGEONHOLE_VERSION = 0.4.21 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From cf51842fcb6d8f9ce44536b46d7341a3b6cb5db9 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 23 Nov 2017 11:54:59 +0100 Subject: [PATCH 069/160] python-jaraco-classes: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-jaraco-classes/Config.in | 7 +++++++ .../python-jaraco-classes.hash | 4 ++++ .../python-jaraco-classes/python-jaraco-classes.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-jaraco-classes/Config.in create mode 100644 package/python-jaraco-classes/python-jaraco-classes.hash create mode 100644 package/python-jaraco-classes/python-jaraco-classes.mk diff --git a/package/Config.in b/package/Config.in index 4a7327c70c..54f6f57e6d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -789,6 +789,7 @@ menu "External python modules" source "package/python-ipython-genutils/Config.in" source "package/python-iso8601/Config.in" source "package/python-itsdangerous/Config.in" + source "package/python-jaraco-classes/Config.in" source "package/python-jinja2/Config.in" source "package/python-jsonschema/Config.in" source "package/python-json-schema-validator/Config.in" diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in new file mode 100644 index 0000000000..05c11237ab --- /dev/null +++ b/package/python-jaraco-classes/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_JARACO_CLASSES + bool "python-jaraco-classes" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Utility functions for Python class constructs. + + https://github.com/jaraco/jaraco.classes diff --git a/package/python-jaraco-classes/python-jaraco-classes.hash b/package/python-jaraco-classes/python-jaraco-classes.hash new file mode 100644 index 0000000000..bc30c5f79b --- /dev/null +++ b/package/python-jaraco-classes/python-jaraco-classes.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/jaraco.classes/json, sha256 locally computed +md5 c0cb1a0ce529e3cdbca9d99742071a04 jaraco.classes-1.4.3.tar.gz +sha256 e347f2b502521bfc35c57ab4695e8b6d7371625c392a0ca0d46742ee93359d3e jaraco.classes-1.4.3.tar.gz +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk new file mode 100644 index 0000000000..4251452293 --- /dev/null +++ b/package/python-jaraco-classes/python-jaraco-classes.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jaraco-classes +# +################################################################################ + +PYTHON_JARACO_CLASSES_VERSION = 1.4.3 +PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz +PYTHON_JARACO_CLASSES_SITE = https://pypi.python.org/packages/b3/ce/031a6004619c2a3744b977b4a8414d7e8087afe6247110efcac797fee7f1 +PYTHON_JARACO_CLASSES_LICENSE = MIT +PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE +PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 4874efd6ffbb5360d29aa1a9525ed8ebe3a45397 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 23 Nov 2017 11:55:00 +0100 Subject: [PATCH 070/160] python-cheroot: bump version to 5.9.0 Omit 5.9.1 as is has broken Python files. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-cheroot/python-cheroot.hash | 6 +++--- package/python-cheroot/python-cheroot.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index 348b82d1ca..7b309a9399 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/cheroot/json, sha256 locally computed -md5 e5503b0e67bdba29c6585965e7f42099 cheroot-5.5.0.tar.gz -sha256 59e349f91b9230930f7078646bb92b3a5b0f9cf19a6ff949777409fd289a1eba cheroot-5.5.0.tar.gz +# md5 from https://pypi.python.org/pypi/Cheroot/json, sha256 locally computed +md5 288eb3a6df4964ba0435493d2914da3d cheroot-5.9.0.tar.gz +sha256 d8ec06b6e907b911ac5bb626876ee498c289d21f1a638cb2510fc57290567ef5 cheroot-5.9.0.tar.gz diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 3f4b6893d5..d3e056be36 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 5.5.0 +PYTHON_CHEROOT_VERSION = 5.9.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/a5/43/f8a461762dc62e9f273d4944fb8c140757c11a29c91c91d3fbd5fafb1570 +PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/df/63/5c5265feb7e02e43d2f3a3c19dbb2d78742b0a2ff237c9e473c77bc23500 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools From c36f636393df8bb7278022acfe523b9e4adc9bcd Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 23 Nov 2017 11:55:01 +0100 Subject: [PATCH 071/160] python-cherrypy: bump version to 12.0.1 Add licence file checksum and new runtime dependencies. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-cherrypy/Config.in | 1 + package/python-cherrypy/python-cherrypy.hash | 5 +++-- package/python-cherrypy/python-cherrypy.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in index c04997269b..622dd1f49b 100644 --- a/package/python-cherrypy/Config.in +++ b/package/python-cherrypy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" select BR2_PACKAGE_PYTHON_CHEROOT # runtime + select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime select BR2_PACKAGE_PYTHON_PORTEND # runtime select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime diff --git a/package/python-cherrypy/python-cherrypy.hash b/package/python-cherrypy/python-cherrypy.hash index ac3b982ba8..d8f97af0f7 100644 --- a/package/python-cherrypy/python-cherrypy.hash +++ b/package/python-cherrypy/python-cherrypy.hash @@ -1,3 +1,4 @@ # md5 from https://pypi.python.org/pypi/CherryPy/json, sha256 locally computed -md5 105cbcd4f7cd139ab4107f1b0e39afe3 CherryPy-10.2.2.tar.gz -sha256 32d93334df765c7fd5d22815ab643333e850f0cc4f6d51fee62a68f23eea8ff8 CherryPy-10.2.2.tar.gz +md5 e21fd0c5706504a8f26c46d808a14255 CherryPy-12.0.1.tar.gz +sha256 6a3a90a43b1e05bd4634c60acfdcf34efe74f9f8746aca14dbe95a9b69db30ea CherryPy-12.0.1.tar.gz +sha256 02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9 LICENSE.md diff --git a/package/python-cherrypy/python-cherrypy.mk b/package/python-cherrypy/python-cherrypy.mk index 2820b69828..72b17bc876 100644 --- a/package/python-cherrypy/python-cherrypy.mk +++ b/package/python-cherrypy/python-cherrypy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHERRYPY_VERSION = 10.2.2 +PYTHON_CHERRYPY_VERSION = 12.0.1 PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = https://pypi.python.org/packages/a2/de/dddea0c4d4be436724bfc2d1486c99368541d93c269bfa2a7fa3d132021e +PYTHON_CHERRYPY_SITE = https://pypi.python.org/packages/be/d8/a8ef56bfe1c39d466b8d55b496b64459cc43dec71361d88edf904901637f PYTHON_CHERRYPY_LICENSE = BSD-3-Clause PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md PYTHON_CHERRYPY_SETUP_TYPE = setuptools From 5ba7d209c60fdb4c030a118c0ff9ed86c0769912 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 22 Nov 2017 19:34:20 +0100 Subject: [PATCH 072/160] package/waylandpp: new package Building waylandpp for the target requires a wayland-scanner++ binary built for the host. Signed-off-by: Bernd Kuhls [Thomas: use 'depends on BR2_PACKAGE_WAYLAND' instead of a select.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/waylandpp/Config.in | 16 ++++++++++++++++ package/waylandpp/waylandpp.hash | 4 ++++ package/waylandpp/waylandpp.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 package/waylandpp/Config.in create mode 100644 package/waylandpp/waylandpp.hash create mode 100644 package/waylandpp/waylandpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index f93c617cf5..fe943d3d85 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -337,6 +337,7 @@ F: package/vdr/ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ +F: package/waylandpp/ F: package/x11r7/ F: package/x264/ F: package/x265/ diff --git a/package/Config.in b/package/Config.in index 54f6f57e6d..0f5b7df322 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1145,6 +1145,7 @@ menu "Graphics" source "package/tiff/Config.in" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" + source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" source "package/zbar/Config.in" diff --git a/package/waylandpp/Config.in b/package/waylandpp/Config.in new file mode 100644 index 0000000000..3d7362b3c0 --- /dev/null +++ b/package/waylandpp/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_WAYLANDPP + bool "waylandpp" + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_HOST_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_PACKAGE_WAYLAND + help + Wayland C++ bindings + + https://github.com/NilsBrause/waylandpp + +comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9" + depends on BR2_PACKAGE_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash new file mode 100644 index 0000000000..7e793cc866 --- /dev/null +++ b/package/waylandpp/waylandpp.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 3d6d07a6fa4164c092608cdc53172af11138fbe7b7a9894090ca6502d8153448 waylandpp-0.1.5.tar.gz +sha256 49aa6d728fd13226952c9e3a5a9cae46379b2a501010064760172b5ce7cd94bb LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/package/waylandpp/waylandpp.mk b/package/waylandpp/waylandpp.mk new file mode 100644 index 0000000000..0054838876 --- /dev/null +++ b/package/waylandpp/waylandpp.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# waylandpp +# +################################################################################ + +WAYLANDPP_VERSION = 0.1.5 +WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION)) +WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner) +WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt +WAYLANDPP_INSTALL_STAGING = YES +HOST_WAYLANDPP_DEPENDENCIES = host-pkgconf host-wayland +WAYLANDPP_DEPENDENCIES = libegl host-pkgconf wayland host-waylandpp + +# host variant of wayland-scanner++ is needed for building the target +# package +HOST_WAYLANDPP_CONF_OPTS = \ + -DBUILD_LIBRARIES=OFF \ + -DBUILD_SCANNER=ON + +WAYLANDPP_CONF_OPTS = \ + -DBUILD_LIBRARIES=ON \ + -DBUILD_SCANNER=OFF \ + -DWAYLAND_SCANNERPP=$(HOST_DIR)/bin/wayland-scanner++ + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 357322107859d50230721604faca00940451c359 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Sat, 18 Nov 2017 10:28:47 +0100 Subject: [PATCH 073/160] uboot: Use BR2_TARGET_UBOOT_SPL_NAME for TPL name Since the BR2_TARGET_UBOOT_SPL_NAME option accepts a space-separated list of binaries, the same option can be reuses for TPL binaries as well. This commit updates the string and help text to indicate that the same option can be used for SPL and TPL. Signed-off-by: Jagan Teki Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 14caafa3cd..0e109d0977 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -334,13 +334,14 @@ config BR2_TARGET_UBOOT_SPL into DDR. config BR2_TARGET_UBOOT_SPL_NAME - string "U-Boot SPL binary image name" + string "U-Boot SPL/TPL binary image name(s)" default "spl/u-boot-spl.bin" depends on BR2_TARGET_UBOOT_SPL help - A space-separated list of SPL binaries, generated during - u-boot build. For most platform it is spl/u-boot-spl.bin but - not always. It is MLO on OMAP and SPL on i.MX6 for example. + A space-separated list of SPL/TPL binaries, generated during + u-boot build. For most platform SPL name is spl/u-boot-spl.bin + and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is + MLO on OMAP and SPL on i.MX6 for example. config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" From 18d54431b3fe3319d67359df916a4e59b82b3c04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 11:45:21 +0100 Subject: [PATCH 074/160] package/python-oauthlib: new package Needed for python-mwclient version bump to 0.8.6. Signed-off-by: Bernd Kuhls Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-oauthlib/Config.in | 7 +++++++ package/python-oauthlib/python-oauthlib.hash | 4 ++++ package/python-oauthlib/python-oauthlib.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-oauthlib/Config.in create mode 100644 package/python-oauthlib/python-oauthlib.hash create mode 100644 package/python-oauthlib/python-oauthlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe943d3d85..2ff00c8a99 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -322,6 +322,7 @@ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ F: package/python-mako/ +F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ F: package/python-slob/ diff --git a/package/Config.in b/package/Config.in index 0f5b7df322..66a490d9f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -817,6 +817,7 @@ menu "External python modules" source "package/python-networkmanager/Config.in" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" + source "package/python-oauthlib/Config.in" source "package/python-paho-mqtt/Config.in" source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" diff --git a/package/python-oauthlib/Config.in b/package/python-oauthlib/Config.in new file mode 100644 index 0000000000..982272cff4 --- /dev/null +++ b/package/python-oauthlib/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_OAUTHLIB + bool "python-oauthlib" + help + A generic, spec-compliant, thorough implementation of the OAuth + request-signing logic. + + https://github.com/idan/oauthlib diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash new file mode 100644 index 0000000000..f8e1324244 --- /dev/null +++ b/package/python-oauthlib/python-oauthlib.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/oauthlib/json, sha256 locally computed +md5 277a9a966cc8c72e492b4eeb41332445 oauthlib-2.0.6.tar.gz +sha256 ce57b501e906ff4f614e71c36a3ab9eacbb96d35c24d1970d2539bbc3ec70ce1 oauthlib-2.0.6.tar.gz +sha256 9e1ae8725f5815738dadb6cbb09f450453d94e07c7b5efaee864f546a6209a95 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk new file mode 100644 index 0000000000..ab39800247 --- /dev/null +++ b/package/python-oauthlib/python-oauthlib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-oauthlib +# +################################################################################ + +PYTHON_OAUTHLIB_VERSION = 2.0.6 +PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz +PYTHON_OAUTHLIB_SITE = https://pypi.python.org/packages/a5/8a/212e9b47fb54be109f3ff0684165bb38c51117f34e175c379fce5c7df754 +PYTHON_OAUTHLIB_SETUP_TYPE = setuptools +PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause +PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From b281703dc4af2911a617010212d30a9e3241dbdb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 11:45:22 +0100 Subject: [PATCH 075/160] package/python-requests-oauthlib: new package Needed for python-mwclient version bump to 0.8.6. Signed-off-by: Bernd Kuhls Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-requests-oauthlib/Config.in | 8 ++++++++ .../python-requests-oauthlib.hash | 4 ++++ .../python-requests-oauthlib.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-requests-oauthlib/Config.in create mode 100644 package/python-requests-oauthlib/python-requests-oauthlib.hash create mode 100644 package/python-requests-oauthlib/python-requests-oauthlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2ff00c8a99..19a9f2dc45 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -325,6 +325,7 @@ F: package/python-mako/ F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ +F: package/python-requests-oauthlib/ F: package/python-slob/ F: package/rtmpdump/ F: package/softether/ diff --git a/package/Config.in b/package/Config.in index 66a490d9f2..a8f3f7cb11 100644 --- a/package/Config.in +++ b/package/Config.in @@ -879,6 +879,7 @@ menu "External python modules" source "package/python-pyzmq/Config.in" source "package/python-raven/Config.in" source "package/python-requests/Config.in" + source "package/python-requests-oauthlib/Config.in" source "package/python-requests-toolbelt/Config.in" source "package/python-rpi-gpio/Config.in" source "package/python-rtslib-fb/Config.in" diff --git a/package/python-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in new file mode 100644 index 0000000000..85283b209c --- /dev/null +++ b/package/python-requests-oauthlib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB + bool "python-requests-oauthlib" + select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + help + OAuthlib authentication support for Requests. + + https://github.com/requests/requests-oauthlib diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.hash b/package/python-requests-oauthlib/python-requests-oauthlib.hash new file mode 100644 index 0000000000..be0f644b80 --- /dev/null +++ b/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi/requests_oauthlib/json, sha256 locally computed +md5 4358a879a4377393bcfd37d0f9ae6d4d requests-oauthlib-0.8.0.tar.gz +sha256 883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468 requests-oauthlib-0.8.0.tar.gz +sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.mk b/package/python-requests-oauthlib/python-requests-oauthlib.mk new file mode 100644 index 0000000000..02e3114e59 --- /dev/null +++ b/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-requests-oauthlib +# +################################################################################ + +PYTHON_REQUESTS_OAUTHLIB_VERSION = 0.8.0 +PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz +PYTHON_REQUESTS_OAUTHLIB_SITE = https://pypi.python.org/packages/80/14/ad120c720f86c547ba8988010d5186102030591f71f7099f23921ca47fe5 +PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools +PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC +PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 7d55b9351d68f7dc47c52b725b7ab9a1d5f0ec0a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 11:45:23 +0100 Subject: [PATCH 076/160] package/python-mwclient: bump version to 0.8.6 Version 0.8.2 added OAuth support so we need python-requests-oauthlib as runtime dependency from now on. This package also has a runtime dependency on python-requests so all we need is to update the select command in Config.in. Removed patch applied upstream. Signed-off-by: Bernd Kuhls Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- ...01-use-exec-in-py3-compatible-manner.patch | 36 ------------------- package/python-mwclient/Config.in | 2 +- package/python-mwclient/python-mwclient.hash | 4 +-- package/python-mwclient/python-mwclient.mk | 4 +-- 4 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch diff --git a/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch b/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch deleted file mode 100644 index ac7838a7f7..0000000000 --- a/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5de1bb82465d39962e26175c62f644a3e423d030 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 21 Jan 2016 17:21:52 -0800 -Subject: [PATCH] use 'exec' in py3-compatible manner - -per https://docs.python.org/2/reference/simple_stmts.html , -as exec is a function not a statement in py3, the py2 version -has been set to allow the subsequent statement to be a tuple, -so we can invoke it like this to make it both py2 and py3 -compatible. Without this, byte-compiling the file fails under -py3. - -Signed-off-by: Bernd Kuhls ---- -downloaded from upstream commit: -https://github.com/mwclient/mwclient/commit/5de1bb82465d39962e26175c62f644a3e423d030 - - mwclient/ex.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mwclient/ex.py b/mwclient/ex.py -index db4006c..c0b1eae 100644 ---- a/mwclient/ex.py -+++ b/mwclient/ex.py -@@ -12,7 +12,7 @@ def read_config(config_files, **predata): - - def _read_config_file(_config_file, predata): - _file = open(_config_file) -- exec _file in globals(), predata -+ exec(_file, globals(), predata) - _file.close() - - for _k, _v in predata.iteritems(): --- -2.9.3 - diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in index be8897864c..76bf794892 100644 --- a/package/python-mwclient/Config.in +++ b/package/python-mwclient/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_MWCLIENT bool "python-mwclient" - select BR2_PACKAGE_PYTHON_REQUESTS # runtime + select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help MediaWiki API client. diff --git a/package/python-mwclient/python-mwclient.hash b/package/python-mwclient/python-mwclient.hash index 109897173e..1e9744ce38 100644 --- a/package/python-mwclient/python-mwclient.hash +++ b/package/python-mwclient/python-mwclient.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/mwclient/json, sha256 locally computed -md5 c1334facf2d6ca54fe6dba4ab75ecf34 mwclient-0.8.1.tar.gz -sha256 5f892711cc0b23ff2a6d8b7986ee63cd43fd1ec92b0783604ffa7613cd1662e4 mwclient-0.8.1.tar.gz +md5 a73687e8caa4248e9f48caece76592ff mwclient-0.8.6.tar.gz +sha256 08f917b995b331b937ed8c7e297406e3c8d33b80234679ee7fbfeeafd7570a8e mwclient-0.8.6.tar.gz diff --git a/package/python-mwclient/python-mwclient.mk b/package/python-mwclient/python-mwclient.mk index 1f1e209661..7c2a0b0025 100644 --- a/package/python-mwclient/python-mwclient.mk +++ b/package/python-mwclient/python-mwclient.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MWCLIENT_VERSION = 0.8.1 +PYTHON_MWCLIENT_VERSION = 0.8.6 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/19/79/481b288a497f625ee8f76141ff3472d81428b1f14b7155a28a63a3247197 +PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/cd/38/beaf985032b42a0b0c8f9028b469c4dcb0bd7bfab62707ec27af7e890e84 PYTHON_MWCLIENT_LICENSE = MIT PYTHON_MWCLIENT_LICENSE_FILES = mwclient/__init__.py PYTHON_MWCLIENT_SETUP_TYPE = setuptools From 9edec7d2687bf36363ec1e07272ccd03778e59d0 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 7 Nov 2017 09:49:15 -0500 Subject: [PATCH 077/160] refpolicy: bump to 2.20170805 In addition to a simple bump, the following extra changes have occured: - Change the refpolicy site to the official release URL. - Remove REFPOLICY_SITE_METHOD and REFPOLICY_GIT_SUBMODULES as the contrib submodule is included in the release tarball. - Refpolicy is now compatible with python3, as such, remove host-python. from the dependencies and add a check for python3 or python in it's place. - Add upstreamed 0001-fix-regex-escape-sequence-error.patch to fix building against python3.6. - Add sha256 license hash to hash file. Signed-off-by: Adam Duskett Tested-by: Matt Weber Signed-off-by: Thomas Petazzoni --- ...0001-fix-regex-escape-sequence-error.patch | 59 +++++++++++++++++++ package/refpolicy/refpolicy.hash | 7 ++- package/refpolicy/refpolicy.mk | 17 +++--- 3 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 package/refpolicy/0001-fix-regex-escape-sequence-error.patch diff --git a/package/refpolicy/0001-fix-regex-escape-sequence-error.patch b/package/refpolicy/0001-fix-regex-escape-sequence-error.patch new file mode 100644 index 0000000000..1aa01892d0 --- /dev/null +++ b/package/refpolicy/0001-fix-regex-escape-sequence-error.patch @@ -0,0 +1,59 @@ +From 6c9cc47e6cc9c6e67b1b822f7a1a2e1f6d836118 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 10 Oct 2017 18:00:30 -0400 +Subject: [PATCH] fix regex escape sequence error. + +python3.6 will error out with the message "invalid escape sequence" +in genhomedircon.py. This patch fixes these errors by turning the string +in the into a raw string. + +Upstream status: accepted + +Signed-off-by: Adam Duskett +--- + support/genhomedircon.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/support/genhomedircon.py b/support/genhomedircon.py +index 036f5cc9..6662f412 100644 +--- a/support/genhomedircon.py ++++ b/support/genhomedircon.py +@@ -189,13 +189,13 @@ def oldgenhomedircon(filecontextdir, filecontext): + addme = 1 + for regex in prefix_regex: + #match a trailing (/*)? which is actually a bug in rpc_pipefs +- regex = re.sub("\(/\*\)\?$", "", regex) ++ regex = re.sub(r"\(/\*\)\?$", "", regex) + #match a trailing .+ +- regex = re.sub("\.+$", "", regex) ++ regex = re.sub(r"\.+$", "", regex) + #match a trailing .* +- regex = re.sub("\.\*$", "", regex) ++ regex = re.sub(r"\.\*$", "", regex) + #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s +- regex = re.sub("\(\/\.\*\)\?", "", regex) ++ regex = re.sub(r"\(\/\.\*\)\?", "", regex) + regex = regex + "/*$" + if re.search(regex, potential, 0): + addme = 0 +@@ -391,13 +391,13 @@ class selinuxConfig: + exists=1 + for regex in prefix_regex: + #match a trailing (/*)? which is actually a bug in rpc_pipefs +- regex = re.sub("\(/\*\)\?$", "", regex) ++ regex = re.sub(r"\(/\*\)\?$", "", regex) + #match a trailing .+ +- regex = re.sub("\.+$", "", regex) ++ regex = re.sub(r"\.+$", "", regex) + #match a trailing .* +- regex = re.sub("\.\*$", "", regex) ++ regex = re.sub(r"\.\*$", "", regex) + #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s +- regex = re.sub("\(\/\.\*\)\?", "", regex) ++ regex = re.sub(r"\(\/\.\*\)\?", "", regex) + regex = regex + "/*$" + if re.search(regex, home, 0): + exists = 0 +-- +2.13.6 + diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index 7aeac4113d..905ac88542 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,2 +1,5 @@ -#From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease -sha256 08f9e2afc5e4939c23e56deeec7c47da029d7b85d82fb4ded01a36eb5da0651e refpolicy-RELEASE_2_20170204.tar.gz +# From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease +sha256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d refpolicy-2.20170805.tar.bz2 + +# Locally computed +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 2da151f321..1e2180b2cb 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -4,12 +4,9 @@ # ################################################################################ -REFPOLICY_VERSION = RELEASE_2_20170204 - -# Do not use GitHub helper as git submodules are needed for refpolicy-contrib -REFPOLICY_SITE = https://github.com/TresysTechnology/refpolicy.git -REFPOLICY_SITE_METHOD = git -REFPOLICY_GIT_SUBMODULES = y # Required for refpolicy-contrib +REFPOLICY_VERSION = 2.20170805 +REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 +REFPOLICY_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING REFPOLICY_INSTALL_STAGING = YES @@ -19,13 +16,17 @@ REFPOLICY_DEPENDENCIES = \ host-policycoreutils \ host-setools \ host-gawk \ - host-python \ policycoreutils +ifeq ($(BR2_PACKAGE_PYTHON3),y) +REFPOLICY_DEPENDENCIES += host-python3 +else +REFPOLICY_DEPENDENCIES += host-python +endif + # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ TEST_TOOLCHAIN=$(HOST_DIR) \ - PYTHON="$(HOST_DIR)/bin/python2" \ $(TARGET_MAKE_ENV) \ $(MAKE1) From 56b0ed5de28677a2a7aad026bb0e795d9837fa74 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 4 Nov 2017 16:34:58 +0100 Subject: [PATCH 078/160] package/python-networkmanager: Bump to version 2.0.1 Added new runtime dependency on python-six. Dropped dbus-python as build time dependency (it's only runtime dependency). Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/python-networkmanager/Config.in | 3 ++- .../python-networkmanager/python-networkmanager.hash | 6 +++--- package/python-networkmanager/python-networkmanager.mk | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package/python-networkmanager/Config.in b/package/python-networkmanager/Config.in index fcbce5748d..9b2b474d4b 100644 --- a/package/python-networkmanager/Config.in +++ b/package/python-networkmanager/Config.in @@ -4,7 +4,8 @@ config BR2_PACKAGE_PYTHON_NETWORKMANAGER depends on BR2_USE_WCHAR # dbus-python depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python depends on BR2_PACKAGE_DBUS # dbus-python - select BR2_PACKAGE_DBUS_PYTHON + select BR2_PACKAGE_DBUS_PYTHON # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help python-networkmanager wraps NetworkManagers D-Bus interface so you can be less verbose when talking to NetworkManager diff --git a/package/python-networkmanager/python-networkmanager.hash b/package/python-networkmanager/python-networkmanager.hash index cbd6febcd1..1fed4befb7 100644 --- a/package/python-networkmanager/python-networkmanager.hash +++ b/package/python-networkmanager/python-networkmanager.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=97c84c19b84b1124903a06379b107f77, sha256 locally computed -md5 97c84c19b84b1124903a06379b107f77 python-networkmanager-1.2.1.tar.gz -sha256 7107c07383f8077cfac33fdbb3c4cda4de40be20a6b20d30840055eb519a0e89 python-networkmanager-1.2.1.tar.gz +# md5 from https://pypi.python.org/pypi/python-networkmanager/json, sha256 locally computed +md5 5fc644a65463031295c6b7dd51a0f1bd python-networkmanager-2.0.1.tar.gz +sha256 bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517 python-networkmanager-2.0.1.tar.gz diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk index d0e4011421..7401396421 100644 --- a/package/python-networkmanager/python-networkmanager.mk +++ b/package/python-networkmanager/python-networkmanager.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_NETWORKMANAGER_VERSION = 1.2.1 -PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/e7/b1/09993250ceea9e03bc65fbabcd5286540200292c011b22237b2963c11471 -PYTHON_NETWORKMANAGER_SETUP_TYPE = distutils -PYTHON_NETWORKMANAGER_LICENSE = GPL-3.0+ +PYTHON_NETWORKMANAGER_VERSION = 2.0.1 +PYTHON_NETWORKMANAGER_SOURCE = python-networkmanager-$(PYTHON_NETWORKMANAGER_VERSION).tar.gz +PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/d7/f9/5cbd99fd24a072875ce048e48d1754285f137aab447de8fee63b6cba990a +PYTHON_NETWORKMANAGER_SETUP_TYPE = setuptools +PYTHON_NETWORKMANAGER_LICENSE = Zlib PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING -PYTHON_NETWORKMANAGER_DEPENDENCIES = dbus-python $(eval $(python-package)) From 9c2a54a542d703609fa851195d6984b765d21314 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Oct 2017 19:36:57 +0100 Subject: [PATCH 079/160] package/git: add optional support for pcre2 Renamed --with-libpcre to --with-libpcre1. Currently --with-libpcre activates pcre1 support but this can change in the future to pcre2: https://github.com/git/git/blob/df7fd961a9d9ba60840ffc0868d36cc3db2aec74/configure.ac#L258 Please note that we cannot use --with-/--without because it will lead to an error reported by configure, for example --with-libpcre1 --without-libpcre2 will produce configure: error: Only supply one of --with-libpcre1 or --with-libpcre2! Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/git/git.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/git/git.mk b/package/git/git.mk index 181e7421e2..6269dc570e 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -19,9 +19,12 @@ else GIT_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PCRE),y) +ifeq ($(BR2_PACKAGE_PCRE2),y) +GIT_DEPENDENCIES += pcre2 +GIT_CONF_OPTS += --with-libpcre2 +else ifeq ($(BR2_PACKAGE_PCRE),y) GIT_DEPENDENCIES += pcre -GIT_CONF_OPTS += --with-libpcre +GIT_CONF_OPTS += --with-libpcre1 GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1 else GIT_CONF_OPTS += --without-libpcre From 7acccf5f254562fc09eff19833de926ee2364408 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 24 Nov 2017 08:51:56 +0100 Subject: [PATCH 080/160] DEVELOPERS, .gitlab-ci.yml: fix typoes in imx6sx-sdb board name The addition of a new defconfig in commit 459e3320dc234f96b93661bed1a753e477aeab17 ("configs/imx6sx-sdb: Add new defconfig") introduced changes in the DEVELOPERS file and .gitlab-ci.yml file that were not matching the defconfig name. This commit fixes those issues. Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 2 +- DEVELOPERS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747977df7b..c34d2f7b1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ imx6-sabreauto_defconfig: *defconfig imx6-sabresd_defconfig: *defconfig imx6-sabresd_qt5_defconfig: *defconfig imx6slevk_defconfig: *defconfig -imx6sxsdb_defconfig: *defconfig +imx6sx-sdb_defconfig: *defconfig imx6ulevk_defconfig: *defconfig imx6ulpico_defconfig: *defconfig imx7dpico_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 19a9f2dc45..e4aeae6aaf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -581,7 +581,7 @@ F: board/warp7/ F: configs/freescale_imx* F: configs/imx6-sabresd* F: configs/imx6slevk_defconfig -F: configs/imx6sxsdb_defconfig +F: configs/imx6sx-sdb_defconfig F: configs/imx6ulevk_defconfig F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig From 10f5da59ed7aa6012586e94c0e7c615b2bc09c90 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Nov 2017 07:30:14 +0100 Subject: [PATCH 081/160] motion: fix build on musl Some toolchains (musl) have pthread_setname_np but not pthread_getname_np. The first patch fixes check on pthread_setname_np and the second one add a check for pthread_getname_np Fixes: http://autobuild.buildroot.net/results/65534775c5977e2424c5f5c63c46f9d0f39d7e1b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-Fix-pthread_setname_np-detection.patch | 50 ++++++++++++++ .../0002-Check-for-pthread_getname_np.patch | 66 +++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 package/motion/0001-Fix-pthread_setname_np-detection.patch create mode 100644 package/motion/0002-Check-for-pthread_getname_np.patch diff --git a/package/motion/0001-Fix-pthread_setname_np-detection.patch b/package/motion/0001-Fix-pthread_setname_np-detection.patch new file mode 100644 index 0000000000..dc14232c2b --- /dev/null +++ b/package/motion/0001-Fix-pthread_setname_np-detection.patch @@ -0,0 +1,50 @@ +From 505be2201377fa347a34b6cb4164c856b55e7484 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Nov 2017 22:47:39 +0100 +Subject: [PATCH] Fix pthread_setname_np detection + +Commit 6617c6f2c8aad041d3428bea11206fd2e61763b1 replaced +AC_LINK_IFELSE with AC_COMPILE_IFELSE. This has broken the +pthread_setname_np detection as compilation will always succeed even if +pthread_setname_np is not available (if the function is not found, a +simple warning will be displayed in config.log). + +The correct fix is to put back AC_LINK_IFELSE with -pthread in LIBS +otherwise compilation will fail on toolchain without pthread_setname_np. + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1792b65..21efd2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,17 +128,20 @@ fi + if test x$THREADS = xyes; then + TEMP_LIBS="$TEMP_LIBS -pthread" + TEMP_CFLAGS="${TEMP_CFLAGS} -D_THREAD_SAFE" +-fi + + ############################################################################## + ### Check for pthread_setname_np (nonstandard GNU extension) + ############################################################################## +-AC_MSG_CHECKING([for pthread_setname_np]) +-AC_COMPILE_IFELSE( ++ AC_MSG_CHECKING([for pthread_setname_np]) ++ HOLD_LIBS="$LIBS" ++ LIBS="$TEMP_LIBS" ++ AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ], [pthread_setname_np(pthread_self(), "name")])], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define if you have pthread_setname_np function.]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])] ) ++ LIBS="$HOLD_LIBS" ++fi + + ############################################################################## + ### Check for JPG +-- +2.14.1 + diff --git a/package/motion/0002-Check-for-pthread_getname_np.patch b/package/motion/0002-Check-for-pthread_getname_np.patch new file mode 100644 index 0000000000..c6b5d6aa74 --- /dev/null +++ b/package/motion/0002-Check-for-pthread_getname_np.patch @@ -0,0 +1,66 @@ +From 4067b793689f740e86b2f070c63cc72860347ab5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Nov 2017 22:53:03 +0100 +Subject: [PATCH] Check for pthread_getname_np + +On some toolchains (like musl), pthread_setname_np is available but not +pthread_getname_np so add this check in configure.ac + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 11 +++++++++++ + logger.c | 2 +- + motion.c | 2 +- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 21efd2a..06b2990 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,6 +140,17 @@ if test x$THREADS = xyes; then + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define if you have pthread_setname_np function.]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])] ) ++ ++############################################################################## ++### Check for pthread_getname_np (nonstandard GNU extension) ++############################################################################## ++ AC_MSG_CHECKING([for pthread_getname_np]) ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([#include ], [pthread_getname_np(pthread_self(), NULL, 0)])], ++ [AC_DEFINE([HAVE_PTHREAD_GETNAME_NP], [1], [Define if you have pthread_getname_np function.]) ++ AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no])] ) ++ + LIBS="$HOLD_LIBS" + fi + +diff --git a/logger.c b/logger.c +index 01ea5a5..fd80d77 100644 +--- a/logger.c ++++ b/logger.c +@@ -207,7 +207,7 @@ void motion_log(int level, unsigned int type, int errno_flag, const char *fmt, . + errno_save = errno; + + char threadname[32] = "unknown"; +-#if ((!defined(BSD) && HAVE_PTHREAD_SETNAME_NP) || defined(__APPLE__)) ++#if ((!defined(BSD) && HAVE_PTHREAD_GETNAME_NP) || defined(__APPLE__)) + pthread_getname_np(pthread_self(), threadname, sizeof(threadname)); + #endif + +diff --git a/motion.c b/motion.c +index 8570896..985d4b2 100644 +--- a/motion.c ++++ b/motion.c +@@ -3772,7 +3772,7 @@ void util_threadname_set(const char *abbr, int threadnbr, const char *threadname + + void util_threadname_get(char *threadname){ + +-#if ((!defined(BSD) && HAVE_PTHREAD_SETNAME_NP) || defined(__APPLE__)) ++#if ((!defined(BSD) && HAVE_PTHREAD_GETNAME_NP) || defined(__APPLE__)) + char currname[16]; + pthread_getname_np(pthread_self(), currname, sizeof(currname)); + snprintf(threadname, sizeof(currname), "%s",currname); +-- +2.14.1 + From c1c5703e84b83f00b01dea98467293b3033c1d74 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Nov 2017 19:00:11 +0100 Subject: [PATCH 082/160] libupnp: bump to version 1.6.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 10124618f1..3b45d5311c 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc libupnp-1.6.22.tar.bz2 +sha256 7d83d79af3bb4062e5c3a58bf2e90d2da5b8b99e2b2d57c23b5b6f766288cf96 libupnp-1.6.24.tar.bz2 diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index bf01b4d946..c7085c2148 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.22 +LIBUPNP_VERSION = 1.6.24 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no From db8b65249144ac8d32269e7c541a02edc0088e39 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Nov 2017 19:10:17 +0100 Subject: [PATCH 083/160] tinycbor: bump to version 0.4.2 - Remove patch (already in version) - Add LICENSE hash - Change github repo name from 01org to intel Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-Fix-static-compilation-of-json2cbor.patch | 28 ------------------- package/tinycbor/tinycbor.hash | 3 +- package/tinycbor/tinycbor.mk | 4 +-- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/tinycbor/0001-Fix-static-compilation-of-json2cbor.patch diff --git a/package/tinycbor/0001-Fix-static-compilation-of-json2cbor.patch b/package/tinycbor/0001-Fix-static-compilation-of-json2cbor.patch deleted file mode 100644 index 8d265d814e..0000000000 --- a/package/tinycbor/0001-Fix-static-compilation-of-json2cbor.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ae608ea2735bd331ec7dcf9d89928c38f0e0c981 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 6 Mar 2017 18:59:22 +0100 -Subject: [PATCH] Fix static compilation of json2cbor - -json2cbor depends on cjson so tools/json2cbor/json2cbor.o must be -before -lcjson - -Signed-off-by: Fabrice Fontaine -[Upstream commit: https://github.com/01org/tinycbor/commit/ae608ea2735bd331ec7dcf9d89928c38f0e0c981] -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 97b292c..a8cb57c 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a - - bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a - @$(MKDIR) -p bin -- $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm -+ $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm - - tinycbor.pc: tinycbor.pc.in - $(SED) > $@ < $< \ diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index 6cb0a6eab8..affc7a6e41 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 8e42984015d62e8323b7f2a439bde157d707e0d7ae57a6d8d5a2665247af6638 tinycbor-v0.4.1.tar.gz +sha256 37a06c618ccddd7edc3747277425fcd38fa71eab37c7aaf0b03818a49950da81 tinycbor-v0.4.2.tar.gz +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index 9c3d2eb063..b1848b56aa 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,8 +4,8 @@ # ################################################################################ -TINYCBOR_VERSION = v0.4.1 -TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION)) +TINYCBOR_VERSION = v0.4.2 +TINYCBOR_SITE = $(call github,intel,tinycbor,$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE From f9448321888dcd1e5a928539089115cb6b84302c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Nov 2017 19:15:03 +0100 Subject: [PATCH 084/160] libmaxminddb: bump to version 1.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmaxminddb/libmaxminddb.hash | 3 ++- package/libmaxminddb/libmaxminddb.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index 952a655d0f..b8e52b833b 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 06a0ec3d1496e1a7e30d74ea15373e0010bbe392ea1819c149aaf724dc57dd9a libmaxminddb-1.2.1.tar.gz +sha256 a8c7e245241cd427a41edb7eb40246ba125957510af2f88b93446fe7c2143705 libmaxminddb-1.3.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index f0678a05ee..ccb5b35d07 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.2.1 +LIBMAXMINDDB_VERSION = 1.3.0 LIBMAXMINDDB_SITE = $(call github,maxmind,libmaxminddb,$(LIBMAXMINDDB_VERSION)) LIBMAXMINDDB_INSTALL_STAGING = YES LIBMAXMINDDB_LICENSE = Apache-2.0 From 43f76947ac2a05f24c3129db1bb690aad65e9474 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 24 Nov 2017 15:44:59 +0100 Subject: [PATCH 085/160] python-cheroot: bump version to 5.10.0 Fix licence file name and add checksum. Fixes: http://autobuild.buildroot.net/results/94d/94dee5b01e0f7693d4e6e05074e7d93e92236e2c Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-cheroot/python-cheroot.hash | 5 +++-- package/python-cheroot/python-cheroot.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index 7b309a9399..664ad1002d 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,3 +1,4 @@ # md5 from https://pypi.python.org/pypi/Cheroot/json, sha256 locally computed -md5 288eb3a6df4964ba0435493d2914da3d cheroot-5.9.0.tar.gz -sha256 d8ec06b6e907b911ac5bb626876ee498c289d21f1a638cb2510fc57290567ef5 cheroot-5.9.0.tar.gz +md5 d256a0ccd28c3426a7764868e98a9020 cheroot-5.10.0.tar.gz +sha256 a408f1b80a3f93a3b49fc330f68eea40d8d30b9b07084f374607d1a5cc2e824f cheroot-5.10.0.tar.gz +sha256 02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9 LICENSE diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index d3e056be36..07775e577b 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 5.9.0 +PYTHON_CHEROOT_VERSION = 5.10.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/df/63/5c5265feb7e02e43d2f3a3c19dbb2d78742b0a2ff237c9e473c77bc23500 +PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/14/dc/afc41e7f7e797973808d8520e6aef21c4efd00550aa32f5b726327d36be0 PYTHON_CHEROOT_LICENSE = BSD-3-Clause -PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md +PYTHON_CHEROOT_LICENSE_FILES = LICENSE PYTHON_CHEROOT_SETUP_TYPE = setuptools PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm From 0d2e7522ed18a1bd06aa9bd22c46e71d90bcf0bd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2017 15:19:05 +0200 Subject: [PATCH 086/160] mtd: be explicit about config options for the host Instead of letting auto-detection do its job, be explicit about the fact that we want the JFFS2 and UBIFS utilities when building the host variant of mtd. Signed-off-by: Thomas Petazzoni --- package/mtd/mtd.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index a69ef4082e..7094aad89e 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -45,7 +45,10 @@ MTD_CONF_OPTS += --without-xattr endif HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux -HOST_MTD_CONF_OPTS = --disable-tests +HOST_MTD_CONF_OPTS = \ + --with-jffs \ + --with-ubifs \ + --disable-tests MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2 SUMTOOL = $(HOST_DIR)/sbin/sumtool From 5a0cfbded075dea4a0416ffcfe7407b8db91d0a4 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Thu, 14 Sep 2017 14:08:11 +0300 Subject: [PATCH 087/160] hostapd: add support for Realtek driver Since kernel drivers for Realtek wireless chips use non-standard interfaces, upstream hostapd does not support them. One have to apply an external patch for hostapd to work with these chips. See: https://github.com/pritambaral/hostapd-rtl871xdrv A configuration option is added to enable support for Realtek chips, and it's turned off by default. Signed-off-by: Alexander Mukhin Tested-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/hostapd/Config.in | 5 +++++ package/hostapd/hostapd.hash | 1 + package/hostapd/hostapd.mk | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e4aeae6aaf..8a44e042ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -78,6 +78,9 @@ F: package/putty/ N: Alexander Lukichev F: package/openpgm/ +N: Alexander Mukhin +F: package/hostapd/ + N: Alexander Varnin F: package/liblog4c-localtime/ diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 1609d0df5d..40c7015e73 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -14,6 +14,11 @@ config BR2_PACKAGE_HOSTAPD if BR2_PACKAGE_HOSTAPD +config BR2_PACKAGE_HOSTAPD_DRIVER_RTW + bool "Enable rtl871xdrv driver" + help + Enable support for Realtek wireless chips. + config BR2_PACKAGE_HOSTAPD_ACS bool "Enable ACS" default y diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index b20c89b184..588879f65a 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,4 +1,5 @@ # Locally calculated sha256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d hostapd-2.6.tar.gz +sha256 e204da659d0583c71af23cb9b55536fe99598ee26a44104344f456e4d17350c6 rtlxdrv.patch sha256 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch sha256 147c8abe07606905d16404fb2d2c8849796ca7c85ed8673c09bb50038bcdeb9e rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 3f94c8c4b7..bb3919e988 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -47,6 +47,11 @@ HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif +ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) +HOSTAPD_PATCH = https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch +HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW +endif + ifeq ($(BR2_PACKAGE_HOSTAPD_ACS),y) HOSTAPD_CONFIG_ENABLE += CONFIG_ACS endif From 974d97bc267d4e529ec3619c6c71e59f8f51833d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:27 +0200 Subject: [PATCH 088/160] arch: introduce minimal required gcc version Some CPU variants require that a recent-enough gcc be selected. For example, ARM's cortex-a35 requires gcc-5, while cortex-a73 requires gcc-7. Same goes for other architectures, of course. Currently, we hard-code every such conditions in the gcc version choice, as well as in the individual external toolchains. However, as we add even more CPU variants, the conditions are getting more and more complex to write and maintain. Introduce new symbols, that architectures can select if they have a specific requirement on the gcc version. gcc and external toolchains can then properly depend on those symbols. The burden of maintaining the requirements on the gcc version now falls down to the architeture, instead of being split up in gcc and all the external toolchains. As the oldest gcc version to handle, we can either choose gcc-4.9, as the oldest version we support in our internal toolchain, or choose gcc-4.8, as the oldest external toolchain we support (except for the custom ones, but they'll be handled specifically in upcoming changes). We choose to go back up to gcc-4.8. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/Config.in b/arch/Config.in index c10bf16809..607da36c1d 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -261,6 +261,27 @@ config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT bool default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT +# The following symbols are selected by the individual +# Config.in.$ARCH files +config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 + bool + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_6 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + +config BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH From 1f33e55df0704067c270a452f92c323c52406025 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:28 +0200 Subject: [PATCH 089/160] package/gcc: hide versions too old for the current arch Begin the conversion from hard-coded dependencies on architectures, to architecture-specified version requirement, using the newly introduced BR2_ARCH_NEEDS_GCC_AT_LEAST_XXX symbols. Hard-coded dependencies will be removed progressively, as archs are individually converted over to using the new symbols. We do not change the architecture-specific versions for ARC and OpenRISC, because there is no point in doing so for those, as they use special, non-upstream versions anyway. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 1fb6b6045c..c470b430a2 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -22,6 +22,7 @@ config BR2_GCC_VERSION_OR1K config BR2_GCC_VERSION_4_9_X bool "gcc 4.9.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin && !BR2_or1k # Broken or unsupported ARM cores @@ -45,6 +46,7 @@ config BR2_GCC_VERSION_4_9_X config BR2_GCC_VERSION_5_X bool "gcc 5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin && !BR2_or1k # Broken or unsupported ARM cores @@ -61,6 +63,7 @@ config BR2_GCC_VERSION_5_X config BR2_GCC_VERSION_6_X bool "gcc 6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 # Broken or unsupported architectures depends on !BR2_arc depends on !BR2_or1k From 3ae7f68b59e97af86bd43b0e2d454705e8feaa31 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:29 +0200 Subject: [PATCH 090/160] toolchain/external-custom: hide versions too old for the current arch When an architecture expresses a requirement on the gcc version, limit the version choice in the custom external toolchain. The rationale being that there is no point in offering that version to the user if we know before-hand that the gcc version will not work for that architecture. All versions below the minimum we support is just made conditional to that minimum as well, including the "older" entry. However, this means that the "older" entry is no longer available when the architecture requires a minimum gcc version. A user who wants to use a toolchain with a gcc older than the minimum will have no choice but to realise the toolchain is not suitable (or lie and we would catch that when checking the gcc version anyway). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../toolchain-external-custom/Config.in.options | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index b9e7c2078a..e35ef8784d 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -18,6 +18,11 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX choice bool "External toolchain gcc version" + default BR2_TOOLCHAIN_EXTERNAL_GCC_7 if BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + default BR2_TOOLCHAIN_EXTERNAL_GCC_6 if BR2_ARCH_NEEDS_GCC_AT_LEAST_6 + default BR2_TOOLCHAIN_EXTERNAL_GCC_5 if BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + default BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 + default BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 default BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 help Set to the gcc version that is used by your external @@ -29,42 +34,52 @@ config BR2_TOOLCHAIN_EXTERNAL_GCC_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_6 bool "6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_5 bool "5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 bool "4.9.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 bool "4.8.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7 bool "4.7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6 bool "4.6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5 bool "4.5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4 bool "4.4.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 bool "4.3.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD bool "older" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 help Use this option if your GCC version is older than any of the above. From 881cc8f1c41e681155afeac42f9e849d199f77bf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:30 +0200 Subject: [PATCH 091/160] toolchain/external: hide versions too old for the current arch Hide the toolchains if the arch requires a gcc version more recent than the one they provide. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../toolchain-external-codescape-img-mips/Config.in | 1 + .../toolchain-external-codescape-mti-mips/Config.in | 1 + .../toolchain-external-codesourcery-aarch64/Config.in | 1 + .../toolchain-external-codesourcery-amd64/Config.in | 1 + .../toolchain-external-codesourcery-arm/Config.in | 2 ++ .../toolchain-external-codesourcery-mips/Config.in | 2 ++ .../toolchain-external-codesourcery-niosII/Config.in | 1 + .../toolchain-external-linaro-aarch64/Config.in | 1 + .../toolchain-external/toolchain-external-linaro-arm/Config.in | 2 ++ .../toolchain-external-linaro-armeb/Config.in | 2 ++ .../toolchain-external-synopsys-arc/Config.in | 1 + 11 files changed, 15 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index e29c4dcb87..8b2eab0ad2 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS bool "Codescape IMG GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index efe6f8527e..db191fd1be 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS bool "Codescape MTI GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in index 66a032e9ac..24cbcffa29 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 bool "CodeSourcery AArch64 2014.11" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 # a57/a53 and a72/a53 appeared in gcc-6 or were broken before depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in index 101e227af9..50c5a20019 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 bool "Sourcery CodeBench AMD64 2016.11" depends on BR2_x86_64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS depends on BR2_x86_jaguar || BR2_x86_steamroller diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index e1a7891007..b91daa5c81 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM bool "Sourcery CodeBench ARM 2014.05" depends on BR2_arm + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 # a15/a7 appeared in gcc-4.9, a17/a7 in gcc-5, a57/a53 and a72/a53 # in gcc-6, or they each were broken earlier than that. depends on !BR2_cortex_a15_a7 && !BR2_cortex_a17_a7 @@ -35,5 +36,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM comment "Sourcery CodeBench toolchains available for the EABI ABI" depends on BR2_arm + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 depends on !BR2_ARM_EABI depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in index 6a13ae6cd6..734f0e4c7c 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in @@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS bool "Sourcery CodeBench MIPS 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 # Unsupported MIPS cores depends on !BR2_mips_interaptiv depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -89,5 +90,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS Select BR2_SOFT_FLOAT comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 depends on BR2_MIPS_NABI32 depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in index 341bc2ab44..7563995eb6 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII bool "Sourcery CodeBench Nios-II 2017.05" depends on BR2_nios2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 5f66f56662..0a9e60a371 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 bool "Linaro AArch64 2017.08" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index fd4e03b2bc..9e0bcad501 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -1,11 +1,13 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_arm + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM bool "Linaro ARM 2017.08" depends on BR2_arm + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index 5fb7eb5c1d..52fa4506bb 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -1,11 +1,13 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_armeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2017.08" depends on BR2_armeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index f438ea765d..8e4344a83d 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,6 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC bool "Synopsys ARC 2016.09 toolchain" depends on BR2_arc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP From 6df07bc58e089be6d3820099c0fbb1b8ac7e8eb2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:31 +0200 Subject: [PATCH 092/160] arch/bfin: needs gcc >= 6 Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in | 1 + package/gcc/Config.in.host | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index 607da36c1d..d3f63da34f 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -79,6 +79,7 @@ config BR2_aarch64_be config BR2_bfin bool "Blackfin" select BR2_ARCH_HAS_FDPIC_SUPPORT + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 help The Blackfin is a family of 16 or 32-bit microprocessors developed, manufactured and marketed by Analog Devices. diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index c470b430a2..582a40910a 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -24,7 +24,7 @@ config BR2_GCC_VERSION_4_9_X bool "gcc 4.9.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 # Broken or unsupported architectures - depends on !BR2_arc && !BR2_bfin && !BR2_or1k + depends on !BR2_arc && !BR2_or1k # Broken or unsupported ARM cores depends on !BR2_cortex_a17 && !BR2_cortex_a17_a7 depends on !BR2_cortex_a72 && !BR2_cortex_a72_a53 @@ -48,7 +48,7 @@ config BR2_GCC_VERSION_5_X bool "gcc 5.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 # Broken or unsupported architectures - depends on !BR2_arc && !BR2_bfin && !BR2_or1k + depends on !BR2_arc && !BR2_or1k # Broken or unsupported ARM cores depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 # musl ppc64 unsupported From f82218fcbb536cc9c65782e687afdf2d93f02947 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:32 +0200 Subject: [PATCH 093/160] arch/mips: some variants need different gcc versions We use the conditions currently expressed in the gcc version choice. We leave the musl vs mips64 conditions in gcc, because the "fault" really is on gcc, which does not recognise the mips64+musl tuples, so the fix lies within gcc, and the current conditions are fitting. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 7 +++++++ package/gcc/Config.in.host | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 1cce1710da..c08b2a2968 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -7,9 +7,11 @@ config BR2_MIPS_CPU_MIPS32R2 select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS32R5 bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_MIPS_CPU_MIPS32R6 bool select BR2_MIPS_NAN_2008 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_MIPS_CPU_MIPS64 bool select BR2_MIPS_NAN_LEGACY @@ -18,9 +20,11 @@ config BR2_MIPS_CPU_MIPS64R2 select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS64R5 bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_MIPS_CPU_MIPS64R6 bool select BR2_MIPS_NAN_2008 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 choice prompt "Target Architecture Variant" @@ -53,11 +57,13 @@ config BR2_mips_interaptiv bool "interAptiv" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_mips_m5150 bool "M5150" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 select BR2_MIPS_NAN_2008 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_mips_m6250 bool "M6250" depends on !BR2_ARCH_IS_64 @@ -101,6 +107,7 @@ config BR2_mips_i6400 bool "I6400" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R6 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_mips_p6600 bool "P6600" depends on BR2_ARCH_IS_64 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 582a40910a..c681dee49c 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -28,12 +28,6 @@ config BR2_GCC_VERSION_4_9_X # Broken or unsupported ARM cores depends on !BR2_cortex_a17 && !BR2_cortex_a17_a7 depends on !BR2_cortex_a72 && !BR2_cortex_a72_a53 - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl microblaze unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) # musl ppc64 unsupported @@ -53,8 +47,6 @@ config BR2_GCC_VERSION_5_X depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && !BR2_mips_i6400 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # glibc >= 2.26 needs gcc >= 6.2 From d08ccb40f53f152f4c4443a636b52239fded57ec Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:33 +0200 Subject: [PATCH 094/160] arch/arm: some variants need different gcc versions Take the conditions currently specified in the gcc version choice. Also, the conditions explained in the commit log for 78c2a9f7 were not all properly applied, especially the a57-a53 combo needs gcc-6, but 78c2a9f7 forgot to add the condition to gcc-4.9. gcc-4.9 was excluded for cortex-a17 and a72, but the CodeSourcery external toolchain, which uses 4.8, was not excluded for those two cores. Now it is. Remove the arch condition from gcc and the external toolchains. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 ++++++ package/gcc/Config.in.host | 5 ----- .../toolchain-external-codesourcery-arm/Config.in | 4 ---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 09916df7ad..b58be6bce0 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -190,6 +190,7 @@ config BR2_cortex_a15_a7 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 depends on !BR2_ARCH_IS_64 config BR2_cortex_a17 bool "cortex-A17" @@ -199,6 +200,7 @@ config BR2_cortex_a17 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 depends on !BR2_ARCH_IS_64 config BR2_cortex_a17_a7 bool "cortex-A17/A7 big.LITTLE" @@ -208,6 +210,7 @@ config BR2_cortex_a17_a7 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 depends on !BR2_ARCH_IS_64 config BR2_cortex_a53 bool "cortex-A53" @@ -233,6 +236,7 @@ config BR2_cortex_a57_a53 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a72 bool "cortex-A72" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -241,6 +245,7 @@ config BR2_cortex_a72 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_cortex_a72_a53 bool "cortex-A72/A53 big.LITTLE" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -249,6 +254,7 @@ config BR2_cortex_a72_a53 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB2 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index c681dee49c..780ee73c90 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -25,9 +25,6 @@ config BR2_GCC_VERSION_4_9_X depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 # Broken or unsupported architectures depends on !BR2_arc && !BR2_or1k - # Broken or unsupported ARM cores - depends on !BR2_cortex_a17 && !BR2_cortex_a17_a7 - depends on !BR2_cortex_a72 && !BR2_cortex_a72_a53 # musl microblaze unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) # musl ppc64 unsupported @@ -43,8 +40,6 @@ config BR2_GCC_VERSION_5_X depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 # Broken or unsupported architectures depends on !BR2_arc && !BR2_or1k - # Broken or unsupported ARM cores - depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) # musl mips64 unsupported diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index b91daa5c81..60d86c33d5 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -2,10 +2,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM bool "Sourcery CodeBench ARM 2014.05" depends on BR2_arm depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - # a15/a7 appeared in gcc-4.9, a17/a7 in gcc-5, a57/a53 and a72/a53 - # in gcc-6, or they each were broken earlier than that. - depends on !BR2_cortex_a15_a7 && !BR2_cortex_a17_a7 - depends on !BR2_cortex_a57_53 && !BR2_cortex_a72_53 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABI # Unsupported ARM cores From 5e6de23e45b2b39a39b00ff80ac6e884be89b62c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:44:34 +0200 Subject: [PATCH 095/160] package/gcc: slight cleanup and reorg in remaining arch depends Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 780ee73c90..74c1b2f4e2 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -24,12 +24,11 @@ config BR2_GCC_VERSION_4_9_X bool "gcc 4.9.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 # Broken or unsupported architectures - depends on !BR2_arc && !BR2_or1k - # musl microblaze unsupported + depends on !BR2_arc + depends on !BR2_or1k + # musl on microblaze, ppc64 and mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) - # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # glibc >= 2.26 needs gcc >= 6.2 depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) @@ -39,10 +38,10 @@ config BR2_GCC_VERSION_5_X bool "gcc 5.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 # Broken or unsupported architectures - depends on !BR2_arc && !BR2_or1k - # musl ppc64 unsupported + depends on !BR2_arc + depends on !BR2_or1k + # musl on ppc64 and mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # glibc >= 2.26 needs gcc >= 6.2 depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) From 31b134a64537b1f6f38cd9378f4ddf0f43b22b43 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:53:50 +0200 Subject: [PATCH 096/160] arch/mips: inverse the NaN logic Currently the possibility to choose the NaN encoding is conditional to having a sufficiently recent gcc version. Which means that the architecture selection depends on the gcc version. But that's opposite to what we've always done in Buildroot: the software versions are conditional to the architecture options. There is nothing we can do about the hardware: it is there, we can't change it, while we can restrict ourselves to using software that is working on said hardware. Thus, we inverse the logic, to move the condition onto the software side: whenever NaN-2008 are selected, we restrict the toolchain selection to at least a gcc-4.9. But now, the option with the NaN type is always set, so we must enclose the code in gcc.mk inside a HAS_NAN_OPTION condition, as is already done for the external toolchain case. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 2 +- package/gcc/gcc.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index c08b2a2968..13d1a477e6 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -176,10 +176,10 @@ config BR2_MIPS_NAN_LEGACY config BR2_MIPS_NAN_2008 bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 choice prompt "Target NaN" - depends on BR2_TOOLCHAIN_HAS_MNAN_OPTION depends on BR2_mips_32r5 || BR2_mips_64r5 default BR2_MIPS_ENABLE_NAN_2008 help diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6bdd6c88e3..1112003df4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -207,9 +207,11 @@ endif ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),) HOST_GCC_COMMON_CONF_OPTS += --with-abi=$(BR2_GCC_TARGET_ABI) endif +ifeq ($(BR2_TOOLCHAIN_HAS_MNAN_OPTION),y) ifneq ($(call qstrip,$(BR2_GCC_TARGET_NAN)),) HOST_GCC_COMMON_CONF_OPTS += --with-nan=$(BR2_GCC_TARGET_NAN) endif +endif ifneq ($(call qstrip,$(BR2_GCC_TARGET_FP32_MODE)),) HOST_GCC_COMMON_CONF_OPTS += --with-fp-32=$(BR2_GCC_TARGET_FP32_MODE) endif From e25d704e10230f7ea095b4bbb5660e73fbefdf29 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:53:51 +0200 Subject: [PATCH 097/160] arch/mips: inverse the mfpxx logic Currently, the possibility to choose the floating point mode (32, xx or 64) is conditional on having a sufficiently recent gcc version. Which means that the architecture selection depends on the gcc version. But that's opposite to what we've always done in Buildroot: the software versions are conditional to the architecture options. There is nothing we can do about the hardware: it is there, we can't change it, while we can restrict ourselves to using software that is working on said hardware. Thus, we inverse the logic, to move the condition onto the software side: whenever mfpxx is selected, we restrict the toolchain selection to at least a gcc-5. And now, the blind BR2_TOOLCHAIN_HAS_MFPXX_OPTION symbol is no longer needed, so we get rid of it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 4 ++-- toolchain/toolchain-common.in | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 13d1a477e6..f8e57bab33 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -146,7 +146,7 @@ config BR2_MIPS_SOFT_FLOAT choice prompt "FP mode" depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT - default BR2_MIPS_FP32_MODE_XX if BR2_TOOLCHAIN_HAS_MFPXX_OPTION + default BR2_MIPS_FP32_MODE_XX help MIPS32 supports different FP modes (32,xx,64). Information about FP modes can be found here: @@ -159,7 +159,7 @@ config BR2_MIPS_FP32_MODE_32 config BR2_MIPS_FP32_MODE_XX bool "xx" - depends on BR2_TOOLCHAIN_HAS_MFPXX_OPTION + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_MIPS_FP32_MODE_64 bool "64" diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 15553772fd..d743c637ce 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -356,10 +356,6 @@ config BR2_TOOLCHAIN_HAS_MNAN_OPTION bool default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_TOOLCHAIN_HAS_MFPXX_OPTION - bool - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_5 - config BR2_TOOLCHAIN_HAS_SYNC_1 bool default y From 4a5140ecffb75d1dc1f696e149a31744145ac63c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 11:53:52 +0200 Subject: [PATCH 098/160] toolchain/buildroot: glibc requires kernel headers >= 4.5 with NaN-2008 From sysdeps/unix/sysv/linux/mips/configure.ac in glibc: if test -z "$arch_minimum_kernel"; then if test x$libc_cv_mips_nan2008 = xyes; then arch_minimum_kernel=4.5.0 fi fi Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Romain Naour Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-buildroot/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 25ab667927..cbe2038a77 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -52,6 +52,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 depends on !BR2_powerpc_SPE select BR2_TOOLCHAIN_USES_GLIBC # our glibc.mk enables RPC support From 52d500aa35acb8b3570dcfcc36ac71e083656e5a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:41 +0200 Subject: [PATCH 099/160] arch/arm: re-order cores choice Currently, the logic for ordering the ARM cores in the choice is all but obvious. ;-) Reorder the choice by architecture generation, starting with armv4, ending with armv8. Add a comment before each generation, just for ease of use. Add a separate comment for armv7a and armv7m. Finally, order cores alphabetically inside the same generation (except for armv7m cores, listed after all armv7a cores). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 116 +++++++++++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 47 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index b58be6bce0..66dce3a562 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -68,6 +68,8 @@ choice help Specific CPU variant to use +comment "armv4 cores" + depends on !BR2_ARCH_IS_64 config BR2_arm920t bool "arm920t" select BR2_ARM_CPU_HAS_ARM @@ -82,6 +84,21 @@ config BR2_arm922t select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL depends on !BR2_ARCH_IS_64 +config BR2_fa526 + bool "fa526/626" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_ARMV4 + select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 +config BR2_strongarm + bool "strongarm sa110/sa1100" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_ARMV4 + select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 + +comment "armv5 cores" + depends on !BR2_ARCH_IS_64 config BR2_arm926t bool "arm926t" select BR2_ARM_CPU_HAS_ARM @@ -90,6 +107,22 @@ config BR2_arm926t select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL depends on !BR2_ARCH_IS_64 +config BR2_iwmmxt + bool "iwmmxt" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_ARMV5 + select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 +config BR2_xscale + bool "xscale" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_THUMB + select BR2_ARM_CPU_ARMV5 + select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 + +comment "armv6 cores" + depends on !BR2_ARCH_IS_64 config BR2_arm1136j_s bool "arm1136j-s" select BR2_ARM_CPU_HAS_ARM @@ -128,6 +161,9 @@ config BR2_arm11mpcore select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL depends on !BR2_ARCH_IS_64 + +comment "armv7a cores" + depends on !BR2_ARCH_IS_64 config BR2_cortex_a5 bool "cortex-A5" select BR2_ARM_CPU_HAS_ARM @@ -212,6 +248,28 @@ config BR2_cortex_a17_a7 select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 depends on !BR2_ARCH_IS_64 +config BR2_pj4 + bool "pj4" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_VFPV3 + select BR2_ARM_CPU_ARMV7A + select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 + +comment "armv7m cores" + depends on !BR2_ARCH_IS_64 +config BR2_cortex_m3 + bool "cortex-M3" + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_IS_64 +config BR2_cortex_m4 + bool "cortex-M4" + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_IS_64 + +comment "armv8 cores" config BR2_cortex_a53 bool "cortex-A53" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -255,48 +313,6 @@ config BR2_cortex_a72_a53 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 -config BR2_cortex_m3 - bool "cortex-M3" - select BR2_ARM_CPU_HAS_THUMB2 - select BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_IS_64 -config BR2_cortex_m4 - bool "cortex-M4" - select BR2_ARM_CPU_HAS_THUMB2 - select BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_IS_64 -config BR2_fa526 - bool "fa526/626" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 -config BR2_pj4 - bool "pj4" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_HAS_VFPV3 - select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 -config BR2_strongarm - bool "strongarm sa110/sa1100" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 -config BR2_xscale - bool "xscale" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_HAS_THUMB - select BR2_ARM_CPU_ARMV5 - select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 -config BR2_iwmmxt - bool "iwmmxt" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_ARMV5 - select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 endchoice config BR2_ARM_ENABLE_NEON @@ -551,15 +567,23 @@ config BR2_ENDIAN default "BIG" if (BR2_armeb || BR2_aarch64_be) config BR2_GCC_TARGET_CPU + # armv4 default "arm920t" if BR2_arm920t default "arm922t" if BR2_arm922t + default "fa526" if BR2_fa526 + default "strongarm" if BR2_strongarm + # armv5 default "arm926ej-s" if BR2_arm926t + default "iwmmxt" if BR2_iwmmxt + default "xscale" if BR2_xscale + # armv6 default "arm1136j-s" if BR2_arm1136j_s default "arm1136jf-s" if BR2_arm1136jf_s default "arm1176jz-s" if BR2_arm1176jz_s default "arm1176jzf-s" if BR2_arm1176jzf_s default "mpcore" if BR2_arm11mpcore && BR2_ARM_CPU_HAS_VFPV2 default "mpcorenovfp" if BR2_arm11mpcore + # armv7a default "cortex-a5" if BR2_cortex_a5 default "cortex-a7" if BR2_cortex_a7 default "cortex-a8" if BR2_cortex_a8 @@ -569,13 +593,11 @@ config BR2_GCC_TARGET_CPU default "cortex-a15.cortex-a7" if BR2_cortex_a15_a7 default "cortex-a17" if BR2_cortex_a17 default "cortex-a17.cortex-a7" if BR2_cortex_a17_a7 + default "marvell-pj4" if BR2_pj4 + # armv7m default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 - default "fa526" if BR2_fa526 - default "marvell-pj4" if BR2_pj4 - default "strongarm" if BR2_strongarm - default "xscale" if BR2_xscale - default "iwmmxt" if BR2_iwmmxt + # armv8 default "cortex-a53" if BR2_cortex_a53 default "cortex-a57" if BR2_cortex_a57 default "cortex-a57.cortex-a53" if BR2_cortex_a57_a53 From a9f95de2c0d81d40ef4b062447f1d7deba34788c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:42 +0200 Subject: [PATCH 100/160] arch/arm: simplify hiding non 64-bit cores Now that the cores are all oredered correctly, we can just enclose all the non 64-bit cores inside a big if-block, rather than have each of them have the dependency. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 66dce3a562..c2b7931528 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -68,37 +68,32 @@ choice help Specific CPU variant to use +if !BR2_ARCH_IS_64 comment "armv4 cores" - depends on !BR2_ARCH_IS_64 config BR2_arm920t bool "arm920t" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_arm922t bool "arm922t" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_fa526 bool "fa526/626" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_strongarm bool "strongarm sa110/sa1100" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 comment "armv5 cores" - depends on !BR2_ARCH_IS_64 config BR2_arm926t bool "arm926t" select BR2_ARM_CPU_HAS_ARM @@ -106,30 +101,25 @@ config BR2_arm926t select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_iwmmxt bool "iwmmxt" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_xscale bool "xscale" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 comment "armv6 cores" - depends on !BR2_ARCH_IS_64 config BR2_arm1136j_s bool "arm1136j-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_arm1136jf_s bool "arm1136jf-s" select BR2_ARM_CPU_HAS_ARM @@ -137,14 +127,12 @@ config BR2_arm1136jf_s select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_arm1176jz_s bool "arm1176jz-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_arm1176jzf_s bool "arm1176jzf-s" select BR2_ARM_CPU_HAS_ARM @@ -152,7 +140,6 @@ config BR2_arm1176jzf_s select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_arm11mpcore bool "mpcore" select BR2_ARM_CPU_HAS_ARM @@ -160,10 +147,8 @@ config BR2_arm11mpcore select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 comment "armv7a cores" - depends on !BR2_ARCH_IS_64 config BR2_cortex_a5 bool "cortex-A5" select BR2_ARM_CPU_HAS_ARM @@ -172,7 +157,6 @@ config BR2_cortex_a5 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a7 bool "cortex-A7" select BR2_ARM_CPU_HAS_ARM @@ -181,7 +165,6 @@ config BR2_cortex_a7 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a8 bool "cortex-A8" select BR2_ARM_CPU_HAS_ARM @@ -190,7 +173,6 @@ config BR2_cortex_a8 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a9 bool "cortex-A9" select BR2_ARM_CPU_HAS_ARM @@ -199,7 +181,6 @@ config BR2_cortex_a9 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a12 bool "cortex-A12" select BR2_ARM_CPU_HAS_ARM @@ -208,7 +189,6 @@ config BR2_cortex_a12 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a15 bool "cortex-A15" select BR2_ARM_CPU_HAS_ARM @@ -217,7 +197,6 @@ config BR2_cortex_a15 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 config BR2_cortex_a15_a7 bool "cortex-A15/A7 big.LITTLE" select BR2_ARM_CPU_HAS_ARM @@ -227,7 +206,6 @@ config BR2_cortex_a15_a7 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on !BR2_ARCH_IS_64 config BR2_cortex_a17 bool "cortex-A17" select BR2_ARM_CPU_HAS_ARM @@ -237,7 +215,6 @@ config BR2_cortex_a17 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - depends on !BR2_ARCH_IS_64 config BR2_cortex_a17_a7 bool "cortex-A17/A7 big.LITTLE" select BR2_ARM_CPU_HAS_ARM @@ -247,27 +224,23 @@ config BR2_cortex_a17_a7 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - depends on !BR2_ARCH_IS_64 config BR2_pj4 bool "pj4" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_VFPV3 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL - depends on !BR2_ARCH_IS_64 comment "armv7m cores" - depends on !BR2_ARCH_IS_64 config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_IS_64 config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_IS_64 +endif # !BR2_ARCH_IS_64 comment "armv8 cores" config BR2_cortex_a53 From 003b1f3c74689986f9f6e7f8ce96b4e422c94a93 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:43 +0200 Subject: [PATCH 101/160] arch/arm: armv8 is really armv8a For armv8, there are different profiles: A, M and R, like there is for armv7. So, rename our internal symbol to mirror what we do for armv7. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 14 +++++++------- package/pkg-cmake.mk | 2 +- .../toolchain-external-codesourcery-arm/Config.in | 2 +- .../toolchain-external-linaro-arm/Config.in | 2 +- .../toolchain-external-linaro-armeb/Config.in | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index c2b7931528..d110d52e2d 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -59,7 +59,7 @@ config BR2_ARM_CPU_ARMV7A config BR2_ARM_CPU_ARMV7M bool -config BR2_ARM_CPU_ARMV8 +config BR2_ARM_CPU_ARMV8A bool choice @@ -249,7 +249,7 @@ config BR2_cortex_a53 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 - select BR2_ARM_CPU_ARMV8 + select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a57 bool "cortex-A57" @@ -257,7 +257,7 @@ config BR2_cortex_a57 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 - select BR2_ARM_CPU_ARMV8 + select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a57_a53 bool "cortex-A57/A53 big.LITTLE" @@ -265,7 +265,7 @@ config BR2_cortex_a57_a53 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 - select BR2_ARM_CPU_ARMV8 + select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a72 @@ -274,7 +274,7 @@ config BR2_cortex_a72 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 - select BR2_ARM_CPU_ARMV8 + select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_cortex_a72_a53 @@ -283,7 +283,7 @@ config BR2_cortex_a72_a53 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 - select BR2_ARM_CPU_ARMV8 + select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 endchoice @@ -570,7 +570,7 @@ config BR2_GCC_TARGET_CPU # armv7m default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 - # armv8 + # armv8a default "cortex-a53" if BR2_cortex_a53 default "cortex-a57" if BR2_cortex_a57 default "cortex-a57.cortex-a53" if BR2_cortex_a57_a53 diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index db78d897d8..6739704e3c 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -224,7 +224,7 @@ else ifeq ($(BR2_ARM_CPU_ARMV6),y) CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv6 else ifeq ($(BR2_ARM_CPU_ARMV7A),y) CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv7 -else ifeq ($(BR2_ARM_CPU_ARMV8),y) +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv8 endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index 60d86c33d5..bdbe2acaea 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -5,7 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABI # Unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8 + depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index 9e0bcad501..d665b99874 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM bool "Linaro ARM 2017.08" depends on BR2_arm depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 + depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index 52fa4506bb..3c45a610c5 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2017.08" depends on BR2_armeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 + depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS From ffc9d6024312017a9fc7ecf6c112e60bd8288af4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:45 +0200 Subject: [PATCH 102/160] arch/arm: add cortex-A32 The cortex-A32 is an armv8a core, but it lacks the optional AArch64 extensions, so can only work in 32-bit mode. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index d110d52e2d..061c0ea082 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -243,6 +243,16 @@ config BR2_cortex_m4 endif # !BR2_ARCH_IS_64 comment "armv8 cores" +config BR2_cortex_a32 + bool "cortex-A32" + depends on !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a53 bool "cortex-A53" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -571,6 +581,7 @@ config BR2_GCC_TARGET_CPU default "cortex-m3" if BR2_cortex_m3 default "cortex-m4" if BR2_cortex_m4 # armv8a + default "cortex-a32" if BR2_cortex_a32 default "cortex-a53" if BR2_cortex_a53 default "cortex-a57" if BR2_cortex_a57 default "cortex-a57.cortex-a53" if BR2_cortex_a57_a53 From e9960da6ec84d0fc4f3d7ef8d9db5b1e29d79358 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:46 +0200 Subject: [PATCH 103/160] arch/arm: add some armv8a cortex variants Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 061c0ea082..6f189c6ba9 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -253,6 +253,15 @@ config BR2_cortex_a32 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_cortex_a35 + bool "cortex-A35" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a53 bool "cortex-A53" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -296,6 +305,33 @@ config BR2_cortex_a72_a53 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_cortex_a73 + bool "cortex-A73" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_cortex_a73_a35 + bool "cortex-A73/A35 big.LITTLE" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_cortex_a73_a53 + bool "cortex-A73/A53 big.LITTLE" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 endchoice config BR2_ARM_ENABLE_NEON @@ -582,11 +618,15 @@ config BR2_GCC_TARGET_CPU default "cortex-m4" if BR2_cortex_m4 # armv8a default "cortex-a32" if BR2_cortex_a32 + default "cortex-a35" if BR2_cortex_a35 default "cortex-a53" if BR2_cortex_a53 default "cortex-a57" if BR2_cortex_a57 default "cortex-a57.cortex-a53" if BR2_cortex_a57_a53 default "cortex-a72" if BR2_cortex_a72 default "cortex-a72.cortex-a53" if BR2_cortex_a72_a53 + default "cortex-a73" if BR2_cortex_a73 + default "cortex-a73.cortex-a35" if BR2_cortex_a73_a35 + default "cortex-a73.cortex-a53" if BR2_cortex_a73_a53 config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From d632d9e5a984a8da01156f28a2180e344f6a07a7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:47 +0200 Subject: [PATCH 104/160] arch/arm: add some non-cortex armv8a cores Some need gcc-5, some gcc-6 and some gcc-7. The thunderx familly does not build in 32-bit mode (gcc complains that the CPU is unknown, and even gcc master only knows them as aarch64-only). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 6f189c6ba9..2d6eb99692 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -332,6 +332,74 @@ config BR2_cortex_a73_a53 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_exynos_m1 + bool "exynos-m1" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 +config BR2_falkor + bool "falkor" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_qdf24xx + bool "qdf24xx" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +if BR2_ARCH_IS_64 +config BR2_thunderx + bool "thunderx" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 +config BR2_thunderxt81 + bool "thunderxt81" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_thunderxt83 + bool "thunderxt83" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_thunderxt88 + bool "thunderxt88" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_thunderxt88p1 + bool "thunderxt88p1" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +endif # BR2_ARCH_IS_64 +config BR2_xgene1 + bool "xgene1" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 endchoice config BR2_ARM_ENABLE_NEON @@ -627,6 +695,15 @@ config BR2_GCC_TARGET_CPU default "cortex-a73" if BR2_cortex_a73 default "cortex-a73.cortex-a35" if BR2_cortex_a73_a35 default "cortex-a73.cortex-a53" if BR2_cortex_a73_a53 + default "exynos-m1" if BR2_exynos_m1 + default "falkor" if BR2_falkor + default "qdf24xx" if BR2_qdf24xx + default "thunderx" if BR2_thunderx + default "thunderxt81" if BR2_thunderxt81 + default "thunderxt83" if BR2_thunderxt83 + default "thunderxt88" if BR2_thunderxt88 + default "thunderxt88p1" if BR2_thunderxt88p1 + default "xgene1" if BR2_xgene1 config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From 6317a199ecb525309e8172237a15b46776fe3a72 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Sep 2017 15:17:48 +0200 Subject: [PATCH 105/160] arch/arm: add armv8.1a cores The armv8.1a generation is a cumulative extension to armv8a. It adds new extensions, and makes some previously optional ones now mandatory. Since gcc correctly enables the appropriate extensions based on the core name, we don't really need to introduce a separate config for armv8.1a, and we can piggyback on armv8a. All those new cores are aarch64 only (gcc fails to build in arm mode). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 2d6eb99692..85070fbfc9 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -400,6 +400,37 @@ config BR2_xgene1 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + +if BR2_ARCH_IS_64 +comment "armv8.1a cores" +config BR2_thunderx2t99 + bool "thunderx2t99" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_thunderx2t99p1 + bool "thunderx2t99p1" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_vulcan + bool "vulcan" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +endif # BR2_ARCH_IS_64 endchoice config BR2_ARM_ENABLE_NEON @@ -704,6 +735,10 @@ config BR2_GCC_TARGET_CPU default "thunderxt88" if BR2_thunderxt88 default "thunderxt88p1" if BR2_thunderxt88p1 default "xgene1" if BR2_xgene1 + # armv8.1a + default "thunderx2t99" if BR2_thunderx2t99 + default "thunderx2t99p1" if BR2_thunderx2t99p1 + default "vulcan" if BR2_vulcan config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From c33c9ca62a1d34c59538b77e88d9e5f130527971 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 24 Nov 2017 20:49:37 +0100 Subject: [PATCH 106/160] package/python-mwclient: require pytest-runner only when necessary Fixes http://autobuild.buildroot.net/results/09c/09c0e590448f1fc069d1d00564c202d2b009d59a/ http://autobuild.buildroot.net/results/79e/79ef04d2e8c91231028e23f4bb35df685efa55ca/ http://autobuild.buildroot.net/results/7a4/7a4a4aecbe6dd315062bafe97b291645d3d6ced1/ Signed-off-by: Bernd Kuhls Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- ...re-pytest-runner-only-when-necessary.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch diff --git a/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch b/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch new file mode 100644 index 0000000000..124236c0b8 --- /dev/null +++ b/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch @@ -0,0 +1,43 @@ +From a6ff9745f56b776f244c2c412685f5c10ff0f09d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 24 Nov 2017 20:44:53 +0100 +Subject: [PATCH] setup.py: require pytest-runner only when necessary + +This optimizes setup.py for cases when pytest-runner is not needed, +using the approach that is suggested upstream: + +https://pypi.python.org/pypi/pytest-runner#conditional-requirement + +Patch sent upstream: https://github.com/mwclient/mwclient/pull/180 + +Signed-off-by: Bernd Kuhls +--- + setup.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a32cbde..660d93b 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,6 +8,9 @@ from setuptools import setup + here = os.path.abspath(os.path.dirname(__file__)) + README = open(os.path.join(here, 'README.rst')).read() + ++needs_pytest = set(['pytest', 'test', 'ptr']).intersection(sys.argv) ++pytest_runner = ['pytest-runner'] if needs_pytest else [] ++ + setup(name='mwclient', + version='0.8.6', # Use bumpversion to update + description='MediaWiki API client', +@@ -27,7 +30,7 @@ setup(name='mwclient', + license='MIT', + packages=['mwclient'], + install_requires=['requests_oauthlib', 'six'], +- setup_requires=['pytest-runner'], ++ setup_requires=pytest_runner, + tests_require=['pytest', 'pytest-pep8', 'pytest-cache', 'pytest-cov', + 'responses>=0.3.0', 'responses!=0.6.0', 'mock'], + zip_safe=True +-- +2.11.0 + From 921014df873fbdeac63eb72164d40316721bb417 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sat, 25 Nov 2017 01:44:47 -0300 Subject: [PATCH 107/160] axel: bump to version 2.16 - Change upstream URL. - Add optional dependency on libressl/openssl. - Switch to autotools-package. Signed-off-by: Ismael Luceno Signed-off-by: Thomas Petazzoni --- package/axel/Config.in | 2 +- package/axel/axel.hash | 3 +-- package/axel/axel.mk | 42 ++++++++++++++++++------------------------ 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index 6e709cfb13..4507855ff8 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_AXEL help HTTP/FTP download accelerator. - http://axel.alioth.debian.org/ + https://github.com/axel-download-accelerator/axel/ comment "axel needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/axel/axel.hash b/package/axel/axel.hash index 8957670118..1fc1c55ae0 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1 @@ -# Locally calculated -sha256 359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036 axel-2.4.tar.gz +sha256 bd65f8d8add34ab61ce1fb9e1c7b1c3449b1cfd981ce48aeee218e755ba0d6fb axel-2.16.tar.xz diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 60bf5e4a61..dcc8afd0b4 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,33 +4,27 @@ # ################################################################################ -AXEL_VERSION = 2.4 -AXEL_SITE = http://sources.buildroot.net +AXEL_VERSION = 2.16 +AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) +AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING AXEL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -AXEL_LDFLAGS = -lpthread $(TARGET_NLS_LIBS) -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) -AXEL_DISABLE_I18N = --i18n=0 +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +AXEL_CONF_OPTS = \ + ac_cv_prog_cc_c99=-std=c99 \ + CFLAGS="$(TARGET_CFLAGS)" + +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +AXEL_CONF_OPTS += --with-ssl +AXEL_DEPENDENCIES += libressl +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +AXEL_CONF_OPTS += --with-ssl +AXEL_DEPENDENCIES += openssl +else +AXEL_CONF_OPTS += --without-ssl endif -define AXEL_CONFIGURE_CMDS - (cd $(@D); \ - ./configure \ - --prefix=/usr \ - --debug=1 \ - $(AXEL_DISABLE_I18N) \ - ) -endef - -define AXEL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D) -endef - -define AXEL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) From cda7db8b869c89f0f4e7f668477ebfc9f5d897ba Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 25 Nov 2017 10:11:42 +0100 Subject: [PATCH 108/160] package/nano: bump version to 2.9.0 Removed patch applied upstream, added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ion-when-configured-with-enable-tiny.patch | 43 ------------------- package/nano/nano.hash | 3 +- package/nano/nano.mk | 4 +- 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch diff --git a/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch b/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch deleted file mode 100644 index db684f9832..0000000000 --- a/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg -Date: Tue, 29 Aug 2017 19:28:44 +0200 -Subject: tweaks: fix compilation when configured with --enable-tiny - -When moving the cursor to the top-left corner, it is not necessary -to compute leftedge because firstcolumn IS the relevant leftedge. - -Reported-by: Jordi Mallach - -Downloaded from upstream master branch: -http://git.savannah.gnu.org/cgit/nano.git/commit/?id=28cfab7580c42a6d6c9c5d787ce736094fd51a0c - -Signed-off-by: Bernd Kuhls ---- - src/move.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/move.c b/src/move.c -index d138356..ce276e4 100644 ---- a/src/move.c -+++ b/src/move.c -@@ -121,7 +121,7 @@ void do_page_up(void) - openfile->current = openfile->edittop; - openfile->current_y = 0; - -- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); -+ leftedge = openfile->firstcolumn; - target_column = 0; - } else - get_edge_and_target(&leftedge, &target_column); -@@ -152,7 +152,7 @@ void do_page_down(void) - openfile->current = openfile->edittop; - openfile->current_y = 0; - -- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); -+ leftedge = openfile->firstcolumn; - target_column = 0; - } else - get_edge_and_target(&leftedge, &target_column); --- -cgit v1.0-41-gc330 - diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 4e0abc4489..c09f0313d3 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 fbe31746958698d73c6726ee48ad8b0612697157961a2e9aaa83b4aa53d1165a nano-2.8.7.tar.xz +sha256 d2d30c39caef53aba1ec1b4baff4186d4496f35d2411b0848242a5f2e27e129e nano-2.9.0.tar.xz +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index f1c172ffd5..458174a473 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 2.8 -NANO_VERSION = $(NANO_VERSION_MAJOR).7 +NANO_VERSION_MAJOR = 2.9 +NANO_VERSION = $(NANO_VERSION_MAJOR).0 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From ab01a1279c4990d201e6a560dbe9cc5b25a20fae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 25 Nov 2017 10:14:57 +0100 Subject: [PATCH 109/160] package/php: bump version to 7.1.12 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index d1f36f2d34..cdec308b66 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 074093e9d7d21afedc5106904218a80a47b854abe368d2728ed22184c884893e php-7.1.11.tar.xz +sha256 a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3 php-7.1.12.tar.xz # License file sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index aaeacde69a..72d5ea80c7 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.11 +PHP_VERSION = 7.1.12 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From ee967f28cd2da7865425822afb919afe72a5cff9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 25 Nov 2017 10:18:40 +0100 Subject: [PATCH 110/160] package/eudev: bump version to 3.2.5 Added license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/eudev/eudev.hash | 5 +++-- package/eudev/eudev.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index 75f2cc1c48..3fa47980ec 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,4 +1,5 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 66acef4c6094aab4aced7ae83b74b0d2 eudev-3.2.4.tar.gz +md5 6ca08c0e14380f87df8e8aceac123671 eudev-3.2.5.tar.gz # Locally calculated -sha256 dddcf4c89b21f5f3210f7e4d3888c92cbfc657ff734ac21b6bdd3f5bcb146fed eudev-3.2.4.tar.gz +sha256 49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af eudev-3.2.5.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index b712475861..d08b9bb0c9 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.4 +EUDEV_VERSION = 3.2.5 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING From 9e252c9575fbdc82ac2800fbe99edfe7621596a9 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Sat, 25 Nov 2017 14:08:51 +0300 Subject: [PATCH 111/160] hostapd: keep previous patches when DRIVER_RTW set Changed HOSTAPD_PATCH= to HOSTAPD_PATCH+= to keep previously added patches. Signed-off-by: Alexander Mukhin Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index bb3919e988..0ed1631421 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -48,7 +48,7 @@ HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) -HOSTAPD_PATCH = https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch +HOSTAPD_PATCH += https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW endif From 0954a0372ba8c690f34d9c99e923a013304f751c Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 6 Nov 2017 10:28:23 -0800 Subject: [PATCH 112/160] python-schedule: new package Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-schedule/Config.in | 6 ++++++ package/python-schedule/python-schedule.hash | 5 +++++ package/python-schedule/python-schedule.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-schedule/Config.in create mode 100644 package/python-schedule/python-schedule.hash create mode 100644 package/python-schedule/python-schedule.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8a44e042ef..7dcc95b232 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -805,6 +805,7 @@ F: configs/qemu_ppc64le_pseries_defconfig N: Joseph Kogut F: package/python-raven/ +F: package/python-schedule/ F: package/python-websockets/ N: Johan Derycke diff --git a/package/Config.in b/package/Config.in index a8f3f7cb11..86acab6427 100644 --- a/package/Config.in +++ b/package/Config.in @@ -885,6 +885,7 @@ menu "External python modules" source "package/python-rtslib-fb/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy3k/Config.in" + source "package/python-schedule/Config.in" source "package/python-sdnotify/Config.in" source "package/python-serial/Config.in" source "package/python-service-identity/Config.in" diff --git a/package/python-schedule/Config.in b/package/python-schedule/Config.in new file mode 100644 index 0000000000..d00c245948 --- /dev/null +++ b/package/python-schedule/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_SCHEDULE + bool "python-schedule" + help + Job scheduling for humans. + + https://github.com/dbader/schedule diff --git a/package/python-schedule/python-schedule.hash b/package/python-schedule/python-schedule.hash new file mode 100644 index 0000000000..9f64cc4373 --- /dev/null +++ b/package/python-schedule/python-schedule.hash @@ -0,0 +1,5 @@ +# md5 from https://pypi.python.org/pypi/schedule/json, sha256 locally computed +md5 ab135a73458547d2b836beddd168528b schedule-0.4.3.tar.gz +sha256 31a160546a17838842199c792ba267575cf41339ca730aaf060567b798f4f46e schedule-0.4.3.tar.gz +# License file, locally calculated +30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/package/python-schedule/python-schedule.mk b/package/python-schedule/python-schedule.mk new file mode 100644 index 0000000000..26a3f5bce1 --- /dev/null +++ b/package/python-schedule/python-schedule.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-schedule +# +################################################################################ + +PYTHON_SCHEDULE_VERSION = 0.4.3 +PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz +PYTHON_SCHEDULE_SITE = https://pypi.python.org/packages/ee/68/ba6b0bb69b2be13b32983971bca6c5adf22df6321945232e1419bc34a82f +PYTHON_SCHEDULE_SETUP_TYPE = setuptools +PYTHON_SCHEDULE_LICENSE = MIT +PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From e5b2fc8c7d8614fc3a62abbc3fa6fb2c841146d4 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sat, 4 Nov 2017 21:36:44 +0100 Subject: [PATCH 113/160] utils/diffconfig: add diffconfig utility Diffconfig is a simple utility for comparing two configuration files. See usage in the script for more info. Borrowed from the Linux kernel source code and adapted to Buildroot. Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ utils/diffconfig | 136 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100755 utils/diffconfig diff --git a/DEVELOPERS b/DEVELOPERS index 7dcc95b232..1a6a31f0ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1014,6 +1014,9 @@ F: package/turbolua/ N: Marcin Nowakowski F: package/libkcapi/ +N: Marcus Folkesson +F: utils/diffconfig + N: Marek Belisko F: package/libatasmart/ F: package/polkit/ diff --git a/utils/diffconfig b/utils/diffconfig new file mode 100755 index 0000000000..5862a62f25 --- /dev/null +++ b/utils/diffconfig @@ -0,0 +1,136 @@ +#!/usr/bin/python +# +# diffconfig - a tool to compare .config files. +# +# originally written in 2006 by Matt Mackall +# (at least, this was in his bloatwatch source code) +# last worked on 2008 by Tim Bird for the Linux kernel +# Adapted to Buildroot 2017 by Marcus Folkesson +# + +import sys, os + +def usage(): + print("""Usage: diffconfig [-h] [-m] [ ] + +Diffconfig is a simple utility for comparing two .config files. +Using standard diff to compare .config files often includes extraneous and +distracting information. This utility produces sorted output with only the +changes in configuration values between the two files. + +Added and removed items are shown with a leading plus or minus, respectively. +Changed items show the old and new values on a single line. + +If -m is specified, then output will be in "merge" style, which has the +changed and new values in kernel config option format. + +If no config files are specified, .config and .config.old are used. + +Example usage: + $ diffconfig .config config-with-some-changes +-LINUX_KERNEL_INTREE_DTS_NAME "vexpress-v2p-ca9" + LINUX_KERNEL_DTS_SUPPORT y -> n + LINUX_KERNEL_USE_INTREE_DTS y -> n + PACKAGE_DFU_UTIL n -> y + PACKAGE_LIBUSB n -> y + TARGET_GENERIC_HOSTNAME "buildroot" -> "Tuxie" + TARGET_GENERIC_ISSUE "Welcome to Buildroot" -> "Welcome to CustomBoard" ++PACKAGE_LIBUSB_COMPAT n + +""") + sys.exit(0) + +# returns a dictionary of name/value pairs for config items in the file +def readconfig(config_file): + d = {} + for line in config_file: + line = line[:-1] + if line[:4] == "BR2_": + name, val = line[4:].split("=", 1) + d[name] = val + if line[-11:] == " is not set": + d[line[6:-11]] = "n" + return d + +def print_config(op, config, value, new_value): + global merge_style + + if merge_style: + if new_value: + if new_value=="n": + print("# BR2_%s is not set" % config) + else: + print("BR2_%s=%s" % (config, new_value)) + else: + if op=="-": + print("-%s %s" % (config, value)) + elif op=="+": + print("+%s %s" % (config, new_value)) + else: + print(" %s %s -> %s" % (config, value, new_value)) + +def main(): + global merge_style + + # parse command line args + if ("-h" in sys.argv or "--help" in sys.argv): + usage() + + merge_style = 0 + if "-m" in sys.argv: + merge_style = 1 + sys.argv.remove("-m") + + argc = len(sys.argv) + if not (argc==1 or argc == 3): + print("Error: incorrect number of arguments or unrecognized option") + usage() + + if argc == 1: + # if no filenames given, assume .config and .config.old + build_dir="" + if "KBUILD_OUTPUT" in os.environ: + build_dir = os.environ["KBUILD_OUTPUT"]+"/" + configa_filename = build_dir + ".config.old" + configb_filename = build_dir + ".config" + else: + configa_filename = sys.argv[1] + configb_filename = sys.argv[2] + + try: + a = readconfig(open(configa_filename)) + b = readconfig(open(configb_filename)) + except (IOError): + e = sys.exc_info()[1] + print("I/O error[%s]: %s\n" % (e.args[0],e.args[1])) + usage() + + # print items in a but not b (accumulate, sort and print) + old = [] + for config in a: + if config not in b: + old.append(config) + old.sort() + for config in old: + print_config("-", config, a[config], None) + del a[config] + + # print items that changed (accumulate, sort, and print) + changed = [] + for config in a: + if a[config] != b[config]: + changed.append(config) + else: + del b[config] + changed.sort() + for config in changed: + print_config("->", config, a[config], b[config]) + del b[config] + + # now print items in b but not in a + # (items from b that were in a were removed above) + new = sorted(b.keys()) + for config in new: + print_config("+", config, None, b[config]) + +main() From a8c1f02ecc40678e6eacfbdb34ea842840f5bee5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 26 Nov 2017 22:07:35 -0200 Subject: [PATCH 114/160] linux-firmware: Bump to the latest version Update to commit 17e6288135d4. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 2 +- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 9b8dfedb8e..209ea26228 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ec58d9aaf3cf80f768c32ba22d925c0542436ef3ee4588acd3e49b12ca2ed9d9 linux-firmware-a3a26af24e29c818ef9b5661856018e21a5c49fb.tar.gz +sha256 28d359523a36c1cdc3e85a8e148bb2d68b036d28b10f0e80a192f3dc29f02c16 linux-firmware-17e6288135d4500f9fe60224dce2b46d850c346b.tar.gz diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index d238abe9ea..fd0fa3d213 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = a3a26af24e29c818ef9b5661856018e21a5c49fb +LINUX_FIRMWARE_VERSION = 17e6288135d4500f9fe60224dce2b46d850c346b LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git From c7f33aa9d12b3c756a9aae9325ffc9a53d06bb5c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 27 Nov 2017 07:24:06 +0100 Subject: [PATCH 115/160] package/samba4: bump version to 4.7.3 Rebased 0001-libreplace-disable-libbsd-support.patch. Added iconv-related entry to samba4-cache.txt to fix configure error: Cross answers file /home/buildroot/test-samba4/armv5-ctng-linux-gnueabi/build/samba4-4.7.3/cache.txt is incomplete with this defconfig BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_LIBICONV=y BR2_PACKAGE_SAMBA4=y BR2_PACKAGE_SAMBA4_AD_DC=y BR2_PACKAGE_SAMBA4_ADS=y BR2_PACKAGE_SAMBA4_SMBTORTURE=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-libreplace-disable-libbsd-support.patch | 11 +++++++---- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 4d0c770af4..ed6accfca1 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -9,6 +9,8 @@ This causes redefinition conflicts for link(2) when both standard unistd.h and bsd/unistd.h get included. Signed-off-by: Gustavo Zacarias +(rebased for version 4.7.3) +Signed-off-by: Bernd Kuhls --- lib/replace/wscript | 12 ------------ 1 file changed, 12 deletions(-) @@ -17,14 +19,15 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 1dfd902..456be9b 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -248,18 +248,6 @@ def configure(conf): +@@ -253,19 +253,6 @@ - conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index 3ba8a75ea6..4a6471dd7a 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -37,3 +37,4 @@ Checking value of NSIG: "65" Checking value of _NSIG: "65" Checking value of SIGRTMAX: "64" Checking value of SIGRTMIN: "34" +Checking errno of iconv for illegal multibyte sequence: "0" diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 7446b1bdb8..49122c60cb 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a samba-4.6.9.tar.gz +sha256 06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c samba-4.7.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 7502fa6a13..f7dd30cd3e 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.6.9 +SAMBA4_VERSION = 4.7.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From d7500b615ff4b8d0669252acff61421763d6c4fe Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 27 Nov 2017 07:33:54 +0100 Subject: [PATCH 116/160] python-jaraco-classes: add missing dependency python-jaraco-classes needs host-python-setuptools-scm. Fixes: http://autobuild.buildroot.net/results/3a7000002b86663a56c0341d192f131a4a8f4936 http://autobuild.buildroot.net/results/553d6fdeb6ea5359b1c7d4eeb844da7a588f02e7 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-jaraco-classes/python-jaraco-classes.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk index 4251452293..c361e97a68 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.mk +++ b/package/python-jaraco-classes/python-jaraco-classes.mk @@ -10,5 +10,6 @@ PYTHON_JARACO_CLASSES_SITE = https://pypi.python.org/packages/b3/ce/031a6004619c PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools +PYTHON_JARACO_CLASSES_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From 0ddfa001948ab877b71d19f74b68bab7a3061cb7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 26 Nov 2017 10:12:52 +0100 Subject: [PATCH 117/160] package/{mesa3d, mesa3d-headers}: bump version to 17.2.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index a944353642..87fbb2f043 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 17.2.5 +MESA3D_HEADERS_VERSION = 17.2.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index baadc49392..5779258072 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,7 +1,7 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-November/000374.html -md5 ba649f82a066f710aa23655254a83eb8 mesa-17.2.5.tar.xz -sha1 1509bd00f32ee42128f29b63b4aaf26bf9abb63e mesa-17.2.5.tar.xz -sha256 7f7f914b7b9ea0b15f2d9d01a4375e311b0e90e55683b8e8a67ce8691eb1070f mesa-17.2.5.tar.xz -sha512 c4b0f7f48b0b57fdf610de3d61e127774f8223e755acfde6cf2649818eec985e8f925abf8a15d530ecdb882cb8d7268fd01e5d94c8ac6934551b8a74272353c7 mesa-17.2.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2017-November/000378.html +md5 862f2b7e2a08554570b192a89f723b6f mesa-17.2.6.tar.xz +sha1 03003f7d5966ef842d169020e95bcbdf92add055 mesa-17.2.6.tar.xz +sha256 6ad85224620330be26ab68c8fc78381b12b38b610ade2db8716b38faaa8f30de mesa-17.2.6.tar.xz +sha512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202 mesa-17.2.6.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c license.html diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index fb94185367..6c8e86f0ec 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 17.2.5 +MESA3D_VERSION = 17.2.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 84e3bbcac89b59ee64ab4d92adc18badf86a9ed7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 25 Nov 2017 22:12:18 +0200 Subject: [PATCH 118/160] dbus: bump to version 1.12.2 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index df1891b6d8..1aa5aa445d 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.0.tar.gz.asc -sha256 39af0d9267391434b549c5c4adc001b735518c96f7630c3fe7162af1d13ef3c0 dbus-1.12.0.tar.gz +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.2.tar.gz.asc +sha256 272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88 dbus-1.12.2.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 56a54e309c..22ba22e17e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.0 +DBUS_VERSION = 1.12.2 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From 0f2450477132e002a445708b78fd173275458300 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 25 Nov 2017 17:10:31 +0100 Subject: [PATCH 119/160] package/avahi: bump version to 0.7 Added license hash, removed license text in avahi.mk added in 2006: https://git.buildroot.net/buildroot/commit/package/avahi?id=21e97d3e155f4d9604f729698cdfff3c40eefbe7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.hash | 3 ++- package/avahi/avahi.mk | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash index 09c5d42433..b4d36ffe50 100644 --- a/package/avahi/avahi.hash +++ b/package/avahi/avahi.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 avahi-0.6.32.tar.gz +sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 94b6292b5d..b89887b4c7 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -4,14 +4,7 @@ # ################################################################################ -# -# This program is free software; you can redistribute it -# and/or modify it under the terms of the GNU Lesser General -# Public License as published by the Free Software Foundation -# either version 2.1 of the License, or (at your option) any -# later version. - -AVAHI_VERSION = 0.6.32 +AVAHI_VERSION = 0.7 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPL-2.1+ AVAHI_LICENSE_FILES = LICENSE From b101114b82dba39cc58b66dbc870f2ef613afbcf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 25 Nov 2017 12:12:14 -0500 Subject: [PATCH 120/160] postgresql: bump to 10.1 - Add a hash for the license file. - PostgreSQL 10.0 and above will default to checking for /dev/urandom if an SSL library is not found, which will fail when cross compiling. Since /dev/urandom is guaranteed to be provided on Linux systems, add ac_cv_file__dev_urandom=yes to the configure environment if a SSL library is not selected. Signed-off-by: Adam Duskett [Thomas: minor tweaks to the /dev/urandom comment in the .mk file.] Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 7 ++++--- package/postgresql/postgresql.mk | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e62838911e..e2347701c1 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.6/postgresql-9.6.6.tar.bz2.sha256 -sha256 399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154 postgresql-9.6.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v10.1/postgresql-10.1.tar.bz2.sha256 +sha256 3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713 postgresql-10.1.tar.bz2 + # License file, Locally calculated -sha256 7dc8de32741ad1b03e21710771b55a1b9d460671d47f28a8840f917e38c66676 COPYRIGHT +sha256 7dc8de32741ad1b03e21710771b55a1b9d460671d47f28a8840f917e38c66676 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 50ce212c1c..4657489a53 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.6 +POSTGRESQL_VERSION = 10.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -56,6 +56,11 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) POSTGRESQL_DEPENDENCIES += openssl POSTGRESQL_CONF_OPTS += --with-openssl +else +# PostgreSQL checks for /dev/urandom and fails if it's being cross-compiled and +# an SSL library isn't found. Since /dev/urandom is guaranteed to be provided +# on Linux systems, explicitly tell the configure script it's available. +POSTGRESQL_CONF_ENV += ac_cv_file__dev_urandom=yes endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) From 00012bf9d5943f007e0ae0e1e45ff6dab102e9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 23 Nov 2017 18:26:19 -0500 Subject: [PATCH 121/160] qt5webengine: enable build for 5.6.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build was broken in 5.6.2 and was disabled. It compiles fine since 5.6.3. The two additional patches are useful at run-time. The first one avoid the need to specify the path to the SSL certificate directory (using an additional environment variable). The second one is the same used in 5.9.x (plus resolved conflicts). It uses the process's context to get handles on EGL and GLESv2 libraries. Those libraries are linked to Qt WebEngine at compile time. The patch is particularly usefull for RPI boards since the raspberrypi userland package does not provide the libEGLv2.so.2 and libGLES.so.1 symlinks. Both library paths are hardcoded in Qt WebEngine. Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- .../0001-Change-default-SSL-directory.patch | 35 +++++++ ...bEGL-and-libGLES2-symbols-implicitly.patch | 93 +++++++++++++++++++ package/qt5/qt5webengine/Config.in | 5 - package/qt5/qt5webengine/qt5webengine.hash | 3 + 4 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch create mode 100644 package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch diff --git a/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch b/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch new file mode 100644 index 0000000000..15cd9f87bb --- /dev/null +++ b/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch @@ -0,0 +1,35 @@ +From fc41c0f572ff347142cca4bf5d82b87782bb5906 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Thu, 23 Nov 2017 16:18:06 -0500 +Subject: [PATCH] Change default SSL directory +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Change the default SSL directory, as buildroot ca-cert package is +installed at /etc/ssl. That way, we don't have to use the SSL_CERT_DIR +environment at runtime. + +Upstream-Status: Inappropriate +Signed-off-by: Damien Riegel +Signed-off-by: Gaël PORTAY +--- + src/core/qtwebengine_extras.gypi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi +index 229421ef..3b2386c0 100644 +--- a/src/core/qtwebengine_extras.gypi ++++ b/src/core/qtwebengine_extras.gypi +@@ -96,7 +96,7 @@ + 'GL_GLEXT_PROTOTYPES', + 'EGL_EGLEXT_PROTOTYPES', + # At runtime the env variable SSL_CERT_DIR can be used to override this +- 'OPENSSLDIR="/usr/lib/ssl"', ++ 'OPENSSLDIR="/etc/ssl"', + 'OPENSSL_LOAD_CONF', + 'EGL_API_FB=1', + 'LINUX=1', +-- +2.15.0 + diff --git a/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch new file mode 100644 index 0000000000..05ed2956d2 --- /dev/null +++ b/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch @@ -0,0 +1,93 @@ +From bdfd084296681bcead17c42f1e5cf0e24ee04f65 Mon Sep 17 00:00:00 2001 +From: Viktor Engelmann +Date: Fri, 7 Jul 2017 12:56:19 +0200 +Subject: [PATCH] Load libEGL and libGLES2 symbols implicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Instead of explicitly loading libraries from hard-coded locations, +we now just call dlopen(NULL, RTLD_LAZY). This returns a handle to +the host process'es context, which already contains the symbols of +both these libraries, because we link against them. +It was necessary to bypass LoadLibrary, because that expects a non-NULL +file path, so we couldn't pass NULL through that interface. + +Upstream-Status: Merged +Task-number: QTBUG-57761 +Change-Id: I29f037dfe542222b5188a33c7727c81a464a87bb +Reviewed-by: Allan Sandfeld Jensen +Reviewed-by: Michal Klocek +Signed-off-by: Gaël PORTAY +[gportay: backport from 5.9 and merge conflicts] +--- + src/core/surface_factory_qt.cpp | 40 ++++++++-------------------------------- + 1 file changed, 8 insertions(+), 32 deletions(-) + +diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp +index 48c91bfc..c6059b67 100644 +--- a/src/core/surface_factory_qt.cpp ++++ b/src/core/surface_factory_qt.cpp +@@ -51,51 +51,27 @@ + #if defined(USE_OZONE) + + #include +- +-#ifndef QT_LIBDIR_EGL +-#define QT_LIBDIR_EGL "/usr/lib" +-#endif +-#ifndef QT_LIBDIR_GLES2 +-#define QT_LIBDIR_GLES2 QT_LIBDIR_EGL +-#endif ++#include + + namespace QtWebEngineCore { + +-base::NativeLibrary LoadLibrary(const base::FilePath& filename) { +- base::NativeLibraryLoadError error; +- base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); +- if (!library) { +- LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString(); +- return NULL; +- } +- return library; +-} +- + bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) + { +- base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); +- libEGLPath = libEGLPath.Append("libEGL.so.1"); +- base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); +- if (!eglLibrary) +- return false; +- +- base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2); +- libGLES2Path = libGLES2Path.Append("libGLESv2.so.2"); +- base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path); +- if (!gles2Library) ++ base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY); ++ if (!eglgles2Library) { ++ LOG(ERROR) << "Failed to open EGL/GLES2 context " << dlerror(); + return false; ++ } + +- gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast(base::GetFunctionPointerFromNativeLibrary(eglLibrary, "eglGetProcAddress")); ++ gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast(base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress")); + if (!get_proc_address) { + LOG(ERROR) << "eglGetProcAddress not found."; +- base::UnloadNativeLibrary(eglLibrary); +- base::UnloadNativeLibrary(gles2Library); ++ base::UnloadNativeLibrary(eglgles2Library); + return false; + } + + gfx::SetGLGetProcAddressProc(get_proc_address); +- gfx::AddGLNativeLibrary(eglLibrary); +- gfx::AddGLNativeLibrary(gles2Library); ++ gfx::AddGLNativeLibrary(eglgles2Library); + return true; + } + +-- +2.15.0 + diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index d40b58062e..d0c8d18210 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -20,10 +20,6 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL -comment "qt5webengine is not available with Qt 5.6" - depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS - depends on BR2_PACKAGE_QT5_VERSION_5_6 - config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS @@ -35,7 +31,6 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV - depends on !BR2_PACKAGE_QT5_VERSION_5_6 # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 918f7edb3a..f71889e251 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,2 +1,5 @@ +# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz + # Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz.mirrorlist sha256 cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108 qtwebengine-opensource-src-5.9.2.tar.xz From 86dfb429ae1770550beb49299ef08ef05605c190 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 14 Nov 2017 14:02:38 +0200 Subject: [PATCH 122/160] gnupg2: don't preserve the old gpg2 executable name Commit e82fadab236a (gnupg2: bump to version 2.2.0) added a configure option to keep the old 'gpg2' executable name to avoid conflict with the gnupg package. It turns out that gnupg depends on !BR2_PACKAGE_GNUPG2 since commit 2cadb26e6d4 (gnupg: make gnupg and gnupg2 mutually exclusive). Drop this configure option. Rename the config option that controls the removal of gpgv2, now gpgv, to match the new name. Add legacy config symbol handling. Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 11 +++++++++++ package/gnupg2/Config.in | 6 +++--- package/gnupg2/gnupg2.mk | 10 ++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 35a6d6e1fe..c8db9fac42 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,17 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2018.02" + +config BR2_PACKAGE_GNUPG2_GPGV2 + bool "gnupg2 gpgv2 option removed" + select BR2_LEGACY + select BR2_PACKAGE_GNUPG2_GPGV + help + The gpgv2 executable is now named gpgv. The config option + has been renamed accordingly. + ############################################################################### comment "Legacy options removed in 2017.11" diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index c287089657..ef1817ef02 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -28,10 +28,10 @@ config BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2 -config BR2_PACKAGE_GNUPG2_GPGV2 - bool "gpgv2" +config BR2_PACKAGE_GNUPG2_GPGV + bool "gpgv" help - gpgv2 is an OpenPGP signature verification tool. + gpgv is an OpenPGP signature verification tool. This program is actually a stripped-down version of gpg which is only able to check signatures. It is somewhat diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 0466ed633f..f5fcb15e36 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -12,9 +12,7 @@ GNUPG2_LICENSE_FILES = COPYING GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf -# Keep the gpg2 binary name to avoid conflict with gnupg GNUPG2_CONF_OPTS = \ - --enable-gpg-is-gpg2 \ --disable-rpath --disable-regex --disable-doc \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ @@ -22,11 +20,11 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr -ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y) -define GNUPG2_REMOVE_GPGV2 - rm -f $(TARGET_DIR)/usr/bin/gpgv2 +ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) +define GNUPG2_REMOVE_GPGV + rm -f $(TARGET_DIR)/usr/bin/gpgv endef -GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2 +GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV endif ifeq ($(BR2_PACKAGE_BZIP2),y) From 3587d29eae6086c1006526c054df2d0fce6fe687 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 14 Nov 2017 14:02:39 +0200 Subject: [PATCH 123/160] gnupg2: bump to version 2.2.2 Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 84152ee4f2..43ce3c6328 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000413.html -sha1 36ee693d0b2ec529ecf53dd6d397cc38ba71c0a7 gnupg-2.2.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q4/000416.html +sha1 efa00fc20295b1cafe467359107ea170258870e2 gnupg-2.2.2.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.0.tar.bz2.sig -sha256 d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6 gnupg-2.2.0.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.2.tar.bz2.sig +sha256 bfb62c7412ceb3b9422c6c7134a34ff01a560f98eb981c2d96829c1517c08197 gnupg-2.2.2.tar.bz2 diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index f5fcb15e36..baf85e7163 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.0 +GNUPG2_VERSION = 2.2.2 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From d682569f5dca884a23d5810a89388e6174687bfd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 31 Oct 2017 09:39:32 +0100 Subject: [PATCH 124/160] gupnp-av: fix static library linking with gupnp gupnp and gupnp-av defines two internal functions with the same name: xml_util_get_element and xml_util_get_child_element_content, as a result an application such as rygel can't be build statically. To fix this issue, rename both functions as xml_util_get_element2 and xml_util_get_child_element_content2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ix-static-library-linking-with-gupnp.patch | 354 ++++++++++++++++++ 1 file changed, 354 insertions(+) create mode 100644 package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch diff --git a/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch b/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch new file mode 100644 index 0000000000..eba99da45b --- /dev/null +++ b/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch @@ -0,0 +1,354 @@ +From 268ec01e448ed7cedf90b37fbc27f01806637825 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 30 Oct 2017 22:10:23 +0100 +Subject: [PATCH 1/1] Fix static library linking with gupnp + +gupnp and gupnp-av defines two internal functions with the same name: +xml_util_get_element and xml_util_get_child_element_content, as a result +an application such as rygel can't be build statically. +To fix this issue, rename both functions as +xml_util_get_element2 and xml_util_get_child_element_content2 + +Signed-off-by: Fabrice Fontaine +--- + libgupnp-av/gupnp-cds-last-change-parser.c | 2 +- + libgupnp-av/gupnp-didl-lite-container.c | 4 ++-- + libgupnp-av/gupnp-didl-lite-item.c | 2 +- + libgupnp-av/gupnp-didl-lite-object.c | 26 +++++++++++++------------- + libgupnp-av/gupnp-didl-lite-parser.c | 4 ++-- + libgupnp-av/gupnp-didl-lite-writer.c | 2 +- + libgupnp-av/gupnp-feature-list-parser.c | 2 +- + libgupnp-av/gupnp-last-change-parser.c | 2 +- + libgupnp-av/xml-util.c | 16 ++++++++-------- + libgupnp-av/xml-util.h | 4 ++-- + 10 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c +index cff5f0b..36f6b0a 100644 +--- a/libgupnp-av/gupnp-cds-last-change-parser.c ++++ b/libgupnp-av/gupnp-cds-last-change-parser.c +@@ -119,7 +119,7 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser, + goto out; + } + +- state_event = xml_util_get_element ((xmlNode *) doc, ++ state_event = xml_util_get_element2 ((xmlNode *) doc, + "StateEvent", + NULL); + if (state_event == NULL) { +diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c +index d7ac578..c0e7395 100644 +--- a/libgupnp-av/gupnp-didl-lite-container.c ++++ b/libgupnp-av/gupnp-didl-lite-container.c +@@ -340,7 +340,7 @@ gupnp_didl_lite_container_container_update_id_is_set + + xml_node = gupnp_didl_lite_object_get_xml_node + (GUPNP_DIDL_LITE_OBJECT (container)); +- content = xml_util_get_child_element_content (xml_node, ++ content = xml_util_get_child_element_content2 (xml_node, + "containerUpdateID"); + return content != NULL; + } +@@ -390,7 +390,7 @@ gupnp_didl_lite_container_total_deleted_child_count_is_set + + xml_node = gupnp_didl_lite_object_get_xml_node + (GUPNP_DIDL_LITE_OBJECT (container)); +- content = xml_util_get_child_element_content (xml_node, ++ content = xml_util_get_child_element_content2 (xml_node, + "totalDeletedChildCount"); + return content != NULL; + } +diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c +index 3588052..3d6d4d0 100644 +--- a/libgupnp-av/gupnp-didl-lite-item.c ++++ b/libgupnp-av/gupnp-didl-lite-item.c +@@ -254,7 +254,7 @@ gupnp_didl_lite_item_get_lifetime (GUPnPDIDLLiteItem *item) + object = GUPNP_DIDL_LITE_OBJECT (item); + node = gupnp_didl_lite_object_get_xml_node (object); + +- lifetime_str = xml_util_get_child_element_content (node, "lifetime"); ++ lifetime_str = xml_util_get_child_element_content2 (node, "lifetime"); + lifetime = seconds_from_time (lifetime_str); + + return lifetime; +diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c +index 68156dc..cab2359 100644 +--- a/libgupnp-av/gupnp-didl-lite-object.c ++++ b/libgupnp-av/gupnp-didl-lite-object.c +@@ -1065,7 +1065,7 @@ gupnp_didl_lite_object_get_upnp_class (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "class"); + } + +@@ -1211,7 +1211,7 @@ gupnp_didl_lite_object_get_title (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "title"); + } + +@@ -1228,7 +1228,7 @@ gupnp_didl_lite_object_get_creator (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "creator"); + } + +@@ -1266,7 +1266,7 @@ gupnp_didl_lite_object_get_artist (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "artist"); + } + +@@ -1303,7 +1303,7 @@ gupnp_didl_lite_object_get_author (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "author"); + } + +@@ -1377,7 +1377,7 @@ gupnp_didl_lite_object_get_genre (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "genre"); + } + +@@ -1394,7 +1394,7 @@ gupnp_didl_lite_object_get_write_status (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "writeStatus"); + } + +@@ -1411,7 +1411,7 @@ gupnp_didl_lite_object_get_album (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "album"); + } + +@@ -1428,7 +1428,7 @@ gupnp_didl_lite_object_get_album_art (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "albumArtURI"); + } + +@@ -1445,7 +1445,7 @@ gupnp_didl_lite_object_get_description (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "description"); + } + +@@ -1462,7 +1462,7 @@ gupnp_didl_lite_object_get_date (GUPnPDIDLLiteObject *object) + { + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + +- return xml_util_get_child_element_content (object->priv->xml_node, ++ return xml_util_get_child_element_content2 (object->priv->xml_node, + "date"); + } + +@@ -1481,7 +1481,7 @@ gupnp_didl_lite_object_get_track_number (GUPnPDIDLLiteObject *object) + + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), -1); + +- str = xml_util_get_child_element_content (object->priv->xml_node, ++ str = xml_util_get_child_element_content2 (object->priv->xml_node, + "originalTrackNumber"); + if (str == NULL) + return -1; +@@ -1552,7 +1552,7 @@ gupnp_didl_lite_object_update_id_is_set (GUPnPDIDLLiteObject *object) + g_return_val_if_fail (object != NULL, FALSE); + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), FALSE); + +- content = xml_util_get_child_element_content (object->priv->xml_node, ++ content = xml_util_get_child_element_content2 (object->priv->xml_node, + "objectUpdateID"); + return content != NULL; + } +diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c +index 59255ef..93d03c0 100644 +--- a/libgupnp-av/gupnp-didl-lite-parser.c ++++ b/libgupnp-av/gupnp-didl-lite-parser.c +@@ -52,7 +52,7 @@ verify_didl_attributes (xmlNode *node) + { + const char *content; + +- content = xml_util_get_child_element_content (node, "date"); ++ content = xml_util_get_child_element_content2 (node, "date"); + if (content) { + /* try to roughly verify the passed date with ^\d{4}-\d{2}-\d{2} */ + char *ptr = (char *) content; +@@ -251,7 +251,7 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser, + } + + /* Get a pointer to root element */ +- element = xml_util_get_element ((xmlNode *) doc, ++ element = xml_util_get_element2 ((xmlNode *) doc, + "DIDL-Lite", + NULL); + if (element == NULL) { +diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c +index fb37c0b..e61739a 100644 +--- a/libgupnp-av/gupnp-didl-lite-writer.c ++++ b/libgupnp-av/gupnp-didl-lite-writer.c +@@ -223,7 +223,7 @@ filter_node (xmlNode *node, + + if (strcmp ((const char *) node->name, "container") == 0) { + is_container = TRUE; +- container_class = xml_util_get_child_element_content (node, ++ container_class = xml_util_get_child_element_content2 (node, + "class"); + } + +diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c +index 85fb232..dcaad6b 100644 +--- a/libgupnp-av/gupnp-feature-list-parser.c ++++ b/libgupnp-av/gupnp-feature-list-parser.c +@@ -138,7 +138,7 @@ gupnp_feature_list_parser_parse_text + } + + /* Get a pointer to root element */ +- element = xml_util_get_element ((xmlNode *) doc, "Features", NULL); ++ element = xml_util_get_element2 ((xmlNode *) doc, "Features", NULL); + if (element == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +diff --git a/libgupnp-av/gupnp-last-change-parser.c b/libgupnp-av/gupnp-last-change-parser.c +index a98aecf..7078713 100644 +--- a/libgupnp-av/gupnp-last-change-parser.c ++++ b/libgupnp-av/gupnp-last-change-parser.c +@@ -75,7 +75,7 @@ read_state_variable (const char *variable_name, + xmlNode *variable_node; + const char *val_str; + +- variable_node = xml_util_get_element (instance_node, ++ variable_node = xml_util_get_element2 (instance_node, + variable_name, + NULL); + if (!variable_node) +diff --git a/libgupnp-av/xml-util.c b/libgupnp-av/xml-util.c +index da718b2..8c937e0 100644 +--- a/libgupnp-av/xml-util.c ++++ b/libgupnp-av/xml-util.c +@@ -81,7 +81,7 @@ xml_doc_unref (GUPnPAVXMLDoc *doc) + } + + xmlNode * +-xml_util_get_element (xmlNode *node, ++xml_util_get_element2 (xmlNode *node, + ...) + { + va_list var_args; +@@ -130,13 +130,13 @@ xml_util_get_child_elements_by_name (xmlNode *node, const char *name) + } + + const char * +-xml_util_get_child_element_content (xmlNode *node, ++xml_util_get_child_element_content2 (xmlNode *node, + const char *child_name) + { + xmlNode *child_node; + const char *content; + +- child_node = xml_util_get_element (node, child_name, NULL); ++ child_node = xml_util_get_element2 (node, child_name, NULL); + if (!child_node || !(child_node->children)) + return NULL; + +@@ -154,7 +154,7 @@ xml_util_get_uint_child_element (xmlNode *node, + { + const char *content; + +- content = xml_util_get_child_element_content (node, child_name); ++ content = xml_util_get_child_element_content2 (node, child_name); + if (!content) + return default_value; + +@@ -168,7 +168,7 @@ xml_util_get_uint64_child_element (xmlNode *node, + { + const char *content; + +- content = xml_util_get_child_element_content (node, child_name); ++ content = xml_util_get_child_element_content2 (node, child_name); + if (!content) + return default_value; + +@@ -281,7 +281,7 @@ xml_util_set_child (xmlNode *parent_node, + xmlNode *node; + xmlChar *escaped; + +- node = xml_util_get_element (parent_node, name, NULL); ++ node = xml_util_get_element2 (parent_node, name, NULL); + if (node == NULL) { + xmlNsPtr ns_ptr = NULL; + +@@ -305,7 +305,7 @@ xml_util_unset_child (xmlNode *parent_node, + { + xmlNode *node; + +- node = xml_util_get_element (parent_node, name, NULL); ++ node = xml_util_get_element2 (parent_node, name, NULL); + if (node != NULL) { + xmlUnlinkNode (node); + xmlFreeNode (node); +@@ -342,7 +342,7 @@ xml_util_get_child_string (xmlNode *parent_node, + char *ret; + xmlNode *node; + +- node = xml_util_get_element (parent_node, name, NULL); ++ node = xml_util_get_element2 (parent_node, name, NULL); + if (!node) + return NULL; + +diff --git a/libgupnp-av/xml-util.h b/libgupnp-av/xml-util.h +index 9ae5b19..5ff2020 100644 +--- a/libgupnp-av/xml-util.h ++++ b/libgupnp-av/xml-util.h +@@ -63,7 +63,7 @@ xml_doc_get_type (void) G_GNUC_CONST; + + /* Misc utilities for inspecting xmlNodes */ + G_GNUC_INTERNAL xmlNode * +-xml_util_get_element (xmlNode *node, ++xml_util_get_element2 (xmlNode *node, + ...) G_GNUC_NULL_TERMINATED; + + G_GNUC_INTERNAL GList * +@@ -71,7 +71,7 @@ xml_util_get_child_elements_by_name (xmlNode *node, + const char *name); + + G_GNUC_INTERNAL const char * +-xml_util_get_child_element_content (xmlNode *node, ++xml_util_get_child_element_content2 (xmlNode *node, + const char *child_name); + + G_GNUC_INTERNAL guint +-- +2.14.1 + From fa8b196e5fbb71620f446999c9ff081c8de3909b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 31 Oct 2017 09:39:33 +0100 Subject: [PATCH 125/160] rygel: new package Rygel is a home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices. Additionally, media player software may use Rygel to become a MediaRenderer that may be controlled remotely by a UPnP or DLNA Controller. Rygel achieves interoperability with other devices in the market by trying to conform to the very strict requirements of DLNA and by converting media on-the-fly to formats that client devices can handle. Most Rygel functionality is implemented through a plug-in mechanism. Signed-off-by: Fabrice Fontaine [Thomas: - use SPDX license codes - add hashes for license files - move Config.in comment at the end of the Config.in file to not break the indentation of the sub-options.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/rygel/Config.in | 51 ++++++++++++++++++++++++++ package/rygel/S99rygel | 37 +++++++++++++++++++ package/rygel/rygel.hash | 6 ++++ package/rygel/rygel.mk | 72 +++++++++++++++++++++++++++++++++++++ package/rygel/rygel.service | 10 ++++++ 7 files changed, 178 insertions(+) create mode 100644 package/rygel/Config.in create mode 100644 package/rygel/S99rygel create mode 100644 package/rygel/rygel.hash create mode 100644 package/rygel/rygel.mk create mode 100644 package/rygel/rygel.service diff --git a/DEVELOPERS b/DEVELOPERS index 1a6a31f0ab..40123bc38d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -620,6 +620,7 @@ F: package/igd2-for-linux/ F: package/libupnp18/ F: package/minissdpd/ F: package/motion/ +F: package/rygel/ F: package/tinycbor/ F: package/tinydtls/ diff --git a/package/Config.in b/package/Config.in index 86acab6427..fa6bc19543 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1767,6 +1767,7 @@ endif source "package/rsync/Config.in" source "package/rtorrent/Config.in" source "package/rtptools/Config.in" + source "package/rygel/Config.in" source "package/s6-dns/Config.in" source "package/s6-networking/Config.in" source "package/samba4/Config.in" diff --git a/package/rygel/Config.in b/package/rygel/Config.in new file mode 100644 index 0000000000..86d6a38e1e --- /dev/null +++ b/package/rygel/Config.in @@ -0,0 +1,51 @@ +config BR2_PACKAGE_RYGEL + bool "rygel" + depends on BR2_USE_WCHAR # gupnp-av + depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av + depends on BR2_USE_MMU # gupnp-av + select BR2_PACKAGE_GUPNP_AV + select BR2_PACKAGE_LIBGEE + select BR2_PACKAGE_LIBMEDIAART + select BR2_PACKAGE_SQLITE + help + Rygel is a home media solution (UPnP AV MediaServer) that + allows you to easily share audio, video and pictures to other + devices. + + Additionally, media player software may use Rygel to become a + MediaRenderer that may be controlled remotely by a UPnP or + DLNA Controller. + + Rygel achieves interoperability with other devices in the + market by trying to conform to the very strict requirements of + DLNA and by converting media on-the-fly to formats that client + devices can handle. + + Most Rygel functionality is implemented through a plug-in + mechanism. + + https://wiki.gnome.org/Projects/Rygel + +if BR2_PACKAGE_RYGEL + +choice + prompt "media engine" + default BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE + +config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE + bool "simple" + +config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 + bool "gstreamer1" + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GUPNP_DLNA + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + +endchoice + +comment "rygel needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +endif # BR2_PACKAGE_RYGEL diff --git a/package/rygel/S99rygel b/package/rygel/S99rygel new file mode 100644 index 0000000000..ee832e9baf --- /dev/null +++ b/package/rygel/S99rygel @@ -0,0 +1,37 @@ +#!/bin/sh + +NAME=rygel +PIDFILE=/var/run/$NAME.pid +DAEMON=/usr/bin/$NAME + +start() { + printf "Starting $NAME: " + start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping $NAME: " + start-stop-daemon -K -q -p $PIDFILE + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash new file mode 100644 index 0000000000..028af21bb4 --- /dev/null +++ b/package/rygel/rygel.hash @@ -0,0 +1,6 @@ +# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.36/rygel-0.36.0.sha256sum: +sha256 31e8ade78b4ea59978d1b59056fa5cd8aef6b9c1457d3dd06de4d2e75a01813f rygel-0.36.0.tar.xz + +# Locally calculated +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 c7d881be8ae01162510e982a32001446c6d6d18a9cecc89cc41a28bd215a0262 COPYING.logo diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk new file mode 100644 index 0000000000..e892df75a0 --- /dev/null +++ b/package/rygel/rygel.mk @@ -0,0 +1,72 @@ +################################################################################ +# +# rygel +# +################################################################################ + +RYGEL_VERSION_MAJOR = 0.36 +RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).0 +RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz +RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR) +RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) +RYGEL_LICENSE_FILES = COPYING COPYING.logo +RYGEL_DEPENDENCIES = \ + gupnp-av \ + libgee \ + libmediaart \ + sqlite +RYGEL_INSTALL_STAGING = YES + +RYGEL_CONF_OPTS += \ + --disable-apidocs \ + --disable-coverage \ + --disable-example-plugins \ + --enable-external-plugin \ + --enable-lms-plugin \ + --enable-mpris-plugin \ + --enable-ruih-plugin \ + --disable-tracker-plugin + +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) +RYGEL_DEPENDENCIES += gdk-pixbuf +endif + +ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y) +RYGEL_CONF_OPTS += \ + --with-media-engine=gstreamer \ + --enable-playbin-plugin \ + --enable-media_export-plugin \ + --enable-gst-launch-plugin +RYGEL_DEPENDENCIES += \ + gupnp-dlna \ + gst1-plugins-base \ + gstreamer1 +else ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE),y) +RYGEL_CONF_OPTS += \ + --with-media-engine=simple \ + --disable-playbin-plugin \ + --disable-media_export-plugin \ + --disable-gst-launch-plugin +endif + +ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) +RYGEL_CONF_OPTS += --with-ui +RYGEL_DEPENDENCIES += libgtk3 +else +RYGEL_CONF_OPTS += --without-ui +endif + +define RYGEL_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/rygel/S99rygel \ + $(TARGET_DIR)/etc/init.d/S99rygel +endef + +define RYGEL_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/rygel/rygel.service \ + $(TARGET_DIR)/usr/lib/systemd/system/rygel.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/rygel.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rygel.service +endef + +$(eval $(autotools-package)) diff --git a/package/rygel/rygel.service b/package/rygel/rygel.service new file mode 100644 index 0000000000..6ae8ee7279 --- /dev/null +++ b/package/rygel/rygel.service @@ -0,0 +1,10 @@ +[Unit] +Description=Rygel DLNA server +After=network.target + +[Service] +ExecStart=/usr/bin/rygel +Restart=always + +[Install] +WantedBy=multi-user.target From 306ad0181a329c2d6fda064c2b746f5f4a4aea25 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Oct 2017 17:30:56 +0200 Subject: [PATCH 126/160] core/pkg-generic: remove intermediate file-list files To compute the list of files added by a package, we first store the list of files before the install, do the install, list the files after the install, and finally compare the two lists. The two lists are stored in dot-files, hidden in the package's build dir. We currently keep those two files, and only list the files installed in target/ In followup patches, we'll also list files installed in staging/ as well as files installed in host/. Rather than add even more internal, hidden files in the package build dir, we'll just re-use the same two temporary files to store the before and after lists. So, remove them after the comparison is done. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0e28675fbe..d4cb42d892 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -85,6 +85,7 @@ define step_pkg_size_end while read hash file ; do \ echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \ done + rm -f $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after endef define step_pkg_size From d63670009b42462a9c685b574af107e71ab1ab45 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Oct 2017 17:30:57 +0200 Subject: [PATCH 127/160] core/pkg-generic: redirect only when listing package's installed files There is no need to redirect again and again for each new file added to the list; we can just redirect once and for all. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index d4cb42d892..ad10a8c903 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -83,8 +83,8 @@ define step_pkg_size_end $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_after) comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \ while read hash file ; do \ - echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \ - done + echo "$(1),$${file}" ; \ + done >> $(BUILD_DIR)/packages-file-list.txt rm -f $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after endef From 0c02bf829b363a49a648517be4a48ad91050d789 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Oct 2017 17:30:58 +0200 Subject: [PATCH 128/160] core/pkg-generic: store file->package list for staging and host too Currently, we store the list of files installed in target/ and associate each of them to the package that installed it. However, we sometimes may need to know what package installed which file in staging/, for example to debug header collision, or in host/, to debug what package installed what host tool. Enhance the step instrumentation to also generate the list for staging/ and host/. We maintain backward compatibility, for external scripts that wanted to parse the previously existing list, by not renaming the target-related package list. Only the staging- and host-related lists are named after staging and host. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni [Thomas: fix missing word in .mk comment.] Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index ad10a8c903..fb5a1ca725 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -58,7 +58,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # Hooks to collect statistics about installed files define _step_pkg_size_get_file_list - (cd $(TARGET_DIR) ; \ + (cd $(2) ; \ ( \ find . -xtype f -print0 | xargs -0 md5sum ; \ find . -xtype d -print0 | xargs -0 -I{} printf 'directory {}\n'; \ @@ -66,32 +66,44 @@ define _step_pkg_size_get_file_list ) | sort > $1 endef -# This hook will be called before the target installation of a -# package. We store in a file named .br_filelist_before the list of -# files currently installed in the target. Note that the MD5 is also -# stored, in order to identify if the files are overwritten. +# This hook will be called before the installation of a package. We store in +# a file named .br_filelist_before the list of files currently installed. +# Note that the MD5 is also stored, in order to identify if the files are +# overwritten. +# $(1): package name (ignored) +# $(2): base directory to search in define step_pkg_size_start - $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_before) + $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_before,$(2)) endef -# This hook will be called after the target installation of a -# package. We store in a file named .br_filelist_after the list of -# files (and their MD5) currently installed in the target. We then do -# a diff with the .br_filelist_before to compute the list of files -# installed by this package. +# This hook will be called after the installation of a package. We store in +# a file named .br_filelist_after the list of files (and their MD5) currently +# installed. We then do a diff with the .br_filelist_before to compute the +# list of files installed by this package. +# The suffix is typically empty for the target variant, for legacy backward +# compatibility. +# $(1): package name (ignored) +# $(2): base directory to search in +# $(3): suffix of file (optional) define step_pkg_size_end - $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_after) + $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_after,$(2)) comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \ while read hash file ; do \ echo "$(1),$${file}" ; \ - done >> $(BUILD_DIR)/packages-file-list.txt + done >> $(BUILD_DIR)/packages-file-list$(3).txt rm -f $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after endef define step_pkg_size $(if $(filter install-target,$(2)),\ - $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3))) \ - $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3)))) + $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(TARGET_DIR))) \ + $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(TARGET_DIR)))) + $(if $(filter install-staging,$(2)),\ + $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(STAGING_DIR),-staging)) \ + $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(STAGING_DIR),-staging))) + $(if $(filter install-host,$(2)),\ + $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3),$(HOST_DIR),-host)) \ + $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3),$(HOST_DIR),-host))) endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size From 1b8ad2d08e4ff95873e7c7e9d18860a69baa4b33 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Oct 2017 17:30:59 +0200 Subject: [PATCH 129/160] core: check files are not touched by more than one package Currently, we do nothing about packages that touch the same file: given a specific configuration, the result is reproducible (even though it might not be what the user expected) because the build order is guaranteed. However, when we later introduce top-level parallel build, we will no longer be able to guarantee a build order, by the mere way of it being parallel. Reconciliating all those modified files will be impossible to do automatically. The only way will be to refuse such situations. As a preliminary step, introduce a helper script that detects files that are being moified by two or more packages, and reports them and the impacted packages, at the end of the build. The list being reported at the end of the build will make it prominently visible in autobuilder results, so we can assess the problem, if any. Later on, calling that helper script can be done right after the package installation step, to bail out early. Thanks Arnout for the pythonist way to write default dictionaries! ;-) Note: doing it in python rather than a shell script is impressively faster: where the shell script takes ~1.2s on a minimalist build, the python script only takes ~0.015s, that is about 80 times faster. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Baruch Siach Cc: Peter Seiderer [Thomas: rename script without .py extension.] Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++++ support/scripts/check-uniq-files | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100755 support/scripts/check-uniq-files diff --git a/Makefile b/Makefile index 55409b99af..ef10c90489 100644 --- a/Makefile +++ b/Makefile @@ -679,6 +679,10 @@ $(TARGETS_ROOTFS): target-finalize .PHONY: target-finalize target-finalize: $(PACKAGES) @$(call MESSAGE,"Finalizing target directory") + # Check files that are touched by more than one package + ./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt + ./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt + ./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files new file mode 100755 index 0000000000..ea5afdb0b3 --- /dev/null +++ b/support/scripts/check-uniq-files @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +import sys +import csv +import argparse +from collections import defaultdict + +warn = 'Warning: {} file "{}" is touched by more than one package: {}\n' + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('packages_file_list', nargs='*', + help='The packages-file-list to check from') + parser.add_argument('-t', '--type', metavar="TYPE", + help='Report as a TYPE file (TYPE is either target, staging, or host)') + + args = parser.parse_args() + + if not len(args.packages_file_list) == 1: + sys.stderr.write('No packages-file-list was provided.\n') + return False + + if args.type is None: + sys.stderr.write('No type was provided\n') + return False + + file_to_pkg = defaultdict(list) + with open(args.packages_file_list[0], 'r') as pkg_file_list: + r = csv.reader(pkg_file_list, delimiter=',') + for row in r: + pkg = row[0] + file = row[1] + file_to_pkg[file].append(pkg) + + for file in file_to_pkg: + if len(file_to_pkg[file]) > 1: + sys.stderr.write(warn.format(args.type, file, file_to_pkg[file])) + +if __name__ == "__main__": + sys.exit(main()) From c7abd1ddfbdbd7b4e4e426dce7c9d1c82fde1582 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Oct 2017 18:14:36 +0100 Subject: [PATCH 130/160] utils/genrandconfig: filter empty lines and comments in CSV file In preparation for the addition of comments in the CSV file listing toolchain configurations, we filter out such lines when reading the CSV file in utils/genrandconfig. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index a67d46fad9..883322552c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -126,7 +126,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): """ with open(toolchains_csv) as r: - toolchains = decode_byte_list(r.readlines()) + # filter empty lines and comments + lines = [ t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#' ] + toolchains = decode_byte_list(lines) configs = [] (_, _, _, _, hostarch) = os.uname() From 9272eb468463deff3a3b181db0372e64b51affc1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Oct 2017 18:14:37 +0100 Subject: [PATCH 131/160] test-pkg: filter empty lines and comments in CSV file In preparation for the addition of comments in the CSV file listing toolchain configurations, we filter out such lines when reading the CSV file in utils/test-pkg. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 6899d44f7c..1b7046eac4 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -54,7 +54,7 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d;' "${toolchains_csv}" \ + toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ |if [ ${random} -gt 0 ]; then \ sort -R |head -n ${random} else From 48b4ad9451cb9a6c5dabc6028e1e6c01a6411177 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 28 Nov 2017 15:54:52 +0200 Subject: [PATCH 132/160] libmicrohttpd: bump to version 0.9.57 Drop libgcrypt dependency for SSL support; with newer version of gnutls libgcrypt is not needed. Drop the LIBS fix for static linking with gnutls that has been introduced in commit 2d3d6d258bb (libmicrohttpd: fix static linking with gnutls). gnutls does not support static linking anymore. Fix a comment typo. Add license hash. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/libmicrohttpd/Config.in | 2 -- package/libmicrohttpd/libmicrohttpd.hash | 3 ++- package/libmicrohttpd/libmicrohttpd.mk | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index 2a685ca408..7f3c9bb8fd 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -11,11 +11,9 @@ if BR2_PACKAGE_LIBMICROHTTPD config BR2_PACKAGE_LIBMICROHTTPD_SSL bool "https support" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT help Enable HTTPS (SSL) support. diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index a1460fd724..e628cb2c6c 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8 libmicrohttpd-0.9.55.tar.gz +sha256 dec1a76487d7e48ad74b468a888bfda1c05731f185ff950f1e363ca9d39caf4e libmicrohttpd-0.9.57.tar.gz +sha256 70e12e2a60151b9ed1a4c94a5ffeb99cd086fa94542b5a92fec581506e8d3121 COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index a87c93b3ae..62fb7fc237 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.55 +LIBMICROHTTPD_VERSION = 0.9.57 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES @@ -12,7 +12,7 @@ LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 # gcc on arc and bfin doesn't define _REENTRANT when -pthread is -# passed while it should. Compensate this defiency here otherwise +# passed while it should. Compensate this deficiency here otherwise # libmicrohttpd configure script doesn't find that thread support is # enabled. ifeq ($(BR2_arc)$(BR2_bfin),y) @@ -23,10 +23,8 @@ LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) LIBMICROHTTPD_LICENSE = LGPL-2.1+ -LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt -LIBMICROHTTPD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs gnutls`" -LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls +LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr else LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos LIBMICROHTTPD_CONF_OPTS += --disable-https From a34d965af7d9e0799dc4227226ee2741e98ea483 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 28 Nov 2017 16:10:30 +0200 Subject: [PATCH 133/160] gnutls: bump to version 3.5.16 Add link to tarball signature. Add license hashes. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 6 +++++- package/gnutls/gnutls.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 608ccf89c5..9ec366f781 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda gnutls-3.5.14.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.16.tar.xz.sig +sha256 0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25 gnutls-3.5.16.tar.xz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index b00bd139cd..3559086c61 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).14 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).16 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) From 7a6dc427a2a9bb7f4575ce3dd265ad3fa695a506 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 29 Nov 2017 21:04:51 +0100 Subject: [PATCH 134/160] package/physfs: bump to 3.0.1 Remove upstream patch. Use the official archive and add a hash file. Also add a license file hash. Remove LGPL.txt license file since src/lzma directory has been removed from the sources. Signed-off-by: Romain Naour Cc: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- .../0001-Fix-builds-with-modern-GCC.patch | 38 ------------------- package/physfs/physfs.hash | 3 ++ package/physfs/physfs.mk | 10 ++--- 3 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 package/physfs/0001-Fix-builds-with-modern-GCC.patch create mode 100644 package/physfs/physfs.hash diff --git a/package/physfs/0001-Fix-builds-with-modern-GCC.patch b/package/physfs/0001-Fix-builds-with-modern-GCC.patch deleted file mode 100644 index 710b4ff94d..0000000000 --- a/package/physfs/0001-Fix-builds-with-modern-GCC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 Mon Sep 17 00:00:00 2001 -From: Jacob Burroughs -Date: Thu, 23 Jun 2016 13:03:47 -0500 -Subject: [PATCH] Fix builds with modern GCC - -From SuperTux project: -https://github.com/SuperTux/physfs/commit/61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 - -Signed-off-by: Romain Naour ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a371af..94c4844 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,7 +50,7 @@ endif() - # Add some gcc-specific command lines. - if(CMAKE_COMPILER_IS_GNUCC) - # Always build with debug symbols...you can strip it later. -- add_definitions(-g -pipe -Werror -fsigned-char) -+ add_definitions(-g -pipe -fsigned-char) - - # Stupid BeOS generates warnings in the system headers. - if(NOT BEOS) -@@ -304,7 +304,7 @@ if(PHYSFS_BUILD_TEST) - if(READLINE_LIBRARY) - set(HAVE_SYSTEM_READLINE TRUE) - set(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY}) -- include_directories(${READLINE_H} ${HISTORY_H}) -+ include_directories(SYSTEM ${READLINE_H} ${HISTORY_H}) - add_definitions(-DPHYSFS_HAVE_READLINE=1) - endif() - endif() --- -2.9.3 - diff --git a/package/physfs/physfs.hash b/package/physfs/physfs.hash new file mode 100644 index 0000000000..3d97fe0b0d --- /dev/null +++ b/package/physfs/physfs.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1 physfs-3.0.1.tar.bz2 +sha256 7ce475991f6cc09958ef0d57312522eba78e36d984307c95f9a3965adf7e4e2b LICENSE.txt diff --git a/package/physfs/physfs.mk b/package/physfs/physfs.mk index 9193ad5ec0..78176be4bf 100644 --- a/package/physfs/physfs.mk +++ b/package/physfs/physfs.mk @@ -4,12 +4,12 @@ # ################################################################################ -PHYSFS_VERSION = be27dfd07d97336145e7f49d3fd200a6e902f85e -PHYSFS_SITE = https://hg.icculus.org/icculus/physfs -PHYSFS_SITE_METHOD = hg +PHYSFS_VERSION = 3.0.1 +PHYSFS_SOURCE = physfs-$(PHYSFS_VERSION).tar.bz2 +PHYSFS_SITE = https://icculus.org/physfs/downloads -PHYSFS_LICENSE = Zlib (physfs), LGPL with exceptions (lzma) -PHYSFS_LICENSE_FILES = LICENSE.txt src/lzma/LGPL.txt +PHYSFS_LICENSE = Zlib +PHYSFS_LICENSE_FILES = LICENSE.txt PHYSFS_INSTALL_STAGING = YES From dd983d5d17547cf8bcdb6d94a9b8632fddbe9b46 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 29 Nov 2017 21:04:52 +0100 Subject: [PATCH 135/160] package/solatus: new package Sample quest and testing quest are not included in SOLARUS_LICENSE since it's notinstalled by default. Remove Werror when building with debugging symbols. Add libpng runtime dependency since solarus games require png image support. Signed-off-by: Romain Naour Cc: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + .../solarus/0001-cmake-remove-Werror.patch | 27 ++++++++++++++++ package/solarus/Config.in | 31 +++++++++++++++++++ package/solarus/solarus.hash | 5 +++ package/solarus/solarus.mk | 23 ++++++++++++++ 6 files changed, 88 insertions(+) create mode 100644 package/solarus/0001-cmake-remove-Werror.patch create mode 100644 package/solarus/Config.in create mode 100644 package/solarus/solarus.hash create mode 100644 package/solarus/solarus.mk diff --git a/DEVELOPERS b/DEVELOPERS index 40123bc38d..4057438c0e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1422,6 +1422,7 @@ F: package/minetest/ F: package/minetest-game/ F: package/openpowerlink/ F: package/physfs/ +F: package/solarus/ F: package/stress-ng/ F: package/supertux/ F: package/terminology/ diff --git a/package/Config.in b/package/Config.in index fa6bc19543..e2f71b4353 100644 --- a/package/Config.in +++ b/package/Config.in @@ -241,6 +241,7 @@ menu "Games" source "package/prboom/Config.in" source "package/rubix/Config.in" source "package/sl/Config.in" + source "package/solarus/Config.in" source "package/stella/Config.in" source "package/supertux/Config.in" source "package/supertuxkart/Config.in" diff --git a/package/solarus/0001-cmake-remove-Werror.patch b/package/solarus/0001-cmake-remove-Werror.patch new file mode 100644 index 0000000000..b27908c829 --- /dev/null +++ b/package/solarus/0001-cmake-remove-Werror.patch @@ -0,0 +1,27 @@ +From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 22 Jun 2017 00:19:56 +0200 +Subject: [PATCH] cmake: remove Werror + +Signed-off-by: Romain Naour +--- + cmake/AddCompilationFlags.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake +index 5159ff9..a506033 100644 +--- a/cmake/AddCompilationFlags.cmake ++++ b/cmake/AddCompilationFlags.cmake +@@ -24,9 +24,6 @@ endif() + # Be less pedantic in release builds for users. + set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}") + +-# Be more pedantic in debug mode for developers. +-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}") +- + # Platform-specific flags. + if(WIN32) + # MinGW: disable the console by default. +-- +2.9.4 + diff --git a/package/solarus/Config.in b/package/solarus/Config.in new file mode 100644 index 0000000000..30c7aa28b5 --- /dev/null +++ b/package/solarus/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_SOLARUS + bool "solarus" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_LIBMODPLUG + select BR2_PACKAGE_LIBOGG + select BR2_PACKAGE_LIBPNG # runtime + select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_LUAJIT + select BR2_PACKAGE_OPENAL + select BR2_PACKAGE_PHYSFS + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_IMAGE + select BR2_PACKAGE_SDL2_TTF + help + Solarus is an open-source Zelda-like 2D game engine written + in C++. It can run games scripted in Lua. This engine is used + by our Zelda fangames. Solarus is licensed under GPL v3. + + http://www.solarus-games.org + https://github.com/solarus-games/solarus + +comment "solarus needs a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/solarus/solarus.hash b/package/solarus/solarus.hash new file mode 100644 index 0000000000..8ed5cafa4b --- /dev/null +++ b/package/solarus/solarus.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 5930584e7c333089a2c1bf372ccc25ad3fb5c1d973189d2bf67f2308189af94d solarus-v1.5.3.tar.gz + +sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d license.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 license_gpl.txt diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk new file mode 100644 index 0000000000..af37f81a0b --- /dev/null +++ b/package/solarus/solarus.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# solarus +# +################################################################################ + +SOLARUS_VERSION = v1.5.3 +SOLARUS_SITE = $(call github,solarus-games,solarus,$(SOLARUS_VERSION)) + +SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \ + CC-BY-SA-3.0 (GUI icons) +SOLARUS_LICENSE_FILES = license.txt license_gpl.txt + +# Install libsolarus.so +SOLARUS_INSTALL_STAGING = YES + +SOLARUS_DEPENDENCIES = libmodplug libogg libvorbis luajit openal physfs sdl2 \ + sdl2_image sdl2_ttf + +# Disable launcher GUI (requires Qt5) +SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF + +$(eval $(cmake-package)) From c26b1bf1a4a055006110b9f38f9082c01c0db1ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 28 Nov 2017 07:47:57 +0100 Subject: [PATCH 136/160] uclibc: update to 1.0.27 All patches are upstream. C-sky support added. Lot of or1k NPTL bugfixes. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../uclibc/0001-fix-issues-with-gdb-8.0.patch | 72 ------------- ...e-R_MICROBLAZE_NONE-for-ld.so-bootst.patch | 42 -------- ...nvert-accept4-to-use-cancel.h-macros.patch | 102 ------------------ package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 2 +- 5 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 package/uclibc/0001-fix-issues-with-gdb-8.0.patch delete mode 100644 package/uclibc/0002-microblaze-handle-R_MICROBLAZE_NONE-for-ld.so-bootst.patch delete mode 100644 package/uclibc/0003-convert-accept4-to-use-cancel.h-macros.patch diff --git a/package/uclibc/0001-fix-issues-with-gdb-8.0.patch b/package/uclibc/0001-fix-issues-with-gdb-8.0.patch deleted file mode 100644 index 20567e682f..0000000000 --- a/package/uclibc/0001-fix-issues-with-gdb-8.0.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 111f01d432d542a153c1cad83def3a6ab57df7af Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 5 Aug 2017 11:28:07 +0200 -Subject: [PATCH] fix issues with gdb 8.0 - -GDB 8.0 is compiled and linked with g++, but the -linking of static targets (f.e. coldfire) fails, -without declaring the functions in thread_db.h -extern C. - -The compilation of gdb errors out with: -thread-db.o: In function `thread_db_init()': -thread-db.c:(.text+0x5b6): undefined reference to `td_ta_new(ps_prochandle*, td_thragent**)' -thread-db.c:(.text+0x61e): undefined reference to `td_thr_get_info(td_thrhandle const*, td_thrinfo*)' -thread-db.c:(.text+0x632): undefined reference to `td_symbol_list()' -.. - -Signed-off-by: Waldemar Brodkorb ---- - libpthread/linuxthreads_db/thread_db.h | 7 +++++++ - libpthread/nptl_db/thread_db.h | 7 +++++++ - 2 files changed, 14 insertions(+) - -diff --git a/libpthread/linuxthreads_db/thread_db.h b/libpthread/linuxthreads_db/thread_db.h -index 13c30af..ec79f60 100644 ---- a/libpthread/linuxthreads_db/thread_db.h -+++ b/libpthread/linuxthreads_db/thread_db.h -@@ -27,6 +27,9 @@ - #include - #include - -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Error codes of the library. */ - typedef enum -@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th); - /* Resume execution of thread TH. */ - extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* thread_db.h */ -diff --git a/libpthread/nptl_db/thread_db.h b/libpthread/nptl_db/thread_db.h -index 27ea69a..993842f 100644 ---- a/libpthread/nptl_db/thread_db.h -+++ b/libpthread/nptl_db/thread_db.h -@@ -27,6 +27,9 @@ - #include - #include - -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Error codes of the library. */ - typedef enum -@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th); - /* Resume execution of thread TH. */ - extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* thread_db.h */ --- -2.1.4 - diff --git a/package/uclibc/0002-microblaze-handle-R_MICROBLAZE_NONE-for-ld.so-bootst.patch b/package/uclibc/0002-microblaze-handle-R_MICROBLAZE_NONE-for-ld.so-bootst.patch deleted file mode 100644 index 9886efd879..0000000000 --- a/package/uclibc/0002-microblaze-handle-R_MICROBLAZE_NONE-for-ld.so-bootst.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9db18d93811153fc9a70c9844fadc6fdf7cbbb64 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sun, 6 Aug 2017 21:15:50 +0200 -Subject: [PATCH] microblaze: handle R_MICROBLAZE_NONE for ld.so bootstrap - -Latest binutils 2.29 release emits a R_MICROBLAZE_NONE -relocation, which breaks shared library loader bootstrap -relocation. - -Signed-off-by: Waldemar Brodkorb ---- - ldso/ldso/microblaze/dl-startup.h | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/ldso/ldso/microblaze/dl-startup.h b/ldso/ldso/microblaze/dl-startup.h -index 720c53a..16d5762 100644 ---- a/ldso/ldso/microblaze/dl-startup.h -+++ b/ldso/ldso/microblaze/dl-startup.h -@@ -82,18 +82,15 @@ static __always_inline - void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, - unsigned long symbol_addr, unsigned long load_addr, attribute_unused Elf32_Sym *symtab) - { -- - switch (ELF_R_TYPE(rpnt->r_info)) - { - case R_MICROBLAZE_REL: -- - *reloc_addr = load_addr + rpnt->r_addend; - break; -- -+ case R_MICROBLAZE_NONE: -+ break; - default: - _dl_exit(1); - break; -- - } -- - } --- -2.1.4 - diff --git a/package/uclibc/0003-convert-accept4-to-use-cancel.h-macros.patch b/package/uclibc/0003-convert-accept4-to-use-cancel.h-macros.patch deleted file mode 100644 index 178dcde581..0000000000 --- a/package/uclibc/0003-convert-accept4-to-use-cancel.h-macros.patch +++ /dev/null @@ -1,102 +0,0 @@ -From c7e82668bd23fbdd02ebe1e83ff2bb6877812423 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 2 Nov 2017 02:40:43 +0100 -Subject: [PATCH] convert accept4() to use cancel.h macros - -Signed-off-by: Waldemar Brodkorb ---- - include/sys/socket.h | 1 + - libc/inet/socketcalls.c | 37 +++++++++-------------------------- - libpthread/linuxthreads/wrapsyscall.c | 7 +++++++ - 3 files changed, 17 insertions(+), 28 deletions(-) - -diff --git a/include/sys/socket.h b/include/sys/socket.h -index 63dc4b953..83e1fcaa2 100644 ---- a/include/sys/socket.h -+++ b/include/sys/socket.h -@@ -269,6 +269,7 @@ libc_hidden_proto(accept) - __THROW. */ - extern int accept4 (int __fd, __SOCKADDR_ARG __addr, - socklen_t *__restrict __addr_len, int __flags); -+libc_hidden_proto(accept4) - #endif - - /* Shut down all or part of the connection open on socket FD. -diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c -index e33d69344..1b92609d0 100644 ---- a/libc/inet/socketcalls.c -+++ b/libc/inet/socketcalls.c -@@ -76,43 +76,24 @@ lt_libc_hidden(accept) - #endif - - #ifdef L_accept4 --#ifdef __NR_accept4 --# define __NR___sys_accept4 __NR_accept4 --static _syscall4(int, __sys_accept4, int, fd, struct sockaddr *, addr, socklen_t *, addrlen, int, flags) --int accept4(int fd, struct sockaddr *addr, socklen_t * addrlen, int flags) --{ -- if (SINGLE_THREAD_P) -- return __sys_accept4(fd, addr, addrlen, flags); --#ifdef __UCLIBC_HAS_THREADS_NATIVE__ -- else { -- int oldtype = LIBC_CANCEL_ASYNC (); -- int result = __sys_accept4(fd, addr, addrlen, flags); -- LIBC_CANCEL_RESET (oldtype); -- return result; -- } --#endif --} --#elif defined(__NR_socketcall) --int accept4(int fd, struct sockaddr *addr, socklen_t *addrlen, int flags) -+static int __NC(accept4)(int fd, struct sockaddr *addr, socklen_t *addrlen, int flags) - { -+# ifdef __NR_accept4 -+ return INLINE_SYSCALL(accept4, 4, fd, addr, addrlen, flags); -+# elif defined(__NR_socketcall) - unsigned long args[4]; - - args[0] = fd; - args[1] = (unsigned long) addr; - args[2] = (unsigned long) addrlen; - args[3] = flags; -- if (SINGLE_THREAD_P) -- return __socketcall(SYS_ACCEPT4, args); --#ifdef __UCLIBC_HAS_THREADS_NATIVE__ -- else { -- int oldtype = LIBC_CANCEL_ASYNC (); -- int result = __socketcall(SYS_ACCEPT4, args); -- LIBC_CANCEL_RESET (oldtype); -- return result; -- } -+ -+ return __socketcall(SYS_ACCEPT4, args); - #endif - } --#endif -+CANCELLABLE_SYSCALL(int, accept4, (int fd, struct sockaddr *addr, socklen_t *addrlen, int flags), -+ (fd, addr, addrlen, flags)) -+lt_libc_hidden(accept4) - #endif - - #ifdef L_bind -diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads/wrapsyscall.c -index ca046a442..2386bfdef 100644 ---- a/libpthread/linuxthreads/wrapsyscall.c -+++ b/libpthread/linuxthreads/wrapsyscall.c -@@ -192,6 +192,13 @@ CANCELABLE_SYSCALL (int, accept, (int fd, __SOCKADDR_ARG addr, - socklen_t *addr_len), - (fd, addr, addr_len)) - -+#if defined __UCLIBC_LINUX_SPECIFIC__ -+/* accept4(2). */ -+CANCELABLE_SYSCALL (int, accept4, (int fd, __SOCKADDR_ARG addr, -+ socklen_t *addr_len, int flags), -+ (fd, addr, addr_len, flags)) -+#endif -+ - /* connect(2). */ - CANCELABLE_SYSCALL (int, connect, (int fd, __CONST_SOCKADDR_ARG addr, - socklen_t len), --- -2.11.0 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index fcba474acd..df25a7ed23 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From https://uclibc-ng.org/ -sha256 d88470775192b01d278633953ccc9fecacd090e52f401d506a71add3e47d4694 uClibc-ng-1.0.26.tar.xz +sha256 9452b0e92f76db19d8ff30b2d6d10a80e1ed01e4c504a36fef34cfc9de490b24 uClibc-ng-1.0.27.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index f235070b6c..1741421d2e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.26 +UCLIBC_VERSION = 1.0.27 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 0af9010d81f1e2172086d6122e9a45be118d8c2f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 Nov 2017 11:17:32 +0100 Subject: [PATCH 137/160] musl: bump to 1.1.18 Patch 0002-arm-atomics-asm-with-new-binutils.patch is upstream as of commit b261a24256792177a5f0531dbb25cc6267220ca5. Patch 0003-Makefile-include-per-arch-Makefile-before-Makefile is upstream as of commit 45ca5d3fcb6f874bf5ba55d0e9651cef68515395. Signed-off-by: Thomas Petazzoni --- ...02-arm-atomics-asm-with-new-binutils.patch | 43 ------------------- ...allback-enforce-MAXADDRS-to-preclude.patch | 35 --------------- package/musl/musl.hash | 5 ++- package/musl/musl.mk | 2 +- 4 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 package/musl/0002-arm-atomics-asm-with-new-binutils.patch delete mode 100644 package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch diff --git a/package/musl/0002-arm-atomics-asm-with-new-binutils.patch b/package/musl/0002-arm-atomics-asm-with-new-binutils.patch deleted file mode 100644 index 3790889d7f..0000000000 --- a/package/musl/0002-arm-atomics-asm-with-new-binutils.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b261a24256792177a5f0531dbb25cc6267220ca5 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Wed, 15 Feb 2017 17:05:50 -0500 -Subject: fix build regression in arm atomics asm with new binutils - -binutils commit bada43421274615d0d5f629a61a60b7daa71bc15 tightened -immediate fixup handling in gas in such a way that the final .arch of -an object file must be compatible with the fixups used when the -instruction was assembled; this in turn broke assembling of atomics.s, -at least in thumb mode. - -it's not clear whether this should be considered a bug in gas, but -.object_arch is preferable anyway for our purpose here of controlling -the ISA level tag on the object file being produced, and it's the -intended directive for use in object files with runtime code -selection. research by Szabolcs Nagy confirmed that .object_arch is -supported in all relevant versions of binutils and clang's integrated -assembler. - -patch by Reiner Herrmann. - -Signed-off-by: Timothy Lee -[Backport from upstream https://git.musl-libc.org/cgit/musl/commit/?id=b261a24256792177a5f0531dbb25cc6267220ca5.] ---- - src/thread/arm/atomics.s | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/thread/arm/atomics.s b/src/thread/arm/atomics.s -index 202faa4..101ad39 100644 ---- a/src/thread/arm/atomics.s -+++ b/src/thread/arm/atomics.s -@@ -84,7 +84,7 @@ __a_gettp_cp15: - bx lr - - /* Tag this file with minimum ISA level so as not to affect linking. */ --.arch armv4t -+.object_arch armv4t - .eabi_attribute 6,2 - - .data --- -cgit v0.11.2 - diff --git a/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch b/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch deleted file mode 100644 index c6b5ef26b4..0000000000 --- a/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Wed, 18 Oct 2017 14:50:03 -0400 -Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude - overflow - -MAXADDRS was chosen not to need enforcement, but the logic used to -compute it assumes the answers received match the RR types of the -queries. specifically, it assumes that only one replu contains A -record answers. if the replies to both the A and the AAAA query have -their answer sections filled with A records, MAXADDRS can be exceeded -and clobber the stack of the calling function. - -this bug was found and reported by Felix Wilhelm. - -Signed-off-by: Peter Korsgaard ---- - src/network/lookup_name.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c -index 066be4d5..209c20f0 100644 ---- a/src/network/lookup_name.c -+++ b/src/network/lookup_name.c -@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const - { - char tmp[256]; - struct dpc_ctx *ctx = c; -+ if (ctx->cnt >= MAXADDRS) return -1; - switch (rr) { - case RR_A: - if (len != 4) return -1; --- -2.11.0 - diff --git a/package/musl/musl.hash b/package/musl/musl.hash index f3f3741092..68e6aab1fd 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,2 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 musl-1.1.16.tar.gz +# Locally calculated after checking pgp signature from +# http://www.musl-libc.org/releases/musl-1.1.18.tar.gz.asc +sha256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 musl-1.1.18.tar.gz diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 6d5603398b..b1aace0400 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.16 +MUSL_VERSION = 1.1.18 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From b865c38ea627ae59e46a67efe805b4bce101fecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 28 Nov 2017 06:59:30 -0500 Subject: [PATCH 138/160] package/qt5: simplify and cleanup _SITE variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The variable QT5_SNAPSHOTS_SITE was introduced in commit 9d5ac9698 to fetch sources of obsolete modules. It was used to download qt5webkit tarballs. The variable is not referenced anymore since the qt5webkit tarballs are downloaded from the Qt community release site. Since the introduction of qt-5.9 in aa1c40ba3, the QT5_SITE variable was duplicated for no good reason. Signed-off-by: Gaël PORTAY Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 0e49c6b58b..5d63433666 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -7,13 +7,11 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5_VERSION_MAJOR = 5.9 QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules else QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).3 -QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules -QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules endif +QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) From 9ab3058e096f4f4d53d8071fe5b248b234cc437b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Nov 2017 16:19:02 +0100 Subject: [PATCH 139/160] toolchain/buildroot: add comment for glibc NaN-2008 headers requirement Commit 4a5140ecf (toolchain/buildroot: glibc requires kernel headers >= 4.5 with NaN-2008) added a restriction on kernel headers for glibc when the architecture is using naN-2008. However, such a restriction is usually associated to a comment explaining the restriction, so the user knows what is happening. That comment was forgotten in 4a5140ecf. Add it now. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-buildroot/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index cbe2038a77..c624350cac 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -72,6 +72,11 @@ comment "glibc on powerpc64le needs a toolchain w/ headers >= 3.10" depends on BR2_powerpc64le depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 +# Support for MIPS NAN2008 needs headers >= 4.5 +comment "glibc on MIPS w/ NAN2008 needs a toolchain w/ headers >= 4.5" + depends on BR2_MIPS_NAN_2008 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ From 91ffb23f9e8f9a1ab26441821f0d19954c2ec111 Mon Sep 17 00:00:00 2001 From: Andrey Yurovsky Date: Mon, 27 Nov 2017 19:27:23 -0800 Subject: [PATCH 140/160] rauc: bump to version 0.2 Version 0.2 of rauc provides several bug fixes and minor feature enhancements. Signed-off-by: Andrey Yurovsky Signed-off-by: Thomas Petazzoni --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 78c3e279d6..649d19571e 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v0.1.1/rauc-0.1.1.tar.xz.asc -sha256 d2901d493f1d3210aef6411e83b02edac3a678d6d825d71a1c61b5b6afc7e478 rauc-0.1.1.tar.xz +# https://github.com/rauc/rauc/releases/download/v0.2/rauc-0.2.tar.xz.asc +sha256 83aa3ac3716e1c29315162e3cbf5d4db79f26dd95efe1bc634bbce364b95491a rauc-0.2.tar.xz diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 479a583206..11991edef0 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 0.1.1 +RAUC_VERSION = 0.2 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From d9e2135a71056ff16243bde1c892ec8118a11fb6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 29 Nov 2017 21:55:54 +0100 Subject: [PATCH 141/160] package/x11r7/xapp_xfs: bump version to 1.2.0 xfs was ported to use libXfont 2.x instead of 1.x: https://cgit.freedesktop.org/xorg/app/xfs/diff/configure.ac?id=fedc90e8e3f6c36204de5562bfb726270064a4f1 Added all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xfs/Config.in | 2 +- package/x11r7/xapp_xfs/xapp_xfs.hash | 7 +++++-- package/x11r7/xapp_xfs/xapp_xfs.mk | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xfs/Config.in b/package/x11r7/xapp_xfs/Config.in index 0a5d711524..b708af8c0c 100644 --- a/package/x11r7/xapp_xfs/Config.in +++ b/package/x11r7/xapp_xfs/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_XAPP_XFS bool "xfs" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_XLIB_LIBFS - select BR2_PACKAGE_XLIB_LIBXFONT + select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XPROTO_FONTSPROTO help X font server diff --git a/package/x11r7/xapp_xfs/xapp_xfs.hash b/package/x11r7/xapp_xfs/xapp_xfs.hash index 67823742b5..27577ba2bd 100644 --- a/package/x11r7/xapp_xfs/xapp_xfs.hash +++ b/package/x11r7/xapp_xfs/xapp_xfs.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-August/002472.html -sha256 a40b75e674c091464f85739292b6bf24e2d153f4a2ac456d3ea6b8a64e269ffa xfs-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-November/002826.html +md5 b4d2e644bfb35cae8858d2411501b07e xfs-1.2.0.tar.bz2 +sha1 00848fcc2915ed8b00e75ac311c4727327324f57 xfs-1.2.0.tar.bz2 +sha256 db2212115783498f8eeaaee1349461d6c4e9d2005e142bacd3a984fe57269860 xfs-1.2.0.tar.bz2 +sha512 557b08aa07919239ce345d60b288b886640200bb1a59649fc890c3ccaa8559cc6745189614e696ab1b390ec024b393be5493787b7b0d2b3545b342d743c2e0ef xfs-1.2.0.tar.bz2 diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk index 3e704554b2..f4fe35dfb7 100644 --- a/package/x11r7/xapp_xfs/xapp_xfs.mk +++ b/package/x11r7/xapp_xfs/xapp_xfs.mk @@ -4,11 +4,11 @@ # ################################################################################ -XAPP_XFS_VERSION = 1.1.4 +XAPP_XFS_VERSION = 1.2.0 XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFS_LICENSE = MIT XAPP_XFS_LICENSE_FILES = COPYING -XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto +XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xproto_fontsproto $(eval $(autotools-package)) From 43e1d099b4fca37ce7cbbf3dd41fe4330610b723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 28 Nov 2017 23:50:38 -0500 Subject: [PATCH 142/160] Revert "package/qt5webkit-examples: remove obsolete package" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 940bfe2f4336a3fea1ec6805db1f90ce83bd4a78 with the following changes: - new hashes for 5.6.3 and 5.9.1 (there is no 5.9.2). - BR2_PACKAGE_QT5BASE_LICENSE_APPROVED has been removed - add GPL-3 to licences - uses SPDX identifier for licences - add missing dependencies (qt5base, qt5webkit, qt5declarative) - removes /usr when qmake host-tools is invoked at configure Signed-off-by: Gaël PORTAY [Thomas: add entry in the DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 --- DEVELOPERS | 1 + package/qt5/Config.in | 1 + .../0001-Build-examples.patch | 52 ++++++++++++++++++ package/qt5/qt5webkit-examples/Config.in | 10 ++++ .../qt5webkit-examples.hash | 5 ++ .../qt5webkit-examples/qt5webkit-examples.mk | 54 +++++++++++++++++++ 7 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch create mode 100644 package/qt5/qt5webkit-examples/Config.in create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash create mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk diff --git a/Config.in.legacy b/Config.in.legacy index c8db9fac42..decbaceb76 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1154,13 +1154,6 @@ config BR2_x86_i386 The support for the i386 processors of the x86 architecture has been removed. -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES - bool "qt5webkit-examples package removed" - select BR2_LEGACY - help - The qt5webkit-examples package has been removed, since it - was removed from upstream starting from Qt 5.6. - config BR2_PACKAGE_QT5QUICK1 bool "qt5quick1 package removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 4057438c0e..8bd7d85039 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -679,6 +679,7 @@ F: package/zxing-cpp/ N: Gaël Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ +F: package/qt5/qt5webkit-examples/ N: Gary Bisson F: board/boundarydevices/ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 8513c36623..0136e1124f 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -80,6 +80,7 @@ source "package/qt5/qt5virtualkeyboard/Config.in" source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch new file mode 100644 index 0000000000..6303006f62 --- /dev/null +++ b/package/qt5/qt5webkit-examples/0001-Build-examples.patch @@ -0,0 +1,52 @@ +From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Tue, 28 Nov 2017 23:14:42 -0500 +Subject: [PATCH 1/1] Build examples +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +This patch improves the qt5webkit examples build for 2 aspects: + + - Allows to build even if qt5base examples are not enabled + - Builds xmlpatterns example only if the qt5xmlpattern package + has been built + +Signed-off-by: Massimo Callegari +Signed-off-by: Gaël PORTAY +[gportay: build imageanalyzer example if concurrent module is built] +--- + examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- + qtwebkit-examples.pro | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro +index ab20df4..67f6785 100644 +--- a/examples/webkitwidgets/webkitwidgets.pro ++++ b/examples/webkitwidgets/webkitwidgets.pro +@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ + previewer \ + fancybrowser \ + simpleselector \ +- imageanalyzer \ + framecapture \ + browser \ + embedded \ +- scroller \ +- xmlpatterns ++ scroller ++ ++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns ++qtHaveModule(concurrent): SUBDIRS += imageanalyzer +diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro +index 3fcecf1..2ade7ff 100644 +--- a/qtwebkit-examples.pro ++++ b/qtwebkit-examples.pro +@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) + load(qt_parts) + + SUBDIRS += doc ++SUBDIRS += examples +-- +2.15.0 + diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in new file mode 100644 index 0000000000..47bbcbaa68 --- /dev/null +++ b/package/qt5/qt5webkit-examples/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit-examples" + depends on BR2_PACKAGE_QT5WEBKIT + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package contains examples for the qt5webkit module. + + http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash new file mode 100644 index 0000000000..2af1efbaf0 --- /dev/null +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -0,0 +1,5 @@ +# Hash from: http://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist +sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk new file mode 100644 index 0000000000..59e9248ffe --- /dev/null +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# qt5webkit-examples +# +################################################################################ + +# no 5.9.2 package available, fall back to 5.9.1 version +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 +QT5WEBKIT_EXAMPLES_SITE = http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules +else +QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION) +QT5WEBKIT_EXAMPLES_SITE = http://download.qt.io/community_releases/5.6/$(QT5_VERSION) +endif + +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit + +QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 + +QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 +# Source files contain references to LGPL_EXCEPTION.txt but it is not included +# in the archive. + +ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) +QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns +endif + +define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) +endef + +define QT5WEBKIT_EXAMPLES_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5WEBKIT_DEPENDENCIES += qt5declarative +define QT5WEBKIT_EXAMPLES_INSTALL_QML + cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples +endef +endif + +define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib/qt/examples + cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples + $(QT5WEBKIT_EXAMPLES_INSTALL_QML) +endef + +$(eval $(generic-package)) From d42a19990f1c8d1c60f19990ee9709d6b3d3317f Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 12 Nov 2017 22:06:09 +0100 Subject: [PATCH 143/160] libostree: new package OSTree is an upgrade system for Linux-based operating systems Signed-off-by: Marcus Folkesson [Thomas: use SPDX license code, fix license, it's GPL-2.0+ not GPL-2.0.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libostree/Config.in | 25 ++++++++++++++ package/libostree/libostree.hash | 3 ++ package/libostree/libostree.mk | 59 ++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 package/libostree/Config.in create mode 100644 package/libostree/libostree.hash create mode 100644 package/libostree/libostree.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8bd7d85039..35507de953 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1017,6 +1017,7 @@ N: Marcin Nowakowski F: package/libkcapi/ N: Marcus Folkesson +F: package/libostree/ F: utils/diffconfig N: Marek Belisko diff --git a/package/Config.in b/package/Config.in index e2f71b4353..877cbf2cbe 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1926,6 +1926,7 @@ menu "System tools" source "package/keyutils/Config.in" source "package/kmod/Config.in" source "package/kvmtool/Config.in" + source "package/libostree/Config.in" source "package/lxc/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" diff --git a/package/libostree/Config.in b/package/libostree/Config.in new file mode 100644 index 0000000000..b62f4ea0a1 --- /dev/null +++ b/package/libostree/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBOSTREE + bool "libostree" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on !BR2_STATIC_LIBS # libfuse + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme + # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_XZ + help + OSTree is an upgrade system for Linux-based operating + systems. + + https://ostree.readthedocs.io/en/latest/ + +comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_MMU diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash new file mode 100644 index 0000000000..7acc04e3e8 --- /dev/null +++ b/package/libostree/libostree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 fc409f04c9fd440b83b4fa324f3b912cbf61145389378d44254b8b191c9fef08 libostree-2017.12.tar.xz +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk new file mode 100644 index 0000000000..bac44ddbdb --- /dev/null +++ b/package/libostree/libostree.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# libostree +# +################################################################################ + +LIBOSTREE_VERSION = 2017.12 +LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz +LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) + +LIBOSTREE_LICENSE = GPL-2.0+ +LIBOSTREE_LICENSE_FILES = COPYING +LIBOSTREE_DEPENDENCIES = e2fsprogs host-pkgconf libfuse libglib2 libgpgme xz + +LIBOSTREE_CONF_OPTS += --with-gpgme-prefix=$(STAGING_DIR)/usr + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBOSTREE_CONF_OPTS += --with-openssl +LIBOSTREE_DEPENDENCIES += openssl +else +LIBOSTREE_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_AVAHI),y) +LIBOSTREE_CONF_OPTS += --with-avahi +LIBOSTREE_DEPENDENCIES += avahi +else +LIBOSTREE_CONF_OPTS += --without-avahi +endif + +#cURL support depends on libsoup +ifeq ($(BR2_PACKAGE_LIBSOUP),y) +LIBOSTREE_CONF_OPTS += --with-libsoup +LIBOSTREE_DEPENDENCIES += libsoup +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBOSTREE_CONF_OPTS += --with-curl +LIBOSTREE_DEPENDENCIES += libcurl +else +LIBOSTREE_CONF_OPTS += --without-curl +endif +else +LIBOSTREE_CONF_OPTS += --without-libsoup --without-curl +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +LIBOSTREE_CONF_OPTS += --with-libarchive +LIBOSTREE_DEPENDENCIES += libarchive +else +LIBOSTREE_CONF_OPTS += --without-libarchive +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LIBOSTREE_CONF_OPTS += --with-selinux +LIBOSTREE_DEPENDENCIES += libselinux +else +LIBOSTREE_CONF_OPTS += --without-selinux +endif + +$(eval $(autotools-package)) From b09586c4c3560cb3b0607d91a4a50df6c9d9d775 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 10 Nov 2017 00:56:48 +0300 Subject: [PATCH 144/160] gcc: allow the selection of upstream GCC 7.x for ARC Upstream gcc now has support for ARC, as of 7.x, with 7.2 being usable, so let's allow its selection. GCC from Synopsys GitHub still has a lot of fixes and improvements most of which will be a part of the next upstream release but let's see how it goes and if we see vanilla GCC doesn't require way too many back-ported patches we'll be able to get rid of Synopsys GitHub here at all. As of today the only really required back-port is the one for non-uClibc libc. Back-ported from upstream master with help of: -------------------->8-------------------- git format-patch 927c0132251f -1 -- . ':!gcc/ChangeLog' ':!libgcc/ChangeLog' -------------------->8-------------------- Signed-off-by: Alexey Brodkin Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...ript-to-allow-non-uclibc-based-tripl.patch | 51 +++++++++++++++++++ package/gcc/Config.in.host | 1 - package/gcc/gcc.mk | 2 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 package/gcc/7.2.0/0893-ARC-Configure-script-to-allow-non-uclibc-based-tripl.patch diff --git a/package/gcc/7.2.0/0893-ARC-Configure-script-to-allow-non-uclibc-based-tripl.patch b/package/gcc/7.2.0/0893-ARC-Configure-script-to-allow-non-uclibc-based-tripl.patch new file mode 100644 index 0000000000..4f97c2f3da --- /dev/null +++ b/package/gcc/7.2.0/0893-ARC-Configure-script-to-allow-non-uclibc-based-tripl.patch @@ -0,0 +1,51 @@ +From 927c0132251f1cd3452b96ebd75f1b06bc53e4ec Mon Sep 17 00:00:00 2001 +From: claziss +Date: Mon, 10 Jul 2017 13:55:26 +0000 +Subject: [PATCH] [ARC] Configure script to allow non uclibc based triplets + +gcc/ +2017-07-10 Vineet Gupta + + * config.gcc: Remove uclibc from arc target spec. + +libgcc/ +2017-07-10 Vineet Gupta + + * config.host: Remove uclibc from arc target spec. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@250097 138bc75d-0d04-0410-961f-82ee72b054a4 +Signed-off-by: Alexey Brodkin +--- + gcc/config.gcc | 2 +- + libgcc/config.host | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 1b47457..933a451 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1044,7 +1044,7 @@ arc*-*-elf*) + big*) tm_file="arc/big.h ${tm_file}" + esac + ;; +-arc*-*-linux-uclibc*) ++arc*-*-linux*) + tm_file="arc/arc-arch.h dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arc/linux.h ${tm_file}" + tmake_file="${tmake_file} arc/t-arc" + extra_gcc_objs="driver-arc.o" +diff --git a/libgcc/config.host b/libgcc/config.host +index 989ac71..a5ab453 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -383,7 +383,7 @@ arc*-*-elf*) + extra_parts="crti.o crtn.o crtend.o crtbegin.o crtendS.o crtbeginS.o" + extra_parts="$extra_parts crttls.o" + ;; +-arc*-*-linux-uclibc*) ++arc*-*-linux*) + tmake_file="${tmake_file} t-slibgcc-libgcc t-slibgcc-nolc-override arc/t-arc-uClibc arc/t-arc" + extra_parts="$extra_parts crti.o crtn.o" + extra_parts="$extra_parts crttls.o" +-- +2.10.2 + diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 74c1b2f4e2..70cce0a5c5 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -58,7 +58,6 @@ config BR2_GCC_VERSION_6_X config BR2_GCC_VERSION_7_X bool "gcc 7.x" # Broken or unsupported architectures - depends on !BR2_arc depends on !BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 1112003df4..27fc1e987c 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -10,7 +10,7 @@ GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION)) -ifeq ($(BR2_arc),y) +ifeq ($(BR2_GCC_VERSION_ARC),y) GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz else ifeq ($(BR2_or1k),y) From e1432d28e9d5d326667174638658e1e629f3ba93 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 10 Nov 2017 19:37:26 +0300 Subject: [PATCH 145/160] binutils: allow the selection of upstream binutils 2.29 for ARC As of today quite a lot of ARC stuff got merged in upsream such that we may finally use upstream realease for building and even running Linux kernel and rootfs built with vanilla binutils. Essentially upstream release is still a bit behind our GitHub-based releases but let's try to use vanilla version and if we're lucky enough with just a small set of back-ported patches we'll be able to use vanilla release(s) for everything in Buildroot. Signed-off-by: Alexey Brodkin Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Cc: Peter Korsgaard [Thomas: fixup the condition to select the special binutils site for ARC.] Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 11 ++++++++--- package/binutils/binutils.mk | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 95144c84c9..4a2992a79b 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -2,8 +2,8 @@ comment "Binutils Options" choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_28_X - depends on !BR2_arc + default BR2_BINUTILS_VERSION_2_28_X if !BR2_arc + default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. @@ -11,18 +11,23 @@ config BR2_BINUTILS_VERSION_2_27_X bool "binutils 2.27" # binutils 2.27 triggers a bug in elf2flt on ARM/noMMU depends on !(BR2_arm && !BR2_USE_MMU) + depends on !BR2_arc config BR2_BINUTILS_VERSION_2_28_X bool "binutils 2.28.1" + depends on !BR2_arc config BR2_BINUTILS_VERSION_2_29_X bool "binutils 2.29.1" +config BR2_BINUTILS_VERSION_ARC + bool "binutils arc (2.29)" + depends on BR2_arc endchoice config BR2_BINUTILS_VERSION string - default "arc-2017.09-release" if BR2_arc + default "arc-2017.09-release" if BR2_BINUTILS_VERSION_ARC default "2.27" if BR2_BINUTILS_VERSION_2_27_X default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index d2bf5b9755..473fcac181 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -15,7 +15,7 @@ BINUTILS_VERSION = 2.28.1 endif endif # BINUTILS_VERSION -ifeq ($(BR2_arc),y) +ifeq ($(BINUTILS_VERSION),arc-2017.09-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y From c0a1ad9d6b7e2e23f9e29c607276491a7ede108b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Nov 2017 06:58:54 +0100 Subject: [PATCH 146/160] uclibc: enable NPTL for or1k With 1.0.27 NPTL for or1k is improved and can be used by default. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 3b4f91da91..47f25b5c1b 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -48,7 +48,7 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" depends on BR2_USE_MMU - depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k + depends on !BR2_m68k && !BR2_microblaze select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL From 913c822e01d184c6a867cb68c7fda8de8724aac6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Nov 2017 06:59:56 +0100 Subject: [PATCH 147/160] qemu-or1k: update to 4.14.x Or1k support improved, f.e. musl can be tested inside qemu. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- board/qemu/or1k/{linux-4.11.config => linux.config} | 0 configs/qemu_or1k_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename board/qemu/or1k/{linux-4.11.config => linux.config} (100%) diff --git a/board/qemu/or1k/linux-4.11.config b/board/qemu/or1k/linux.config similarity index 100% rename from board/qemu/or1k/linux-4.11.config rename to board/qemu/or1k/linux.config diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 0eb1916a41..c667142185 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -5,12 +5,12 @@ BR2_or1k=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4,11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 4,14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.2" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux-4.11.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" From fc6a562c04be41d9e869c644dd6691fc5d5aa3ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Nov 2017 07:00:28 +0100 Subject: [PATCH 148/160] musl: enable or1k architecture With Linux kernel >= 4.13.x musl or1k can be used with Qemu. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-buildroot/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index c624350cac..9668f8d41a 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -79,10 +79,10 @@ comment "glibc on MIPS w/ NAN2008 needs a toolchain w/ headers >= 4.5" config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_microblaze || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh || BR2_x86_64 + depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ + BR2_microblaze || BR2_mips || BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_or1k || BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks # sh2 nommu is supported by musl, but we don't have support # for it in Buildroot. From b0dc300b73124b42ea3465973e20b962f064a870 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 30 Nov 2017 00:33:34 +0100 Subject: [PATCH 149/160] package/efl: bump to 1.20.6 https://www.enlightenment.org/news/efl-1.20.6 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index edc72c2d1f..8b0543007e 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.5.tar.xz.sha256 -sha256 da5e69b81c94b79f4e31cfc312413c36acb7429e1cb6fd4397a1251a0e23c21c efl-1.20.5.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256 +sha256 56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1 efl-1.20.6.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index e0748d2215..5a82479ff5 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.20.5 +EFL_VERSION = 1.20.6 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+ From 203219ca93947bbf5d43edba89380ff41ef5a8a8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:39 +0100 Subject: [PATCH 150/160] core: sort packages and eliminate duplicates in show-targets Currently, enabling more than one filesystem image will make 'show-targets' list a few host packages more than once. This is because all filesystem images add the same set of host-packages to their dependencies, which are then added as-is to the package list. Thus, host-fakeroot, host-makedevs and, if needed, host-mkpasswd will appear as many times as there are filesystem images enabled. Fix that by sorting the package list, thus eliminating duplicates from that list. Also sort the rootfs list for good measure. Sort the two separately, so that rootfses are last. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ef10c90489..d52852153f 100644 --- a/Makefile +++ b/Makefile @@ -793,7 +793,7 @@ legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p .PHONY: show-targets show-targets: - @echo $(PACKAGES) $(TARGETS_ROOTFS) + @echo $(sort $(PACKAGES)) $(sort $(TARGETS_ROOTFS)) .PHONY: show-build-order show-build-order: $(patsubst %,%-show-build-order,$(PACKAGES)) From 6426f64176ea33660a05c8bccd2b8c5e38220a63 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:40 +0100 Subject: [PATCH 151/160] linux: split overly-long dependency line for readability Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index bd5589bae0..1c5631f937 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -485,7 +485,10 @@ $(eval $(kconfig-package)) # Support for rebuilding the kernel after the cpio archive has # been generated in $(BINARIES_DIR)/rootfs.cpio. -$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio +$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed +$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_images_installed +$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(BINARIES_DIR)/rootfs.cpio +$(LINUX_DIR)/.stamp_initramfs_rebuilt: @$(call MESSAGE,"Rebuilding kernel with initramfs") # Build the kernel. $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) From cef77a6cf5c1982d22e899f046d5e345c0271e7a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:41 +0100 Subject: [PATCH 152/160] linux: meddle not in the internals of filesystems Currently, the rule to rebuild the Linux kernel with an initramfs directly depends on the path of the file of the intermediate cpio image. This is inherently "bad" from a purity point of view; linux.mk should not have to delve into the fs internals. Rather, make it directly depend on the "frontal" rule that generates the cpio image. Drop the comment for linux-rebuild-with-initramfs, it was misleading (talking about generating "the initramfs list of files", which is not what was done, since we use a cpio as source of initramfs, not a list of files). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 1c5631f937..5300b9cfc5 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -484,21 +484,17 @@ endif # BR_BUILDING $(eval $(kconfig-package)) # Support for rebuilding the kernel after the cpio archive has -# been generated in $(BINARIES_DIR)/rootfs.cpio. -$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed -$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_images_installed -$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(BINARIES_DIR)/rootfs.cpio -$(LINUX_DIR)/.stamp_initramfs_rebuilt: +# been generated. +.PHONY: linux-rebuild-with-initramfs +linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_target_installed +linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_images_installed +linux-rebuild-with-initramfs: rootfs-cpio +linux-rebuild-with-initramfs: @$(call MESSAGE,"Rebuilding kernel with initramfs") # Build the kernel. - $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) + $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME) $(LINUX_APPEND_DTB) # Copy the kernel image(s) to its(their) final destination $(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR)) # If there is a .ub file copy it to the final destination test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR) - $(Q)touch $@ - -# The initramfs building code must make sure this target gets called -# after it generated the initramfs list of files. -linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt From 0a49b49e0a7df15347ccf9fa03c618639e9947b9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:42 +0100 Subject: [PATCH 153/160] fs/initramfs: cleanups, enhance comments rootfs-initramfs is not using the generic fs infrastructure, because there is virtually nothing to do to build the initramfs image: there is no actual image to be built to begin with. The only purpose of rootfs-initramfs is to ensure the rootfs.cpio image is built and then that the Linux kernel is rebuilt with that rootfs.cpio as initramfs source. Using variables of the fs infra like if it were used is misleading. It looked nice as long as there was the possibility that rootfs-initramfs would one day use the fs infra. But there's no way that will happen any time soon. Furthermore, the linux' rule linux-rebuild-with-initramfs now already depends on rootfs-cpio by itself, so we need not duplicate this dependency in rootfs-initramfs. Still, we want to advertise that the dependency is on rootfs-cpio, so we get nice dependency graphs (and not expose the internal linux-rebuild-with-initramfs rule to the users). So, remove the variables and directly define the rules. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Romain Naour Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- fs/initramfs/initramfs.mk | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk index db5081224c..b8dee18ec5 100644 --- a/fs/initramfs/initramfs.mk +++ b/fs/initramfs/initramfs.mk @@ -5,17 +5,25 @@ # ################################################################################ -ROOTFS_INITRAMFS_DEPENDENCIES += rootfs-cpio - -ROOTFS_INITRAMFS_POST_TARGETS += linux-rebuild-with-initramfs - - # The generic fs infrastructure isn't very useful here. +# +# The initramfs image does not actually build an image; its only purpose is: +# 1- to ensure rootfs.cpio is generated, +# 2- to then rebuild the kernel with rootfs.cpio as initramfs +# +# Note: ordering of the dependencies is not guaranteed here, but in +# linux/linux.mk, via the linux-rebuild-with-initramfs rule, which depends +# on the rootfs-cpio filesystem rule. +# +# Note: the trick here is that we directly depend on rebuilding the Linux +# kernel image (which itself depends on the rootfs-cpio rule), while we +# advertise that our dependency is on the rootfs-cpio rule, which is +# cleaner in the dependency graph. -rootfs-initramfs: $(ROOTFS_INITRAMFS_DEPENDENCIES) $(ROOTFS_INITRAMFS_POST_TARGETS) +rootfs-initramfs: linux-rebuild-with-initramfs rootfs-initramfs-show-depends: - @echo $(ROOTFS_INITRAMFS_DEPENDENCIES) + @echo rootfs-cpio .PHONY: rootfs-initramfs rootfs-initramfs-show-depends From 03b6b7952f7fad486d0c130acae08e7561739dae Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:43 +0100 Subject: [PATCH 154/160] fs/ext2: use a post-gen hook rather than a post-target rule post-target rules are probably not resilient to parallel builds, given that they do not depend on the image being generated first. Beside, we already have a mechanism for running stuff after the filesystem is generated, and that's called post-gen hooks. Use those hooks. Note: this basically reverts 75b6303 (rootfs-ext2: make the symlink as a _POST_TARGET) since we've now re-introduced post-gen hooks. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- fs/ext2/ext2.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 5439e2b993..12b87a722c 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -36,13 +36,11 @@ define ROOTFS_EXT2_CMD } endef -rootfs-ext2-symlink: - ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) - -.PHONY: rootfs-ext2-symlink - ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2) -ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink +define ROOTFS_EXT2_SYMLINK + ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) +endef +ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK endif $(eval $(call ROOTFS_TARGET,ext2)) From 9f2ca35998447a8107488925f5f60d371b46f047 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:44 +0100 Subject: [PATCH 155/160] fs/cpio: use a post-gen hook rather than a post-target rule We already have a mechanism for running stuff after the filesystem is generated, and that's called post-gen hooks. Use those hooks. Note: for cpio (and unlike ext2 previously), the dependency chain was correct, in that the post-target rule correctly depended on the image rule. Nonetheless, we still want to fix it for consistency. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- fs/cpio/cpio.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index e82167e512..c68e0bfb97 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -31,12 +31,13 @@ define ROOTFS_CPIO_CMD cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@ endef -$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools - $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \ - -C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@ - ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) -ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot +ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools +define ROOTFS_CPIO_UBOOT_MKIMAGE + $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \ + -C none -d $@$(ROOTFS_CPIO_COMPRESS_EXT) $@.uboot +endef +ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE endif $(eval $(call ROOTFS_TARGET,cpio)) From 207c596ad7669c6f09bebf83450e20bdba191631 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:45 +0100 Subject: [PATCH 156/160] fs/common: get rid of post-target rules The only users of post-target rules were ext2, cpio and initramfs. Of those, ext2 and cpio were changed to use post-gen hooks, while initramfs was not even using the generic rootfs infra and was fixed to no longer reference post-target rules. Besides, the comment in the infra was really misleading: it referenced initramfs implying it was the sole user of that feature, even though initramfs was not using the fs infra. Furthermore, using post-target rules was inherently broken for top-level parallel builds, because filesystems had to ensure the ordering by themselves. Of the two real users of post-target rules (cpio and ext2), one did enforce rules ordering (apparently correctly), while the other forgot to do so. We can get rid of post-target rules altogether, now. Add a legacy check, to catch out-of-tree (e.g. br2-external) users of post-target rules, and instruct them to switch to post-gen hooks instead. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- fs/common.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 5b612a3f41..378907e9ed 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -19,10 +19,6 @@ # ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after # generating the filesystem image # -# ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be -# run after running the main filesystem target. This is useful for -# initramfs, to rebuild the kernel once the initramfs is generated. -# # In terms of configuration option, this macro assumes that the # BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable # the generation of a filesystem image of a particular type. If @@ -115,7 +111,7 @@ endif rootfs-$(1)-show-depends: @echo $$(ROOTFS_$(2)_DEPENDENCIES) -rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS) +rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) .PHONY: rootfs-$(1) rootfs-$(1)-show-depends @@ -123,6 +119,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS_ROOTFS += rootfs-$(1) PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES)) endif + +# Check for legacy POST_TARGETS rules +ifneq ($$(ROOTFS_$(2)_POST_TARGETS),) +$$(error Filesystem $(1) uses post-target rules, which are no longer supported.\ + Update $(1) to use post-gen hooks instead) +endif + endef define ROOTFS_TARGET From b282f33cf83a18cc73365b897a912a16021d5475 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:46 +0100 Subject: [PATCH 157/160] fs: remove TARGET_DIR_WARNING_FILE late Remove it just before generating the filesystem image. This way, removing-and-recreating the file encloses the actual image generation as tightly as possible. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 378907e9ed..d4d5c183a5 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -70,7 +70,6 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) rm -f $$(FAKEROOT_SCRIPT) - rm -f $$(TARGET_DIR_WARNING_FILE) rm -f $$(USERS_TABLE) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) @@ -100,6 +99,7 @@ endif $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) chmod a+x $$(FAKEROOT_SCRIPT) + rm -f $$(TARGET_DIR_WARNING_FILE) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) From 917508e6bc2012103bf2ecaacdb892b8afbe8bb6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:47 +0100 Subject: [PATCH 158/160] fs: don't pollute $(BUILD_DIR) with temp files Currently, we create a bunch of temporary files in $(BUILD_DIR), while assembling the filesystem images. Move those files to their own sub-directory. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- fs/common.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index d4d5c183a5..7bbc143892 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -27,11 +27,12 @@ # BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the # macro will automatically generate a compressed filesystem image. -FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs -FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt +FS_DIR = $(BUILD_DIR)/buildroot-fs +FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs +FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ $(BR2_ROOTFS_STATIC_DEVICE_TABLE)) -USERS_TABLE = $(BUILD_DIR)/_users_table.txt +USERS_TABLE = $(FS_DIR)/users_table.txt ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) # Since this function will be called from within an $(eval ...) @@ -69,8 +70,8 @@ endif $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) - rm -f $$(FAKEROOT_SCRIPT) - rm -f $$(USERS_TABLE) + rm -rf $(FS_DIR) + mkdir -p $(FS_DIR) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) From 76ff49300923f239e8912d1fd107763c5e5886ce Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:48 +0100 Subject: [PATCH 159/160] fs/iso9660: don't pollute $(BUILD_DIR) with temp dir Use the newly-introdued $(FS_DIR) location to store temporary files. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- fs/iso9660/iso9660.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index d49d593bd6..c2de27101a 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -35,7 +35,7 @@ ROOTFS_ISO9660_USE_INITRD = YES endif ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES) -ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/rootfs.iso9660.tmp +ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp define ROOTFS_ISO9660_CREATE_TEMPDIR $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) mkdir -p $(ROOTFS_ISO9660_TARGET_DIR) From 787a31fed42f98a8e2e6a0bd2079376c861436f2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:49 +0100 Subject: [PATCH 160/160] fs: don't remove intermediate files Now that they are in their own directory and no longer pollute the build dir, there is no point in removing them. Furthermore, a follow-up patch will require that those files survive when more than one filesystem image is generated. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- fs/common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 7bbc143892..c17c4585ff 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -103,7 +103,6 @@ endif rm -f $$(TARGET_DIR_WARNING_FILE) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) - -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT) endif